Skip to content

Commit bf24470

Browse files
committed
Fix: fix linter warnings
1 parent 34b4d0b commit bf24470

2 files changed

Lines changed: 12 additions & 24 deletions

File tree

‎PWGCF/Femto/Core/femtoUtils.h‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -86,10 +86,10 @@ float itsSignal(T const& track)
8686
// internally by TDatabasePDG's particle-table construction) and no mass constant exists in
8787
// PhysicsConstants.h either, so both the codes and the mass are hardcoded here, same as kRho770_0/
8888
// kRho770Plus below.
89-
constexpr int kDeltaMinus1232 = 1114;
90-
constexpr int kDelta01232 = 2114;
91-
constexpr int kDeltaPlus1232 = 2214;
92-
constexpr int kDeltaPlusPlus1232 = 2224;
89+
constexpr int DeltaMinus1232 = 1114;
90+
constexpr int Delta01232 = 2114;
91+
constexpr int DeltaPlus1232 = 2214;
92+
constexpr int DeltaPlusPlus1232 = 2224;
9393

9494
inline double getPdgMass(int pdgCode)
9595
{
@@ -158,10 +158,10 @@ inline double getPdgMass(int pdgCode)
158158
case o2::constants::physics::kEta:
159159
mass = o2::constants::physics::MassEta;
160160
break;
161-
case kDeltaMinus1232:
162-
case kDelta01232:
163-
case kDeltaPlus1232:
164-
case kDeltaPlusPlus1232:
161+
case DeltaMinus1232:
162+
case Delta01232:
163+
case DeltaPlus1232:
164+
case DeltaPlusPlus1232:
165165
mass = 1.232; // not defined in O2?
166166
break;
167167
default:

‎PWGCF/Femto/Core/particleCleaner.h‎

Lines changed: 4 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -47,9 +47,6 @@ struct ConfParticleCleaner : o2::framework::ConfigurableGroup {
4747
o2::framework::Configurable<float> motherPtMax{"motherPtMax", 1e6f, "Maximum pT of the mother. One shared window applies regardless of which requiredMotherPdgCodes/rejectMotherPdgCodes entry the mother's own pdg code matched"};
4848
o2::framework::Configurable<float> motherEtaMin{"motherEtaMin", -1e6f, "Minimum eta of the mother. One shared window applies regardless of which requiredMotherPdgCodes/rejectMotherPdgCodes entry the mother's own pdg code matched"};
4949
o2::framework::Configurable<float> motherEtaMax{"motherEtaMax", 1e6f, "Maximum eta of the mother. One shared window applies regardless of which requiredMotherPdgCodes/rejectMotherPdgCodes entry the mother's own pdg code matched"};
50-
// Rapidity cut on the mother. FMcMothers has no mass column, so the mass is looked up from
51-
// PdgCode via utils::getPdgMass() (the same lookup pairHistManager.h uses for kstar/Q3) and
52-
// combined with the mother's pt/eta to get y -- see RecoDecay::y(pt, eta, m).
5350
o2::framework::Configurable<float> motherRapidityMin{"motherRapidityMin", -1e6f, "Minimum rapidity of the mother. One shared window applies regardless of which requiredMotherPdgCodes/rejectMotherPdgCodes entry the mother's own pdg code matched"};
5451
o2::framework::Configurable<float> motherRapidityMax{"motherRapidityMax", 1e6f, "Maximum rapidity of the mother. One shared window applies regardless of which requiredMotherPdgCodes/rejectMotherPdgCodes entry the mother's own pdg code matched"};
5552
o2::framework::Configurable<float> motherPhiMin{"motherPhiMin", 0.f, "Minimum phi of the mother. One shared window applies regardless of which requiredMotherPdgCodes/rejectMotherPdgCodes entry the mother's own pdg code matched"};
@@ -240,24 +237,15 @@ class ParticleCleaner
240237
}
241238
}
242239

243-
// One shared pt/eta/phi/rapidity window, applied to the mother regardless of which (if any)
244-
// requiredMotherPdgCodes/rejectMotherPdgCodes entry it matched above -- see the comment on
245-
// ConfParticleCleaner's motherPtMin et al.
240+
// One shared pt/eta/phi window, applied to the mother regardless of which (if any)
241+
// requiredMotherPdgCodes/rejectMotherPdgCodes entry it matched above
242+
double motherRapidity = mother.y(utils::getPdgMass(mother.pdgCode()));
246243
if (!(mother.pt() > mMotherPtMin && mother.pt() < mMotherPtMax &&
247244
mother.eta() > mMotherEtaMin && mother.eta() < mMotherEtaMax &&
245+
motherRapidity > mMotherRapidityMin && motherRapidity < mMotherRapidityMax &&
248246
mother.phi() > mMotherPhiMin && mother.phi() < mMotherPhiMax)) {
249247
motherKinematicsOk = false;
250248
}
251-
252-
// rapidity needs the mother's mass, which FMcMothers does not store directly -- its Y()
253-
// dynamic column takes mass as a free argument, looked up from the pdg code (same mechanism
254-
// as the kstar/Q3 mass lookup in pairHistManager.h)
255-
if (mMotherRapidityMin > -1e6f || mMotherRapidityMax < 1e6f) {
256-
double motherRapidity = mother.y(utils::getPdgMass(mother.pdgCode()));
257-
if (!(motherRapidity > mMotherRapidityMin && motherRapidity < mMotherRapidityMax)) {
258-
motherKinematicsOk = false;
259-
}
260-
}
261249
}
262250

263251
// MC partonic mother — same idea, via mcParticle

0 commit comments

Comments
 (0)