@@ -214,19 +214,19 @@ enum preselectParticleIndex { kGamma = 0,
214214 kXiPlus ,
215215 kOmegaMinus ,
216216 kOmegaPlus ,
217- nPartTypes};
217+ nPartTypes };
218218
219219enum V0PreSelection : uint8_t { selGamma = 0 ,
220220 selK0Short,
221221 selLambda,
222222 selAntiLambda,
223- nSelV0Types};
223+ nSelV0Types };
224224
225225enum CascPreSelection : uint8_t { selXiMinus = 0 ,
226226 selXiPlus,
227227 selOmegaMinus,
228228 selOmegaPlus,
229- nSelCascTypes};
229+ nSelCascTypes };
230230
231231static constexpr float defaultK0MassWindowParameters[1 ][4 ] = {{2.81882e-03 , 1.14057e-03 , 1.72138e-03 , 5.00262e-01 }};
232232static constexpr float defaultLambdaWindowParameters[1 ][4 ] = {{1.17518e-03 , 1.24099e-04 , 5.47937e-03 , 3.08009e-01 }};
@@ -394,8 +394,8 @@ struct cascadeConfigurables : o2::framework::ConfigurableGroup {
394394struct preSelectOpts : o2::framework::ConfigurableGroup {
395395 std::string prefix = " preSelectOpts" ;
396396 o2::framework::Configurable<o2::framework::LabeledArray<int >> preselectedSpecies{" preselectedSpecies" ,
397- {defaultPreselectParameters[0 ], nPreselectParticles, nPreselectParameters, preselectParticleNames, parameterNames},
398- " Preselect this species with compatible TPC PID and mass info: 0/1 is false/true" };
397+ {defaultPreselectParameters[0 ], nPreselectParticles, nPreselectParameters, preselectParticleNames, parameterNames},
398+ " Preselect this species with compatible TPC PID and mass info: 0/1 is false/true" };
399399
400400 std::vector<int > mEnabledPreselectedSpecies ; // Vector of enabled preselected particle species
401401 // lifetime preselection options
@@ -1531,30 +1531,30 @@ class BuilderModule
15311531 uint8_t maskV0Preselection = 0 ;
15321532
15331533 if ( // photon PID, mass, lifetime selection
1534- preSelectOpts.mEnabledPreselectedSpecies [kGamma ] && preSelectedPIDV0s[kGamma ] &&
1535- std::abs (straHelper.v0 .massGamma ) < preSelectOpts.massCutPhoton ) {
1536- BITSET (maskV0Preselection, selGamma);
1534+ preSelectOpts.mEnabledPreselectedSpecies [kGamma ] && preSelectedPIDV0s[kGamma ] &&
1535+ std::abs (straHelper.v0 .massGamma ) < preSelectOpts.massCutPhoton ) {
1536+ BITSET (maskV0Preselection, selGamma);
15371537 }
15381538
15391539 if ( // K0Short PID, mass, lifetime selection
1540- preSelectOpts.mEnabledPreselectedSpecies [kK0Short ] && preSelectedPIDV0s[kK0Short ] &&
1541- o2::constants::physics::MassKaonNeutral * lLengthTraveled / (lPtot + 1e-13 ) < preSelectOpts.lifetimeCut ->get (" lifetimeCutK0S" ) &&
1542- std::abs (straHelper.v0 .massK0Short - o2::constants::physics::MassKaonNeutral) < preSelectOpts.massWindownumberOfSigmas * getMassSigmaK0Short (lPt) + preSelectOpts.massWindowSafetyMargin ) {
1543- BITSET (maskV0Preselection, selK0Short);
1540+ preSelectOpts.mEnabledPreselectedSpecies [kK0Short ] && preSelectedPIDV0s[kK0Short ] &&
1541+ o2::constants::physics::MassKaonNeutral * lLengthTraveled / (lPtot + 1e-13 ) < preSelectOpts.lifetimeCut ->get (" lifetimeCutK0S" ) &&
1542+ std::abs (straHelper.v0 .massK0Short - o2::constants::physics::MassKaonNeutral) < preSelectOpts.massWindownumberOfSigmas * getMassSigmaK0Short (lPt) + preSelectOpts.massWindowSafetyMargin ) {
1543+ BITSET (maskV0Preselection, selK0Short);
15441544 }
15451545
15461546 if ( // Lambda PID, mass, lifetime selection
1547- preSelectOpts.mEnabledPreselectedSpecies [kLambda ] && preSelectedPIDV0s[kLambda ] &&
1548- o2::constants::physics::MassLambda * lLengthTraveled / (lPtot + 1e-13 ) < preSelectOpts.lifetimeCut ->get (" lifetimeCutLambda" ) &&
1549- std::abs (straHelper.v0 .massLambda - o2::constants::physics::MassLambda) < preSelectOpts.massWindownumberOfSigmas * getMassSigmaLambda (lPt) + preSelectOpts.massWindowSafetyMargin ) {
1550- BITSET (maskV0Preselection, selLambda);
1547+ preSelectOpts.mEnabledPreselectedSpecies [kLambda ] && preSelectedPIDV0s[kLambda ] &&
1548+ o2::constants::physics::MassLambda * lLengthTraveled / (lPtot + 1e-13 ) < preSelectOpts.lifetimeCut ->get (" lifetimeCutLambda" ) &&
1549+ std::abs (straHelper.v0 .massLambda - o2::constants::physics::MassLambda) < preSelectOpts.massWindownumberOfSigmas * getMassSigmaLambda (lPt) + preSelectOpts.massWindowSafetyMargin ) {
1550+ BITSET (maskV0Preselection, selLambda);
15511551 }
15521552
15531553 if ( // antiLambda PID, mass, lifetime selection
1554- preSelectOpts.mEnabledPreselectedSpecies [kAntiLambda ] && preSelectedPIDV0s[kAntiLambda ] &&
1555- o2::constants::physics::MassLambda * lLengthTraveled / (lPtot + 1e-13 ) < preSelectOpts.lifetimeCut ->get (" lifetimeCutLambda" ) &&
1556- std::abs (straHelper.v0 .massAntiLambda - o2::constants::physics::MassLambda) < preSelectOpts.massWindownumberOfSigmas * getMassSigmaLambda (lPt) + preSelectOpts.massWindowSafetyMargin ) {
1557- BITSET (maskV0Preselection, selAntiLambda);
1554+ preSelectOpts.mEnabledPreselectedSpecies [kAntiLambda ] && preSelectedPIDV0s[kAntiLambda ] &&
1555+ o2::constants::physics::MassLambda * lLengthTraveled / (lPtot + 1e-13 ) < preSelectOpts.lifetimeCut ->get (" lifetimeCutLambda" ) &&
1556+ std::abs (straHelper.v0 .massAntiLambda - o2::constants::physics::MassLambda) < preSelectOpts.massWindownumberOfSigmas * getMassSigmaLambda (lPt) + preSelectOpts.massWindowSafetyMargin ) {
1557+ BITSET (maskV0Preselection, selAntiLambda);
15581558 }
15591559
15601560 histos.fill (HIST (" hPreselectionV0s" ), maskV0Preselection);
@@ -2051,7 +2051,7 @@ class BuilderModule
20512051 preSelectedPIDCascades.resize (nPartTypes, 1 );
20522052 }
20532053 }
2054-
2054+
20552055 if (baseOpts.useV0BufferForCascades ) {
20562056 // this processing path uses a buffer of V0s so that no
20572057 // additional minimization step is redone. It consumes less
@@ -2123,35 +2123,35 @@ class BuilderModule
21232123 uint8_t maskCascadePreselection = 0 ;
21242124
21252125 if ( // XiMinus PID and mass selection
2126- preSelectOpts.mEnabledPreselectedSpecies [kXiMinus ] && straHelper.cascade .charge < 0 && preSelectedPIDCascades[kXiMinus ] &&
2127- o2::constants::physics::MassLambda * lV0LengthTraveled / (lV0Ptot + 1e-13 ) < preSelectOpts.lifetimeCut ->get (" lifetimeCutLambda" ) &&
2128- o2::constants::physics::MassXiMinus * lLengthTraveled / (lPtot + 1e-13 ) < preSelectOpts.lifetimeCut ->get (" lifetimeCutXi" ) &&
2129- std::abs (straHelper.cascade .massXi - o2::constants::physics::MassXiMinus) < preSelectOpts.massWindownumberOfSigmas * getMassSigmaXi (lPt) + preSelectOpts.massWindowSafetyMargin ) {
2130- BITSET (maskCascadePreselection, selXiMinus);
2126+ preSelectOpts.mEnabledPreselectedSpecies [kXiMinus ] && straHelper.cascade .charge < 0 && preSelectedPIDCascades[kXiMinus ] &&
2127+ o2::constants::physics::MassLambda * lV0LengthTraveled / (lV0Ptot + 1e-13 ) < preSelectOpts.lifetimeCut ->get (" lifetimeCutLambda" ) &&
2128+ o2::constants::physics::MassXiMinus * lLengthTraveled / (lPtot + 1e-13 ) < preSelectOpts.lifetimeCut ->get (" lifetimeCutXi" ) &&
2129+ std::abs (straHelper.cascade .massXi - o2::constants::physics::MassXiMinus) < preSelectOpts.massWindownumberOfSigmas * getMassSigmaXi (lPt) + preSelectOpts.massWindowSafetyMargin ) {
2130+ BITSET (maskCascadePreselection, selXiMinus);
21312131 }
21322132
21332133 if ( // XiPlus PID and mass selection
2134- preSelectOpts.mEnabledPreselectedSpecies [kXiPlus ] && straHelper.cascade .charge > 0 && preSelectedPIDCascades[kXiPlus ] &&
2135- o2::constants::physics::MassLambda * lV0LengthTraveled / (lV0Ptot + 1e-13 ) < preSelectOpts.lifetimeCut ->get (" lifetimeCutLambda" ) &&
2136- o2::constants::physics::MassXiMinus * lLengthTraveled / (lPtot + 1e-13 ) < preSelectOpts.lifetimeCut ->get (" lifetimeCutXi" ) &&
2137- std::abs (straHelper.cascade .massXi - o2::constants::physics::MassXiMinus) < preSelectOpts.massWindownumberOfSigmas * getMassSigmaXi (lPt) + preSelectOpts.massWindowSafetyMargin ) {
2138- BITSET (maskCascadePreselection, selXiPlus);
2134+ preSelectOpts.mEnabledPreselectedSpecies [kXiPlus ] && straHelper.cascade .charge > 0 && preSelectedPIDCascades[kXiPlus ] &&
2135+ o2::constants::physics::MassLambda * lV0LengthTraveled / (lV0Ptot + 1e-13 ) < preSelectOpts.lifetimeCut ->get (" lifetimeCutLambda" ) &&
2136+ o2::constants::physics::MassXiMinus * lLengthTraveled / (lPtot + 1e-13 ) < preSelectOpts.lifetimeCut ->get (" lifetimeCutXi" ) &&
2137+ std::abs (straHelper.cascade .massXi - o2::constants::physics::MassXiMinus) < preSelectOpts.massWindownumberOfSigmas * getMassSigmaXi (lPt) + preSelectOpts.massWindowSafetyMargin ) {
2138+ BITSET (maskCascadePreselection, selXiPlus);
21392139 }
21402140
21412141 if ( // OmegaMinus PID and mass selection
2142- preSelectOpts.mEnabledPreselectedSpecies [kOmegaMinus ] && straHelper.cascade .charge < 0 && preSelectedPIDCascades[kOmegaMinus ] &&
2143- o2::constants::physics::MassLambda * lV0LengthTraveled / (lV0Ptot + 1e-13 ) < preSelectOpts.lifetimeCut ->get (" lifetimeCutLambda" ) &&
2144- o2::constants::physics::MassOmegaMinus * lLengthTraveled / (lPtot + 1e-13 ) < preSelectOpts.lifetimeCut ->get (" lifetimeCutOmega" ) &&
2145- std::abs (straHelper.cascade .massOmega - o2::constants::physics::MassOmegaMinus) < preSelectOpts.massWindownumberOfSigmas * getMassSigmaOmega (lPt) + preSelectOpts.massWindowSafetyMargin ) {
2146- BITSET (maskCascadePreselection, selOmegaMinus);
2142+ preSelectOpts.mEnabledPreselectedSpecies [kOmegaMinus ] && straHelper.cascade .charge < 0 && preSelectedPIDCascades[kOmegaMinus ] &&
2143+ o2::constants::physics::MassLambda * lV0LengthTraveled / (lV0Ptot + 1e-13 ) < preSelectOpts.lifetimeCut ->get (" lifetimeCutLambda" ) &&
2144+ o2::constants::physics::MassOmegaMinus * lLengthTraveled / (lPtot + 1e-13 ) < preSelectOpts.lifetimeCut ->get (" lifetimeCutOmega" ) &&
2145+ std::abs (straHelper.cascade .massOmega - o2::constants::physics::MassOmegaMinus) < preSelectOpts.massWindownumberOfSigmas * getMassSigmaOmega (lPt) + preSelectOpts.massWindowSafetyMargin ) {
2146+ BITSET (maskCascadePreselection, selOmegaMinus);
21472147 }
21482148
21492149 if ( // OmegaPlus PID and mass selection
2150- preSelectOpts.mEnabledPreselectedSpecies [kOmegaPlus ] && straHelper.cascade .charge > 0 && preSelectedPIDCascades[kOmegaPlus ] &&
2151- o2::constants::physics::MassLambda * lV0LengthTraveled / (lV0Ptot + 1e-13 ) < preSelectOpts.lifetimeCut ->get (" lifetimeCutLambda" ) &&
2152- o2::constants::physics::MassOmegaMinus * lLengthTraveled / (lPtot + 1e-13 ) < preSelectOpts.lifetimeCut ->get (" lifetimeCutOmega" ) &&
2153- std::abs (straHelper.cascade .massOmega - o2::constants::physics::MassOmegaMinus) < preSelectOpts.massWindownumberOfSigmas * getMassSigmaOmega (lPt) + preSelectOpts.massWindowSafetyMargin ) {
2154- BITSET (maskCascadePreselection, selOmegaPlus);
2150+ preSelectOpts.mEnabledPreselectedSpecies [kOmegaPlus ] && straHelper.cascade .charge > 0 && preSelectedPIDCascades[kOmegaPlus ] &&
2151+ o2::constants::physics::MassLambda * lV0LengthTraveled / (lV0Ptot + 1e-13 ) < preSelectOpts.lifetimeCut ->get (" lifetimeCutLambda" ) &&
2152+ o2::constants::physics::MassOmegaMinus * lLengthTraveled / (lPtot + 1e-13 ) < preSelectOpts.lifetimeCut ->get (" lifetimeCutOmega" ) &&
2153+ std::abs (straHelper.cascade .massOmega - o2::constants::physics::MassOmegaMinus) < preSelectOpts.massWindownumberOfSigmas * getMassSigmaOmega (lPt) + preSelectOpts.massWindowSafetyMargin ) {
2154+ BITSET (maskCascadePreselection, selOmegaPlus);
21552155 }
21562156
21572157 histos.fill (HIST (" hPreselectionCascades" ), maskCascadePreselection);
0 commit comments