Skip to content

Commit 0c2b052

Browse files
dsekihatdsekihat
committed
[PWGEM/Dilepton] update taggingHFE.cxx
1 parent c461cd2 commit 0c2b052

3 files changed

Lines changed: 25 additions & 16 deletions

File tree

‎PWGEM/Dilepton/DataModel/lmeeMLTables.h‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -260,6 +260,8 @@ DECLARE_SOA_COLUMN(CascadeType, cascadeType, uint8_t); //! cascade type, 0 = XiM
260260
DECLARE_SOA_COLUMN(MassLH, massLH, float); //! invariant mass of LH assuming kaon
261261
DECLARE_SOA_COLUMN(PtLH, ptLH, float); //! pt of LH
262262
DECLARE_SOA_COLUMN(PLH, pLH, float); //! p of LH
263+
DECLARE_SOA_COLUMN(DEtaLH, dEtaLH, float); //! deta between LH at SV
264+
DECLARE_SOA_COLUMN(DPhiLH, dPhiLH, float); //! dphi between LH at SV
263265

264266
DECLARE_SOA_COLUMN(PtSVL, ptSVL, float); //! pT of lepton at SV
265267
// DECLARE_SOA_COLUMN(PlSVL, plSVL, float); //! pL of lepton at SV
@@ -305,7 +307,7 @@ DECLARE_SOA_TABLE(EMMLLTPairs, "AOD", "EMMLLTPAIR", //!
305307
// pidtpc::TPCNSigmaPi, pidtof::TOFNSigmaPi,
306308
pidtpc::TPCNSigmaKa, pidtof::TOFNSigmaKa,
307309
// pidtpc::TPCNSigmaPr, pidtof::TOFNSigmaPr,
308-
emmllhpair::MassLH, emmllhpair::PLH,
310+
emmllhpair::MassLH, emmllhpair::PLH, emmllhpair::DEtaLH, emmllhpair::DPhiLH,
309311
// emmllhpair::PtSVL, emmllhpair::PtSVH, emmllhpair::PtFD, emmllhpair::PlFD,
310312
emmllhpair::Chi2PCA, emmllhpair::CPA, emmllhpair::CPAXY, emmllhpair::CPARZ,
311313
emmllhpair::Lxy, emmllhpair::Lz, emmllhpair::Lxyz, emmllhpair::LxyErr, emmllhpair::LzErr, emmllhpair::LxyzErr,
@@ -319,7 +321,7 @@ DECLARE_SOA_TABLE(EMMLLV0Pairs, "AOD", "EMMLLV0PAIR", //!
319321
emmllhpair::PtH, emmllhpair::RapidityV0,
320322
emmllhpair::V0CPA, emmllhpair::V0CPAXY, emmllhpair::V0CPARZ,
321323
emmllhpair::ImpParXYH, emmllhpair::ImpParZH, emmllhpair::ImpParCYYH, emmllhpair::ImpParCZYH, emmllhpair::ImpParCZZH,
322-
emmllhpair::MassLH, emmllhpair::PLH,
324+
emmllhpair::MassLH, emmllhpair::PLH, emmllhpair::DEtaLH, emmllhpair::DPhiLH,
323325
// emmllhpair::PtSVL, emmllhpair::PtSVH, emmllhpair::PtFD, emmllhpair::PlFD,
324326
emmllhpair::Chi2PCA, emmllhpair::CPA, emmllhpair::CPAXY, emmllhpair::CPARZ,
325327
emmllhpair::Lxy, emmllhpair::Lz, emmllhpair::Lxyz, emmllhpair::LxyErr, emmllhpair::LzErr, emmllhpair::LxyzErr,
@@ -333,7 +335,7 @@ DECLARE_SOA_TABLE(EMMLLCascPairs, "AOD", "EMMLLCPAIR", //!
333335
emmllhpair::Signed1PtH, emmllhpair::RapidityC,
334336
emmllhpair::CascCPA, emmllhpair::CascCPAXY, emmllhpair::CascCPARZ,
335337
emmllhpair::ImpParXYH, emmllhpair::ImpParZH, emmllhpair::ImpParCYYH, emmllhpair::ImpParCZYH, emmllhpair::ImpParCZZH,
336-
emmllhpair::MassLH, emmllhpair::PLH,
338+
emmllhpair::MassLH, emmllhpair::PLH, emmllhpair::DEtaLH, emmllhpair::DPhiLH,
337339
// emmllhpair::PtSVL, emmllhpair::PtSVH, emmllhpair::PtFD, emmllhpair::PlFD,
338340
emmllhpair::Chi2PCA, emmllhpair::CPA, emmllhpair::CPAXY, emmllhpair::CPARZ,
339341
emmllhpair::Lxy, emmllhpair::Lz, emmllhpair::Lxyz, emmllhpair::LxyErr, emmllhpair::LzErr, emmllhpair::LxyzErr,

‎PWGEM/Dilepton/Tasks/taggingHFE.cxx‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1770,7 +1770,7 @@ struct taggingHFE {
17701770
// kaon.tpcNSigmaPi(), tofNSigmaPi,
17711771
kaon.tpcNSigmaKa(), tofNSigmaKa,
17721772
// kaon.tpcNSigmaPr(), tofNSigmaPr,
1773-
eKpair.mass, eKpair.p,
1773+
eKpair.mass, eKpair.p, eKpair.deta, eKpair.dphi,
17741774
// eKpair.ptSVL, eKpair.ptSVH, eKpair.ptFD, eKpair.plFD,
17751775
eKpair.chi2PCA, eKpair.cospa, eKpair.cospaXY, eKpair.cospaRZ,
17761776
eKpair.lxy, eKpair.lz, eKpair.lxyz, eKpair.lxyErr, eKpair.lzErr, eKpair.lxyzErr,
@@ -1831,7 +1831,7 @@ struct taggingHFE {
18311831
// kaon.tpcNSigmaPi(), tofNSigmaPi,
18321832
kaon.tpcNSigmaKa(), tofNSigmaKa,
18331833
// kaon.tpcNSigmaPr(), tofNSigmaPr,
1834-
eKpair.mass, eKpair.p,
1834+
eKpair.mass, eKpair.p, eKpair.deta, eKpair.dphi,
18351835
// eKpair.ptSVL, eKpair.ptSVH, eKpair.ptFD, eKpair.plFD,
18361836
eKpair.chi2PCA, eKpair.cospa, eKpair.cospaXY, eKpair.cospaRZ,
18371837
eKpair.lxy, eKpair.lz, eKpair.lxyz, eKpair.lxyErr, eKpair.lzErr, eKpair.lxyzErr,
@@ -1910,7 +1910,7 @@ struct taggingHFE {
19101910
RecoDecay::cpaXY(std::array<float, 3>{collision.posX(), collision.posY(), collision.posZ()}, std::array<float, 3>{v0.x(), v0.y(), v0.z()}, std::array<float, 3>{v0.px(), v0.py(), v0.pz()}),
19111911
RecoDecay::cpaRZ(std::array<float, 3>{collision.posX(), collision.posY(), collision.posZ()}, std::array<float, 3>{v0.x(), v0.y(), v0.z()}, std::array<float, 3>{v0.px(), v0.py(), v0.pz()}),
19121912
impactParameterV0.getY(), impactParameterV0.getZ(), impactParameterV0.getSigmaY2(), impactParameterV0.getSigmaYZ(), impactParameterV0.getSigmaZ2(),
1913-
eV0pair.mass, eV0pair.p,
1913+
eV0pair.mass, eV0pair.p, eV0pair.deta, eV0pair.dphi,
19141914
// eV0pair.ptSVL, eV0pair.ptSVH, eV0pair.ptFD, eV0pair.plFD,
19151915
eV0pair.chi2PCA, eV0pair.cospa, eV0pair.cospaXY, eV0pair.cospaRZ,
19161916
eV0pair.lxy, eV0pair.lz, eV0pair.lxyz, eV0pair.lxyErr, eV0pair.lzErr, eV0pair.lxyzErr,
@@ -1973,7 +1973,7 @@ struct taggingHFE {
19731973
RecoDecay::cpaXY(std::array<float, 3>{collision.posX(), collision.posY(), collision.posZ()}, std::array<float, 3>{v0.x(), v0.y(), v0.z()}, std::array<float, 3>{v0.px(), v0.py(), v0.pz()}),
19741974
RecoDecay::cpaRZ(std::array<float, 3>{collision.posX(), collision.posY(), collision.posZ()}, std::array<float, 3>{v0.x(), v0.y(), v0.z()}, std::array<float, 3>{v0.px(), v0.py(), v0.pz()}),
19751975
impactParameterV0.getY(), impactParameterV0.getZ(), impactParameterV0.getSigmaY2(), impactParameterV0.getSigmaYZ(), impactParameterV0.getSigmaZ2(),
1976-
eV0pair.mass, eV0pair.p,
1976+
eV0pair.mass, eV0pair.p, eV0pair.deta, eV0pair.dphi,
19771977
// eV0pair.ptSVL, eV0pair.ptSVH, eV0pair.ptFD, eV0pair.plFD,
19781978
eV0pair.chi2PCA, eV0pair.cospa, eV0pair.cospaXY, eV0pair.cospaRZ,
19791979
eV0pair.lxy, eV0pair.lz, eV0pair.lxyz, eV0pair.lxyErr, eV0pair.lzErr, eV0pair.lxyzErr,
@@ -2041,7 +2041,7 @@ struct taggingHFE {
20412041
RecoDecay::cpaXY(std::array<float, 3>{collision.posX(), collision.posY(), collision.posZ()}, std::array<float, 3>{cascade.x(), cascade.y(), cascade.z()}, std::array<float, 3>{cascade.px(), cascade.py(), cascade.pz()}),
20422042
RecoDecay::cpaRZ(std::array<float, 3>{collision.posX(), collision.posY(), collision.posZ()}, std::array<float, 3>{cascade.x(), cascade.y(), cascade.z()}, std::array<float, 3>{cascade.px(), cascade.py(), cascade.pz()}),
20432043
impactParameterCasc.getY(), impactParameterCasc.getZ(), impactParameterCasc.getSigmaY2(), impactParameterCasc.getSigmaYZ(), impactParameterCasc.getSigmaZ2(),
2044-
eCpair.mass, eCpair.p,
2044+
eCpair.mass, eCpair.p, eCpair.deta, eCpair.dphi,
20452045
// eCpair.ptSVL, eCpair.ptSVH, eCpair.ptFD, eCpair.plFD,
20462046
eCpair.chi2PCA, eCpair.cospa, eCpair.cospaXY, eCpair.cospaRZ,
20472047
eCpair.lxy, eCpair.lz, eCpair.lxyz, eCpair.lxyErr, eCpair.lzErr, eCpair.lxyzErr,
@@ -2109,7 +2109,7 @@ struct taggingHFE {
21092109
RecoDecay::cpaXY(std::array<float, 3>{collision.posX(), collision.posY(), collision.posZ()}, std::array<float, 3>{cascade.x(), cascade.y(), cascade.z()}, std::array<float, 3>{cascade.px(), cascade.py(), cascade.pz()}),
21102110
RecoDecay::cpaRZ(std::array<float, 3>{collision.posX(), collision.posY(), collision.posZ()}, std::array<float, 3>{cascade.x(), cascade.y(), cascade.z()}, std::array<float, 3>{cascade.px(), cascade.py(), cascade.pz()}),
21112111
impactParameterCasc.getY(), impactParameterCasc.getZ(), impactParameterCasc.getSigmaY2(), impactParameterCasc.getSigmaYZ(), impactParameterCasc.getSigmaZ2(),
2112-
eCpair.mass, eCpair.p,
2112+
eCpair.mass, eCpair.p, eCpair.deta, eCpair.dphi,
21132113
// eCpair.ptSVL, eCpair.ptSVH, eCpair.ptFD, eCpair.plFD,
21142114
eCpair.chi2PCA, eCpair.cospa, eCpair.cospaXY, eCpair.cospaRZ,
21152115
eCpair.lxy, eCpair.lz, eCpair.lxyz, eCpair.lxyErr, eCpair.lzErr, eCpair.lxyzErr,
@@ -2206,7 +2206,7 @@ struct taggingHFE {
22062206
// kaon.tpcNSigmaPi(), tofNSigmaPi,
22072207
kaon.tpcNSigmaKa(), tofNSigmaKa,
22082208
// kaon.tpcNSigmaPr(), tofNSigmaPr,
2209-
eKpair.mass, eKpair.p,
2209+
eKpair.mass, eKpair.p, eKpair.deta, eKpair.dphi,
22102210
// eKpair.ptSVL, eKpair.ptSVH, eKpair.ptFD, eKpair.plFD,
22112211
eKpair.chi2PCA, eKpair.cospa, eKpair.cospaXY, eKpair.cospaRZ,
22122212
eKpair.lxy, eKpair.lz, eKpair.lxyz, eKpair.lxyErr, eKpair.lzErr, eKpair.lxyzErr,
@@ -2268,7 +2268,7 @@ struct taggingHFE {
22682268
// kaon.tpcNSigmaPi(), tofNSigmaPi,
22692269
kaon.tpcNSigmaKa(), tofNSigmaKa,
22702270
// kaon.tpcNSigmaPr(), tofNSigmaPr,
2271-
eKpair.mass, eKpair.p,
2271+
eKpair.mass, eKpair.p, eKpair.deta, eKpair.dphi,
22722272
// eKpair.ptSVL, eKpair.ptSVH, eKpair.ptFD, eKpair.plFD,
22732273
eKpair.chi2PCA, eKpair.cospa, eKpair.cospaXY, eKpair.cospaRZ,
22742274
eKpair.lxy, eKpair.lz, eKpair.lxyz, eKpair.lxyErr, eKpair.lzErr, eKpair.lxyzErr,
@@ -2346,7 +2346,7 @@ struct taggingHFE {
23462346
RecoDecay::cpaXY(std::array<float, 3>{collision.posX(), collision.posY(), collision.posZ()}, std::array<float, 3>{v0.x(), v0.y(), v0.z()}, std::array<float, 3>{v0.px(), v0.py(), v0.pz()}),
23472347
RecoDecay::cpaRZ(std::array<float, 3>{collision.posX(), collision.posY(), collision.posZ()}, std::array<float, 3>{v0.x(), v0.y(), v0.z()}, std::array<float, 3>{v0.px(), v0.py(), v0.pz()}),
23482348
impactParameterV0.getY(), impactParameterV0.getZ(), impactParameterV0.getSigmaY2(), impactParameterV0.getSigmaYZ(), impactParameterV0.getSigmaZ2(),
2349-
eV0pair.mass, eV0pair.p,
2349+
eV0pair.mass, eV0pair.p, eV0pair.deta, eV0pair.dphi,
23502350
// eV0pair.ptSVL, eV0pair.ptSVH, eV0pair.ptFD, eV0pair.plFD,
23512351
eV0pair.chi2PCA, eV0pair.cospa, eV0pair.cospaXY, eV0pair.cospaRZ,
23522352
eV0pair.lxy, eV0pair.lz, eV0pair.lxyz, eV0pair.lxyErr, eV0pair.lzErr, eV0pair.lxyzErr,
@@ -2409,7 +2409,7 @@ struct taggingHFE {
24092409
RecoDecay::cpaXY(std::array<float, 3>{collision.posX(), collision.posY(), collision.posZ()}, std::array<float, 3>{v0.x(), v0.y(), v0.z()}, std::array<float, 3>{v0.px(), v0.py(), v0.pz()}),
24102410
RecoDecay::cpaRZ(std::array<float, 3>{collision.posX(), collision.posY(), collision.posZ()}, std::array<float, 3>{v0.x(), v0.y(), v0.z()}, std::array<float, 3>{v0.px(), v0.py(), v0.pz()}),
24112411
impactParameterV0.getY(), impactParameterV0.getZ(), impactParameterV0.getSigmaY2(), impactParameterV0.getSigmaYZ(), impactParameterV0.getSigmaZ2(),
2412-
eV0pair.mass, eV0pair.p,
2412+
eV0pair.mass, eV0pair.p, eV0pair.deta, eV0pair.dphi,
24132413
// eV0pair.ptSVL, eV0pair.ptSVH, eV0pair.ptFD, eV0pair.plFD,
24142414
eV0pair.chi2PCA, eV0pair.cospa, eV0pair.cospaXY, eV0pair.cospaRZ,
24152415
eV0pair.lxy, eV0pair.lz, eV0pair.lxyz, eV0pair.lxyErr, eV0pair.lzErr, eV0pair.lxyzErr,
@@ -2477,7 +2477,7 @@ struct taggingHFE {
24772477
RecoDecay::cpaXY(std::array<float, 3>{collision.posX(), collision.posY(), collision.posZ()}, std::array<float, 3>{cascade.x(), cascade.y(), cascade.z()}, std::array<float, 3>{cascade.px(), cascade.py(), cascade.pz()}),
24782478
RecoDecay::cpaRZ(std::array<float, 3>{collision.posX(), collision.posY(), collision.posZ()}, std::array<float, 3>{cascade.x(), cascade.y(), cascade.z()}, std::array<float, 3>{cascade.px(), cascade.py(), cascade.pz()}),
24792479
impactParameterCasc.getY(), impactParameterCasc.getZ(), impactParameterCasc.getSigmaY2(), impactParameterCasc.getSigmaYZ(), impactParameterCasc.getSigmaZ2(),
2480-
eCpair.mass, eCpair.p,
2480+
eCpair.mass, eCpair.p, eCpair.deta, eCpair.dphi,
24812481
// eCpair.ptSVL, eCpair.ptSVH, eCpair.ptFD, eCpair.plFD,
24822482
eCpair.chi2PCA, eCpair.cospa, eCpair.cospaXY, eCpair.cospaRZ,
24832483
eCpair.lxy, eCpair.lz, eCpair.lxyz, eCpair.lxyErr, eCpair.lzErr, eCpair.lxyzErr,
@@ -2545,7 +2545,7 @@ struct taggingHFE {
25452545
RecoDecay::cpaXY(std::array<float, 3>{collision.posX(), collision.posY(), collision.posZ()}, std::array<float, 3>{cascade.x(), cascade.y(), cascade.z()}, std::array<float, 3>{cascade.px(), cascade.py(), cascade.pz()}),
25462546
RecoDecay::cpaRZ(std::array<float, 3>{collision.posX(), collision.posY(), collision.posZ()}, std::array<float, 3>{cascade.x(), cascade.y(), cascade.z()}, std::array<float, 3>{cascade.px(), cascade.py(), cascade.pz()}),
25472547
impactParameterCasc.getY(), impactParameterCasc.getZ(), impactParameterCasc.getSigmaY2(), impactParameterCasc.getSigmaYZ(), impactParameterCasc.getSigmaZ2(),
2548-
eCpair.mass, eCpair.p,
2548+
eCpair.mass, eCpair.p, eCpair.deta, eCpair.dphi,
25492549
// eCpair.ptSVL, eCpair.ptSVH, eCpair.ptFD, eCpair.plFD,
25502550
eCpair.chi2PCA, eCpair.cospa, eCpair.cospaXY, eCpair.cospaRZ,
25512551
eCpair.lxy, eCpair.lz, eCpair.lxyz, eCpair.lxyErr, eCpair.lzErr, eCpair.lxyzErr,

‎PWGEM/Dilepton/Utils/SemiCharmTag.h‎

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,8 @@ struct LHPair { // struct to store electron-hadron pair information
3737
float mass{-999.f};
3838
float pt{-999.f};
3939
float p{-999.f};
40+
float deta{-999.f};
41+
float dphi{-999.f};
4042
float dca2legs{-999.f};
4143
float chi2PCA{-999.f};
4244
float cospa{-999.f};
@@ -173,7 +175,8 @@ LHPair makePairLeptonTrack(TFitter& fitter, TCollision const& collision, TLepton
173175
pair.mass = v12.M();
174176
pair.pt = v12.Pt();
175177
pair.p = v12.P();
176-
178+
pair.deta = v1.Eta() - v2.Eta(); // lepton - hadron
179+
pair.dphi = RecoDecay::constrainAngle(RecoDecay::constrainAngle(v1.Phi(), 0, 1U) - RecoDecay::constrainAngle(v2.Phi(), 0, 1U), -M_PI/2, 1U); // lepton - hadron
177180
pair.isOK = true;
178181
return pair;
179182
}
@@ -299,6 +302,8 @@ LHPair makePairLeptonV0(TFitter& fitter, TCollision const& collision, TLepton co
299302
pair.mass = v12.M();
300303
pair.pt = v12.Pt();
301304
pair.p = v12.P();
305+
pair.deta = v1.Eta() - v2.Eta(); // lepton - hadron
306+
pair.dphi = RecoDecay::constrainAngle(RecoDecay::constrainAngle(v1.Phi(), 0, 1U) - RecoDecay::constrainAngle(v2.Phi(), 0, 1U), -M_PI/2, 1U); // lepton - hadron
302307
pair.isOK = true;
303308

304309
return pair;
@@ -429,6 +434,8 @@ LHPair makePairLeptonCascade(TFitter& fitter, TCollision const& collision, TLept
429434
pair.mass = v12.M();
430435
pair.pt = v12.Pt();
431436
pair.p = v12.P();
437+
pair.deta = v1.Eta() - v2.Eta(); // lepton - hadron
438+
pair.dphi = RecoDecay::constrainAngle(RecoDecay::constrainAngle(v1.Phi(), 0, 1U) - RecoDecay::constrainAngle(v2.Phi(), 0, 1U), -M_PI/2, 1U); // lepton - hadron
432439
pair.isOK = true;
433440

434441
return pair;

0 commit comments

Comments
 (0)