Commit 0362149a authored by Yan Zhaojun's avatar Yan Zhaojun
Browse files

test

parent 2d2f26d7
Loading
Loading
Loading
Loading
Loading
+32 −26
Original line number Diff line number Diff line
@@ -1493,33 +1493,8 @@ class MCIsimulator():
        
        self._createEmpty()
        
        now=datetime.utcnow()
               
        data_time=now.strftime("%Y-%m-%d-%H-%M-%S")
        
        print('simnumber', simnumber)   

        self.log = lg.setUpLogger(self.result_path+'/log_Data/MCIsim_'+source+'_'+data_time+'_Num_'+str(simnumber)+'.log')
        
        #print('logger.handlers=', self.log.handlers)
        
        self.log.info('-------STARTING A NEW SIMULATION------------')
        
        self.log.info('The exposure order is  %i ' % simnumber )
        
        #load instrument model, these values are also stored in the FITS header
        
        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"]
        
        #### load telescope efficiency data
        print(self.information['dir_path'])

        self.tel_eff=np.load(self.information['dir_path']+'MCI_inputData/tel_eff/tel_eff.npy',allow_pickle=True).item()
        
        #### load MCI filter data
        self.filterP=np.load(self.information['dir_path']+'MCI_inputData/MCI_filters/mci_filterPWTC.npy',allow_pickle=True).item()    
        
        ###########################################################################
        
@@ -1558,6 +1533,37 @@ class MCIsimulator():
            os.mkdir(self.result_path+'/PSF_Data')
                
                
        now=datetime.utcnow()
               
        data_time=now.strftime("%Y-%m-%d-%H-%M-%S")
        
        print('simnumber', simnumber)     

        self.log = lg.setUpLogger(self.result_path+'/log_Data/MCIsim_'+source+'_'+data_time+'_Num_'+str(simnumber)+'.log')
        
        #print('logger.handlers=', self.log.handlers)
        
        self.log.info('-------STARTING A NEW SIMULATION------------')
        
        self.log.info('The exposure order is  %i ' % simnumber )
        
        #load instrument model, these values are also stored in the FITS header
        
        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"]
        
        #### load telescope efficiency data
        print(self.information['dir_path'])
        
        self.tel_eff=np.load(self.information['dir_path']+'MCI_inputData/tel_eff/tel_eff.npy',allow_pickle=True).item()
        
        #### load MCI filter data
        self.filterP=np.load(self.information['dir_path']+'MCI_inputData/MCI_filters/mci_filterPWTC.npy',allow_pickle=True).item()    
        



        
        return