Skip to content

Commit 2af4105

Browse files
authored
Merge pull request AliceO2Group#31 from alibuild/alibot-cleanup-3886
Please consider the following formatting changes to AliceO2Group#3886
2 parents c1591db + 962b471 commit 2af4105

File tree

1 file changed

+25
-27
lines changed

1 file changed

+25
-27
lines changed

PWGHF/TableProducer/trackIndexSkimCreator.cxx

Lines changed: 25 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -2958,15 +2958,15 @@ struct HfTrackIndexSkimCreatorLfCascades {
29582958
// a tolerance has been added to be more conservative
29592959
Configurable<float> v0TransvRadius{"v0TransvRadius", 0.6, "V0 radius in xy plane"}; // 0.5 in run2
29602960
Configurable<float> cascTransvRadius{"cascTransvRadius", 0.7, "Cascade radius in xy plane"}; // 0.5 cm for xi and 0.6 for omega
2961-
Configurable<float> dcaBachToPv{"dcaBachToPv", .06, "DCA Bach To PV"}; // 0.04 in run2
2962-
Configurable<float> dcaV0ToPv{"dcaV0ToPv", .08, "DCA V0 To PV"}; // 0.06 in run2
2963-
Configurable<double> v0CosPA{"v0CosPA", 0.95, "V0 CosPA"}; // 0.97 in run2 - double -> N.B. dcos(x)/dx = 0 at x=0)
2964-
Configurable<double> cascCosPA{"cascCosPA", 0.95, "Casc CosPA"}; // 0.97 in run2 - double -> N.B. dcos(x)/dx = 0 at x=0)
2965-
Configurable<float> dcaV0Dau{"dcaV0Dau", 2.0, "DCA V0 Daughters"}; // conservative, a cut ar 1.0 should also be fine
2966-
Configurable<float> dcaCascDau{"dcaCascDau", 2.0, "DCA Casc Daughters"}; // conservative, a cut ar 1.0 should also be fine
2967-
Configurable<float> dcaNegToPv{"dcaNegToPv", .08, "DCA Neg To PV"}; // 0.06 in run2
2968-
Configurable<float> dcaPosToPv{"dcaPosToPv", .08, "DCA Pos To PV"}; // 0.06 in run2
2969-
Configurable<float> v0MassWindow{"v0MassWindow", 0.01, "V0 mass window"}; // 0.008 in run2
2961+
Configurable<float> dcaBachToPv{"dcaBachToPv", .06, "DCA Bach To PV"}; // 0.04 in run2
2962+
Configurable<float> dcaV0ToPv{"dcaV0ToPv", .08, "DCA V0 To PV"}; // 0.06 in run2
2963+
Configurable<double> v0CosPA{"v0CosPA", 0.95, "V0 CosPA"}; // 0.97 in run2 - double -> N.B. dcos(x)/dx = 0 at x=0)
2964+
Configurable<double> cascCosPA{"cascCosPA", 0.95, "Casc CosPA"}; // 0.97 in run2 - double -> N.B. dcos(x)/dx = 0 at x=0)
2965+
Configurable<float> dcaV0Dau{"dcaV0Dau", 2.0, "DCA V0 Daughters"}; // conservative, a cut ar 1.0 should also be fine
2966+
Configurable<float> dcaCascDau{"dcaCascDau", 2.0, "DCA Casc Daughters"}; // conservative, a cut ar 1.0 should also be fine
2967+
Configurable<float> dcaNegToPv{"dcaNegToPv", .08, "DCA Neg To PV"}; // 0.06 in run2
2968+
Configurable<float> dcaPosToPv{"dcaPosToPv", .08, "DCA Pos To PV"}; // 0.06 in run2
2969+
Configurable<float> v0MassWindow{"v0MassWindow", 0.01, "V0 mass window"}; // 0.008 in run2
29702970
Configurable<float> cascadeMassWindow{"cascadeMassWindow", 0.01, "Cascade mass window"};
29712971

29722972
// magnetic field setting from CCDB
@@ -3074,7 +3074,7 @@ struct HfTrackIndexSkimCreatorLfCascades {
30743074
Filter filterSelectTrackIds = (aod::hf_sel_track::isSelProng >= 4); // select tracks passing bachelor selection
30753075

30763076
using SelectedCollisions = soa::Filtered<soa::Join<aod::Collisions, aod::HfSelCollision>>;
3077-
using SelectedHfTrackAssoc = soa::Filtered<soa::Join<aod::TrackAssoc, aod::HfSelTrack>>;
3077+
using SelectedHfTrackAssoc = soa::Filtered<soa::Join<aod::TrackAssoc, aod::HfSelTrack>>;
30783078
using CascFull = soa::Join<aod::CascDatas, aod::CascCovs>;
30793079
using V0Full = soa::Join<aod::V0Datas, aod::V0Covs>;
30803080

@@ -3294,14 +3294,14 @@ struct HfTrackIndexSkimCreatorLfCascades {
32943294

32953295
auto secondaryVertex2XiHyp = df2.getPCACandidate();
32963296

3297-
if(std::abs(casc.mXi() - massXi) < cascadeMassWindow){
3297+
if (std::abs(casc.mXi() - massXi) < cascadeMassWindow) {
32983298
SETBIT(hfFlag, aod::hf_cand_casc_lf::DecayType2Prong::XiczeroOmegaczeroToXiPi);
32993299
}
33003300

33013301
std::array<std::array<float, 3>, 2> arrMomToXi = {pVecXi, pVecPion1XiHyp};
33023302
auto mass2ProngXiHyp = RecoDecay::m(arrMomToXi, arrMass2Prong[hf_cand_casc_lf::DecayType2Prong::XiczeroOmegaczeroToXiPi]);
33033303

3304-
if(mass2ProngXiHyp < massXiPiMin || mass2ProngXiHyp > massXiPiMax){
3304+
if (mass2ProngXiHyp < massXiPiMin || mass2ProngXiHyp > massXiPiMax) {
33053305
statusMassXiPiChannel = false;
33063306
}
33073307

@@ -3329,14 +3329,14 @@ struct HfTrackIndexSkimCreatorLfCascades {
33293329

33303330
auto secondaryVertex2OmegaHyp = df2.getPCACandidate();
33313331

3332-
if(std::abs(casc.mOmega() - massOmega) < cascadeMassWindow){
3332+
if (std::abs(casc.mOmega() - massOmega) < cascadeMassWindow) {
33333333
SETBIT(hfFlag, aod::hf_cand_casc_lf::DecayType2Prong::OmegaczeroToOmegaPi);
33343334
}
33353335

33363336
std::array<std::array<float, 3>, 2> arrMomToOmega = {pVecOmega, pVecPion1OmegaHyp};
33373337
auto mass2ProngOmegaHyp = RecoDecay::m(arrMomToOmega, arrMass2Prong[hf_cand_casc_lf::DecayType2Prong::OmegaczeroToOmegaPi]);
33383338

3339-
if(mass2ProngOmegaHyp < massOmegaPiMin || mass2ProngOmegaHyp > massOmegaPiMax){
3339+
if (mass2ProngOmegaHyp < massOmegaPiMin || mass2ProngOmegaHyp > massOmegaPiMax) {
33403340
statusMassOmegaPiChannel = false;
33413341
}
33423342

@@ -3349,9 +3349,8 @@ struct HfTrackIndexSkimCreatorLfCascades {
33493349
}
33503350
}
33513351

3352-
33533352
// fill table row only if a vertex was found
3354-
if((nVtxFrom2ProngFitterXiHyp!=0 && statusMassXiPiChannel) || (nVtxFrom2ProngFitterOmegaHyp!=0 && statusMassOmegaPiChannel)){
3353+
if ((nVtxFrom2ProngFitterXiHyp != 0 && statusMassXiPiChannel) || (nVtxFrom2ProngFitterOmegaHyp != 0 && statusMassOmegaPiChannel)) {
33553354
rowTrackIndexCasc2Prong(thisCollId,
33563355
casc.globalIndex(),
33573356
trackPion1.globalIndex(),
@@ -3403,15 +3402,14 @@ struct HfTrackIndexSkimCreatorLfCascades {
34033402
// std::array<float, 3> secondaryVertex3 = {0., 0., 0.};
34043403
auto secondaryVertex3 = df3.getPCACandidate();
34053404

3406-
3407-
if(std::abs(casc.mXi() - massXi) < cascadeMassWindow){
3405+
if (std::abs(casc.mXi() - massXi) < cascadeMassWindow) {
34083406
SETBIT(hfFlag, aod::hf_cand_casc_lf::DecayType3Prong::XicplusToXiPiPi);
34093407
}
34103408

34113409
std::array<std::array<float, 3>, 3> arr3Mom = {pVec1, pVec2, pVec3};
34123410
auto mass3Prong = RecoDecay::m(arr3Mom, arrMass3Prong[hf_cand_casc_lf::DecayType3Prong::XicplusToXiPiPi]);
34133411

3414-
if(mass3Prong < massXiPiPiMin || mass3Prong > massXiPiPiMax){
3412+
if (mass3Prong < massXiPiPiMin || mass3Prong > massXiPiPiMax) {
34153413
statusMassXiPiPiChannel = false;
34163414
}
34173415

@@ -3424,14 +3422,14 @@ struct HfTrackIndexSkimCreatorLfCascades {
34243422
}
34253423
}
34263424

3427-
// fill table row only if a vertex was found
3428-
if(nVtxFrom3ProngFitterXiHyp!=0 && statusMassXiPiPiChannel){
3429-
rowTrackIndexCasc3Prong(thisCollId,
3430-
casc.globalIndex(),
3431-
trackPion1.globalIndex(),
3432-
trackPion2.globalIndex(),
3433-
hfFlag);
3434-
}
3425+
// fill table row only if a vertex was found
3426+
if (nVtxFrom3ProngFitterXiHyp != 0 && statusMassXiPiPiChannel) {
3427+
rowTrackIndexCasc3Prong(thisCollId,
3428+
casc.globalIndex(),
3429+
trackPion1.globalIndex(),
3430+
trackPion2.globalIndex(),
3431+
hfFlag);
3432+
}
34353433

34363434
} // end 3prong loop
34373435
} // end 3prong condition

0 commit comments

Comments
 (0)