revanshe

scripts/04_sas_spectrum_pn.py

@@ -40,16 +40,16 @@ files = glob.glob(archive_dir+'/*')
 
 for obsid in files:
     obsid = os.path.basename(obsid)
-    if(obsid in skip):
+    if not (obsid in good):
         continue
 
     work_dir = init_work_dir(obsid, products_dir=products_dir)
 
     os.chdir(work_dir)
 
-    eventfile=f'{products_dir}/{obsid}/EPIC_pn_gtiFilteredEvts.ds'
+    eventfile=f'{products_dir}/{obsid}/EPIC_PN_gtiFilteredEvts.ds'
     if(os.path.isfile(eventfile)==False):
-        print("*** run 02_filter_flares_pn.py ***")
+        print("*** run 02_sas_flares_pn.py ***")
         sys.exit()
 
     # EPIC_pn_gtiFilteredEvts.ds
@@ -64,7 +64,7 @@ for obsid in files:
 
     # Visualize the image with ds9
     src_fn=f'{ds9reg_dir}/{obsid}/src.reg'
-    bkg_fn=f'{ds9reg_dir}/{obsid}/bkg.reg'
+    bkg_fn=f'{ds9reg_dir}/{obsid}/ann.reg'
     x_source,y_source,r_source,x_bkg,y_bkg,r_bkg,r2_bkg = get_ds9_regions(out_IMFile, src_fn, bkg_fn)
 
     #########################################