Skip to content

Commit a2ee147

Browse files
authored
Update HadNucleiFemto.cxx
1 parent 46de7dc commit a2ee147

1 file changed

Lines changed: 6 additions & 16 deletions

File tree

‎PWGCF/Femto/FemtoNuclei/TableProducer/HadNucleiFemto.cxx‎

Lines changed: 6 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -623,8 +623,9 @@ struct HadNucleiFemto {
623623
// cppcheck-suppress unusedStructMember
624624
std::string prefix{"zorro"};
625625
// Zorro
626-
Configurable<bool> settingSkimmedProcessing{"settingSkimmedProcessing", false, "Use the pair-specific fHe or fTritonFemto Zorro trigger"};
627-
Configurable<bool> settingUseHighFt0MultTrigger{"settingUseHighFt0MultTrigger", false, "Select events with the fHighFt0Mult Zorro trigger instead of the pair-specific trigger"};
626+
Configurable<bool> settingEnableTriggerSelection{"settingEnableTriggerSelection", false, "Enable Zorro event selection for the configured software triggers"};
627+
Configurable<std::string> settingSoftwareTriggerNames{"settingSoftwareTriggerNames", "fHighFt0Mult", "Software trigger names, separated by commas (OR selection)"};
628+
Configurable<std::string> settingBaseCCDBPathForTriggers{"settingBaseCCDBPathForTriggers", "EventFiltering/Zorro/", "CCDB path for Zorro trigger information"};
628629
} zorro;
629630

630631
struct : o2::framework::ConfigurableGroup {
@@ -1043,7 +1044,8 @@ struct HadNucleiFemto {
10431044
}
10441045
if constexpr (!isMC) {
10451046
if (useZorroSelection()) {
1046-
mZorro.initCCDB(mCcdb.service, bc.runNumber(), bc.timestamp(), zorroTriggerMask());
1047+
mZorro.setBaseCCDBPath(zorro.settingBaseCCDBPathForTriggers.value);
1048+
mZorro.initCCDB(mCcdb.service, bc.runNumber(), bc.timestamp(), zorro.settingSoftwareTriggerNames.value);
10471049
mZorro.populateHistRegistry(mQaRegistry, bc.runNumber());
10481050
}
10491051
}
@@ -1288,21 +1290,9 @@ struct HadNucleiFemto {
12881290
return species.settingNuPDGCode.value == He3PDG;
12891291
}
12901292

1291-
const char* zorroTriggerMask() const
1292-
{
1293-
if (zorro.settingUseHighFt0MultTrigger.value) {
1294-
return "fHighFt0Mult";
1295-
}
1296-
if (useTritonNucleus()) {
1297-
return "fTritonFemto";
1298-
}
1299-
return "fHe";
1300-
}
1301-
13021293
bool useZorroSelection() const
13031294
{
1304-
return zorro.settingUseHighFt0MultTrigger.value ||
1305-
(zorro.settingSkimmedProcessing.value && (useHelium3Nucleus() || useTritonNucleus()));
1295+
return zorro.settingEnableTriggerSelection.value;
13061296
}
13071297

13081298
const char* nucleusBetheBlochLabel() const

0 commit comments

Comments
 (0)