debugging CI

Please enter the commit message for your changes. Lines starting
cta-observatory · Oct 14, 2024 · bf81b00 · bf81b00
1 parent 3575517
commit bf81b00
Show file tree

Hide file tree

Showing 7 changed files with 8 additions and 81 deletions.
diff --git a/src/nectarchain/dqm/tests/test_camera_monitoring.py b/src/nectarchain/dqm/tests/test_camera_monitoring.py
@@ -7,7 +7,6 @@
 from traitlets.config import Config
 
 from nectarchain.dqm.camera_monitoring import CameraMonitoring
-from nectarchain.makers import ChargesNectarCAMCalibrationTool
 
 
 class TestCameraMonitoring:
@@ -37,19 +36,7 @@ def test_camera_monitoring(self):
 
         Pix, Samp = CameraMonitoring(HIGH_GAIN).DefineForRun(reader1)
 
-        kwargs = {
-            "method": LocalPeakWindowSum,
-            "extractor_kwargs": '{"window_width":16,"window_shift":4}',
-        }
-        charges_kwargs = {}
-        tool = ChargesNectarCAMCalibrationTool()
-        for key in tool.traits().keys():
-            if key in kwargs.keys():
-                charges_kwargs[key] = kwargs[key]
-
-        CameraMonitoring(HIGH_GAIN).ConfigureForRun(
-            path, Pix, Samp, reader1, charges_kwargs
-        )
+        CameraMonitoring(HIGH_GAIN).ConfigureForRun(path, Pix, Samp, reader1)
 
         for evt in tqdm(reader1, total=1):
             run_start1 = evt.nectarcam.tel[0].svc.date

diff --git a/src/nectarchain/dqm/tests/test_charge_integration.py b/src/nectarchain/dqm/tests/test_charge_integration.py
@@ -74,13 +74,14 @@ def test_charge_integration(self):
 
         kwargs = {"method": method, "extractor_kwargs": extractor_kwargs}
         charges_kwargs = {}
+
         tool = ChargesNectarCAMCalibrationTool()
         for key in tool.traits().keys():
             if key in kwargs.keys():
                 charges_kwargs[key] = kwargs[key]
 
         ChargeIntegrationHighLowGain(HIGH_GAIN).ConfigureForRun(
-            path, Pix, Samp, reader1, charges_kwargs
+            path, Pix, Samp, reader1, **charges_kwargs
         )
 
         for evt in tqdm(reader1, total=1):

diff --git a/src/nectarchain/dqm/tests/test_mean_camera_display.py b/src/nectarchain/dqm/tests/test_mean_camera_display.py
@@ -6,7 +6,6 @@
 from traitlets.config import Config
 
 from nectarchain.dqm.mean_camera_display import MeanCameraDisplayHighLowGain
-from nectarchain.makers import ChargesNectarCAMCalibrationTool
 
 
 class TestMeanCameraDisplayHighLowGain:
@@ -36,18 +35,8 @@ def test_mean_camera_display(self):
 
         Pix, Samp = MeanCameraDisplayHighLowGain(HIGH_GAIN).DefineForRun(reader1)
 
-        kwargs = {
-            "method": LocalPeakWindowSum,
-            "extractor_kwargs": '{"window_width":16,"window_shift":4}',
-        }
-        charges_kwargs = {}
-        tool = ChargesNectarCAMCalibrationTool()
-        for key in tool.traits().keys():
-            if key in kwargs.keys():
-                charges_kwargs[key] = kwargs[key]
-
         MeanCameraDisplayHighLowGain(HIGH_GAIN).ConfigureForRun(
-            path, Pix, Samp, reader1, charges_kwargs
+            path, Pix, Samp, reader1
         )
 
         for evt in tqdm(reader1, total=1):

diff --git a/src/nectarchain/dqm/tests/test_mean_waveforms.py b/src/nectarchain/dqm/tests/test_mean_waveforms.py
@@ -7,7 +7,6 @@
 from traitlets.config import Config
 
 from nectarchain.dqm.mean_waveforms import MeanWaveFormsHighLowGain
-from nectarchain.makers import ChargesNectarCAMCalibrationTool
 
 
 class TestMeanWaveForms:
@@ -36,19 +35,7 @@ def test_mean_waveforms(self):
 
         Pix, Samp = MeanWaveFormsHighLowGain(HIGH_GAIN).DefineForRun(reader1)
 
