Fix looping over r0 instead of triggered telescope ids, assign reorde…

…red waveform

src/ctapipe_io_lst/__init__.py

@@ -477,6 +477,7 @@ def fill_from_cta_r1(self, array_event, zfits_event):
 
         reordered_waveform = np.full((n_channels, N_PIXELS, n_samples), 0.0, dtype=np.float32)
         reordered_waveform[:, pixel_id_map] = waveform
+        waveform = reordered_waveform
 
         # FIXME, check using evb_preprocessing and make ctapipe support 2 gains
         if zfits_event.num_channels == 2:
@@ -486,7 +487,6 @@ def fill_from_cta_r1(self, array_event, zfits_event):
             selected_gain_channel = np.where(has_high_gain, 0, 1)
             waveform = waveform[0]
 
-
         array_event.lst.tel[self.tel_id] = self.fill_lst_from_ctar1(zfits_event)
 
         trigger = array_event.trigger

src/ctapipe_io_lst/calibration.py

@@ -224,11 +224,11 @@ def __init__(self, subarray, config=None, parent=None, **kwargs):
     def apply_drs4_corrections(self, event: LSTArrayEventContainer):
         self.update_first_capacitors(event)
 
-        for tel_id, r0 in event.r0.tel.items():
+        for tel_id in event.trigger.tels_with_trigger:
             r1 = event.r1.tel[tel_id]
             # If r1 was not yet filled, copy of r0 converted
             if r1.waveform is None:
-                r1.waveform = r0.waveform
+                r1.waveform = event.r0.tel[tel_id].waveform
 
             # float32 can represent all values of uint16 exactly,
             # so this does not loose precision.