Ensured that espfilt will not run on ObsID-inst-subexp combos that it…

… has already run on. Indirectly for issue #69

Signed-off-by: David Turner <turne540@msu.edu>

daxa/process/xmm/clean.py

@@ -1,5 +1,5 @@
 #  This code is a part of the Democratising Archival X-ray Astronomy (DAXA) module.
-#  Last modified by David J Turner (turne540@msu.edu) 02/09/2024, 21:37. Copyright (c) The Contributors
+#  Last modified by David J Turner (turne540@msu.edu) 03/09/2024, 12:19. Copyright (c) The Contributors
 import os
 from random import randint
 from typing import Union, Tuple
@@ -333,30 +333,30 @@ def espfilt(obs_archive: Archive, method: str = 'histogram', with_smoothing: Uni
             final_paths = [evt_path, gti_path, hist_path]
 
             # If it doesn't already exist then we will create commands to generate it
-            # TODO Need to decide which file to check for here to see whether the command has already been run
-            # Make the temporary directory (it shouldn't already exist but doing this to be safe)
-            if not os.path.exists(temp_dir):
-                os.makedirs(temp_dir)
-
-            # Format the blank command string defined near the top of this function - in this case the
-            #  configuration needs to change depending on the instrument and user configuration
-            if inst == 'PN':
-                with_oot = 'yes'
-                rs = range_scale['pn']
-            else:
-                with_oot = 'no'
-                rs = range_scale['mos']
-
-            cmd = ef_cmd.format(d=temp_dir, ccf=ccf_path, ef=evt_list_file, woot=with_oot, oot=oot_evt_list_file,
-                                me=method, ws=with_smoothing, s=smooth_factor, wb=with_binning, bs=bin_size,
-                                r=ratio, el=filter_lo_en, eh=filter_hi_en, rs=rs, asi=allowed_sigma, gls=gauss_fit_lims,
-                                gti=gti_path, hist=hist_path, allev=evt_path, ogti=og_gti_name, ohist=og_hist_name,
-                                oallev=og_evt_name)
-
-            # Now store the bash command, the path, and extra info in the dictionaries
-            miss_cmds[miss.name][val_id] = cmd
-            miss_final_paths[miss.name][val_id] = final_paths
-            miss_extras[miss.name][val_id] = {'gti_path': gti_path, 'hist_path': hist_path}
+            if val_id not in obs_archive.process_success[miss.name]['cleaned_event_lists']
+                # Make the temporary directory (it shouldn't already exist but doing this to be safe)
+                if not os.path.exists(temp_dir):
+                    os.makedirs(temp_dir)
+
+                # Format the blank command string defined near the top of this function - in this case the
+                #  configuration needs to change depending on the instrument and user configuration
+                if inst == 'PN':
+                    with_oot = 'yes'
+                    rs = range_scale['pn']
+                else:
+                    with_oot = 'no'
+                    rs = range_scale['mos']
+
+                cmd = ef_cmd.format(d=temp_dir, ccf=ccf_path, ef=evt_list_file, woot=with_oot, oot=oot_evt_list_file,
+                                    me=method, ws=with_smoothing, s=smooth_factor, wb=with_binning, bs=bin_size,
+                                    r=ratio, el=filter_lo_en, eh=filter_hi_en, rs=rs, asi=allowed_sigma,
+                                    gls=gauss_fit_lims, gti=gti_path, hist=hist_path, allev=evt_path, ogti=og_gti_name,
+                                    ohist=og_hist_name, oallev=og_evt_name)
+
+                # Now store the bash command, the path, and extra info in the dictionaries
+                miss_cmds[miss.name][val_id] = cmd
+                miss_final_paths[miss.name][val_id] = final_paths
+                miss_extras[miss.name][val_id] = {'gti_path': gti_path, 'hist_path': hist_path}
 
     # This is just used for populating a progress bar during the process run
     process_message = 'Finding PN/MOS soft-proton flares'