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

update

parent 912f171d
Pipeline #7088 failed with stage
in 0 seconds
......@@ -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.
......
......@@ -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:
......
......@@ -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^�?
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment