diff --git a/csst_mci_sim/csst_mci_sim.py b/csst_mci_sim/csst_mci_sim.py index 19e91b870fb24d9267c89f02ffd9f3802ddf3208..2673f324dbb4aeb37310761e587ecfb441fb800a 100644 --- a/csst_mci_sim/csst_mci_sim.py +++ b/csst_mci_sim/csst_mci_sim.py @@ -26,7 +26,7 @@ from scipy.interpolate import interp1d import ipy.spatial as spatial # import sc # from matplotlib import pyplot as plt -#from joblib import Parallel, delayed +# from joblib import Parallel, delayed """ Created on Mon Oct 18 09:38:35 2021 @@ -96,7 +96,9 @@ except: from .mci_so import cdm03bidir #################################################### -########################### functions ######################### +# functions + + def get_file_extension(filename): # 浣跨敤os.path.splitext()鍑芥暟鍒嗗壊鏂囦欢鍚嶅拰鎵╁睍鍚� file_name, extension = os.path.splitext(filename) @@ -119,6 +121,8 @@ parameters in parallel and serial direction. """ # CDM03bidir + + class CDM03bidir(): """ Class to run CDM03 CTI model, class Fortran routine to perform the actual CDM03 calculations. diff --git a/csst_mci_sim/support/shao.py b/csst_mci_sim/support/shao.py index d6f8185808752dedcec781f20dc77f53bf425d18..d5fc942e0d909d3d500d1e423765002461ff164a 100644 --- a/csst_mci_sim/support/shao.py +++ b/csst_mci_sim/support/shao.py @@ -50,7 +50,7 @@ def onOrbitObsPosition(path, input_ra_list, input_dec_list, input_pmra_list, inp input_vy = input_vy*1000.0 input_vz = input_vz*1000.0 - if not isinstance(type(input_date_str), str): + if not isinstance(type(input_date_str), str): # type(input_date_str) != type("2025-03-05"): raise TypeError("Parameter 15 is not string!", input_date_str) else: @@ -75,7 +75,7 @@ def onOrbitObsPosition(path, input_ra_list, input_dec_list, input_pmra_list, inp raise TypeError( "Parameter 15 day range error [1 ~ 31]!", input_day) - if not isinstance(type(input_time_str), str): + if not isinstance(type(input_time_str), str): # type(input_time_str) != type("20:15:15.15"): raise TypeError("Parameter 16 is not string!", input_time_str) else: diff --git a/csst_mci_sim/zodiacal.py b/csst_mci_sim/zodiacal.py index b508cc2d3ad552355d958eb14e23f30553c80f10..2e7084d56f35248ac3deece86f5165f023e9e25b 100644 --- a/csst_mci_sim/zodiacal.py +++ b/csst_mci_sim/zodiacal.py @@ -29,7 +29,7 @@ def zodiacal(ra, dec, time, path): dt = datetime.fromisoformat(time) jd = julian.to_jd(dt, fmt='jd') - ###jd = time2jd(dt) + # jd = time2jd(dt) t = Time(jd, format='jd', scale='utc') astro_sun = get_sun(t) @@ -48,7 +48,7 @@ def zodiacal(ra, dec, time, path): # interpolated zodical surface brightness at 0.5 um zodi = pd.read_csv(path+'MCI_inputData/refs/zodi_map.dat', - sep='\s+', header=None, comment='#') + sep='\\s+', header=None, comment='#') beta_angle = np.array([0, 5, 10, 15, 20, 25, 30, 45, 60, 75]) lamda_angle = np.array([0, 5, 10, 15, 20, 25, 30, 35, 40, 45, 60, 75, 90, 105, 120, 135, 150, 165, 180]) @@ -58,7 +58,7 @@ def zodiacal(ra, dec, time, path): # read the zodical spectrum in the ecliptic cat_spec = pd.read_csv( - path+'MCI_inputData/refs/solar_spec.dat', sep='\s+', header=None, comment='#') + path+'MCI_inputData/refs/solar_spec.dat', sep='\\s+', header=None, comment='#') wave = cat_spec[0].values # A spec0 = cat_spec[1].values # 10^-8 W m^锟�? sr^锟�? 渭m^锟�? zodi_norm = 252 # 10^-8 W m^锟�? sr^锟�? 渭m^锟�?