commit

uds/uds/utils.py

@@ -31,7 +31,7 @@ def remove_file(filename):
     if(os.path.isfile(filename)==True):
         os.remove(filename)            
 
-def do_evtool_esass(events=None,outfile=None,evlist=None,gti=None):
+def do_evtool_esass(events=None,outfile=None,evlist=None,gti=None,region=None,emin=None,emax=None):
 
     eventfiles=None
     if(events):
@@ -42,11 +42,14 @@ def do_evtool_esass(events=None,outfile=None,evlist=None,gti=None):
     if not (eventfiles):
         print("ERROR: Event files not provided")
 
+    emin="emin={}".format(emin) if(emin) else ''
+    emax="emax={}".format(emax) if(emax) else ''
     gti="gti=\'{}\'".format(gti) if(gti) else ''
+    region="region=\'{}\'".format(region) if(region) else ''
 
     cmd=["evtool",
          eventfiles,
-         gti,
+         gti,region,emin,emax,
         "outfile={}".format(outfile),
         "image=yes",
         "flag=0x2000",
@@ -119,7 +122,7 @@ def do_badpix_tm6(filename):
     f.close()
 
 def init_events(key=None, eband_selected=[0], eband_index=None,
-                ra_cen=None, de_cen=None,
+                ra_cen=None, de_cen=None,do_init=True,
                 emin_kev=None, emax_kev=None, infile_dir=None, outfile_dir=None,
                 do_obsmode=False,do_center=False,do_evtool=False,do_expmap=False):
     expmaps=[]
@@ -146,7 +149,7 @@ def init_events(key=None, eband_selected=[0], eband_index=None,
     
     infile="{}/{}.fits".format(infile_dir,key)
         
-    if(do_obsmode==True):
+    if(do_obsmode==True and do_init==True):
         """ correct OBS_MODE in files """
             
         lockfile="{}/{}.obsmode.lock".format(infile_dir,key)
@@ -164,7 +167,7 @@ def init_events(key=None, eband_selected=[0], eband_index=None,
             print("Lock file {} is found, skipping OBS_MODE correction.".format(lockfile))
             pass
 
-    if(do_center==True):
+    if(do_center==True and do_init==True):
         """ re-center original events files """
         if not (ra_cen and de_cen):
             print("Please provide center coordinates")
@@ -198,7 +201,7 @@ def init_events(key=None, eband_selected=[0], eband_index=None,
          "pattern=15"
         ]
     # run the command
-    if(do_evtool==True):
+    if(do_evtool==True and do_init==True):
         #log = subprocess.check_call(cmd)
         print((" ").join(cmd))
         test_exe('evtool')
@@ -215,7 +218,7 @@ def init_events(key=None, eband_selected=[0], eband_index=None,
 
 
     outfile_expmap="{}_ExposureMap_en{}{}".format(os.path.join(outfile_dir,key), eband_index, outfile_post)
-    if(do_expmap==True):
+    if(do_expmap==True and do_init==True):
         cmd=["expmap",
              "inputdatasets=%s" %(outfile_evtool),
              "emin=%s" %(emin_kev),
@@ -230,7 +233,7 @@ def init_events(key=None, eband_selected=[0], eband_index=None,
         test_exe('expmap')
         os.system((" ").join(cmd))
 
-    return outfile_evtool
+    return outfile_evtool,outfile_expmap
 
 
 def test_exe(program):