Commit 912f171d authored by Yan Zhaojun's avatar Yan Zhaojun
Browse files

update

parent 7a2eca2f
Pipeline #7087 failed with stage
in 0 seconds
...@@ -57,7 +57,7 @@ def ill2flux(E, path): ...@@ -57,7 +57,7 @@ def ill2flux(E, path):
# use template from sky_bkg (background_spec_hst.dat) # use template from sky_bkg (background_spec_hst.dat)
filename = path+'MCI_inputData/refs/background_spec_hst.dat' filename = path+'MCI_inputData/refs/background_spec_hst.dat'
cat_spec = pd.read_csv(filename, sep='\s+', header=None, comment='#') cat_spec = pd.read_csv(filename, sep='\\s+', header=None, comment='#')
wave0 = cat_spec[0].values # A wave0 = cat_spec[0].values # A
spec0 = cat_spec[2].values # erg/s/cm^2/A/arcsec^2 spec0 = cat_spec[2].values # erg/s/cm^2/A/arcsec^2
......
...@@ -57,7 +57,7 @@ def ill2flux(E, path): ...@@ -57,7 +57,7 @@ def ill2flux(E, path):
# use template from sky_bkg (background_spec_hst.dat) # use template from sky_bkg (background_spec_hst.dat)
filename = path+'MCI_inputData/refs/background_spec_hst.dat' filename = path+'MCI_inputData/refs/background_spec_hst.dat'
cat_spec = pd.read_csv(filename, sep='\s+', header=None, comment='#') cat_spec = pd.read_csv(filename, sep='\\s+', header=None, comment='#')
wave0 = cat_spec[0].values # A wave0 = cat_spec[0].values # A
spec0 = cat_spec[2].values # erg/s/cm^2/A/arcsec^2 spec0 = cat_spec[2].values # erg/s/cm^2/A/arcsec^2
......
...@@ -48,7 +48,7 @@ class cosmicrays(): ...@@ -48,7 +48,7 @@ class cosmicrays():
self.log = log self.log = log
#image and size # image and size
self.image = image.copy() self.image = image.copy()
self.ysize, self.xsize = self.image.shape self.ysize, self.xsize = self.image.shape
...@@ -180,9 +180,7 @@ class cosmicrays(): ...@@ -180,9 +180,7 @@ class cosmicrays():
return crImage return crImage
################################################## ##################################################
############################################ ############################################
############################################################################
#####################################
########################################
def _drawEventsToCoveringFactor(self, coveringFraction=3.0, limit=1000, verbose=False): def _drawEventsToCoveringFactor(self, coveringFraction=3.0, limit=1000, verbose=False):
""" """
Generate cosmic ray events up to a covering fraction and include it to a cosmic ray map (self.cosmicrayMap). Generate cosmic ray events up to a covering fraction and include it to a cosmic ray map (self.cosmicrayMap).
......
...@@ -217,7 +217,7 @@ def Model_Galaxy_SED(wave, ugriz, z, temp, path): ...@@ -217,7 +217,7 @@ def Model_Galaxy_SED(wave, ugriz, z, temp, path):
temp (class): Class of gaalxy template temp (class): Class of gaalxy template
Returns: Returns:
float array: Spectral energy distribution of stellar SED, float array: Spectral energy distribution of stellar SED,
which have the same length to the input wave which have the same length to the input wave
""" """
sed = 10. ** (-0.4 * ugriz) sed = 10. ** (-0.4 * ugriz)
......
from ctypes import * from ctypes import *
def checkInputList(input_list, n): def checkInputList(input_list, n):
if not isinstance(type(input_list), list): if not isinstance(type(input_list), list):
# if type(input_list) != type([1, 2, 3]): # if type(input_list) != type([1, 2, 3]):
raise TypeError("Input type is not list!", input_list) raise TypeError("Input type is not list!", input_list)
for i in input_list: for i in input_list:
if not isinstance(type(i), float): # type(i) != type(1.1): if not isinstance(type(i), float): # type(i) != type(1.1):
...@@ -49,7 +50,8 @@ def onOrbitObsPosition(path, input_ra_list, input_dec_list, input_pmra_list, inp ...@@ -49,7 +50,8 @@ def onOrbitObsPosition(path, input_ra_list, input_dec_list, input_pmra_list, inp
input_vy = input_vy*1000.0 input_vy = input_vy*1000.0
input_vz = input_vz*1000.0 input_vz = input_vz*1000.0
if not isinstance(type(input_date_str), str): # type(input_date_str) != type("2025-03-05"): 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) raise TypeError("Parameter 15 is not string!", input_date_str)
else: else:
input_date_str = input_date_str.strip() input_date_str = input_date_str.strip()
...@@ -73,7 +75,8 @@ def onOrbitObsPosition(path, input_ra_list, input_dec_list, input_pmra_list, inp ...@@ -73,7 +75,8 @@ def onOrbitObsPosition(path, input_ra_list, input_dec_list, input_pmra_list, inp
raise TypeError( raise TypeError(
"Parameter 15 day range error [1 ~ 31]!", input_day) "Parameter 15 day range error [1 ~ 31]!", input_day)
if not isinstance(type(input_time_str), str): # type(input_time_str) != type("20:15:15.15"): 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) raise TypeError("Parameter 16 is not string!", input_time_str)
else: else:
input_time_str = input_time_str.strip() input_time_str = input_time_str.strip()
......
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