Commit 5d2797c8 authored by Alessio Berti's avatar Alessio Berti
Browse files

Use CameraDescription instead of CameraGeometry, as required by TelescopeDescription.

parent 0d5ee8a2
Pipeline #98254 failed with stage
in 9 minutes and 8 seconds
...@@ -33,7 +33,7 @@ from ctapipe.containers import PedestalContainer ...@@ -33,7 +33,7 @@ from ctapipe.containers import PedestalContainer
from ctapipe.instrument import TelescopeDescription from ctapipe.instrument import TelescopeDescription
from ctapipe.instrument import SubarrayDescription from ctapipe.instrument import SubarrayDescription
from ctapipe.instrument import OpticsDescription from ctapipe.instrument import OpticsDescription
from ctapipe.instrument import CameraGeometry from ctapipe.instrument import CameraDescription
__all__ = ['MAGICEventSource'] __all__ = ['MAGICEventSource']
...@@ -55,9 +55,10 @@ MAGIC_TEL_POSITIONS = { ...@@ -55,9 +55,10 @@ MAGIC_TEL_POSITIONS = {
# MAGIC telescope description # MAGIC telescope description
OPTICS = OpticsDescription.from_name('MAGIC') OPTICS = OpticsDescription.from_name('MAGIC')
GEOM = CameraGeometry.from_name('MAGICCam') MAGICCAM = CameraDescription.from_name("MAGICCam")
GEOM = MAGICCAM.geometry
MAGIC_TEL_DESCRIPTION = TelescopeDescription( MAGIC_TEL_DESCRIPTION = TelescopeDescription(
name='MAGIC', tel_type='MAGIC', optics=OPTICS, camera=GEOM) name='MAGIC', tel_type='MAGIC', optics=OPTICS, camera=MAGICCAM)
MAGIC_TEL_DESCRIPTIONS = {1: MAGIC_TEL_DESCRIPTION, 2: MAGIC_TEL_DESCRIPTION} MAGIC_TEL_DESCRIPTIONS = {1: MAGIC_TEL_DESCRIPTION, 2: MAGIC_TEL_DESCRIPTION}
# trigger patterns: # trigger patterns:
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment