replace more uses

ctapipe/conftest.py

@@ -297,7 +297,7 @@ def dl1_image_file(dl1_tmp_path, prod5_gamma_simtel_path):
             f"--input={prod5_gamma_simtel_path}",
             f"--output={output}",
             "--write-dl1-images",
-            "--DataWriter.write_parameters=False",
+            "--DataWriter.write_dl1_parameters=False",
             "--max-events=20",
             "--DataWriter.Contact.name=αℓℓ the äüöß",
         ]
@@ -351,7 +351,7 @@ def dl1_muon_file(dl1_tmp_path):
             f"--input={infile}",
             f"--output={output}",
             "--write-dl1-images",
-            "--DataWriter.write_parameters=False",
+            "--DataWriter.write_dl1_parameters=False",
             "--DataWriter.Contact.name=αℓℓ the äüöß",
         ]
         assert run_tool(ProcessorTool(), argv=argv, cwd=dl1_tmp_path) == 0

ctapipe/io/datawriter.py

@@ -650,7 +650,7 @@ def _write_dl1_telescope_events(
             if self.write_dl1_images:
                 if dl1_camera.image is None:
                     raise ValueError(
-                        "DataWriter.write_images is True but event does not contain image"
+                        "DataWriter.write_dl1_images is True but event does not contain image"
                     )
                 # note that we always write the image, even if the image quality
                 # criteria are not met (those are only to determine if the parameters

ctapipe/io/tests/conftest.py

@@ -21,11 +21,11 @@ def r1_hdf5_file(r1_path):
     writer = DataWriter(
         event_source=source,
         output_path=path,
-        write_parameters=False,
-        write_images=False,
-        write_showers=False,
-        write_raw_waveforms=False,
-        write_waveforms=True,
+        write_dl1_parameters=False,
+        write_dl1_images=False,
+        write_dl2=False,
+        write_r0_waveforms=False,
+        write_r1_waveforms=True,
     )
 
     for e in source:

ctapipe/io/tests/test_datawriter.py

@@ -57,11 +57,11 @@ def test_write(tmpdir: Path):
     with DataWriter(
         event_source=source,
         output_path=output_path,
-        write_parameters=False,
-        write_images=True,
-        write_showers=True,
-        write_raw_waveforms=True,
-        write_waveforms=True,
+        write_dl1_parameters=False,
+        write_dl1_images=True,
+        write_dl2=True,
+        write_r0_waveforms=True,
+        write_r1_waveforms=True,
     ) as writer:
         writer.log.level = logging.DEBUG
         for event in source:
@@ -138,15 +138,15 @@ def test_roundtrip(tmpdir: Path):
     with DataWriter(
         event_source=source,
         output_path=output_path,
-        write_parameters=False,
-        write_images=True,
+        write_dl1_parameters=False,
+        write_dl1_images=True,
         transform_image=True,
         image_dtype="int32",
         image_scale=10,
         transform_peak_time=True,
         peak_time_dtype="int16",
         peak_time_scale=100,
-        write_showers=True,
+        write_dl2=True,
     ) as write:
         write.log.level = logging.DEBUG
         for event in source:
@@ -211,8 +211,8 @@ def test_dl1writer_no_events(tmpdir: Path):
     with DataWriter(
         event_source=source,
         output_path=output_path,
-        write_parameters=True,
-        write_images=True,
+        write_dl1_parameters=True,
+        write_dl1_images=True,
     ) as writer:
         writer.log.level = logging.DEBUG
         writer.write_simulation_histograms(source)
@@ -249,8 +249,8 @@ def test_metadata(tmpdir: Path):
         with DataWriter(
             event_source=source,
             output_path=output_path,
-            write_parameters=True,
-            write_images=True,
+            write_dl1_parameters=True,
+            write_dl1_images=True,
             config=config,
         ):
             pass

ctapipe/resources/base_config.yaml

@@ -91,7 +91,7 @@ ImageProcessor:
       - ["enough_charge", "lambda im: im.sum() > 50"]
 
 # The ShowerProcessor performs the DL1 to DL2a (reconstructed shower geometry)
-# transition. It is run only if the parameter DataWriter.write_showers=True.
+# transition. It is run only if the parameter DataWriter.write_dl2=True.
 ShowerProcessor:
   # choose between HillasReconstructor and HillasIntersection (two
   # implementations of the standard stereo line-intersection method)

ctapipe/resources/training_config.yaml

@@ -5,7 +5,7 @@
 # Perform Stage 1 and Stage 2a processing to generate features needed for
 # training machine learning algorithms.
 #
-#  Note that here write_images is disabled by default (to avoid very large
+#  Note that here write_dl1_images is disabled by default (to avoid very large
 # files), however for training deep learning algorithms, it should be turned on.
 # ======================================================================
 #

ctapipe/tools/tests/test_process.py

@@ -62,10 +62,7 @@ def test_multiple_configs(dl1_image_file):
     tool.setup()
 
     # ensure the overwriting works (base config has this option disabled)
-    assert (
-        tool.get_current_config()["ProcessorTool"]["DataWriter"]["write_showers"]
-        is True
-    )
+    assert tool.get_current_config()["ProcessorTool"]["DataWriter"]["write_dl2"] is True
 
 
 def test_stage_1_dl1(tmp_path, dl1_image_file, dl1_parameters_file):