Merge pull request #93 from VERITAS-Observatory/livetime

ONTIME is stored as sum of good time intervals and  comments updated in EVENTS header

Author: sona-patel

pyV2DL3/eventdisplay/fillEVENTS.py

@@ -134,10 +134,6 @@ def __fillEVENTS__(edFileIO, select={}):
         evt_dict["TSTART"] = tstart_from_reference
         evt_dict["TSTOP"] = tstop_from_reference
         evt_dict["MJDREFI"] = int(VTS_REFERENCE_MJD)
-        evt_dict["ONTIME"] = tstop_from_reference - tstart_from_reference
-        evt_dict["LIVETIME"] = (tstop_from_reference - tstart_from_reference) * (
-            1 - deadtime
-        )
         evt_dict["DEADC"] = 1 - deadtime
         evt_dict["OBJECT"] = runSummary["TargetName"][0]
         evt_dict["RA_PNT"] = avRA
@@ -168,7 +164,7 @@ def __fillEVENTS__(edFileIO, select={}):
             BitArray = file["run_{}".format(runNumber)]["stereo"]["timeMask"][
                 "maskBits"
             ].member("fAllBits")
-            gti_tstart_from_reference, gti_tstop_from_reference = getGTI(
+            gti_tstart_from_reference, gti_tstop_from_reference, ontime_s = getGTI(
                 BitArray, tstart_from_reference
             )
         except (KeyError):
@@ -178,6 +174,10 @@ def __fillEVENTS__(edFileIO, select={}):
             )
             gti_tstart_from_reference = [tstart_from_reference]
             gti_tstop_from_reference = [tstop_from_reference]
+            ontime_s = tstop_from_reference - tstart_from_reference
+
+        evt_dict["ONTIME"] = ontime_s
+        evt_dict["LIVETIME"] = ontime_s * (1 - deadtime)
 
     return (
         {

pyV2DL3/eventdisplay/util.py

@@ -565,6 +565,7 @@ def getGTI(BitArray, run_start_from_reference):
      ------
      gti_start_from_reference : numpy array of start time of GTIs in second from reference time
      gti_end_from_reference: numpy array of stop time of GTIs in second from reference time
+     ontime: Total of good times
 
     """
 
@@ -574,7 +575,7 @@ def getGTI(BitArray, run_start_from_reference):
         TimeArray_s.append(np.binary_repr(BitArray[i]).count('1'))
 
     duration_s = (n - 1) * 8 + TimeArray_s[-1]
-    ontime_s = np.sum(TimeArray_s[0:n - 1])
+    ontime_s = np.sum(TimeArray_s[0:n])
     print('Duration:', duration_s, '(sec.)', duration_s / 60., '(min.)')
     print('Ontime', ontime_s, '(sec.)', ontime_s / 60., '(min.)')
 
@@ -605,7 +606,7 @@ def getGTI(BitArray, run_start_from_reference):
         gti_start_from_reference[i] = gti_start[i] + run_start_from_reference
         gti_end_from_reference[i] = gti_end[i] + run_start_from_reference
 
-    return gti_start_from_reference, gti_end_from_reference
+    return gti_start_from_reference, gti_end_from_reference, ontime_s
 
 def getRunQuality(logdata):
     """

pyV2DL3/fillEVENTS.py

@@ -78,11 +78,11 @@ def fillEVENTS(datasource, save_multiplicity=False):
 
     hdu1.header.set('ONTIME  ', 
                     evt_dict['ONTIME'],
-                    'time on target (including deadtime)')
+                    'sum of good time intervals [s], does not include instrument deadtime correction')
 
     # Correct live time for time cuts
     hdu1.header.set('LIVETIME', evt_dict['LIVETIME'],
-                    '(dead=ONTIME-LIVETIME) [s] ')
+                    '(ontime * deadtime time correction) [s] ')
 
     hdu1.header.set('DEADC   ', evt_dict['DEADC'],
                     'Average dead time correction (LIVETIME/ONTIME)')