Skip to content

Commit 8fe3bed

Browse files
JaeYoonCHOJaeYoonCHO
authored
[PWGHF] Add variables in MlResponse and fix typo in XicToXiPiPI workflows (#9554)
1 parent 70b7d69 commit 8fe3bed

File tree

3 files changed

+78
-21
lines changed

3 files changed

+78
-21
lines changed

‎PWGHF/Core/HfMlResponseXicToXiPiPi.h‎

Lines changed: 66 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -66,9 +66,28 @@ enum class InputFeaturesXicToXiPiPi : uint8_t {
6666
cosPaXYXi,
6767
cosPaLambda,
6868
cosPaXYLambda,
69-
impactParameterXY0,
70-
impactParameterXY1,
71-
impactParameterXY2
69+
impactParameterXi,
70+
impactParameterPi0,
71+
impactParameterPi1,
72+
invMassXi,
73+
invMassLambda,
74+
dcaXiDaughters,
75+
dcaV0Daughters,
76+
dcaPosToPV,
77+
dcaNegToPV,
78+
dcaBachelorToPV,
79+
dcaXYCascToPV,
80+
dcaZCascToPV,
81+
nSigTpcPiFromXicPlus0,
82+
nSigTpcPiFromXicPlus1,
83+
nSigTpcBachelorPi,
84+
nSigTpcPiFromLambda,
85+
nSigTpcPrFromLambda,
86+
nSigTofPiFromXicPlus0,
87+
nSigTofPiFromXicPlus1,
88+
nSigTofBachelorPi,
89+
nSigTofPiFromLambda,
90+
nSigTofPrFromLambda
7291
};
7392

7493
template <typename TypeOutputScore = float>
@@ -104,9 +123,28 @@ class HfMlResponseXicToXiPiPi : public HfMlResponse<TypeOutputScore>
104123
CHECK_AND_FILL_VEC_XICTOXIPIPI(cosPaXYXi);
105124
CHECK_AND_FILL_VEC_XICTOXIPIPI(cosPaLambda);
106125
CHECK_AND_FILL_VEC_XICTOXIPIPI(cosPaXYLambda);
107-
CHECK_AND_FILL_VEC_XICTOXIPIPI_FULL(candidate, impactParameterXY0, impactParameter0);
108-
CHECK_AND_FILL_VEC_XICTOXIPIPI_FULL(candidate, impactParameterXY1, impactParameter1);
109-
CHECK_AND_FILL_VEC_XICTOXIPIPI_FULL(candidate, impactParameterXY2, impactParameter2);
126+
CHECK_AND_FILL_VEC_XICTOXIPIPI_FULL(candidate, impactParameterXi, impactParameter0);
127+
CHECK_AND_FILL_VEC_XICTOXIPIPI_FULL(candidate, impactParameterPi0, impactParameter1);
128+
CHECK_AND_FILL_VEC_XICTOXIPIPI_FULL(candidate, impactParameterPi1, impactParameter2);
129+
CHECK_AND_FILL_VEC_XICTOXIPIPI(invMassXi);
130+
CHECK_AND_FILL_VEC_XICTOXIPIPI(invMassLambda);
131+
CHECK_AND_FILL_VEC_XICTOXIPIPI(dcaXiDaughters);
132+
CHECK_AND_FILL_VEC_XICTOXIPIPI(dcaV0Daughters);
133+
CHECK_AND_FILL_VEC_XICTOXIPIPI(dcaPosToPV);
134+
CHECK_AND_FILL_VEC_XICTOXIPIPI(dcaNegToPV);
135+
CHECK_AND_FILL_VEC_XICTOXIPIPI(dcaBachelorToPV);
136+
CHECK_AND_FILL_VEC_XICTOXIPIPI(dcaXYCascToPV);
137+
CHECK_AND_FILL_VEC_XICTOXIPIPI(dcaZCascToPV);
138+
CHECK_AND_FILL_VEC_XICTOXIPIPI(nSigTpcPiFromXicPlus0);
139+
CHECK_AND_FILL_VEC_XICTOXIPIPI(nSigTpcPiFromXicPlus1);
140+
CHECK_AND_FILL_VEC_XICTOXIPIPI(nSigTpcBachelorPi);
141+
CHECK_AND_FILL_VEC_XICTOXIPIPI(nSigTpcPiFromLambda);
142+
CHECK_AND_FILL_VEC_XICTOXIPIPI(nSigTpcPrFromLambda);
143+
CHECK_AND_FILL_VEC_XICTOXIPIPI(nSigTofPiFromXicPlus0);
144+
CHECK_AND_FILL_VEC_XICTOXIPIPI(nSigTofPiFromXicPlus1);
145+
CHECK_AND_FILL_VEC_XICTOXIPIPI(nSigTofBachelorPi);
146+
CHECK_AND_FILL_VEC_XICTOXIPIPI(nSigTofPiFromLambda);
147+
CHECK_AND_FILL_VEC_XICTOXIPIPI(nSigTofPrFromLambda);
110148
}
111149
}
112150

