Skip to content

Commit 9576674

Browse files
author
Mattia Faggin
committed
Make collision processes optional.
1 parent 391688e commit 9576674

4 files changed

Lines changed: 52 additions & 40 deletions

File tree

‎PWGHF/TableProducer/candidateCreator2Prong.cxx‎

Lines changed: 13 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -119,17 +119,20 @@ struct HfCandidateCreator2Prong {
119119
}
120120

121121
std::array<bool, 3> processesCollisions = {doprocessCollisions, doprocessCollisionsCentFT0C, doprocessCollisionsCentFT0M};
122-
if (std::accumulate(processesCollisions.begin(), processesCollisions.end(), 0) != 1) {
123-
LOGP(fatal, "One and only one process function for collision monitoring must be enabled at a time.");
122+
const int nProcessesCollisions = std::accumulate(processesCollisions.begin(), processesCollisions.end(), 0);
123+
if (nProcessesCollisions > 1) {
124+
LOGP(fatal, "At most one process function for collision monitoring can be enabled at a time.");
124125
}
125-
if ((doprocessPvRefitWithDCAFitterN || doprocessNoPvRefitWithDCAFitterN || doprocessPvRefitWithKFParticle || doprocessNoPvRefitWithKFParticle) && !doprocessCollisions) {
126-
LOGP(fatal, "Process function for collision monitoring not correctly enabled. Did you enable \"processCollisions\"?");
127-
}
128-
if ((doprocessPvRefitWithDCAFitterNCentFT0C || doprocessNoPvRefitWithDCAFitterNCentFT0C || doprocessPvRefitWithKFParticleCentFT0C || doprocessNoPvRefitWithKFParticleCentFT0C) && !doprocessCollisionsCentFT0C) {
129-
LOGP(fatal, "Process function for collision monitoring not correctly enabled. Did you enable \"processCollisionsCentFT0C\"?");
130-
}
131-
if ((doprocessPvRefitWithDCAFitterNCentFT0M || doprocessNoPvRefitWithDCAFitterNCentFT0M || doprocessPvRefitWithKFParticleCentFT0M || doprocessNoPvRefitWithKFParticleCentFT0M) && !doprocessCollisionsCentFT0M) {
132-
LOGP(fatal, "Process function for collision monitoring not correctly enabled. Did you enable \"processCollisionsCentFT0M\"?");
126+
if (nProcessesCollisions == 1) {
127+
if ((doprocessPvRefitWithDCAFitterN || doprocessNoPvRefitWithDCAFitterN || doprocessPvRefitWithKFParticle || doprocessNoPvRefitWithKFParticle) && !doprocessCollisions) {
128+
LOGP(fatal, "Process function for collision monitoring not correctly enabled. Did you enable \"processCollisions\"?");
129+
}
130+
if ((doprocessPvRefitWithDCAFitterNCentFT0C || doprocessNoPvRefitWithDCAFitterNCentFT0C || doprocessPvRefitWithKFParticleCentFT0C || doprocessNoPvRefitWithKFParticleCentFT0C) && !doprocessCollisionsCentFT0C) {
131+
LOGP(fatal, "Process function for collision monitoring not correctly enabled. Did you enable \"processCollisionsCentFT0C\"?");
132+
}
133+
if ((doprocessPvRefitWithDCAFitterNCentFT0M || doprocessNoPvRefitWithDCAFitterNCentFT0M || doprocessPvRefitWithKFParticleCentFT0M || doprocessNoPvRefitWithKFParticleCentFT0M) && !doprocessCollisionsCentFT0M) {
134+
LOGP(fatal, "Process function for collision monitoring not correctly enabled. Did you enable \"processCollisionsCentFT0M\"?");
135+
}
133136
}
134137

135138
massPi = MassPiPlus;

‎PWGHF/TableProducer/candidateCreator3Prong.cxx‎

Lines changed: 13 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -113,17 +113,20 @@ struct HfCandidateCreator3Prong {
113113
}
114114

115115
std::array<bool, 3> processesCollisions = {doprocessCollisions, doprocessCollisionsCentFT0C, doprocessCollisionsCentFT0M};
116-
if (std::accumulate(processesCollisions.begin(), processesCollisions.end(), 0) != 1) {
117-
LOGP(fatal, "One and only one process function for collision monitoring must be enabled at a time.");
116+
const int nProcessesCollisions = std::accumulate(processesCollisions.begin(), processesCollisions.end(), 0);
117+
if (nProcessesCollisions > 1) {
118+
LOGP(fatal, "At most one process function for collision monitoring can be enabled at a time.");
118119
}
119-
if ((doprocessPvRefit || doprocessNoPvRefit) && !doprocessCollisions) {
120-
LOGP(fatal, "Process function for collision monitoring not correctly enabled. Did you enable \"processCollisions\"?");
121-
}
122-
if ((doprocessPvRefitCentFT0C || doprocessNoPvRefitCentFT0C) && !doprocessCollisionsCentFT0C) {
123-
LOGP(fatal, "Process function for collision monitoring not correctly enabled. Did you enable \"processCollisionsCentFT0C\"?");
124-
}
125-
if ((doprocessPvRefitCentFT0M || doprocessNoPvRefitCentFT0M) && !doprocessCollisionsCentFT0M) {
126-
LOGP(fatal, "Process function for collision monitoring not correctly enabled. Did you enable \"processCollisionsCentFT0M\"?");
120+
if (nProcessesCollisions == 1) {
121+
if ((doprocessPvRefit || doprocessNoPvRefit) && !doprocessCollisions) {
122+
LOGP(fatal, "Process function for collision monitoring not correctly enabled. Did you enable \"processCollisions\"?");
123+
}
124+
if ((doprocessPvRefitCentFT0C || doprocessNoPvRefitCentFT0C) && !doprocessCollisionsCentFT0C) {
125+
LOGP(fatal, "Process function for collision monitoring not correctly enabled. Did you enable \"processCollisionsCentFT0C\"?");
126+
}
127+
if ((doprocessPvRefitCentFT0M || doprocessNoPvRefitCentFT0M) && !doprocessCollisionsCentFT0M) {
128+
LOGP(fatal, "Process function for collision monitoring not correctly enabled. Did you enable \"processCollisionsCentFT0M\"?");
129+
}
127130
}
128131

129132
std::array<bool, 4> creationFlags = {createDplus, createDs, createLc, createXic};

‎PWGHF/TableProducer/candidateCreatorCascade.cxx‎

Lines changed: 13 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -93,17 +93,20 @@ struct HfCandidateCreatorCascade {
9393
}
9494

9595
std::array<bool, 3> processesCollisions = {doprocessCollisions, doprocessCollisionsCentFT0C, doprocessCollisionsCentFT0M};
96-
if (std::accumulate(processesCollisions.begin(), processesCollisions.end(), 0) != 1) {
97-
LOGP(fatal, "One and only one process function for collision monitoring must be enabled at a time.");
96+
const int nProcessesCollisions = std::accumulate(processesCollisions.begin(), processesCollisions.end(), 0);
97+
if (nProcessesCollisions > 1) {
98+
LOGP(fatal, "At most one process function for collision monitoring can be enabled at a time.");
9899
}
99-
if (doprocessNoCent && !doprocessCollisions) {
100-
LOGP(fatal, "Process function for collision monitoring not correctly enabled. Did you enable \"processCollisions\"?");
101-
}
102-
if (doprocessCentFT0C && !doprocessCollisionsCentFT0C) {
103-
LOGP(fatal, "Process function for collision monitoring not correctly enabled. Did you enable \"processCollisionsCentFT0C\"?");
104-
}
105-
if (doprocessCentFT0M && !doprocessCollisionsCentFT0M) {
106-
LOGP(fatal, "Process function for collision monitoring not correctly enabled. Did you enable \"processCollisionsCentFT0M\"?");
100+
if (nProcessesCollisions == 1) {
101+
if (doprocessNoCent && !doprocessCollisions) {
102+
LOGP(fatal, "Process function for collision monitoring not correctly enabled. Did you enable \"processCollisions\"?");
103+
}
104+
if (doprocessCentFT0C && !doprocessCollisionsCentFT0C) {
105+
LOGP(fatal, "Process function for collision monitoring not correctly enabled. Did you enable \"processCollisionsCentFT0C\"?");
106+
}
107+
if (doprocessCentFT0M && !doprocessCollisionsCentFT0M) {
108+
LOGP(fatal, "Process function for collision monitoring not correctly enabled. Did you enable \"processCollisionsCentFT0M\"?");
109+
}
107110
}
108111

109112
massP = MassProton;

‎PWGHF/TableProducer/candidateCreatorDstar.cxx‎

Lines changed: 13 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -122,17 +122,20 @@ struct HfCandidateCreatorDstar {
122122
}
123123

124124
std::array<bool, 3> processesCollisions = {doprocessCollisions, doprocessCollisionsCentFT0C, doprocessCollisionsCentFT0M};
125-
if (std::accumulate(processesCollisions.begin(), processesCollisions.end(), 0) != 1) {
126-
LOGP(fatal, "One and only one process function for collision monitoring must be enabled at a time.");
125+
const int nProcessesCollisions = std::accumulate(processesCollisions.begin(), processesCollisions.end(), 0);
126+
if (nProcessesCollisions > 1) {
127+
LOGP(fatal, "At most one process function for collision monitoring can be enabled at a time.");
127128
}
128-
if ((doprocessPvRefit || doprocessNoPvRefit) && !doprocessCollisions) {
129-
LOGP(fatal, "Process function for collision monitoring not correctly enabled. Did you enable \"processCollisions\"?");
130-
}
131-
if ((doprocessPvRefitCentFT0C || doprocessNoPvRefitCentFT0C) && !doprocessCollisionsCentFT0C) {
132-
LOGP(fatal, "Process function for collision monitoring not correctly enabled. Did you enable \"processCollisionsCentFT0C\"?");
133-
}
134-
if ((doprocessPvRefitCentFT0M || doprocessNoPvRefitCentFT0M) && !doprocessCollisionsCentFT0M) {
135-
LOGP(fatal, "Process function for collision monitoring not correctly enabled. Did you enable \"processCollisionsCentFT0M\"?");
129+
if (nProcessesCollisions == 1) {
130+
if ((doprocessPvRefit || doprocessNoPvRefit) && !doprocessCollisions) {
131+
LOGP(fatal, "Process function for collision monitoring not correctly enabled. Did you enable \"processCollisions\"?");
132+
}
133+
if ((doprocessPvRefitCentFT0C || doprocessNoPvRefitCentFT0C) && !doprocessCollisionsCentFT0C) {
134+
LOGP(fatal, "Process function for collision monitoring not correctly enabled. Did you enable \"processCollisionsCentFT0C\"?");
135+
}
136+
if ((doprocessPvRefitCentFT0M || doprocessNoPvRefitCentFT0M) && !doprocessCollisionsCentFT0M) {
137+
LOGP(fatal, "Process function for collision monitoring not correctly enabled. Did you enable \"processCollisionsCentFT0M\"?");
138+
}
136139
}
137140

138141
// LOG(info) << "Init Function Invoked";

0 commit comments

Comments
 (0)