Skip to content

Commit

Permalink
debugging2
Browse files Browse the repository at this point in the history
  • Loading branch information
hashkar committed Oct 14, 2024
1 parent bf81b00 commit 2dda6cc
Show file tree
Hide file tree
Showing 8 changed files with 24 additions and 15 deletions.
2 changes: 1 addition & 1 deletion src/nectarchain/dqm/camera_monitoring.py
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
25 changes: 17 additions & 8 deletions src/nectarchain/dqm/charge_integration.py
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand All @@ -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(

Check warning on line 96 in src/nectarchain/dqm/charge_integration.py

View check run for this annotation

Codecov / codecov/patch

src/nectarchain/dqm/charge_integration.py#L96

Added line #L96 was not covered by tests
{"LocalPeakWindowSum": {"window_shift": 4, "window_width": 12}}
)
self.integrator = LocalPeakWindowSum(subarray, config=config)

Check warning on line 99 in src/nectarchain/dqm/charge_integration.py

View check run for this annotation

Codecov / codecov/patch

src/nectarchain/dqm/charge_integration.py#L99

Added line #L99 was not covered by tests
print("self.integrator", self.integrator)
# can be replaced by: imageExtractor =
# __class__._get_imageExtractor(method=method, subarray=subarray, **kwargs)

Expand Down
2 changes: 1 addition & 1 deletion src/nectarchain/dqm/mean_camera_display.py
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion src/nectarchain/dqm/mean_waveforms.py
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion src/nectarchain/dqm/pixel_participation.py
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion src/nectarchain/dqm/pixel_timeline.py
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion src/nectarchain/dqm/start_dqm.py
Original file line number Diff line number Diff line change
Expand Up @@ -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)

Check warning on line 228 in src/nectarchain/dqm/start_dqm.py

View check run for this annotation

Codecov / codecov/patch

src/nectarchain/dqm/start_dqm.py#L228

Added line #L228 was not covered by tests

for evt in tqdm(
reader, total=args.max_events if args.max_events else len(reader), unit="ev"
Expand Down
2 changes: 1 addition & 1 deletion src/nectarchain/dqm/trigger_statistics.py
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit 2dda6cc

Please sign in to comment.