Merge pull request #70 from jlenain/ctapipe-0.24-bis

Upgrade to ctapipe v0.24

Author: jlenain

.github/workflows/ci.yml

@@ -36,8 +36,8 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        python-version: ["3.9", "3.10", "3.11"]
-        ctapipe-version: [v0.19.3]
+        python-version: ["3.10", "3.11"]
+        ctapipe-version: [v0.24.0]
 
     defaults:
       run:

environment.yml

@@ -3,7 +3,7 @@ channels:
   - conda-forge
   - default
 dependencies:
-  - ctapipe=0.19
+  - ctapipe=0.24
   - h5py
   - ipython
   - numba

pyproject.toml

@@ -15,15 +15,14 @@ classifiers = [
     "Topic :: Scientific/Engineering :: Astronomy",
     "Topic :: Scientific/Engineering :: Physics",
     "Programming Language :: Python :: 3 :: Only",
-    "Programming Language :: Python :: 3.9",
     "Programming Language :: Python :: 3.10",
     "Programming Language :: Python :: 3.11"
 ]
-requires-python = ">=3.9"
+requires-python = ">=3.10"
 dependencies = [
-    "ctapipe~=0.19",
+    "ctapipe~=0.24.0",
     "protozfits",
-    "scipy==1.11.4",
+    "scipy",
 ]
 
 # needed for setuptools_scm, we don't define a static version

src/ctapipe_io_nectarcam/__init__.py

@@ -45,7 +45,7 @@
 
 from .anyarray_dtypes import CDTS_AFTER_37201_DTYPE, CDTS_BEFORE_37201_DTYPE, TIB_DTYPE
 from .calibration import NectarCAMR0Corrections
-from .constants import N_GAINS, N_PIXELS, N_SAMPLES
+from .constants import N_GAINS, N_PIXELS, N_SAMPLES, nectarcam_location
 from .containers import (
     NectarCAMDataContainer,
     NectarCAMDataStreamContainer,
@@ -636,7 +636,9 @@ def pre_v6_data(self):
         return self._pre_v6_data
 
     @staticmethod
-    def create_subarray(geometry_version, tel_id=0):
+    def create_subarray(
+        geometry_version, tel_id=0, reference_location=nectarcam_location
+    ):
         """
         Obtain the subarray from the EventSource
         Returns
@@ -675,6 +677,7 @@ def create_subarray(geometry_version, tel_id=0):
             name=f"MST-{tel_id} subarray",
             tel_descriptions=tel_descriptions,
             tel_positions=tel_positions,
+            reference_location=nectarcam_location,
         )
 
         return subarray
@@ -962,7 +965,7 @@ def fill_nectarcam_event_container_from_zfile(self, array_event, event):
 
         if not self.pre_v6_data:
             event_container.first_cell_id = np.full(
-                (N_PIXELS,), -1, dtype=event.first_cell_id.dtype
+                (N_PIXELS,), np.nan, dtype=event.first_cell_id.dtype
             )
             event_container.first_cell_id[
                 self.nectarcam_service.pixel_ids
@@ -1137,8 +1140,7 @@ def fill_r0r1_camera_container(self, zfits_event):
         Fill the r0 or r1 container, depending on whether gain
         selection has already happened (r1) or not (r0)
         This will create waveforms of shape (N_GAINS, N_PIXELS, N_SAMPLES),
-        or (N_PIXELS, N_SAMPLES) respectively regardless of the n_pixels, n_samples
-        in the file.
+        regardless of the n_pixels, n_samples in the file.
         Missing or broken pixels are filled using maxval of the waveform dtype.
         """
 

src/ctapipe_io_nectarcam/constants.py

@@ -1,4 +1,6 @@
 import numpy as np
+from astropy import units as u
+from astropy.coordinates.earth import EarthLocation
 
 N_GAINS = 2
 N_MODULES = 265
@@ -9,3 +11,10 @@
 LOW_GAIN = 1
 
 PIXEL_INDEX = np.arange(N_PIXELS)
+
+# Dummy location for NectarCAM, need for ctapipe.instrument.subarray
+nectarcam_location = EarthLocation(
+    lon=0 * u.deg,
+    lat=0 * u.deg,
+    height=0 * u.m,
+)