@@ -132,9 +170,28 @@ class HfMlResponseXicToXiPiPi : public HfMlResponse<TypeOutputScore>
132170
FILL_MAP_XICTOXIPIPI(cosPaXYXi),
133171
FILL_MAP_XICTOXIPIPI(cosPaLambda),
134172
FILL_MAP_XICTOXIPIPI(cosPaXYLambda),
135-
FILL_MAP_XICTOXIPIPI(impactParameterXY0),
136-
FILL_MAP_XICTOXIPIPI(impactParameterXY1),
137-
FILL_MAP_XICTOXIPIPI(impactParameterXY2)};
173+
FILL_MAP_XICTOXIPIPI(impactParameterXi),
174+
FILL_MAP_XICTOXIPIPI(impactParameterPi0),
175+
FILL_MAP_XICTOXIPIPI(impactParameterPi1),
176+
FILL_MAP_XICTOXIPIPI(invMassXi),
177+
FILL_MAP_XICTOXIPIPI(invMassLambda),
178+
FILL_MAP_XICTOXIPIPI(dcaXiDaughters),
179+
FILL_MAP_XICTOXIPIPI(dcaV0Daughters),
180+
FILL_MAP_XICTOXIPIPI(dcaPosToPV),
181+
FILL_MAP_XICTOXIPIPI(dcaNegToPV),
182+
FILL_MAP_XICTOXIPIPI(dcaBachelorToPV),
183+
FILL_MAP_XICTOXIPIPI(dcaXYCascToPV),
184+
FILL_MAP_XICTOXIPIPI(dcaZCascToPV),
185+
FILL_MAP_XICTOXIPIPI(nSigTpcPiFromXicPlus0),
186+
FILL_MAP_XICTOXIPIPI(nSigTpcPiFromXicPlus1),
187+
FILL_MAP_XICTOXIPIPI(nSigTpcBachelorPi),
188+
FILL_MAP_XICTOXIPIPI(nSigTpcPiFromLambda),
189+
FILL_MAP_XICTOXIPIPI(nSigTpcPrFromLambda),
190+
FILL_MAP_XICTOXIPIPI(nSigTofPiFromXicPlus0),
191+
FILL_MAP_XICTOXIPIPI(nSigTofPiFromXicPlus1),
192+
FILL_MAP_XICTOXIPIPI(nSigTofBachelorPi),
193+
FILL_MAP_XICTOXIPIPI(nSigTofPiFromLambda),
194+
FILL_MAP_XICTOXIPIPI(nSigTofPrFromLambda)};
138195
}
139196
};
140197

