update code

csst/msc/calib_pos.py

@@ -428,7 +428,7 @@ class CsstProcMscPositionCalibration(CsstProcessor):
     def prepare(self, dm):
         self.dm = dm
 
-    def run(self, img_list, wht_list, flg_list, fn_list, ccd_ids, path_gaia, search_radius, pm_correct=True, wcs_refine=False, plot=False):
+    def run(self, img_list, wht_list, flg_list, ccd_ids, path_gaia, search_radius, pm_correct=True, wcs_refine=False, plot=False):
         print('preparing files for position calibration....')
         #self.join_data(img_list, wht_list, flg_list)
         print('################## run sextractor ###################')
@@ -437,7 +437,6 @@ class CsstProcMscPositionCalibration(CsstProcessor):
         result = p.map(prod_x, ccd_ids)
         p.close()
         p.join()
-        self.run_sextractor(ccd_ids)
         print('################## sextractor done ###################')
         print('############### combine sextractor catalog ###############')
         self.combine_catalog(ccd_ids)

csst/msc/pipeline.py

@@ -109,7 +109,7 @@ def do_one_exposure(ver_sim="C5.1", dir_l0="", dir_l1="", dir_pcref="", path_aux
     pcProc = CsstProcMscPositionCalibration()
     pcProc.prepare(dm)   
     if (img_list):
-        pcProc.run(img_list, wht_list, flg_list, fn_list, ccd_ids, dir_pcref, 2.0, pm_correct=True, wcs_refine=True, plot=True)
+        pcProc.run(img_list, wht_list, flg_list, ccd_ids, dir_pcref, 2.0, pm_correct=True, wcs_refine=True, plot=True)
     else:
         for this_ccd_id in ccd_ids:
             fp_img = dm.l1_sci(ccd_id=this_ccd_id, suffix="img",ext="fits")
@@ -122,7 +122,6 @@ def do_one_exposure(ver_sim="C5.1", dir_l0="", dir_l1="", dir_pcref="", path_aux
             wht_list.append(wht)
             flg_list.append(flg)
             fn_list.append(dm.l1_sci(ccd_id=this_ccd_id, suffix="img",ext="fits"))
-        print(ccd_ids)
         pcProc.run(img_list, wht_list, flg_list, fn_list, ccd_ids, dir_pcref, 2.0, pm_correct=True, wcs_refine=True, plot=True)
 
     pcProc.cleanup()