Commit 06599961 authored by Yan Zhaojun's avatar Yan Zhaojun
Browse files

debug

parents 5867477f d7cf2ff1

csst_mci_sim/csst_mci_sim.py

+11 −2
Original line number Diff line number Diff line
@@ -69,12 +69,21 @@ import configparser as ConfigParser 
#from matplotlib import pyplot as plt 



from scipy import ndimage

<<<<<<< HEAD

from support import logger as lg

from support import cosmicrays

from support import shao

from support import sed 

from support import MCIinstrumentModel

from mci_so import cdm03bidir

=======

from .support import logger as lg

from .support import cosmicrays

from .support import shao

from .support import sed 

from .support import MCIinstrumentModel

from .mci_so import cdm03bidir

>>>>>>> d7cf2ff1c8720245c57f8bef8a0138aaf8a9475a





from joblib import Parallel, delayed
@@ -1589,7 +1598,7 @@ class MCIsimulator(): 
                self.log.info('begin iteration........')

            

            #if self.debug:

            self.log.info('j =  %i' % (j))

            #self.log.info('j =  %i' % (j))

                

            starRa  = 3600.0*( newRa[j]   )  # ra of star,  arcsecond

            starDec = 3600.0*( newDec[j]  )  # dec of star, arcsecond
@@ -1761,7 +1770,7 @@ class MCIsimulator(): 
                ##self.log.info('appfat= %s'%(self.appFatt))

                

                if self.appFatt : 

                    self.log.info('begin appfat ........')

                    ###self.log.info('begin appfat ........')

                    

                ### apply treering and bright fatter and diffusion;                        

                    SimpleTreeRing = galsim.SiliconSensor().simple_treerings(amplitude=self.information['treering'])

requirements.txt

+3 −4
Original line number Diff line number Diff line 
numpy==1.23.3

numpy==1.23.5

scipy==1.9.2

setuptools==65.5.1

setuptools==65.6.3

pandas==1.5.3

julian==0.14

astropy==5.1

tqdm==4.59.0

tqdm==4.64.1

galsim==2.4.9
 
matplotlib==3.3.1

setup.py

+2 −2
Original line number Diff line number Diff line
@@ -16,7 +16,7 @@ with open("requirements.txt", "r") as f: 
setuptools.setup(

    

    name='csst_mci_sim',  # 包名

    version="1.2.0",  # 版本号

    version="3.0.0",  # 版本号

    author="Zhaojun Yan",  # 作者

    author_email="zhaojunyan@shao.ac.cn",  # 邮箱

    description="The CSST MCI simulation - prototype",  # 短描述
@@ -42,6 +42,6 @@ setuptools.setup( 
    package_data={"": ["LICENSE", "README.md"],

                  "csst_mci_sim": ["mci_so/*", "mci_data/*","CTI/*", "support/*"]},

    # 请注意检查，防止临时文件或其他不必要的文件被提交到仓库，否则会一同安装

    python_requires=">=3.11",  # Python版本要求

    python_requires=">=3.8",  # Python版本要求

    install_requires=requirements,

)