Skip to content

Commit ab9ecf2

Browse files
mvicenzimvicenzi
authored
Merge pull request #870 from PetrilloAtWork/feature/gp_LVDSgatesFix
Trigger simulation modules now support input tags with process name [private]
2 parents 468cb3f + 937b4b6 commit ab9ecf2

9 files changed

+161
-52
lines changed

‎CMakeLists.txt‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,7 @@ find_package(ifdhc REQUIRED )
5555
find_package(ifdh_art REQUIRED )
5656
find_package(Range-v3 REQUIRED )
5757
find_package(sbnobj REQUIRED )
58+
find_package(sbnalg REQUIRED )
5859
find_package(icarus_signal_processing REQUIRED )
5960
find_package(icarusalg REQUIRED )
6061
find_package(icarusutil REQUIRED )

‎icaruscode/PMT/Trigger/LVDSgates_module.cc‎

Lines changed: 22 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -192,9 +192,9 @@ class icarus::trigger::LVDSgates: public art::EDProducer {
192192
{ ComboMode::OR, "OR" }
193193
};
194194

195-
fhicl::OptionalAtom<std::string> TriggerGatesTag {
195+
fhicl::OptionalAtom<art::InputTag> TriggerGatesTag {
196196
Name("TriggerGatesTag"),
197-
Comment("label of trigger gate extraction module (no instance name)")
197+
Comment("tag of trigger gate extraction module (no instance name)")
198198
};
199199

200200
fhicl::Sequence<std::string> Thresholds {
@@ -386,11 +386,11 @@ class icarus::trigger::LVDSgates: public art::EDProducer {
386386

387387
/// Converts a threshold string into an input tag.
388388
static art::InputTag makeTag
389-
(std::string const& thresholdStr, std::string const& defModule);
389+
(std::string const& thresholdStr, art::InputTag const& defModule);
390390

391391
/// Converts an input tag into an instance name for the corresponding output.
392392
static std::string makeOutputInstanceName
393-
(art::InputTag const& inputTag, std::string const& defModule);
393+
(art::InputTag const& inputTag, art::InputTag const& defModule);
394394

395395
}; // class icarus::trigger::LVDSgates
396396

@@ -412,11 +412,11 @@ icarus::trigger::LVDSgates::LVDSgates
412412
//
413413
// more complex parameter parsing
414414
//
415-
std::string const discrModuleLabel = config().TriggerGatesTag().value_or("");
415+
art::InputTag const discrModuleTag = config().TriggerGatesTag().value_or("");
416416
for (std::string const& thresholdStr: config().Thresholds()) {
417-
art::InputTag const inputTag = makeTag(thresholdStr, discrModuleLabel);
417+
art::InputTag const inputTag = makeTag(thresholdStr, discrModuleTag);
418418
fADCthresholds[thresholdStr]
419-
= { inputTag, makeOutputInstanceName(inputTag, discrModuleLabel) };
419+
= { inputTag, makeOutputInstanceName(inputTag, discrModuleTag) };
420420
} // for all thresholds
421421

422422
//
@@ -863,34 +863,38 @@ auto icarus::trigger::LVDSgates::ReadTriggerGates(
863863

864864
//------------------------------------------------------------------------------
865865
art::InputTag icarus::trigger::LVDSgates::makeTag
866-
(std::string const& thresholdStr, std::string const& defModule)
866+
(std::string const& thresholdStr, art::InputTag const& defModule)
867867
{
868868
auto const isNumber = [pattern=std::regex{ "[+-]?[0-9]+" }]
869869
(std::string const& s) -> bool
870870
{ return std::regex_match(s, pattern); };
871-
return
871+
if (!thresholdStr.empty() && !defModule.instance().empty()) {
872+
throw art::Exception(art::errors::Configuration)
873+
<< "Both the input gate module tag instance name (`TriggerGatesTag`: '"
874+
<< defModule.encode() << "') and the threshold '" << thresholdStr
875+
<< "' are set. One of them must be empty.\n";
876+
}
877+
return
872878
((thresholdStr.find(':') != std::string::npos) || !isNumber(thresholdStr))
873879
? art::InputTag{ thresholdStr }
874-
: defModule.empty()
880+
: defModule.label().empty()
875881
? throw (art::Exception(art::errors::Configuration)
876882
<< "No default module label (`TriggerGatesTag`) specified"
877-
", and it's needed for threshold '"
878-
<< thresholdStr << "'.\n")
879-
: art::InputTag{ defModule, thresholdStr }
883+
", and it's needed for threshold '" << thresholdStr << "'.\n")
884+
: art::InputTag{ defModule.label(), thresholdStr, defModule.process() }
880885
;
881886
} // icarus::trigger::LVDSgates::makeTag()
882887

883888

884889
//------------------------------------------------------------------------------
885890
std::string icarus::trigger::LVDSgates::makeOutputInstanceName
886-
(art::InputTag const& inputTag, std::string const& defModule)
891+
(art::InputTag const& inputTag, art::InputTag const& defModule)
887892
{
888-
return (inputTag.label() == defModule)
893+
return (inputTag.label() == defModule.label())
889894
? inputTag.instance()
890-
: inputTag.instance().empty()
891-
? inputTag.label(): inputTag.label() + inputTag.instance()
895+
: inputTag.label() + inputTag.instance()
892896
;
893-
} // icarus::trigger::LVDSgates::makeTag()
897+
} // icarus::trigger::LVDSgates::makeOutputInstanceName()
894898

895899

896900
//------------------------------------------------------------------------------

‎icaruscode/PMT/Trigger/MajorityTriggerSimulation_module.cc‎

Lines changed: 23 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -359,9 +359,9 @@ class icarus::trigger::MajorityTriggerSimulation
359359
using Name = fhicl::Name;
360360
using Comment = fhicl::Comment;
361361

362-
fhicl::Atom<std::string> TriggerGatesTag {
362+
fhicl::Atom<art::InputTag> TriggerGatesTag {
363363
Name("TriggerGatesTag"),
364-
Comment("label of the input trigger gate data product (no instance name)")
364+
Comment("tag of the input trigger gate data product")
365365
};
366366

367367
fhicl::Sequence<raw::ADC_Count_t> Thresholds {
@@ -597,6 +597,11 @@ class icarus::trigger::MajorityTriggerSimulation
597597
//@}
598598

599599

600+
/// Returns `defModule` with instance name replaced by `thresholdStr`.
601+
static art::InputTag makeTag
602+
(art::InputTag const& defModule, std::string const& thresholdStr);
603+
604+
600605
}; // icarus::trigger::MajorityTriggerSimulation
601606

602607

@@ -629,10 +634,10 @@ icarus::trigger::MajorityTriggerSimulation::MajorityTriggerSimulation
629634
//
630635
// more complex parameter parsing
631636
//
632-
std::string const discrModuleLabel = config().TriggerGatesTag();
637+
art::InputTag const& discrModuleTag = config().TriggerGatesTag();
633638
for (raw::ADC_Count_t threshold: config().Thresholds()) {
634639
fADCthresholds[icarus::trigger::ADCCounts_t{threshold}]
635-
= art::InputTag{ discrModuleLabel, util::to_string(threshold) };
640+
= makeTag(discrModuleTag, util::to_string(threshold));
636641
}
637642

638643
// initialization of a vector of atomic is not as trivial as it sounds...
@@ -943,6 +948,20 @@ icarus::trigger::MajorityTriggerSimulation::triggerInfoToTriggerData
943948
} // icarus::trigger::MajorityTriggerSimulation::triggerInfoToTriggerData()
944949

945950

951+
//------------------------------------------------------------------------------
952+
art::InputTag icarus::trigger::MajorityTriggerSimulation::makeTag
953+
(art::InputTag const& defModule, std::string const& thresholdStr)
954+
{
955+
if (!thresholdStr.empty() && !defModule.instance().empty()) {
956+
throw art::Exception(art::errors::Configuration)
957+
<< "Module tag instance name (`TriggerGatesTag`: '"
958+
<< defModule.encode() << "') and the threshold '" << thresholdStr
959+
<< "' are both set. One of them must be empty.\n";
960+
}
961+
return { defModule.label(), thresholdStr, defModule.process() };
962+
} // icarus::trigger::MajorityTriggerSimulation::makeTag()
963+
964+
946965
//------------------------------------------------------------------------------
947966
DEFINE_ART_MODULE(icarus::trigger::MajorityTriggerSimulation)
948967

‎icaruscode/PMT/Trigger/SlidingWindowTriggerSimulation_module.cc‎

Lines changed: 24 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -285,9 +285,9 @@ class icarus::trigger::SlidingWindowTriggerSimulation
285285
using Name = fhicl::Name;
286286
using Comment = fhicl::Comment;
287287

288-
fhicl::Atom<std::string> TriggerGatesTag {
288+
fhicl::Atom<art::InputTag> TriggerGatesTag {
289289
Name("TriggerGatesTag"),
290-
Comment("label of the input trigger gate data product (no instance name)")
290+
Comment("tag of the input trigger gate data product (no instance name)")
291291
};
292292

293293
fhicl::Sequence<std::string> Thresholds {
@@ -573,7 +573,12 @@ class icarus::trigger::SlidingWindowTriggerSimulation
573573
static double eventTimestampInSeconds(art::Timestamp const& time);
574574
static double eventTimestampInSeconds(art::Event const& event);
575575
//@}
576-
576+
577+
578+
/// Returns `defModule` with instance name replaced by `thresholdStr`.
579+
static art::InputTag makeTag
580+
(art::InputTag const& defModule, std::string const& thresholdStr);
581+
577582
}; // icarus::trigger::SlidingWindowTriggerSimulation
578583

579584

@@ -622,9 +627,9 @@ icarus::trigger::SlidingWindowTriggerSimulation::SlidingWindowTriggerSimulation
622627
//
623628
// more complex parameter parsing
624629
//
625-
std::string const& discrModuleLabel = config().TriggerGatesTag();
630+
art::InputTag const& discrModuleTag = config().TriggerGatesTag();
626631
for (std::string const& threshold: config().Thresholds())
627-
fADCthresholds[threshold] = art::InputTag{ discrModuleLabel, threshold };
632+
fADCthresholds[threshold] = makeTag(discrModuleTag, threshold);
628633

629634
// initialization of a vector of atomic is not as trivial as it sounds...
630635
fTriggerCount = std::vector<std::atomic<unsigned int>>(fADCthresholds.size());
@@ -1204,6 +1209,20 @@ double icarus::trigger::SlidingWindowTriggerSimulation::eventTimestampInSeconds
12041209
{ return eventTimestampInSeconds(event.time()); }
12051210

12061211

1212+
//------------------------------------------------------------------------------
1213+
art::InputTag icarus::trigger::SlidingWindowTriggerSimulation::makeTag
1214+
(art::InputTag const& defModule, std::string const& thresholdStr)
1215+
{
1216+
if (!thresholdStr.empty() && !defModule.instance().empty()) {
1217+
throw art::Exception(art::errors::Configuration)
1218+
<< "Module tag instance name (`TriggerGatesTag`: '"
1219+
<< defModule.encode() << "') and the threshold '" << thresholdStr
1220+
<< "' are both set. One of them must be empty.\n";
1221+
}
1222+
return { defModule.label(), thresholdStr, defModule.process() };
1223+
} // icarus::trigger::SlidingWindowTriggerSimulation::makeTag()
1224+
1225+
12071226
//------------------------------------------------------------------------------
12081227
DEFINE_ART_MODULE(icarus::trigger::SlidingWindowTriggerSimulation)
12091228

‎icaruscode/PMT/Trigger/SlidingWindowTrigger_module.cc‎

Lines changed: 22 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -226,9 +226,9 @@ class icarus::trigger::SlidingWindowTrigger: public art::EDProducer {
226226
using Comment = fhicl::Comment;
227227

228228

229-
fhicl::Atom<std::string> TriggerGatesTag {
229+
fhicl::Atom<art::InputTag> TriggerGatesTag {
230230
Name("TriggerGatesTag"),
231-
Comment("label of the input trigger gate data product (no instance name)")
231+
Comment("tag of the input trigger gate data product (no instance name)")
232232
};
233233

234234
fhicl::Sequence<std::string> Thresholds {
@@ -385,6 +385,9 @@ class icarus::trigger::SlidingWindowTrigger: public art::EDProducer {
385385
art::Assns<TriggerGateData_t, sbn::OpDetWaveformMeta> const& assns
386386
);
387387

388+
static art::InputTag makeTag
389+
(art::InputTag const& defModule, std::string const& thresholdStr);
390+
388391
}; // class icarus::trigger::SlidingWindowTrigger
389392

390393

@@ -435,9 +438,9 @@ icarus::trigger::SlidingWindowTrigger::SlidingWindowTrigger
435438
//
436439
// more complex parameter parsing
437440
//
438-
std::string const discrModuleLabel = config().TriggerGatesTag();
441+
art::InputTag const& discrModuleTag = config().TriggerGatesTag();
439442
for (std::string const& threshold: config().Thresholds())
440-
fADCthresholds[threshold] = art::InputTag{ discrModuleLabel, threshold };
443+
fADCthresholds[threshold] = makeTag(discrModuleTag, threshold);
441444

442445
//
443446
// configuration report (short)
@@ -668,6 +671,21 @@ auto icarus::trigger::SlidingWindowTrigger::ReadTriggerGates(
668671

669672
} // icarus::trigger::SlidingWindowTrigger::ReadTriggerGates()
670673

674+
675+
//------------------------------------------------------------------------------
676+
art::InputTag icarus::trigger::SlidingWindowTrigger::makeTag
677+
(art::InputTag const& defModule, std::string const& thresholdStr)
678+
{
679+
if (!thresholdStr.empty() && !defModule.instance().empty()) {
680+
throw art::Exception(art::errors::Configuration)
681+
<< "Module tag instance name (`TriggerGatesTag`: '"
682+
<< defModule.encode() << "') and the threshold '" << thresholdStr
683+
<< "' are both set. One of them must be empty.\n";
684+
}
685+
return { defModule.label(), thresholdStr, defModule.process() };
686+
} // icarus::trigger::SlidingWindowTrigger::makeTag()
687+
688+
671689
//------------------------------------------------------------------------------
672690
DEFINE_ART_MODULE(icarus::trigger::SlidingWindowTrigger)
673691

‎icaruscode/PMT/Trigger/TriggerEfficiencyPlotsBase.cxx‎

Lines changed: 16 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -531,9 +531,9 @@ icarus::trigger::TriggerEfficiencyPlotsBase::TriggerEfficiencyPlotsBase
531531
if (fLogEventDetails.empty()) fLogEventDetails = fLogCategory;
532532
} // if EventDetailsLogCategory is specified
533533

534-
std::string const discrModuleLabel = config.TriggerGatesTag();
534+
art::InputTag const& discrModuleTag = config.TriggerGatesTag();
535535
for (std::string const& threshold: config.Thresholds())
536-
fADCthresholds[threshold] = art::InputTag{ discrModuleLabel, threshold };
536+
fADCthresholds[threshold] = makeInputTag(discrModuleTag, threshold);
537537

538538

539539
if (config.EventTreeName.hasValue()) {
@@ -1497,4 +1497,18 @@ icarus::trigger::TriggerEfficiencyPlotsBase::makeEdepTag(
14971497
} // icarus::trigger::MakeTriggerSimulationTree::makeEdepTag()
14981498

14991499

1500+
//------------------------------------------------------------------------------
1501+
art::InputTag icarus::trigger::TriggerEfficiencyPlotsBase::makeInputTag
1502+
(art::InputTag const& defModule, std::string const& thresholdStr)
1503+
{
1504+
if (!thresholdStr.empty() && !defModule.instance().empty()) {
1505+
throw art::Exception(art::errors::Configuration)
1506+
<< "Module tag instance name (`TriggerGatesTag`: '"
1507+
<< defModule.encode() << "') and the threshold '" << thresholdStr
1508+
<< "' are both set. One of them must be empty.\n";
1509+
}
1510+
return { defModule.label(), thresholdStr, defModule.process() };
1511+
} // icarus::trigger::TriggerEfficiencyPlotsBase::makeInputTag()
1512+
1513+
15001514
//------------------------------------------------------------------------------

‎icaruscode/PMT/Trigger/TriggerEfficiencyPlotsBase.h‎

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -222,7 +222,7 @@ class icarus::trigger::details::TriggerPassCounters {
222222

223223
/// Registers a new pattern in the index and returns its index (unchecked).
224224
std::size_t registerPattern(std::string const& name);
225-
225+
226226
}; // icarus::trigger::details::TriggerPassCounters
227227

228228

@@ -1010,9 +1010,9 @@ class icarus::trigger::TriggerEfficiencyPlotsBase {
10101010
Comment("label of energy deposition summary data product")
10111011
};
10121012

1013-
fhicl::Atom<std::string> TriggerGatesTag {
1013+
fhicl::Atom<art::InputTag> TriggerGatesTag {
10141014
Name("TriggerGatesTag"),
1015-
Comment("label of the input trigger gate data product (no instance name)")
1015+
Comment("tag of the input trigger gate data product (no instance name)")
10161016
};
10171017

10181018
fhicl::Sequence<std::string> Thresholds {
@@ -1565,6 +1565,10 @@ class icarus::trigger::TriggerEfficiencyPlotsBase {
15651565
fhicl::OptionalAtom<art::InputTag> const& EnergyDepositSummaryTag
15661566
);
15671567

1568+
/// Returns `defModule` with instance name replaced by `thresholdStr`.
1569+
static art::InputTag makeInputTag
1570+
(art::InputTag const& defModule, std::string const& thresholdStr);
1571+
15681572
}; // icarus::trigger::TriggerEfficiencyPlotsBase
15691573

15701574

‎icaruscode/PMT/Trigger/TriggerEfficiencyPlots_module.cc‎

Lines changed: 23 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1246,9 +1246,9 @@ class icarus::trigger::TriggerEfficiencyPlots: public art::EDAnalyzer {
12461246
std::vector<art::InputTag>{ "largeant:TPCActive" }
12471247
};
12481248

1249-
fhicl::Atom<std::string> TriggerGatesTag {
1249+
fhicl::Atom<art::InputTag> TriggerGatesTag {
12501250
Name("TriggerGatesTag"),
1251-
Comment("label of the input trigger gate data product (no instance name)")
1251+
Comment("tag of the input trigger gate data product (no instance name)")
12521252
};
12531253

12541254
fhicl::Sequence<raw::ADC_Count_t> Thresholds {
@@ -1496,6 +1496,11 @@ class icarus::trigger::TriggerEfficiencyPlots: public art::EDAnalyzer {
14961496
/// Returns a gate that is `Max()` of all the specified `gates`.
14971497
template <typename TrigGateColl>
14981498
static auto computeMaxGate(TrigGateColl const& gates);
1499+
1500+
1501+
/// Returns `defModule` with instance name replaced by `thresholdStr`.
1502+
static art::InputTag makeTag
1503+
(art::InputTag const& defModule, std::string const& thresholdStr);
14991504

15001505

15011506
}; // icarus::trigger::TriggerEfficiencyPlots
@@ -1533,10 +1538,10 @@ icarus::trigger::TriggerEfficiencyPlots::TriggerEfficiencyPlots
15331538
if (fLogEventDetails.empty()) fLogEventDetails = fLogCategory;
15341539
} // if EventDetailsLogCategory is specified
15351540

1536-
std::string const discrModuleLabel = config().TriggerGatesTag();
1541+
art::InputTag const& discrModuleTag = config().TriggerGatesTag();
15371542
for (raw::ADC_Count_t threshold: config().Thresholds()) {
15381543
fADCthresholds[icarus::trigger::ADCCounts_t{threshold}]
1539-
= art::InputTag{ discrModuleLabel, util::to_string(threshold) };
1544+
= makeTag(discrModuleTag, util::to_string(threshold));
15401545
}
15411546

15421547
if (config().EventTreeName.hasValue()) {
@@ -2467,6 +2472,20 @@ auto icarus::trigger::TriggerEfficiencyPlots::ReadTriggerGates
24672472
} // icarus::trigger::TriggerEfficiencyPlots::ReadTriggerGates()
24682473

24692474

2475+
//------------------------------------------------------------------------------
2476+
art::InputTag icarus::trigger::TriggerEfficiencyPlots::makeTag
2477+
(art::InputTag const& defModule, std::string const& thresholdStr)
2478+
{
2479+
if (!thresholdStr.empty() && !defModule.instance().empty()) {
2480+
throw art::Exception(art::errors::Configuration)
2481+
<< "Module tag instance name (`TriggerGatesTag`: '"
2482+
<< defModule.encode() << "') and the threshold '" << thresholdStr
2483+
<< "' are both set. One of them must be empty.\n";
2484+
}
2485+
return { defModule.label(), thresholdStr, defModule.process() };
2486+
} // icarus::trigger::TriggerEfficiencyPlots::makeTag()
2487+
2488+
24702489
//------------------------------------------------------------------------------
24712490
//--- EventIDTree
24722491
//------------------------------------------------------------------------------

0 commit comments

Comments
 (0)