diff --git a/src/nectarchain/dqm/camera_monitoring.py b/src/nectarchain/dqm/camera_monitoring.py index c919645e..36d394e3 100644 --- a/src/nectarchain/dqm/camera_monitoring.py +++ b/src/nectarchain/dqm/camera_monitoring.py @@ -39,7 +39,7 @@ def __init__(self, gaink): self.ChargeInt_Figures_Dict = {} self.ChargeInt_Figures_Names_Dict = {} - def ConfigureForRun(self, path, Pix, Samp, Reader1, charges_kwargs): + def ConfigureForRun(self, path, Pix, Samp, Reader1, **kwargs): # define number of pixels and samples self.Pix = Pix self.Samp = Samp diff --git a/src/nectarchain/dqm/charge_integration.py b/src/nectarchain/dqm/charge_integration.py index b28e99f3..f18f070b 100644 --- a/src/nectarchain/dqm/charge_integration.py +++ b/src/nectarchain/dqm/charge_integration.py @@ -11,6 +11,7 @@ from ctapipe.visualization import CameraDisplay from ctapipe_io_nectarcam import constants from matplotlib import pyplot as plt +from traitlets.config.loader import Config from ..makers.component import ChargesComponent from ..makers.component.core import ArrayDataComponent @@ -60,7 +61,7 @@ def __init__(self, gaink): self.ChargeInt_Figures_Dict = {} self.ChargeInt_Figures_Names_Dict = {} - def ConfigureForRun(self, path, Pix, Samp, Reader1, charges_kwargs): + def ConfigureForRun(self, path, Pix, Samp, Reader1, **charges_kwargs): # define number of pixels and samples self.Pix = Pix self.Samp = Samp @@ -81,14 +82,22 @@ def ConfigureForRun(self, path, Pix, Samp, Reader1, charges_kwargs): ].camera.readout = ctapipe.instrument.camera.readout.CameraReadout.from_name( "NectarCam" ) - - extractor_kwargs = ( - ChargesComponent._get_extractor_kwargs_from_method_and_kwargs( - method=charges_kwargs["method"], - kwargs=charges_kwargs["extractor_kwargs"], + if charges_kwargs: + extractor_kwargs = ( + ChargesComponent._get_extractor_kwargs_from_method_and_kwargs( + method=charges_kwargs["method"], + kwargs=charges_kwargs["extractor_kwargs"], + ) ) - ) - self.integrator = eval(charges_kwargs["method"])(subarray, **extractor_kwargs) + self.integrator = eval(charges_kwargs["method"])( + subarray, **extractor_kwargs + ) + else: + config = Config( + {"LocalPeakWindowSum": {"window_shift": 4, "window_width": 12}} + ) + self.integrator = LocalPeakWindowSum(subarray, config=config) + print("self.integrator", self.integrator) # can be replaced by: imageExtractor = # __class__._get_imageExtractor(method=method, subarray=subarray, **kwargs) diff --git a/src/nectarchain/dqm/mean_camera_display.py b/src/nectarchain/dqm/mean_camera_display.py index c72e2fbd..b043c807 100644 --- a/src/nectarchain/dqm/mean_camera_display.py +++ b/src/nectarchain/dqm/mean_camera_display.py @@ -31,7 +31,7 @@ def __init__(self, gaink): self.MeanCameraDisplay_Figures_Dict = {} self.MeanCameraDisplay_Figures_Names_Dict = {} - def ConfigureForRun(self, path, Pix, Samp, Reader1, charges_kwargs): + def ConfigureForRun(self, path, Pix, Samp, Reader1, **kwargs): # define number of pixels and samples self.Pix = Pix self.Samp = Samp diff --git a/src/nectarchain/dqm/mean_waveforms.py b/src/nectarchain/dqm/mean_waveforms.py index d8bbdca5..c3df6a8f 100644 --- a/src/nectarchain/dqm/mean_waveforms.py +++ b/src/nectarchain/dqm/mean_waveforms.py @@ -23,7 +23,7 @@ def __init__(self, gaink): self.MeanWaveForms_Figures_Dict = {} self.MeanWaveForms_Figures_Names_Dict = {} - def ConfigureForRun(self, path, Pix, Samp, Reader1, charges_kwargs): + def ConfigureForRun(self, path, Pix, Samp, Reader1, **kwargs): # define number of pixels and samples self.Pix = Pix self.Samp = Samp diff --git a/src/nectarchain/dqm/pixel_participation.py b/src/nectarchain/dqm/pixel_participation.py index 4163e87d..b66d6c34 100644 --- a/src/nectarchain/dqm/pixel_participation.py +++ b/src/nectarchain/dqm/pixel_participation.py @@ -25,7 +25,7 @@ def __init__(self, gaink): self.PixelParticipation_Figures_Dict = {} self.PixelParticipation_Figures_Names_Dict = {} - def ConfigureForRun(self, path, Pix, Samp, Reader1, charges_kwargs): + def ConfigureForRun(self, path, Pix, Samp, Reader1, **kwargs): # define number of pixels and samples self.Pix = Pix self.Samp = Samp diff --git a/src/nectarchain/dqm/pixel_timeline.py b/src/nectarchain/dqm/pixel_timeline.py index d227f6d9..7facc4eb 100644 --- a/src/nectarchain/dqm/pixel_timeline.py +++ b/src/nectarchain/dqm/pixel_timeline.py @@ -24,7 +24,7 @@ def __init__(self, gaink): self.PixelTimeline_Figures_Dict = {} self.PixelTimeline_Figures_Names_Dict = {} - def ConfigureForRun(self, path, Pix, Samp, Reader1, charges_kwargs): + def ConfigureForRun(self, path, Pix, Samp, Reader1, **kwargs): # define number of pixels and samples self.Pix = Pix self.Samp = Samp diff --git a/src/nectarchain/dqm/start_dqm.py b/src/nectarchain/dqm/start_dqm.py index 7ae6685c..91f3216c 100644 --- a/src/nectarchain/dqm/start_dqm.py +++ b/src/nectarchain/dqm/start_dqm.py @@ -225,7 +225,7 @@ def CreateFigFolder(name, type): break for p in processors: - p.ConfigureForRun(path, Pix, Samp, reader1, charges_kwargs) + p.ConfigureForRun(path, Pix, Samp, reader1, **charges_kwargs) for evt in tqdm( reader, total=args.max_events if args.max_events else len(reader), unit="ev" diff --git a/src/nectarchain/dqm/trigger_statistics.py b/src/nectarchain/dqm/trigger_statistics.py index fdc55616..ddc80a35 100644 --- a/src/nectarchain/dqm/trigger_statistics.py +++ b/src/nectarchain/dqm/trigger_statistics.py @@ -32,7 +32,7 @@ def __init__(self, gaink): self.TriggerStat_Figures_Dict = {} self.TriggerStat_Figures_Names_Dict = {} - def ConfigureForRun(self, path, Pix, Samp, Reader1, charges_kwargs): + def ConfigureForRun(self, path, Pix, Samp, Reader1, **kwargs): # define number of pixels and samples self.Pix = Pix self.Samp = Samp