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

test

parent e31dcf3f

csst_mci_sim/csst_mci_sim.py

+1 −1
Original line number Diff line number Diff line
@@ -2002,7 +2002,7 @@ class MCIsimulator(): 
            rv_list = [0.0 for i in range(len(ra_list))]            

            

            ################################################      

            newRa, newDec = shao.onOrbitObsPosition(ra_list, dec_list, pmra_list, \

            newRa, newDec = shao.onOrbitObsPosition(self.information['dir_path'], ra_list, dec_list, pmra_list, \

                                              pmdec_list, rv_list, parallax_list, len(ra_list), \

                                              self.information['pos_x'], self.information['pos_y'], self.information['pos_z'], self.information['velocity_x'],self.information['velocity_y'],self.information['velocity_z'], "J2000", self.TianCe_day, self.TianCe_exp_start)

        else:

csst_mci_sim/support/shao.py

+2 −2
Original line number Diff line number Diff line
@@ -10,7 +10,7 @@ def checkInputList(input_list, n): 
    if len(input_list) != n:

        raise RuntimeError("Length of input list is not equal to stars' number!", input_list)

            

def onOrbitObsPosition(input_ra_list, input_dec_list, input_pmra_list, input_pmdec_list, input_rv_list, \

def onOrbitObsPosition(path, input_ra_list, input_dec_list, input_pmra_list, input_pmdec_list, input_rv_list, \

                       input_parallax_list, input_nstars, input_x, input_y, input_z, input_vx, input_vy, \

                       input_vz, input_epoch, input_date_str, input_time_str):

    #Check input parameters
@@ -90,7 +90,7 @@ def onOrbitObsPosition(input_ra_list, input_dec_list, input_pmra_list, input_pmd 
    currfile=os.getcwd()

    print(currfile)

    

    shao = cdll.LoadLibrary('../mci_so/libshao.so')

    shao = cdll.LoadLibrary(path+'MCI_inputData/TianCe/libshao.so')

    

    shao.onOrbitObs.restype = c_int