Merge pull request #147 from VERITAS-Observatory/trans_finder

Trans_finder

Author: GernotMaier

download_data_for_tests.sh

@@ -2,5 +2,5 @@
 
 set -e
 
-wget --no-verbose https://syncandshare.desy.de/index.php/s/FFqtMQ93PZEHiaj/download/github-CI.tar.gz
+wget --no-verbose https://syncandshare.desy.de/index.php/s/JRez6MJCFiEGenc/download/github-CI.tar.gz
 tar -xvzf github-CI.tar.gz

pyV2DL3/eventdisplay/EventDisplayDataSource.py

@@ -44,7 +44,9 @@ def __fill_response__(self, **kwargs):
                 " ze={1:.2f} deg,"
                 " pedvar={2:.1f}"
             ).format(
-                self.__azimuth__, self.__zenith__, self.__pedvar__,
+                self.__azimuth__,
+                self.__zenith__,
+                self.__pedvar__,
             )
         )
 
@@ -54,5 +56,6 @@ def __fill_response__(self, **kwargs):
             self.__azimuth__,
             self.__zenith__,
             self.__pedvar__,
-            self.__irf_to_store__, **kwargs
+            self.__irf_to_store__,
+            **kwargs
         )

pyV2DL3/eventdisplay/fillEVENTS.py

@@ -92,6 +92,9 @@ def __fillEVENTS__(edFileIO, select=None):
         altArr = DL3EventTree["El"][mask]
         energyArr = DL3EventTree["Energy"][mask]
         nTelArr = DL3EventTree["NImages"][mask]
+        Xoff = DL3EventTree["Xoff"][mask]
+        Yoff = DL3EventTree["Yoff"][mask]
+
         try:
             # Test if anasum file was created using the all events option.
             # In this case write out the additional output.
@@ -157,6 +160,8 @@ def __fillEVENTS__(edFileIO, select=None):
         evt_dict["GEOLON"] = VTS_REFERENCE_LON
         evt_dict["GEOLAT"] = VTS_REFERENCE_LAT
         evt_dict["ALTITUDE"] = VTS_REFERENCE_HEIGHT
+        evt_dict["Xoff"] = Xoff
+        evt_dict["Yoff"] = Yoff
 
         # Read evndispLog which is stored as TMacro in anasum root file (ED >= 486)
         try:

pyV2DL3/fillEVENTS.py

@@ -6,8 +6,30 @@
 import pyV2DL3.constant as constant
 
 
-def fillEVENTS(datasource, save_multiplicity=False, instrument_epoch=None):
+def add_existing_column(columns, evt_dict, name, format, unit=None):
+    """
+    Test if key `name` exists in `evt_dict`. If `true` add a new column to columns inplace.
+
+    Parameters
+    ----------
+    columns: list
+    evt_dict: dict
+    name: str
+        Used as name for the new column and key in evt_dict.
+    format: str
+    unit: str or None
+
+    Returns
+    -------
+    """
+
+    if name in evt_dict:
+        columns.append(
+            fits.Column(name=name, format=format, array=evt_dict[name], unit=unit)
+        )
+
 
+def fillEVENTS(datasource, save_multiplicity=False, instrument_epoch=None):
     logging.debug("Create EVENT HDU")
     evt_dict = datasource.get_evt_data()
 
@@ -19,14 +41,15 @@ def fillEVENTS(datasource, save_multiplicity=False, instrument_epoch=None):
         fits.Column(name="DEC", format="1E", array=evt_dict["DEC"], unit="deg"),
         fits.Column(name="ENERGY", format="1E", array=evt_dict["ENERGY"], unit="TeV"),
     ]
-    try:
-        columns.append(fits.Column("IS_GAMMA", format="1L", array=evt_dict["IS_GAMMA"]))
-        columns.append(
-            fits.Column("BDT_SCORE", format="1E", array=evt_dict["BDT_SCORE"])
-        )
-        logging.debug("Found BDT variables in event list")
-    except KeyError:
-        logging.debug("No BDT variables in event list")
+
+    # Test if key exists in evt_dict. If yes, add these columns.
+    add_existing_column(columns, evt_dict, name="ALT", format="1E", unit="deg")
+    add_existing_column(columns, evt_dict, name="AZ", format="1E", unit="deg")
+    add_existing_column(columns, evt_dict, name="Xoff", format="1E")
+    add_existing_column(columns, evt_dict, name="Yoff", format="1E")
+    add_existing_column(columns, evt_dict, name="IS_GAMMA", format="1L")
+    add_existing_column(columns, evt_dict, name="BDT_SCORE", format="1E")
+
     # Number of triggered telescope if necessary
     if save_multiplicity:
         columns.append(
@@ -45,9 +68,7 @@ def fillEVENTS(datasource, save_multiplicity=False, instrument_epoch=None):
     hdu1.header.set("EQUINOX", constant.EQUINOX, "base equinox")
     hdu1.header.set(
         "CREATOR",
-        "pyV2DL3 v{}::{}".format(
-            constant.VERSION, datasource.get_source_name()
-        ),
+        "pyV2DL3 v{}::{}".format(constant.VERSION, datasource.get_source_name()),
     )
     hdu1.header.set("ORIGIN", "VERITAS Collaboration", "Data from VERITAS")
     hdu1.header.set("TELESCOP", "VERITAS")
@@ -119,6 +140,13 @@ def fillEVENTS(datasource, save_multiplicity=False, instrument_epoch=None):
         "altitude of array center [m]",
     )
 
+    if hasattr(datasource, "__pedvar__"):
+        hdu1.header.set(
+            "PED_VAR",
+            datasource.__pedvar__,
+            "average pedestal variance",
+        )
+
     try:
         hdu1.header.set(
             "QUALITY",

pyV2DL3/script/v2dl3.py

@@ -2,10 +2,7 @@
 
 
 def main():
-    logging.basicConfig(
-        format="%(levelname)s: %(message)s",
-        level=logging.INFO
-    )
+    logging.basicConfig(format="%(levelname)s: %(message)s", level=logging.INFO)
     logging.info(
         """
             Run V2DL3 for VEGAS (.stage5) or EventDisplay (.anasum):