Skip to content

Commit 4ad3206

Browse files
committed
Merge tag 'v0.14.1' into Jorge_TriggerReader
test last version of ctlearn
2 parents b7bb9c1 + 7d0c170 commit 4ad3206

3 files changed

Lines changed: 19 additions & 10 deletions

File tree

.zenodo.json

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,12 @@
11
{
22
"license": "MIT",
33
"contributors": [
4+
{
5+
"affiliation": "Instituto de F\u00edsica de Part\u00edculas y del Cosmos, Departamento de EMFTEL, Universidad Complutense de Madrid, Madrid, Spain ",
6+
"name": "Cervi\u00f1o Cort\u00ednez, Alexander",
7+
"type": "Researcher",
8+
"orcid": "0009-0007-1566-9507"
9+
},
410
{
511
"orcid": "0000-0002-5686-2078",
612
"affiliation": "Laboratoire d'Annecy de Physique des Particules, CNRS, Universit\u00e9 Savoie Mont-Blanc, Annecy, France",
@@ -12,12 +18,6 @@
1218
"affiliation": "Instituto de F\u00edsica de Part\u00edculas y del Cosmos and Departamento de EMFTEL, Universidad Complutense de Madrid, Madrid, Spain",
1319
"type": "Researcher",
1420
"name": "Jos\u00e9 Luis Contreras"
15-
},
16-
{
17-
"orcid": "0009-0007-1566-9507",
18-
"affiliation": "Instituto de F\u00edsica de Part\u00edculas y del Cosmos and Departamento de EMFTEL, Universidad Complutense de Madrid, Madrid, Spain",
19-
"type": "Researcher",
20-
"name": "Alexander Cervi\u00f1o"
2121
}
2222
],
2323
"language": "eng",
@@ -31,7 +31,7 @@
3131
],
3232
"creators": [
3333
{
34-
"orcid": "0000-0003-1821-7964"
34+
"orcid": "0000-0003-1821-7964",
3535
"affiliation": "Universit\u00e9 de Gen\u00e8ve, D\u00e9partement de physique nucl\u00e9aire et corpusculaire, Gen\u00e8ve, Suisse",
3636
"name": "Tjark Miener"
3737
},

README.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ necessary package channels, and install dl1-data-handler specified version and i
4343

4444
.. code-block:: bash
4545
46-
DL1DH_VER=0.14.0
46+
DL1DH_VER=0.14.1
4747
wget https://raw.githubusercontent.com/cta-observatory/dl1-data-handler/v$DL1DH_VER/environment.yml
4848
conda env create -n [ENVIRONMENT_NAME] -f environment.yml
4949
conda activate [ENVIRONMENT_NAME]
@@ -56,7 +56,7 @@ Links
5656
-----
5757

5858

59-
* `Cherenkov Telescope Array (CTA) <https://www.ctao.org/>`_ - Homepage of the CTA Observatory
59+
* `Cherenkov Telescope Array Observatory (CTAO) <https://www.ctao.org/>`_ - Homepage of the CTA Observatory
6060
* `CTLearn <https://github.com/ctlearn-project/ctlearn/>`_ and `GammaLearn <https://gitlab.lapp.in2p3.fr/GammaLearn/GammaLearn>`_ - Repository of code for studies on applying deep learning to IACT analysis tasks. Maintained by groups at Universidad Complutense de Madrid, University of Geneva (CTLearn) and LAPP (GammaLearn).
6161
* `ctapipe <https://cta-observatory.github.io/ctapipe/>`_ - Official documentation for the ctapipe analysis package (in development)
6262

dl1_data_handler/reader.py

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -295,6 +295,15 @@ def __init__(
295295
if selected_tel_ids is not None:
296296
self.subarray = self.subarray.select_subarray(selected_tel_ids)
297297
self.tel_ids = self.subarray.tel_ids
298+
# Copy the pixel rotation of the camera geometry for each telescope of the subarray
299+
# in a variable since the ImageMapper will derotate the pixels. The pixel rotation
300+
# is needed to create a rotated camera frame in order to transform the true Alt/Az
301+
# coordinates to correct camera coordinate offsets.
302+
self.pix_rotation = {}
303+
for tel_id in self.tel_ids:
304+
self.pix_rotation[tel_id] = self.subarray.tel[
305+
tel_id
306+
].camera.geometry.pix_rotation
298307
self.selected_telescopes = {}
299308
for tel_type in self.subarray.telescope_types:
300309
# If is needed here for some sims where the same tel_type is stored twice
@@ -836,7 +845,7 @@ def _transform_to_cam_coord_offsets(self, table) -> Table:
836845
# Set the camera frame with the focal length and rotation of the camera
837846
camera_frame = CameraFrame(
838847
focal_length=self.subarray.tel[tel_id].optics.equivalent_focal_length,
839-
rotation=self.subarray.tel[tel_id].camera.geometry.pix_rotation,
848+
rotation=self.pix_rotation[tel_id],
840849
telescope_pointing=fix_tel_pointing,
841850
)
842851
# Transform the true Alt/Az coordinates to camera coordinates

0 commit comments

Comments
 (0)