Commit 4c83d2d4 authored by Yan Zhaojun's avatar Yan Zhaojun
Browse files

test

parent b457c003
Loading
Loading
Loading
Loading
Loading
+32 −28
Original line number Diff line number Diff line
@@ -1252,6 +1252,35 @@ class MCIsimulator():
        """
        self.configfile = configfile
        self.section = 'TEST'       #####simulation section;   
        self.information = MCIinstrumentModel.MCIinformation()
        
        #update settings with defaults
        self.information.update(dict(quadrant=int(0),
                                     ccdx=int(0),
                                     ccdy=int(0),                                
                                     ccdxgap=1.643,
                                     ccdygap=8.116,
                                     xsize=2000,
                                     ysize=2000,
                                     fullwellcapacity=90000,
                                     pixel_size=0.05,
                                     dark=0.001,
                                     exptime=300.0,
                                     readouttime=4.,
                                     rdose=8.0e9,                                  
                                     ghostCutoff=22.0,
                                     ghostRatio=5.e-5,
                                     coveringfraction=0.1,    #CR: 
                                      cosmicraylengths =self.information['dir_path']+'MCI_inputData/data/cdf_cr_length.dat',
                                      cosmicraydistance=self.information['dir_path']+'MCI_inputData/data/cdf_cr_total.dat',                                
                                      parallelTrapfile =self.information['dir_path']+'MCI_inputData/data/cdm_euclid_parallel.dat',
                                      serialTrapfile   =self.information['dir_path']+'MCI_inputData/data/cdm_euclid_serial.dat',
                                     mode='same'))
            
            
        
        self.log.info('Read in the configuration files and created an empty array')
        
        
        
###############################################################################
@@ -1479,7 +1508,7 @@ class MCIsimulator():
        self.log.info('The exposure order is  %i ' % simnumber )
        
        #load instrument model, these values are also stored in the FITS header
        self.information = MCIinstrumentModel.MCIinformation()
        
        self.information['G_filters']=["F275W",  "F280N","NUV",   "WU",   "CBU",   "F343N",  "u",      "F373N", "F395N",  "F336W"]
        self.information['R_filters']=["F487N", "F502N", "CBV",   "r",    "F656N", "F658N",  "F467M",  "F555W", "F606W",  "F673N"]        
        self.information['I_filters']=["z",      "y",    "F815N", "CBI",  "F925N", "F960M",  "F968N",  "F845M" ,"F850LP" ,"F814W"]
@@ -1528,32 +1557,7 @@ class MCIsimulator():
            os.mkdir(self.result_path+'/sky_Data')
            os.mkdir(self.result_path+'/PSF_Data')

        #update settings with defaults
        self.information.update(dict(quadrant=int(0),
                                     ccdx=int(0),
                                     ccdy=int(0),                                
                                     ccdxgap=1.643,
                                     ccdygap=8.116,
                                     xsize=2000,
                                     ysize=2000,
                                     fullwellcapacity=90000,
                                     pixel_size=0.05,
                                     dark=0.001,
                                     exptime=300.0,
                                     readouttime=4.,
                                     rdose=8.0e9,                                  
                                     ghostCutoff=22.0,
                                     ghostRatio=5.e-5,
                                     coveringfraction=0.1,    #CR: 
                                     cosmicraylengths =FOLDER+'MCI_inputData/data/cdf_cr_length.dat',
                                     cosmicraydistance=FOLDER+'MCI_inputData/data/cdf_cr_total.dat',                                
                                     parallelTrapfile =FOLDER+'MCI_inputData/data/cdm_euclid_parallel.dat',
                                     serialTrapfile   =FOLDER+'MCI_inputData/data/cdm_euclid_serial.dat',
                                     mode='same'))
            
            

        self.log.info('Read in the configuration files and created an empty array')
        
        return