MAGIC reader compatible with ctapipe 0.7.0.post98

ctapipe_io_magic/__init__.py

@@ -80,7 +80,7 @@ class MAGICEventSource(EventSource):
         geom = CameraGeometry.from_name('MAGICCam')
         self.magic_tel_description = TelescopeDescription(name='MAGIC', tel_type='MAGIC', optics=optics, camera=geom)
         self.magic_tel_descriptions = {1: self.magic_tel_description, 2: self.magic_tel_description}
-        self.magic_subarray = SubarrayDescription('MAGIC', self.magic_tel_positions, self.magic_tel_descriptions)
+        self._subarray_info = SubarrayDescription('MAGIC', self.magic_tel_positions, self.magic_tel_descriptions)
 
     @staticmethod
     def is_compatible(file_mask):
@@ -175,6 +175,10 @@ class MAGICEventSource(EventSource):
 
         return run
 
+    @property
+    def subarray(self):
+        return self._subarray_info
+
     def _generator(self):
         """
         The default event generator. Return the stereo event
@@ -276,9 +280,6 @@ class MAGICEventSource(EventSource):
                 data.dl0.tels_with_data = tels_with_data
                 data.trig.tels_with_trigger = tels_with_data
 
-                # Setting the instrument sub-array
-                data.inst.subarray = self.magic_subarray
-
                 yield data
                 counter += 1
 
@@ -387,9 +388,6 @@ class MAGICEventSource(EventSource):
                 data.dl0.tels_with_data = tels_with_data
                 data.trig.tels_with_trigger = tels_with_data
 
-                # Setting the instrument sub-array
-                data.inst.subarray = self.magic_subarray
-
                 yield data
                 counter += 1
 
@@ -498,9 +496,6 @@ class MAGICEventSource(EventSource):
                 data.dl0.tels_with_data = tels_with_data
                 data.trig.tels_with_trigger = tels_with_data
 
-                # Setting the instrument sub-array
-                data.inst.subarray = self.magic_subarray
-
                 yield data
                 counter += 1
 
@@ -559,7 +554,7 @@ class MAGICEventSourceMC(EventSource):
         geom = CameraGeometry.from_name('MAGICCam')
         self.magic_tel_description = TelescopeDescription(name='MAGIC', tel_type='MAGIC', optics=optics, camera=geom)
         self.magic_tel_descriptions = {1: self.magic_tel_description, 2: self.magic_tel_description}
-        self.magic_subarray = SubarrayDescription('MAGIC', self.magic_tel_positions, self.magic_tel_descriptions)
+        self._subarray_info = SubarrayDescription('MAGIC', self.magic_tel_positions, self.magic_tel_descriptions)
 
     @staticmethod
     def is_compatible(file_name):
@@ -600,6 +595,10 @@ class MAGICEventSourceMC(EventSource):
 
         return is_magic_root_file
 
+    @property
+    def subarray(self):
+        return self._subarray_info
+
     def _generator(self):
         """
         The default event generator. Return the stereo event
@@ -682,9 +681,6 @@ class MAGICEventSourceMC(EventSource):
             data.dl0.tels_with_data = tels_with_data
             data.trig.tels_with_trigger = tels_with_data
 
-            # Setting the instrument sub-array
-            data.inst.subarray = self.magic_subarray
-
             # mc = data.mc.tel[self.mc_file.telescope]
             # mc.dc_to_pe = array_event['laser_calibrations'][tel_id]['calib']
             # mc.pedestal = array_event['camera_monitorings'][tel_id]['pedestal']
@@ -781,9 +777,6 @@ class MAGICEventSourceMC(EventSource):
             data.dl0.tels_with_data = tels_with_data
             data.trig.tels_with_trigger = tels_with_data
 
-            # Setting the instrument sub-array
-            data.inst.subarray = self.magic_subarray
-
             # mc = data.mc.tel[self.mc_file.telescope]
             # mc.dc_to_pe = array_event['laser_calibrations'][tel_id]['calib']
             # mc.pedestal = array_event['camera_monitorings'][tel_id]['pedestal']