Commit d8cf2fc9 authored by Federico Di Pierro's avatar Federico Di Pierro
Browse files

Merge branch 'correct-camera-container' into 'master'

Use CameraDescription instead of CameraGeometry, as required by TelescopeDescription.

See merge request !18
parents 0d5ee8a2 5d2797c8
Pipeline #100191 failed with stage
in 9 minutes and 14 seconds
......@@ -33,7 +33,7 @@ from ctapipe.containers import PedestalContainer
from ctapipe.instrument import TelescopeDescription
from ctapipe.instrument import SubarrayDescription
from ctapipe.instrument import OpticsDescription
from ctapipe.instrument import CameraGeometry
from ctapipe.instrument import CameraDescription
__all__ = ['MAGICEventSource']
......@@ -55,9 +55,10 @@ MAGIC_TEL_POSITIONS = {
# MAGIC telescope description
OPTICS = OpticsDescription.from_name('MAGIC')
GEOM = CameraGeometry.from_name('MAGICCam')
MAGICCAM = CameraDescription.from_name("MAGICCam")
GEOM = MAGICCAM.geometry
MAGIC_TEL_DESCRIPTION = TelescopeDescription(
name='MAGIC', tel_type='MAGIC', optics=OPTICS, camera=GEOM)
name='MAGIC', tel_type='MAGIC', optics=OPTICS, camera=MAGICCAM)
# trigger patterns:
Markdown is supported
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