Merge branch 'master' into fix_energy_integral

pyirf/io/eventdisplay.py

@@ -1,11 +1,10 @@
-from astropy.table import QTable
+import logging
+
+from astropy.table import QTable, unique
 import astropy.units as u
 
 from ..simulations import SimulatedEventsInfo
 
-import logging
-import numpy as np
-
 
 log = logging.getLogger(__name__)
 
@@ -45,16 +44,17 @@ def read_eventdisplay_fits(infile):
 
     """
     log.debug(f"Reading {infile}")
-    events_table = QTable.read(infile, hdu="EVENTS")
+    events = QTable.read(infile, hdu="EVENTS")
     sim_events = QTable.read(infile, hdu="SIMULATED EVENTS")
     run_header = QTable.read(infile, hdu="RUNHEADER")[0]
 
-    events = QTable({new: events_table[old] for new, old in COLUMN_MAP.items()})
+    for new, old in COLUMN_MAP.items():
+        events.rename_column(old, new)
 
-    n_runs = len(np.unique(events["obs_id"]))
-    log.info(f"Estimated number of runs from obs ids: {n_runs}")
+    n_runs = len(unique(events[['obs_id', 'pointing_az', 'pointing_alt']]))
+    log.info(f"Estimated number of runs from obs ids and pointing position: {n_runs}")
 
-    n_showers = run_header["num_showers"] * run_header["num_use"] * n_runs
+    n_showers = n_runs * run_header["num_use"] * run_header["num_showers"]
     log.debug(f"Number of events from n_runs and run header: {n_showers}")
     log.debug(f'Number of events histogram: {sim_events["EVENTS"].sum()}')