update to ctapipe v0.8.0

Author: vuillaut

Benchmarks/DL1/integrated_distribution.ipynb

@@ -285,7 +285,7 @@
    "name": "python",
    "nbconvert_exporter": "python",
    "pygments_lexer": "ipython3",
-   "version": "3.7.3"
+   "version": "3.7.6"
   },
   "nteract": {
    "version": "0.12.3"

Preparation/integration_prep.ipynb

@@ -25,7 +25,7 @@
     "from ctapipe.calib import CameraCalibrator\n",
     "from ctapipe.visualization import CameraDisplay\n",
     "from ctapipe.io import HDF5TableWriter\n",
-    "from ctapipe.io.containers import Container, Field\n",
+    "from ctapipe.containers import Container, Field\n",
     "from ctabench import tel_to_impact_point_distance\n",
     "from ctapipe.image.extractor import GlobalPeakWindowSum, NeighborPeakWindowSum, FullWaveformSum\n",
     "from ctapipe.calib.camera.gainselection import ThresholdGainSelector"
@@ -109,20 +109,21 @@
     "    print(integrator)    \n",
     "    with HDF5TableWriter(output_filename, group_name=integrator, mode='a', add_prefix=True) as h5_table:\n",
     "\n",
-    "        cal = CameraCalibrator(image_extractor=globals()[integrator](), \n",
-    "                               gain_selector=ThresholdGainSelector(threshold=4094))\n",
+    "        cal = CameraCalibrator(source.subarray,\n",
+    "                               image_extractor=globals()[integrator](source.subarray), \n",
+    "                               )\n",
     "\n",
     "        for event in source:\n",
     "            cal(event)\n",
     "            \n",
     "            for tel_id in event.r0.tels_with_data:\n",
-    "                tel = event.inst.subarray.tel[tel_id]\n",
-    "                cam_id = tel.camera.cam_id\n",
+    "                tel = source.subarray.tel[tel_id]\n",
+    "                cam_id = tel.camera.camera_name\n",
     "                \n",
-    "                dl1_parameters.mc_distance_tel_impact = tel_to_impact_point_distance(event, tel_id)\n",
+    "                dl1_parameters.mc_distance_tel_impact = tel_to_impact_point_distance(event, source.subarray, tel_id)\n",
     "\n",
     "                image_container.calibrated = event.dl1.tel[tel_id].image\n",
-    "                image_container.true_pe = event.mc.tel[tel_id].photo_electron_image\n",
+    "                image_container.true_pe = event.mc.tel[tel_id].true_image\n",
     "                \n",
     "                h5_table.write(cam_id, [image_container, event.mc, event.r0, dl1_parameters])\n"
    ]
@@ -152,7 +153,7 @@
    "name": "python",
    "nbconvert_exporter": "python",
    "pygments_lexer": "ipython3",
-   "version": "3.7.3"
+   "version": "3.7.6"
   },
   "nteract": {
    "version": "0.12.3"

ctabench/core.py

@@ -4,7 +4,7 @@
     'tel_to_impact_point_distance'
 ]
 
-def tel_to_impact_point_distance(event, tel_id):
+def tel_to_impact_point_distance(event, subarray, tel_id):
     """
     Return the distance from the shower impact point to the telescope.
 
@@ -17,6 +17,5 @@ def tel_to_impact_point_distance(event, tel_id):
     -------
     `astropy.units.Quantity`
     """
-    tel_index = event.inst.subarray.tel_indices[tel_id]
-    return np.sqrt((event.mc.core_x - event.inst.subarray.tel_coords.x[tel_index]) ** 2
-                   + (event.mc.core_y - event.inst.subarray.tel_coords.y[tel_index]) ** 2)
+    return np.sqrt((event.mc.core_x - subarray.positions[tel_id][0]) ** 2
+                   + (event.mc.core_y - subarray.positions[tel_id][1]) ** 2)

setup.py

@@ -10,7 +10,7 @@
       description="library for CTA benchmarks",
       # these should be minimum list of what is needed to run
       packages=setuptools.find_packages(),
-      install_requires=['ctapipe=0.7.0',
+      install_requires=['ctapipe==0.8.0',
                         'seaborn',
                         'pandas',
                         ],