Skip to content

Commit a2db293

Browse files
fchinufchinu
committed
Add more single track variables
1 parent 29b6a32 commit a2db293

File tree

4 files changed

+234
-144
lines changed

4 files changed

+234
-144
lines changed

‎PWGHF/D2H/DataModel/ReducedDataModel.h‎

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -189,6 +189,7 @@ DECLARE_SOA_COLUMN(HasTOFProng2, hasTOFProng2, bool);
189189
DECLARE_SOA_COLUMN(ItsNCls, itsNCls, int); //! Number of clusters in ITS
190190
DECLARE_SOA_COLUMN(TpcNClsCrossedRows, tpcNClsCrossedRows, int); //! Number of TPC crossed rows
191191
DECLARE_SOA_COLUMN(TpcChi2NCl, tpcChi2NCl, float); //! TPC chi2
192+
DECLARE_SOA_COLUMN(ItsChi2NCl, itsChi2NCl, float); //! ITS chi2
192193
DECLARE_SOA_COLUMN(ItsNClsProngMin, itsNClsProngMin, int); //! minimum value of number of ITS clusters for the decay daughter tracks
193194
DECLARE_SOA_COLUMN(TpcNClsCrossedRowsProngMin, tpcNClsCrossedRowsProngMin, int); //! minimum value of number of TPC crossed rows for the decay daughter tracks
194195
DECLARE_SOA_COLUMN(TpcChi2NClProngMax, tpcChi2NClProngMax, float); //! maximum value of TPC chi2 for the decay daughter tracks
@@ -299,6 +300,7 @@ DECLARE_SOA_TABLE(HfRedBach0Bases, "AOD", "HFREDBACH0BASE", //! Table with track
299300
hf_track_vars_reduced::ItsNCls,
300301
hf_track_vars_reduced::TpcNClsCrossedRows,
301302
hf_track_vars_reduced::TpcChi2NCl,
303+
hf_track_vars_reduced::ItsChi2NCl,
302304
hf_track_vars_reduced::HasTPC,
303305
hf_track_vars_reduced::HasTOF,
304306
pidtpc::TPCNSigmaPi,
@@ -330,6 +332,7 @@ DECLARE_SOA_TABLE(HfRedBach1Bases, "AOD", "HFREDBACH1BASE", //! Table with track
330332
hf_track_vars_reduced::ItsNCls,
331333
hf_track_vars_reduced::TpcNClsCrossedRows,
332334
hf_track_vars_reduced::TpcChi2NCl,
335+
hf_track_vars_reduced::ItsChi2NCl,
333336
hf_track_vars_reduced::HasTPC,
334337
hf_track_vars_reduced::HasTOF,
335338
pidtpc::TPCNSigmaPi,
@@ -388,6 +391,16 @@ DECLARE_SOA_COLUMN(ProngPosId, prongPosId, int); //! Original track
388391
DECLARE_SOA_COLUMN(ProngNegId, prongNegId, int); //! Original track index
389392
DECLARE_SOA_COLUMN(HfRedCollisionId, hfRedCollisionId, int); //! Collision index
390393
DECLARE_SOA_COLUMN(M, m, float); //! Invariant mass of candidate in GeV/c2
394+
395+
DECLARE_SOA_COLUMN(ItsNClsDauPos, itsNClsDauPos, int); //! Number of clusters in ITS
396+
DECLARE_SOA_COLUMN(TpcNClsCrossedRowsDauPos, tpcNClsCrossedRowsDauPos, int); //! Number of TPC crossed rows
397+
DECLARE_SOA_COLUMN(TpcChi2NClDauPos, tpcChi2NClDauPos, float); //! TPC chi2 / Number of clusters
398+
DECLARE_SOA_COLUMN(ItsChi2NClDauPos, itsChi2NClDauPos, float); //! ITS chi2 / Number of clusters
399+
DECLARE_SOA_COLUMN(ItsNClsDauNeg, itsNClsDauNeg, int); //! Number of clusters in ITS
400+
DECLARE_SOA_COLUMN(TpcNClsCrossedRowsDauNeg, tpcNClsCrossedRowsDauNeg, int); //! Number of TPC crossed rows
401+
DECLARE_SOA_COLUMN(TpcChi2NClDauNeg, tpcChi2NClDauNeg, float); //! TPC chi2 / Number of clusters
402+
DECLARE_SOA_COLUMN(ItsChi2NClDauNeg, itsChi2NClDauNeg, float); //! ITS chi2 / Number of clusters
403+
391404
DECLARE_SOA_COLUMN(XDauPos, xDauPos, float); //! x
392405
DECLARE_SOA_COLUMN(XDauNeg, xDauNeg, float); //! x
393406
DECLARE_SOA_COLUMN(YDauPos, yDauPos, float); //! y
@@ -556,6 +569,14 @@ DECLARE_SOA_TABLE(HfRedJpsis, "AOD", "HFREDJPSI", //! Table with J/Psi candidate
556569
hf_track_index_reduced::HfRedCollisionId,
557570
hf_cand::XSecondaryVertex, hf_cand::YSecondaryVertex, hf_cand::ZSecondaryVertex,
558571
hf_jpsi_cand_reduced::M,
572+
hf_jpsi_cand_reduced::ItsNClsDauPos,
573+
hf_jpsi_cand_reduced::TpcNClsCrossedRowsDauPos,
574+
hf_jpsi_cand_reduced::TpcChi2NClDauPos,
575+
hf_jpsi_cand_reduced::ItsChi2NClDauPos,
576+
hf_jpsi_cand_reduced::ItsNClsDauNeg,
577+
hf_jpsi_cand_reduced::TpcNClsCrossedRowsDauNeg,
578+
hf_jpsi_cand_reduced::TpcChi2NClDauNeg,
579+
hf_jpsi_cand_reduced::ItsChi2NClDauNeg,
559580
hf_jpsi_cand_reduced::XDauPos, hf_jpsi_cand_reduced::XDauNeg,
560581
hf_jpsi_cand_reduced::YDauPos, hf_jpsi_cand_reduced::YDauNeg,
561582
hf_jpsi_cand_reduced::ZDauPos, hf_jpsi_cand_reduced::ZDauNeg,

‎PWGHF/D2H/TableProducer/dataCreatorJpsiHadReduced.cxx‎

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -201,8 +201,8 @@ struct HfDataCreatorJpsiHadReduced {
201201

202202
Preslice<aod::HfCand2ProngWPid> candsJpsiPerCollision = aod::track_association::collisionId;
203203
Preslice<aod::TrackAssoc> trackIndicesPerCollision = aod::track_association::collisionId;
204-
PresliceUnsorted<CollisionsWCMcLabels> colPerMcCollision = aod::mccollisionlabel::mcCollisionId;
205204
Preslice<aod::McParticles> mcParticlesPerMcCollision = aod::mcparticle::mcCollisionId;
205+
PresliceUnsorted<CollisionsWCMcLabels> colPerMcCollision = aod::mccollisionlabel::mcCollisionId;
206206

207207
o2::base::Propagator::MatCorrType noMatCorr = o2::base::Propagator::MatCorrType::USEMatCorrNONE;
208208
int runNumber;
@@ -438,7 +438,8 @@ struct HfDataCreatorJpsiHadReduced {
438438
}
439439

440440
template <typename T1>
441-
bool isSelectedJpsiDauPid(const T1& track) {
441+
bool isSelectedJpsiDauPid(const T1& track)
442+
{
442443
int pidPion = -1;
443444
int pidProton = -1;
444445
int pidElectron = -1;
@@ -896,7 +897,7 @@ struct HfDataCreatorJpsiHadReduced {
896897
trackParCovBach.getX(), trackParCovBach.getAlpha(),
897898
trackParCovBach.getY(), trackParCovBach.getZ(), trackParCovBach.getSnp(),
898899
trackParCovBach.getTgl(), trackParCovBach.getQ2Pt(),
899-
trackBach.itsNCls(), trackBach.tpcNClsCrossedRows(), trackBach.tpcChi2NCl(),
900+
trackBach.itsNCls(), trackBach.tpcNClsCrossedRows(), trackBach.tpcChi2NCl(), trackBach.itsChi2NCl(),
900901
trackBach.hasTPC(), trackBach.hasTOF(),
901902
trackBach.tpcNSigmaPi(), trackBach.tofNSigmaPi(),
902903
trackBach.tpcNSigmaKa(), trackBach.tofNSigmaKa(),
@@ -993,7 +994,7 @@ struct HfDataCreatorJpsiHadReduced {
993994
trackParCovBach.getX(), trackParCovBach.getAlpha(),
994995
trackParCovBach.getY(), trackParCovBach.getZ(), trackParCovBach.getSnp(),
995996
trackParCovBach.getTgl(), trackParCovBach.getQ2Pt(),
996-
trackBach.itsNCls(), trackBach.tpcNClsCrossedRows(), trackBach.tpcChi2NCl(),
997+
trackBach.itsNCls(), trackBach.tpcNClsCrossedRows(), trackBach.tpcChi2NCl(), trackBach.itsChi2NCl(),
997998
trackBach.hasTPC(), trackBach.hasTOF(),
998999
trackBach.tpcNSigmaPi(), trackBach.tofNSigmaPi(),
9991000
trackBach.tpcNSigmaKa(), trackBach.tofNSigmaKa(),
@@ -1017,7 +1018,7 @@ struct HfDataCreatorJpsiHadReduced {
10171018
trackBach2ParCov.getX(), trackBach2ParCov.getAlpha(),
10181019
trackBach2ParCov.getY(), trackBach2ParCov.getZ(), trackBach2ParCov.getSnp(),
10191020
trackBach2ParCov.getTgl(), trackBach2ParCov.getQ2Pt(),
1020-
trackBach2.itsNCls(), trackBach2.tpcNClsCrossedRows(), trackBach2.tpcChi2NCl(),
1021+
trackBach2.itsNCls(), trackBach2.tpcNClsCrossedRows(), trackBach2.tpcChi2NCl(), trackBach2.itsChi2NCl(),
10211022
trackBach2.hasTPC(), trackBach2.hasTOF(),
10221023
trackBach2.tpcNSigmaPi(), trackBach2.tofNSigmaPi(),
10231024
trackBach2.tpcNSigmaKa(), trackBach2.tofNSigmaKa(),
@@ -1057,6 +1058,8 @@ struct HfDataCreatorJpsiHadReduced {
10571058
indexHfReducedCollision,
10581059
candidate.xSecondaryVertex(), candidate.ySecondaryVertex(), candidate.zSecondaryVertex(),
10591060
invMassJpsi,
1061+
trackPos.itsNCls(), trackPos.tpcNClsCrossedRows(), trackPos.tpcChi2NCl(), trackPos.itsChi2NCl(),
1062+
trackNeg.itsNCls(), trackNeg.tpcNClsCrossedRows(), trackNeg.tpcChi2NCl(), trackNeg.itsChi2NCl(),
10601063
trackPosParCov.getX(), trackNegParCov.getX(),
10611064
trackPosParCov.getY(), trackNegParCov.getY(),
10621065
trackPosParCov.getZ(), trackNegParCov.getZ(),

0 commit comments

Comments
 (0)