Skip to content

Commit 28647f5

Browse files
committed
clean up fcls, update metric labels to reflect current daq config
- producer labels should be `pmtmetricbnb` and `pmtmetricoffbeam`
1 parent a887bbb commit 28647f5

14 files changed

Lines changed: 22 additions & 121 deletions

sbndcode/Trigger/PMTSoftware/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ cet_build_plugin(MetricFilter art::module SOURCE MetricFilter_module.cc LIBR
2828
cet_build_plugin(PMTMetricProducer art::module SOURCE PMTMetricProducer_module.cc LIBRARIES ${MODULE_LIBRARIES})
2929
cet_build_plugin(PMTMCMetricProducer art::module SOURCE PMTMCMetricProducer_module.cc LIBRARIES ${MODULE_LIBRARIES})
3030

31-
add_subdirectory(metric_fcls)
31+
add_subdirectory(fcls)
3232

3333
install_headers()
3434
install_fhicl()

sbndcode/Trigger/PMTSoftware/MetricAnalyzer_module.cc

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -69,12 +69,10 @@ sbndaq::MetricAnalyzer::MetricAnalyzer(fhicl::ParameterSet const& p)
6969
// More initializers here.
7070
{
7171
fmetric_module_labels = p.get<std::vector<std::string>>("metric_module_labels",{"pmtmetricproducer",
72-
"pmtmetricbnbzero",
73-
"pmtmetricbnblight",
74-
"pmtmetricoffbeamzero",
75-
"pmtmetricoffbeamlight",
76-
"pmtmetriccrossingsmuon"});
77-
fstream_labels = p.get<std::vector<int>>("stream_labels",{0,1,2,3,4,5});
72+
"pmtmetricbnb",
73+
"pmtmetricoffbeam",
74+
"pmtmetriccrossingmuon"});
75+
fstream_labels = p.get<std::vector<int>>("stream_labels",{0,1,2,3});
7876
fmetric_instance_name = p.get<std::string>("metric_instance_name","");
7977
fspectdc_module_label = p.get<std::string>("spectdc_module_name","tdcdecoder");
8078
fspectdc_etrig_ch = p.get<uint32_t>("spectdc_etrig_ch",4);

sbndcode/Trigger/PMTSoftware/MetricFilter_module.cc

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -59,11 +59,9 @@ sbndaq::MetricFilter::MetricFilter(fhicl::ParameterSet const& p)
5959
// More initializers here.
6060
{
6161
fmetric_module_labels = p.get<std::vector<std::string>>("metric_module_labels",{"pmtmetricproducer",
62-
"pmtmetricbnbzero",
63-
"pmtmetricbnblight",
64-
"pmtmetricoffbeamzero",
65-
"pmtmetricoffbeamlight",
66-
"pmtmetriccrossingmuon"});
62+
"pmtmetricbnb",
63+
"pmtmetricoffbeam",
64+
"pmtmetriccrossingmuon"});
6765
fmetric_instance_name = p.get<std::string>("metric_instance_name","");
6866
ftime_min = p.get<float>("time_min",0);
6967
ftime_max = p.get<float>("time_max",3);
File renamed without changes.
Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
BEGIN_PROLOG
2+
3+
metricfilter_sbnd:
4+
{
5+
module_type: "MetricFilter"
6+
metric_module_labels: ["pmtmetricproducer",
7+
"pmtmetricbnb",
8+
"pmtmetricoffbeam",
9+
"pmtmetriccrossingmuon"];
10+
time_max: 3
11+
pe_thresh: 30
12+
}
13+
14+
END_PROLOG

sbndcode/Trigger/PMTSoftware/metric_fcls/pmtmetricproducer.fcl renamed to sbndcode/Trigger/PMTSoftware/fcls/pmtmetricproducer.fcl

File renamed without changes.
File renamed without changes.

sbndcode/Trigger/PMTSoftware/metric_fcls/run_crossingmuon.fcl renamed to sbndcode/Trigger/PMTSoftware/fcls/run_crossingmuon.fcl

File renamed without changes.
File renamed without changes.
File renamed without changes.

0 commit comments

Comments
 (0)