Skip to content

Ctapipe 25 #101

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 10 commits into
base: master
Choose a base branch
from
Open

Ctapipe 25 #101

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
b3f2e1f
Update ci.yml
Elisa-Visentin May 26, 2025
09e77ff
Update deploy.yml
Elisa-Visentin May 26, 2025
14e80b2
Update __init__.py
Elisa-Visentin May 26, 2025
a200f0c
Update environment.yml
Elisa-Visentin May 26, 2025
c385600
Update example_stage1_config.json
Elisa-Visentin May 26, 2025
4ee80bb
Update setup.cfg
Elisa-Visentin May 26, 2025
fc30f6b
Update ctapipe v
Elisa-Visentin May 28, 2025
8a03393
FIX REF. LOCATION
Elisa-Visentin May 30, 2025
26a427e
add ctapipe_io_lst
Elisa-Visentin May 30, 2025
4a324dd
Update setup.cfg
Elisa-Visentin May 30, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.1"]

defaults:
run:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/deploy.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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: |
Expand Down
2 changes: 2 additions & 0 deletions ctapipe_io_magic/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@
from astropy.time import Time
from pkg_resources import resource_filename

from ctapipe_io_lst.constants import REFERENCE_LOCATION
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

mmmh I would not have introduced a dependency also on ctapipe_io_lst ... I would assume that those coordinates will not change frequently (if at all, maybe when more than one LST is included, but that's quite in the future). I would probably go into the direction of including those constants in constants.py and update them if really needed. @jsitarek opinions?

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I do not have a strong opinion here. For ctapipe_io_magic this is an extra dependency which obviously is best to avoid if needed, but ctapipe_io_magic is either way always working together with magic-cta-pipe, where we have lstchain dependency, that needs ctapipe_io_lst, and all the versions still need to agree, so I do not see a big issue to leave it as it is now. But the option that you proposed is also fine with me.

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Maybe we can discuss that on Wednesday, so that we can collect opinions also from the rest of the group? Both options are fine for me, we just have to choose, but this is not extremely urgent

from ctapipe.io import EventSource, DataLevel
from ctapipe.core import Provenance, Container, Field
from ctapipe.core.traits import Bool, UseEnum
Expand Down Expand Up @@ -971,6 +972,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:
Expand Down
9 changes: 5 additions & 4 deletions environment.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,10 @@ name: magicio
channels:
- conda-forge
dependencies:
- astropy-base=5
- astropy-base
- python=3.11
- ctapipe=0.19
- ctapipe>=0.25.0
- ctapipe_io_lst
- eventio
- corsikaio
- zeromq
Expand All @@ -14,8 +15,8 @@ dependencies:
- numpydoc
- pytest
- pyyaml
- scipy<1.14
- scipy
- zlib
- pip
- h5py
- uproot=5
- uproot
6 changes: 3 additions & 3 deletions example_stage1_config.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
},
Expand Down
14 changes: 7 additions & 7 deletions setup.cfg
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,21 +18,21 @@ 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
ctapipe_io_lst
numpy>=1.22
uproot~=5.0
scipy<1.14
uproot
scipy

[options.package_data]
* = resources/*
Expand Down