-        kwargs = {
-            "method": LocalPeakWindowSum,
-            "extractor_kwargs": '{"window_width":16,"window_shift":4}',
-        }
-        charges_kwargs = {}
-        tool = ChargesNectarCAMCalibrationTool()
-        for key in tool.traits().keys():
-            if key in kwargs.keys():
-                charges_kwargs[key] = kwargs[key]
-
-        MeanWaveFormsHighLowGain(HIGH_GAIN).ConfigureForRun(
-            path, Pix, Samp, reader1, charges_kwargs
-        )
+        MeanWaveFormsHighLowGain(HIGH_GAIN).ConfigureForRun(path, Pix, Samp, reader1)
 
         for evt in tqdm(reader1, total=1):
             self.pixelBAD = evt.mon.tel[0].pixel_status.hardware_failing_pixels

diff --git a/src/nectarchain/dqm/tests/test_pixel_participation.py b/src/nectarchain/dqm/tests/test_pixel_participation.py
@@ -7,7 +7,6 @@
 from traitlets.config import Config
 
 from nectarchain.dqm.pixel_participation import PixelParticipationHighLowGain
-from nectarchain.makers import ChargesNectarCAMCalibrationTool
 
 
 class TestPixelParticipation:
@@ -36,18 +35,8 @@ def test_pixel_participation(self):
 
         Pix, Samp = PixelParticipationHighLowGain(HIGH_GAIN).DefineForRun(reader1)
 
-        kwargs = {
-            "method": LocalPeakWindowSum,
-            "extractor_kwargs": '{"window_width":16,"window_shift":4}',
-        }
-        charges_kwargs = {}
-        tool = ChargesNectarCAMCalibrationTool()
-        for key in tool.traits().keys():
-            if key in kwargs.keys():
-                charges_kwargs[key] = kwargs[key]
-
         PixelParticipationHighLowGain(HIGH_GAIN).ConfigureForRun(
-            path, Pix, Samp, reader1, charges_kwargs
+            path, Pix, Samp, reader1
         )
 
         for evt in tqdm(reader1, total=1):

diff --git a/src/nectarchain/dqm/tests/test_pixel_timeline.py b/src/nectarchain/dqm/tests/test_pixel_timeline.py
@@ -7,7 +7,6 @@
 from traitlets.config import Config
 
 from nectarchain.dqm.pixel_timeline import PixelTimelineHighLowGain
-from nectarchain.makers import ChargesNectarCAMCalibrationTool
 
 
 class TestPixelTimeline:
@@ -36,19 +35,7 @@ def test_pixel_timeline(self):
 
         Pix, Samp = PixelTimelineHighLowGain(HIGH_GAIN).DefineForRun(reader1)
 
-        kwargs = {
-            "method": LocalPeakWindowSum,
-            "extractor_kwargs": '{"window_width":16,"window_shift":4}',
-        }
-        charges_kwargs = {}
-        tool = ChargesNectarCAMCalibrationTool()
-        for key in tool.traits().keys():
-            if key in kwargs.keys():
-                charges_kwargs[key] = kwargs[key]
-
-        PixelTimelineHighLowGain(HIGH_GAIN).ConfigureForRun(
-            path, Pix, Samp, reader1, charges_kwargs
-        )
+        PixelTimelineHighLowGain(HIGH_GAIN).ConfigureForRun(path, Pix, Samp, reader1)
 
         for evt in tqdm(reader1, total=1):
             self.pixelBAD = evt.mon.tel[0].pixel_status.hardware_failing_pixels

diff --git a/src/nectarchain/dqm/tests/test_trigger_statistics.py b/src/nectarchain/dqm/tests/test_trigger_statistics.py
@@ -6,7 +6,6 @@
 from traitlets.config import Config
 
 from nectarchain.dqm.trigger_statistics import TriggerStatistics
-from nectarchain.makers import ChargesNectarCAMCalibrationTool
 
 
 class TestTriggerStatistics:
@@ -36,19 +35,7 @@ def test_trigger_statistics(self):
 
         Pix, Samp = TriggerStatistics(HIGH_GAIN).DefineForRun(reader1)
 
-        kwargs = {
-            "method": LocalPeakWindowSum,
-            "extractor_kwargs": '{"window_width":16,"window_shift":4}',
-        }
-        charges_kwargs = {}
-        tool = ChargesNectarCAMCalibrationTool()
-        for key in tool.traits().keys():
-            if key in kwargs.keys():
-                charges_kwargs[key] = kwargs[key]
-
-        TriggerStatistics(HIGH_GAIN).ConfigureForRun(
-            path, Pix, Samp, reader1, charges_kwargs
-        )
+        TriggerStatistics(HIGH_GAIN).ConfigureForRun(path, Pix, Samp, reader1)
 
         for evt in tqdm(reader1, total=1):
             time = evt.trigger.time.value