Container Improvements and Cleanup for DL1

ctapipe/calib/camera/calibrator.py

@@ -105,6 +105,7 @@ def _calibrate_dl0(self, event, telid):
         waveforms_copy = waveforms.copy()
         waveforms_copy[~reduced_waveforms_mask] = 0
         event.dl0.tel[telid].waveform = waveforms_copy
+        event.dl0.tel[telid].selected_gain_channel = selected_gain_channel
 
     def _calibrate_dl1(self, event, telid):
         waveforms = event.dl0.tel[telid].waveform
@@ -120,9 +121,9 @@ def _calibrate_dl1(self, event, telid):
             #   - Don't do anything if dl1 container already filled
             #   - Update on SST review decision
             charge = waveforms[..., 0]
-            pulse_time = np.zeros(n_pixels)
+            peak_time = np.zeros(n_pixels)
         else:
-            charge, pulse_time = self.image_extractor(
+            charge, peak_time = self.image_extractor(
                 waveforms, telid=telid, selected_gain_channel=selected_gain_channel
             )
 
@@ -133,7 +134,7 @@ def _calibrate_dl1(self, event, telid):
         charge = (charge - pedestal) * relative / absolute
 
         event.dl1.tel[telid].image = charge
-        event.dl1.tel[telid].pulse_time = pulse_time
+        event.dl1.tel[telid].peak_time = peak_time
 
     def __call__(self, event):
         """

ctapipe/calib/camera/tests/test_calibrator.py

@@ -18,11 +18,11 @@ def test_camera_calibrator(example_event, example_subarray):
     calibrator = CameraCalibrator(subarray=example_subarray)
     calibrator(example_event)
     image = example_event.dl1.tel[telid].image
-    pulse_time = example_event.dl1.tel[telid].pulse_time
+    peak_time = example_event.dl1.tel[telid].peak_time
     assert image is not None
-    assert pulse_time is not None
+    assert peak_time is not None
     assert image.shape == (1764,)
-    assert pulse_time.shape == (1764,)
+    assert peak_time.shape == (1764,)
 
 
 def test_manual_extractor(example_subarray):