diff --git a/proto/diagnostics/simple_charge_stats.proto b/proto/diagnostics/simple_charge_stats.proto index cd22bdf1..28fad69d 100644 --- a/proto/diagnostics/simple_charge_stats.proto +++ b/proto/diagnostics/simple_charge_stats.proto @@ -42,10 +42,17 @@ message SimpleChargeStatsConfig { double ped_time_hist_resolution = 20 [ (CFO).desc = "Resolution of pedestal mean and variance vs time histogram.", (CFO).units = "s" ]; - double dual_gain_sample_resolution = 21 [ + double channel_ped_time_hist_range = 21 [ + (CFO).desc = "Maximum time of channel pedestal mean and variance vs time histogram.", + (CFO).units = "s" ]; + double camera_ped_time_hist_range = 22 [ + (CFO).desc = "Maximum time of camera-wide pedestal mean and variance vs time histogram.", + (CFO).units = "s" ]; + + double dual_gain_sample_resolution = 30 [ (CFO).desc = "Resolution of high-gain vs low-gain max sample histogram.", (CFO).units = "DC" ]; - double dual_gain_sum_resolution = 22 [ + double dual_gain_sum_resolution = 40 [ (CFO).desc = "Resolution of high-gain vs low-gain window sum histogram.", (CFO).units = "DC" ]; }; diff --git a/src/diagnostics/simple_charge_stats.cpp b/src/diagnostics/simple_charge_stats.cpp index 7f43e0ca..3558b1d2 100644 --- a/src/diagnostics/simple_charge_stats.cpp +++ b/src/diagnostics/simple_charge_stats.cpp @@ -106,12 +106,14 @@ bool SimpleChargeStatsParallelEventVisitor::visit_telescope_run( chan_hists_.resize(run_config->configured_channel_id_size()); for(auto*& h : chan_hists_) { // For now on do not use per-channel low gain histograms - h = new ChannelHists(has_dual_gain_, config_.ped_time_hist_resolution(), 3600.0, + h = new ChannelHists(has_dual_gain_, config_.ped_time_hist_resolution(), + config_.channel_ped_time_hist_range(), config_.dual_gain_sample_resolution(), config_.dual_gain_sum_resolution()); } delete camera_hists_; - camera_hists_ = new CameraHists(has_dual_gain_, config_.ped_time_hist_resolution(), 86400.0); + camera_hists_ = new CameraHists(has_dual_gain_, config_.ped_time_hist_resolution(), + config_.camera_ped_time_hist_range()); delete data_order_camera_; data_order_camera_ = calin::iact_data::instrument_layout::reorder_camera_channels( @@ -816,6 +818,8 @@ SimpleChargeStatsParallelEventVisitor::default_config() config.set_low_gain_wf_clipping_value(4095); config.set_nearest_neighbor_nchannel_threshold(3); config.set_ped_time_hist_resolution(5.0); + config.set_channel_ped_time_hist_range(86400.0); + config.set_camera_ped_time_hist_range(86400.0); config.set_dual_gain_sample_resolution(1.0); config.set_dual_gain_sum_resolution(5.0); return config;