‎PWGHF/DataModel/CandidateReconstructionTables.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1633,7 +1633,7 @@ DECLARE_SOA_COLUMN(DcaPosToPV, dcaPosToPV, float);
16331633
DECLARE_SOA_COLUMN(DcaNegToPV, dcaNegToPV, float);
16341634
DECLARE_SOA_COLUMN(DcaBachelorToPV, dcaBachelorToPV, float);
16351635
DECLARE_SOA_COLUMN(DcaXYCascToPV, dcaXYCascToPV, float);
1636-
DECLARE_SOA_COLUMN(DcaZCascToPV, dcaXCascToPV, float);
1636+
DECLARE_SOA_COLUMN(DcaZCascToPV, dcaZCascToPV, float);
16371637
// KF specific columns
16381638
DECLARE_SOA_COLUMN(DcaXYPi0Pi1, dcaXYPi0Pi1, float);
16391639
DECLARE_SOA_COLUMN(DcaXYPi0Xi, dcaXYPi0Xi, float);

‎PWGHF/TableProducer/treeCreatorXicToXiPiPi.cxx‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -522,7 +522,7 @@ struct HfTreeCreatorXicToXiPiPi {
522522
candidate.dcaNegToPV(),
523523
candidate.dcaBachelorToPV(),
524524
candidate.dcaXYCascToPV(),
525-
candidate.dcaXCascToPV(),
525+
candidate.dcaZCascToPV(),
526526
candidate.nSigTpcPiFromXicPlus0(),
527527
candidate.nSigTpcPiFromXicPlus1(),
528528
candidate.nSigTpcBachelorPi(),
@@ -856,25 +856,25 @@ struct HfTreeCreatorXicToXiPiPi {
856856
if (indexRecXicPlus == -1) {
857857
continue;
858858
}
859-
auto XicPlusGen = particles.rawIteratorAt(indexRecXicPlus);
860-
origin = RecoDecay::getCharmHadronOrigin(particles, XicPlusGen, true);
859+
auto particleXicPlusGen = particles.rawIteratorAt(indexRecXicPlus);
860+
origin = RecoDecay::getCharmHadronOrigin(particles, particleXicPlusGen, true);
861861

862862
// get MC collision
863-
auto mcCollision = XicPlusGen.mcCollision_as<aod::McCollisions>();
863+
auto mcCollision = particleXicPlusGen.mcCollision_as<aod::McCollisions>();
864864

865865
// get XicPlus daughters as MC particle
866-
RecoDecay::getDaughters(XicPlusGen, &arrDaughIndex, std::array{+kXiMinus, +kPiPlus, +kPiPlus}, 2);
867-
auto XicPlusDaugh0 = particles.rawIteratorAt(arrDaughIndex[0]);
866+
RecoDecay::getDaughters(particleXicPlusGen, &arrDaughIndex, std::array{+kXiMinus, +kPiPlus, +kPiPlus}, 2);
867+
auto daugh0XicPlus = particles.rawIteratorAt(arrDaughIndex[0]);
868868

869869
// calculate residuals and pulls
870-
float pResidual = candidate.p() - XicPlusGen.p();
871-
float ptResidual = candidate.pt() - XicPlusGen.pt();
870+
float pResidual = candidate.p() - particleXicPlusGen.p();
871+
float ptResidual = candidate.pt() - particleXicPlusGen.pt();
872872
pvResiduals[0] = candidate.posX() - mcCollision.posX();
873873
pvResiduals[1] = candidate.posY() - mcCollision.posY();
874874
pvResiduals[2] = candidate.posZ() - mcCollision.posZ();
875-
svResiduals[0] = candidate.xSecondaryVertex() - XicPlusDaugh0.vx();
876-
svResiduals[1] = candidate.ySecondaryVertex() - XicPlusDaugh0.vy();
877-
svResiduals[2] = candidate.zSecondaryVertex() - XicPlusDaugh0.vz();
875+
svResiduals[0] = candidate.xSecondaryVertex() - daugh0XicPlus.vx();
876+
svResiduals[1] = candidate.ySecondaryVertex() - daugh0XicPlus.vy();
877+
svResiduals[2] = candidate.zSecondaryVertex() - daugh0XicPlus.vz();
878878
try {
879879
pvPulls[0] = pvResiduals[0] / candidate.xPvErr();
880880
pvPulls[1] = pvResiduals[1] / candidate.yPvErr();

0 commit comments

Comments
 (0)