From fe4584574f34a56e820e7c68e11b44b12c89b208 Mon Sep 17 00:00:00 2001
From: Johan Comparat <comparat@mpe.mpg.de>
Date: Mon, 26 May 2025 14:59:12 +0200
Subject: [PATCH] skipping when no cluster events
---
src/esass/merge_events.py | 7 +++++--
src/esass/merge_events_noAGN.py | 7 +++++--
src/esass/readme_esass.sh | 16 ++++++++--------
3 files changed, 18 insertions(+), 12 deletions(-)
diff --git a/src/esass/merge_events.py b/src/esass/merge_events.py
index f7cf518..209299e 100644
--- a/src/esass/merge_events.py
+++ b/src/esass/merge_events.py
@@ -98,7 +98,10 @@ for sky_tile in sky_map_hdu[(sky_map_hdu['OWNER']==2)|(sky_map_hdu['OWNER']==0)]
for NCCD, tEXP in zip(n.arange(7)+1, texps):
agn_evt_files = n.array( glob.glob( os.path.join( agn_dir, 't0erass_ccd' + str(NCCD) + '_evt.fits' ) ) )
CL_evt_files = n.array( glob.glob( os.path.join( cluster_dir, 't0erass_ccd' + str(NCCD) + '_evt.fits' ) ) )
- ST_evt_files = n.array( glob.glob( os.path.join( stars_dir, 'simulated_photons_ccd' + str(NCCD) + '.fits' ) ) )
+ #ST_evt_files = n.array( glob.glob( os.path.join( stars_dir, 'simulated_photons_ccd' + str(NCCD) + '.fits' ) ) )
+ if len(CL_evt_files)==0:
+ print(str_field, 'continuing, no cluster file continue')
+ continue
hdu_A = fits.open(agn_evt_files[0])
texp_A = np.sum(hdu_A[2].data['STOP']-hdu_A[2].data['START'])
@@ -137,7 +140,7 @@ for sky_tile in sky_map_hdu[(sky_map_hdu['OWNER']==2)|(sky_map_hdu['OWNER']==0)]
for NCCD, tEXP in zip(n.arange(7)+1, texps):
agn_evt_files = n.array( glob.glob( os.path.join( agn_dir, 't0erass_ccd' + str(NCCD) + '_evt.fits' ) ) )
CL_evt_files = n.array( glob.glob( os.path.join( cluster_dir, 't0erass_ccd' + str(NCCD) + '_evt.fits' ) ) )
- ST_evt_files = n.array( glob.glob( os.path.join( stars_dir, 'simulated_photons_ccd' + str(NCCD) + '.fits' ) ) )
+ #ST_evt_files = n.array( glob.glob( os.path.join( stars_dir, 'simulated_photons_ccd' + str(NCCD) + '.fits' ) ) )
hdu_A = fits.open(agn_evt_files[0])
#N_ev_A = int(len(hdu_A[1].data) * frac_all) + 20
if len(hdu_A[1].data) >= N_ev_A :
diff --git a/src/esass/merge_events_noAGN.py b/src/esass/merge_events_noAGN.py
index 919bad7..6e97704 100644
--- a/src/esass/merge_events_noAGN.py
+++ b/src/esass/merge_events_noAGN.py
@@ -73,6 +73,9 @@ for sky_tile in sky_map_hdu[(sky_map_hdu['OWNER']==2)|(sky_map_hdu['OWNER']==0)]
N_evs = []
for NCCD, tEXP in zip(n.arange(7)+1, texps):
CL_evt_files = n.array( glob.glob( os.path.join( cluster_dir, 't0erass_ccd' + str(NCCD) + '_evt.fits' ) ) )
+ if len(CL_evt_files)==0:
+ print(str_field, 'continuing, no cluster file continue')
+ continue
hdu_C = fits.open(CL_evt_files[0])
texp_C = np.sum(hdu_C[2].data['STOP']-hdu_C[2].data['START'])
frac_C = tEXP/texp_C
@@ -89,7 +92,7 @@ for sky_tile in sky_map_hdu[(sky_map_hdu['OWNER']==2)|(sky_map_hdu['OWNER']==0)]
N_ev_C = int(f_CLU * N_ev_OBS/7)+1
if N_ev_B>len(bg_all):
- print('continue', 'not enough BG events', len(bg_all), 'when ', N_ev_B, 'are needed')
+ print(str_field, 'continue', 'not enough BG events', len(bg_all), 'when ', N_ev_B, 'are needed')
continue
data_C = []
@@ -111,7 +114,7 @@ for sky_tile in sky_map_hdu[(sky_map_hdu['OWNER']==2)|(sky_map_hdu['OWNER']==0)]
id_B = np.random.choice(np.arange(len(bg_all)), size = N_ev_B, replace = False)
data_B.append( bg_all[id_B] )
else:
- print('continue', 'not enough BG events', len(bg_tm), 'when ', N_ev_B, 'are needed')
+ print(str_field, 'continue', 'not enough BG events', len(bg_tm), 'when ', N_ev_B, 'are needed')
data_B.append( bg_all )
continue
diff --git a/src/esass/readme_esass.sh b/src/esass/readme_esass.sh
index 0bab4d6..86f8574 100644
--- a/src/esass/readme_esass.sh
+++ b/src/esass/readme_esass.sh
@@ -15,35 +15,35 @@ python make_summarySimEvt_skymap.py # DONE, OK, all files are there.
nohup python merge_events_onlyBG.py > logs/merge_events_onlyBG.log & # ONGOING
nohup python merge_events.py 1 1 > logs/merge_events_1_1.log & # ONGOING
-nohup python merge_events_noCLU.py 1 > logs/merge_events_noCLU_1.log & # ONGOING
+# nohup python merge_events_noCLU.py 1 > logs/merge_events_noCLU_1.log & # DONE
nohup python merge_events_noAGN.py 1 > logs/merge_events_noAGN_1.log & # ONGOING
nohup python merge_events.py 2 2 > logs/merge_events_2_2.log & # ONGOING
-nohup python merge_events_noCLU.py 2 > logs/merge_events_noCLU_2.log & # ONGOING
+# nohup python merge_events_noCLU.py 2 > logs/merge_events_noCLU_2.log & # DONE
nohup python merge_events_noAGN.py 2 > logs/merge_events_noAGN_2.log & # ONGOING
nohup python merge_events.py 3 3 > logs/merge_events_3_3.log & # ONGOING
-nohup python merge_events_noCLU.py 3 > logs/merge_events_noCLU_3.log & # ONGOING
+# nohup python merge_events_noCLU.py 3 > logs/merge_events_noCLU_3.log & # DONE
nohup python merge_events_noAGN.py 3 > logs/merge_events_noAGN_3.log & # ONGOING
nohup python merge_events.py 4 4 > logs/merge_events_4_4.log & # ONGOING
-nohup python merge_events_noCLU.py 4 > logs/merge_events_noCLU_4.log & # ONGOING
+# nohup python merge_events_noCLU.py 4 > logs/merge_events_noCLU_4.log & # DONE
nohup python merge_events_noAGN.py 4 > logs/merge_events_noAGN_4.log & # ONGOING
nohup python merge_events.py 5 5 > logs/merge_events_5_5.log & # ONGOING
-nohup python merge_events_noCLU.py 5 > logs/merge_events_noCLU_5.log & # ONGOING
+# nohup python merge_events_noCLU.py 5 > logs/merge_events_noCLU_5.log & # DONE
nohup python merge_events_noAGN.py 5 > logs/merge_events_noAGN_5.log & # ONGOING
nohup python merge_events.py 6 6 > logs/merge_events_6_6.log & # ONGOING
-nohup python merge_events_noCLU.py 6 > logs/merge_events_noCLU_6.log & # ONGOING
+# nohup python merge_events_noCLU.py 6 > logs/merge_events_noCLU_6.log & # DONE
nohup python merge_events_noAGN.py 6 > logs/merge_events_noAGN_6.log & # ONGOING
nohup python merge_events.py 7 7 > logs/merge_events_7_7.log & # ONGOING
-nohup python merge_events_noCLU.py 7 > logs/merge_events_noCLU_7.log & # ONGOING
+# nohup python merge_events_noCLU.py 7 > logs/merge_events_noCLU_7.log & # DONE
nohup python merge_events_noAGN.py 7 > logs/merge_events_noAGN_7.log & # ONGOING
nohup python merge_events.py 8 8 > logs/merge_events_8_8.log & # ONGOING
-nohup python merge_events_noCLU.py 8 > logs/merge_events_noCLU_8.log & # ONGOING
+# nohup python merge_events_noCLU.py 8 > logs/merge_events_noCLU_8.log & # DONE
nohup python merge_events_noAGN.py 8 > logs/merge_events_noAGN_8.log & # ONGOING
--
GitLab