diff --git a/csst_mci_sim/csst_mci_sim.py b/csst_mci_sim/csst_mci_sim.py index 8541ff2ada9f6ae4040a7f4920db8b0f21ef58e6..471e3104c2999a153e2887bb95383661007cb5fe 100644 --- a/csst_mci_sim/csst_mci_sim.py +++ b/csst_mci_sim/csst_mci_sim.py @@ -1493,36 +1493,11 @@ 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() + ########################################################################### - ########################################################################### - now=datetime.utcnow() #data_time=now.strftime("%Y-%m-%d-%H-%M-%S") result_day=now.strftime("%Y-%m-%d") @@ -1556,6 +1531,37 @@ class MCIsimulator(): os.mkdir(self.result_path+'/ori_Sky') os.mkdir(self.result_path+'/sky_Data') 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() + +