From b3f2e1fd601ef70ec5648a7862d5899ac16fbb4a Mon Sep 17 00:00:00 2001 From: Elisa-Visentin <121040436+Elisa-Visentin@users.noreply.github.com> Date: Mon, 26 May 2025 17:01:38 +0200 Subject: [PATCH 01/10] Update ci.yml --- .github/workflows/ci.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 8afcefd..cbbbde7 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -18,8 +18,8 @@ jobs: runs-on: ubuntu-latest strategy: matrix: - python-version: ["3.9", "3.10", "3.11"] - ctapipe-version: ["v0.19.2"] + python-version: ["3.10", "3.11", "3.12"] + ctapipe-version: ["v0.25.0"] defaults: run: From 09e77ff1c073ca2ccec041eb086880ad979fd6eb Mon Sep 17 00:00:00 2001 From: Elisa-Visentin <121040436+Elisa-Visentin@users.noreply.github.com> Date: Mon, 26 May 2025 17:01:54 +0200 Subject: [PATCH 02/10] Update deploy.yml --- .github/workflows/deploy.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index 1697ed4..8c00bf8 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -13,7 +13,7 @@ jobs: - name: Set up Python uses: actions/setup-python@v5 with: - python-version: "3.9" + python-version: "3.11" - name: Install dependencies run: | From 14e80b2dfb7de13206a7413ea47d9f969c5aa31f Mon Sep 17 00:00:00 2001 From: Elisa-Visentin <121040436+Elisa-Visentin@users.noreply.github.com> Date: Mon, 26 May 2025 17:03:13 +0200 Subject: [PATCH 03/10] Update __init__.py --- ctapipe_io_magic/__init__.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/ctapipe_io_magic/__init__.py b/ctapipe_io_magic/__init__.py index 6f5a080..5bb7387 100644 --- a/ctapipe_io_magic/__init__.py +++ b/ctapipe_io_magic/__init__.py @@ -16,6 +16,7 @@ from astropy import units as u from astropy.time import Time from pkg_resources import resource_filename +from astropy.coordinates import EarthLocation from ctapipe.io import EventSource, DataLevel from ctapipe.core import Provenance, Container, Field @@ -885,6 +886,7 @@ def prepare_subarray_info(self): # MAGIC telescope positions in m wrt. to the center of MAGIC simulations, from # CORSIKA and reflector input card and recomputed (rotated) to be w.r.t. geographical North + reference_location = EarthLocation.of_site('lapalma') MAGIC_TEL_POSITIONS = { 1: [34.99, -24.02, 0.00] * u.m, 2: [-34.99, 24.02, 0.00] * u.m, @@ -971,6 +973,7 @@ def prepare_subarray_info(self): name="MAGIC", tel_positions=MAGIC_TEL_POSITIONS, tel_descriptions=MAGIC_TEL_DESCRIPTIONS, + reference_location=reference_location, ) if self.allowed_tels: From a200f0c756d567248df08209f1ce8498793af83a Mon Sep 17 00:00:00 2001 From: Elisa-Visentin <121040436+Elisa-Visentin@users.noreply.github.com> Date: Mon, 26 May 2025 17:03:58 +0200 Subject: [PATCH 04/10] Update environment.yml --- environment.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/environment.yml b/environment.yml index 4d24084..e40c2a1 100644 --- a/environment.yml +++ b/environment.yml @@ -2,9 +2,9 @@ name: magicio channels: - conda-forge dependencies: - - astropy-base=5 + - astropy-base - python=3.11 - - ctapipe=0.19 + - ctapipe>=0.25.0 - eventio - corsikaio - zeromq @@ -14,8 +14,8 @@ dependencies: - numpydoc - pytest - pyyaml - - scipy<1.14 + - scipy - zlib - pip - h5py - - uproot=5 \ No newline at end of file + - uproot From c38560077924d4fe66a95a3d3b63b88fbfbe96df Mon Sep 17 00:00:00 2001 From: Elisa-Visentin <121040436+Elisa-Visentin@users.noreply.github.com> Date: Mon, 26 May 2025 17:04:22 +0200 Subject: [PATCH 05/10] Update example_stage1_config.json --- example_stage1_config.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/example_stage1_config.json b/example_stage1_config.json index 392a14c..5b429ad 100644 --- a/example_stage1_config.json +++ b/example_stage1_config.json @@ -4,9 +4,9 @@ }, "DataWriter": { "overwrite": true, - "write_images": true, - "write_parameters": true, - "write_showers": false, + "write_dl1_images": true, + "write_dl1_parameters": true, + "write_dl2": false, "transform_image": true, "transform_peak_time": true }, From 4ee80bb8d458a8e3815dd99d7d1a1498397e9e35 Mon Sep 17 00:00:00 2001 From: Elisa-Visentin <121040436+Elisa-Visentin@users.noreply.github.com> Date: Mon, 26 May 2025 17:05:51 +0200 Subject: [PATCH 06/10] Update setup.cfg --- setup.cfg | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/setup.cfg b/setup.cfg index 76a5dbf..0fc6c5f 100644 --- a/setup.cfg +++ b/setup.cfg @@ -18,21 +18,20 @@ classifiers = Topic :: Scientific/Engineering :: Astronomy Topic :: Scientific/Engineering :: Physics Programming Language :: Python :: 3 :: Only - Programming Language :: Python :: 3.8 - Programming Language :: Python :: 3.9 Programming Language :: Python :: 3.10 Programming Language :: Python :: 3.11 + Programming Language :: Python :: 3.12 [options] packages = find: -python_requires = >=3.8 +python_requires = >=3.10 zip_safe = False install_requires= - astropy~=5.0 - ctapipe~=0.19.0 + astropy + ctapipe>=0.25.0 numpy>=1.22 - uproot~=5.0 - scipy<1.14 + uproot + scipy [options.package_data] * = resources/* From fc30f6b7b4ddbe3b711bc126ddb64cdb3dd6923e Mon Sep 17 00:00:00 2001 From: Elisa-Visentin <121040436+Elisa-Visentin@users.noreply.github.com> Date: Wed, 28 May 2025 15:41:22 +0200 Subject: [PATCH 07/10] Update ctapipe v --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index cbbbde7..4d6d95f 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -19,7 +19,7 @@ jobs: strategy: matrix: python-version: ["3.10", "3.11", "3.12"] - ctapipe-version: ["v0.25.0"] + ctapipe-version: ["v0.25.1"] defaults: run: From 8a03393a40aa14d807d96956d159a8af9734028d Mon Sep 17 00:00:00 2001 From: Elisa-Visentin <121040436+Elisa-Visentin@users.noreply.github.com> Date: Fri, 30 May 2025 11:46:47 +0200 Subject: [PATCH 08/10] FIX REF. LOCATION --- ctapipe_io_magic/__init__.py | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/ctapipe_io_magic/__init__.py b/ctapipe_io_magic/__init__.py index 5bb7387..2754de5 100644 --- a/ctapipe_io_magic/__init__.py +++ b/ctapipe_io_magic/__init__.py @@ -16,8 +16,8 @@ from astropy import units as u from astropy.time import Time from pkg_resources import resource_filename -from astropy.coordinates import EarthLocation +from ctapipe_io_lst.constants import REFERENCE_LOCATION from ctapipe.io import EventSource, DataLevel from ctapipe.core import Provenance, Container, Field from ctapipe.core.traits import Bool, UseEnum @@ -886,7 +886,6 @@ def prepare_subarray_info(self): # MAGIC telescope positions in m wrt. to the center of MAGIC simulations, from # CORSIKA and reflector input card and recomputed (rotated) to be w.r.t. geographical North - reference_location = EarthLocation.of_site('lapalma') MAGIC_TEL_POSITIONS = { 1: [34.99, -24.02, 0.00] * u.m, 2: [-34.99, 24.02, 0.00] * u.m, @@ -973,7 +972,7 @@ def prepare_subarray_info(self): name="MAGIC", tel_positions=MAGIC_TEL_POSITIONS, tel_descriptions=MAGIC_TEL_DESCRIPTIONS, - reference_location=reference_location, + reference_location=REFERENCE_LOCATION, ) if self.allowed_tels: From 26a427e45d0360cfaee0f5b4c593d4266ed52b6a Mon Sep 17 00:00:00 2001 From: Elisa-Visentin <121040436+Elisa-Visentin@users.noreply.github.com> Date: Fri, 30 May 2025 11:56:19 +0200 Subject: [PATCH 09/10] add ctapipe_io_lst --- environment.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/environment.yml b/environment.yml index e40c2a1..5f6993d 100644 --- a/environment.yml +++ b/environment.yml @@ -5,6 +5,7 @@ dependencies: - astropy-base - python=3.11 - ctapipe>=0.25.0 + - ctapipe_io_lst - eventio - corsikaio - zeromq From 4a324dd359920332d8096f9a5af4eaf3f3e35dab Mon Sep 17 00:00:00 2001 From: Elisa-Visentin <121040436+Elisa-Visentin@users.noreply.github.com> Date: Fri, 30 May 2025 11:56:36 +0200 Subject: [PATCH 10/10] Update setup.cfg --- setup.cfg | 1 + 1 file changed, 1 insertion(+) diff --git a/setup.cfg b/setup.cfg index 0fc6c5f..ff34c36 100644 --- a/setup.cfg +++ b/setup.cfg @@ -29,6 +29,7 @@ zip_safe = False install_requires= astropy ctapipe>=0.25.0 + ctapipe_io_lst numpy>=1.22 uproot scipy