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

update

parent 7a2eca2f
Loading
Loading
Loading
Loading
Loading
+1 −1
Original line number Diff line number Diff line
@@ -57,7 +57,7 @@ def ill2flux(E, path):

    # use template from sky_bkg (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
    spec0 = cat_spec[2].values      # erg/s/cm^2/A/arcsec^2

+1 −1
Original line number Diff line number Diff line
@@ -57,7 +57,7 @@ def ill2flux(E, path):

    # use template from sky_bkg (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
    spec0 = cat_spec[2].values      # erg/s/cm^2/A/arcsec^2

+2 −4
Original line number Diff line number Diff line
@@ -180,9 +180,7 @@ class cosmicrays():
        return crImage
##################################################
############################################
############################################################################
#####################################
########################################

    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).
+6 −3
Original line number Diff line number Diff line
from ctypes import *


def checkInputList(input_list, n):
    if not isinstance(type(input_list), list):
        # if type(input_list) != type([1, 2, 3]):
@@ -49,7 +50,8 @@ 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): # 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)
    else:
        input_date_str = input_date_str.strip()
@@ -73,7 +75,8 @@ 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): # 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)
    else:
        input_time_str = input_time_str.strip()
+1 −1

File changed.

Contains only whitespace changes.