Skip to content

Commit d1642fb

Browse files
dsekihatdsekihat
authored
PWGEM/Dilepton: update event and electron table and add 2 converters (#8191)
1 parent 45ffe43 commit d1642fb

14 files changed

Lines changed: 205 additions & 420 deletions

‎PWGEM/Dilepton/DataModel/dileptonTables.h‎

Lines changed: 40 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -132,10 +132,17 @@ DECLARE_SOA_DYNAMIC_COLUMN(EP4BNeg, ep4bneg, [](float q4x, float q4y) -> float {
132132
DECLARE_SOA_DYNAMIC_COLUMN(EP4BTot, ep4btot, [](float q4x, float q4y) -> float { return std::atan2(q4y, q4x) / 4.0; });
133133
} // namespace emevent
134134

135-
DECLARE_SOA_TABLE(EMEvents, "AOD", "EMEVENT", //! Main event information table
135+
DECLARE_SOA_TABLE(EMEvents_000, "AOD", "EMEVENT", //! Main event information table
136136
o2::soa::Index<>, emevent::CollisionId, bc::RunNumber, bc::GlobalBC, evsel::Alias, evsel::Selection, timestamp::Timestamp,
137137
collision::PosX, collision::PosY, collision::PosZ,
138138
collision::NumContrib, evsel::NumTracksInTimeRange, emevent::Sel8<evsel::Selection>);
139+
140+
DECLARE_SOA_TABLE_VERSIONED(EMEvents_001, "AOD", "EMEVENT", 1, //! Main event information table
141+
o2::soa::Index<>, emevent::CollisionId, bc::RunNumber, bc::GlobalBC, evsel::Alias, evsel::Selection, timestamp::Timestamp,
142+
collision::PosX, collision::PosY, collision::PosZ,
143+
collision::NumContrib, evsel::NumTracksInTimeRange, evsel::SumAmpFT0CInTimeRange, emevent::Sel8<evsel::Selection>);
144+
145+
using EMEvents = EMEvents_001;
139146
using EMEvent = EMEvents::iterator;
140147

141148
DECLARE_SOA_TABLE(EMEventsCov, "AOD", "EMEVENTCOV", //! joinable to EMEvents
@@ -414,7 +421,7 @@ DECLARE_SOA_DYNAMIC_COLUMN(MeanClusterSizeITSob, meanClusterSizeITSob, [](uint32
414421
}
415422
});
416423
} // namespace emprimaryelectron
417-
DECLARE_SOA_TABLE(EMPrimaryElectrons, "AOD", "EMPRIMARYEL", //!
424+
DECLARE_SOA_TABLE(EMPrimaryElectrons_000, "AOD", "EMPRIMARYEL", //!
418425
o2::soa::Index<>, emprimaryelectron::CollisionId,
419426
emprimaryelectron::TrackId, emprimaryelectron::Sign,
420427
track::Pt, track::Eta, track::Phi, track::DcaXY, track::DcaZ,
@@ -442,6 +449,37 @@ DECLARE_SOA_TABLE(EMPrimaryElectrons, "AOD", "EMPRIMARYEL", //!
442449
emprimaryelectron::MeanClusterSizeITS<track::ITSClusterSizes>,
443450
emprimaryelectron::MeanClusterSizeITSib<track::ITSClusterSizes>,
444451
emprimaryelectron::MeanClusterSizeITSob<track::ITSClusterSizes>);
452+
453+
DECLARE_SOA_TABLE_VERSIONED(EMPrimaryElectrons_001, "AOD", "EMPRIMARYEL", 1, //!
454+
o2::soa::Index<>, emprimaryelectron::CollisionId,
455+
emprimaryelectron::TrackId, emprimaryelectron::Sign,
456+
track::Pt, track::Eta, track::Phi, track::DcaXY, track::DcaZ,
457+
track::TPCNClsFindable, track::TPCNClsFindableMinusFound, track::TPCNClsFindableMinusCrossedRows, track::TPCNClsShared,
458+
track::TPCChi2NCl, track::TPCInnerParam,
459+
track::TPCSignal, pidtpc::TPCNSigmaEl, pidtpc::TPCNSigmaMu, pidtpc::TPCNSigmaPi, pidtpc::TPCNSigmaKa, pidtpc::TPCNSigmaPr,
460+
pidtofbeta::Beta, pidtof::TOFNSigmaEl, pidtof::TOFNSigmaMu, pidtof::TOFNSigmaPi, pidtof::TOFNSigmaKa, pidtof::TOFNSigmaPr,
461+
track::ITSClusterSizes, track::ITSChi2NCl, track::TOFChi2, track::DetectorMap,
462+
track::X, track::Alpha, track::Y, track::Z, track::Snp, track::Tgl, emprimaryelectron::IsAssociatedToMPC,
463+
464+
// dynamic column
465+
track::TPCNClsFound<track::TPCNClsFindable, track::TPCNClsFindableMinusFound>,
466+
track::TPCNClsCrossedRows<track::TPCNClsFindable, track::TPCNClsFindableMinusCrossedRows>,
467+
track::TPCCrossedRowsOverFindableCls<track::TPCNClsFindable, track::TPCNClsFindableMinusCrossedRows>,
468+
track::TPCFoundOverFindableCls<track::TPCNClsFindable, track::TPCNClsFindableMinusFound>,
469+
track::TPCFractionSharedCls<track::TPCNClsShared, track::TPCNClsFindable, track::TPCNClsFindableMinusFound>,
470+
track::v001::ITSClusterMap<track::ITSClusterSizes>, track::v001::ITSNCls<track::ITSClusterSizes>, track::v001::ITSNClsInnerBarrel<track::ITSClusterSizes>,
471+
track::HasITS<track::DetectorMap>, track::HasTPC<track::DetectorMap>, track::HasTRD<track::DetectorMap>, track::HasTOF<track::DetectorMap>,
472+
emprimaryelectron::Signed1Pt<track::Pt, emprimaryelectron::Sign>,
473+
emprimaryelectron::P<track::Pt, track::Eta>,
474+
emprimaryelectron::Px<track::Pt, track::Phi>,
475+
emprimaryelectron::Py<track::Pt, track::Phi>,
476+
emprimaryelectron::Pz<track::Pt, track::Eta>,
477+
emprimaryelectron::Theta<track::Tgl>,
478+
emprimaryelectron::MeanClusterSizeITS<track::ITSClusterSizes>,
479+
emprimaryelectron::MeanClusterSizeITSib<track::ITSClusterSizes>,
480+
emprimaryelectron::MeanClusterSizeITSob<track::ITSClusterSizes>);
481+
482+
using EMPrimaryElectrons = EMPrimaryElectrons_001;
445483
// iterators
446484
using EMPrimaryElectron = EMPrimaryElectrons::iterator;
447485

‎PWGEM/Dilepton/DataModel/lmeeMLTables.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ DECLARE_SOA_TABLE(EMPrimaryTracks, "AOD", "EMPTRACK", //!
7676
track::TPCChi2NCl, track::TPCInnerParam,
7777
track::TPCSignal, pidtpc::TPCNSigmaEl, pidtpc::TPCNSigmaMu, pidtpc::TPCNSigmaPi, pidtpc::TPCNSigmaKa, pidtpc::TPCNSigmaPr,
7878
pidtofbeta::Beta, pidtof::TOFNSigmaEl, pidtof::TOFNSigmaMu, pidtof::TOFNSigmaPi, pidtof::TOFNSigmaKa, pidtof::TOFNSigmaPr,
79-
track::ITSClusterSizes, track::ITSChi2NCl, track::DetectorMap, emprimarytrack::PIDLabel, emprimarytrack::TrackType,
79+
track::ITSClusterSizes, track::ITSChi2NCl, track::TOFChi2, track::DetectorMap, emprimarytrack::PIDLabel, emprimarytrack::TrackType,
8080

8181
// dynamic column
8282
emprimarytrack::P<track::Pt, track::Eta>,

‎PWGEM/Dilepton/TableProducer/CMakeLists.txt‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -25,11 +25,6 @@ o2physics_add_dpl_workflow(dielectron-ml
2525
PUBLIC_LINK_LIBRARIES O2Physics::AnalysisCore O2Physics::MLCore
2626
COMPONENT_NAME Analysis)
2727

28-
o2physics_add_dpl_workflow(tree-creator-single-electron-qa
29-
SOURCES treeCreatorSingleElectronQA.cxx
30-
PUBLIC_LINK_LIBRARIES O2::Framework O2Physics::AnalysisCore
31-
COMPONENT_NAME Analysis)
32-
3328
o2physics_add_dpl_workflow(skimmer-primary-electron
3429
SOURCES skimmerPrimaryElectron.cxx
3530
PUBLIC_LINK_LIBRARIES O2::Framework O2Physics::AnalysisCore

‎PWGEM/Dilepton/TableProducer/createEMEventDilepton.cxx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -168,7 +168,7 @@ struct CreateEMEventDilepton {
168168

169169
event(collision.globalIndex(), bc.runNumber(), bc.globalBC(), collision.alias_raw(), collision.selection_raw(), bc.timestamp(),
170170
collision.posX(), collision.posY(), collision.posZ(),
171-
collision.numContrib(), collision.trackOccupancyInTimeRange());
171+
collision.numContrib(), collision.trackOccupancyInTimeRange(), collision.ft0cOccupancyInTimeRange());
172172

173173
// eventcov(collision.covXX(), collision.covXY(), collision.covXZ(), collision.covYY(), collision.covYZ(), collision.covZZ(), collision.chi2());
174174

‎PWGEM/Dilepton/TableProducer/filterDielectronEvent.cxx‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -315,7 +315,7 @@ struct filterDielectronEvent {
315315
track.tpcChi2NCl(), track.tpcInnerParam(),
316316
track.tpcSignal(), track.tpcNSigmaEl(), track.tpcNSigmaMu(), track.tpcNSigmaPi(), track.tpcNSigmaKa(), track.tpcNSigmaPr(),
317317
track.beta(), track.tofNSigmaEl(), track.tofNSigmaMu(), track.tofNSigmaPi(), track.tofNSigmaKa(), track.tofNSigmaPr(),
318-
track.itsClusterSizes(), track.itsChi2NCl(), track.detectorMap(),
318+
track.itsClusterSizes(), track.itsChi2NCl(), track.tofChi2(), track.detectorMap(),
319319
track_par_cov_recalc.getX(), track_par_cov_recalc.getAlpha(), track_par_cov_recalc.getY(), track_par_cov_recalc.getZ(), track_par_cov_recalc.getSnp(), track_par_cov_recalc.getTgl(), isAssociatedToMPC);
320320

321321
emprimaryelectronscov(
@@ -1214,7 +1214,7 @@ struct createEMEvent2VP {
12141214

12151215
event(collision.globalIndex(), bc.runNumber(), bc.globalBC(), collision.alias_raw(), collision.selection_raw(), bc.timestamp(),
12161216
collision.posX(), collision.posY(), collision.posZ(),
1217-
collision.numContrib(), collision.trackOccupancyInTimeRange());
1217+
collision.numContrib(), collision.trackOccupancyInTimeRange(), collision.ft0cOccupancyInTimeRange());
12181218

12191219
// eventcov(collision.covXX(), collision.covXY(), collision.covXZ(), collision.covYY(), collision.covYZ(), collision.covZZ(), collision.chi2());
12201220

‎PWGEM/Dilepton/TableProducer/skimmerPrimaryElectron.cxx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -333,7 +333,7 @@ struct skimmerPrimaryElectron {
333333
track.tpcChi2NCl(), track.tpcInnerParam(),
334334
track.tpcSignal(), track.tpcNSigmaEl(), track.tpcNSigmaMu(), track.tpcNSigmaPi(), track.tpcNSigmaKa(), track.tpcNSigmaPr(),
335335
track.beta(), track.tofNSigmaEl(), track.tofNSigmaMu(), track.tofNSigmaPi(), track.tofNSigmaKa(), track.tofNSigmaPr(),
336-
track.itsClusterSizes(), track.itsChi2NCl(), track.detectorMap(),
336+
track.itsClusterSizes(), track.itsChi2NCl(), track.tofChi2(), track.detectorMap(),
337337
track_par_cov_recalc.getX(), track_par_cov_recalc.getAlpha(), track_par_cov_recalc.getY(), track_par_cov_recalc.getZ(), track_par_cov_recalc.getSnp(), track_par_cov_recalc.getTgl(), isAssociatedToMPC);
338338

339339
emprimaryelectronscov(

‎PWGEM/Dilepton/TableProducer/skimmerSecondaryElectron.cxx‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -257,7 +257,7 @@ struct skimmerSecondaryElectron {
257257
track.tpcChi2NCl(), track.tpcInnerParam(),
258258
track.tpcSignal(), track.tpcNSigmaEl(), track.tpcNSigmaMu(), track.tpcNSigmaPi(), track.tpcNSigmaKa(), track.tpcNSigmaPr(),
259259
track.beta(), track.tofNSigmaEl(), track.tofNSigmaMu(), track.tofNSigmaPi(), track.tofNSigmaKa(), track.tofNSigmaPr(),
260-
track.itsClusterSizes(), track.itsChi2NCl(), track.detectorMap(),
260+
track.itsClusterSizes(), track.itsChi2NCl(), track.tofChi2(), track.detectorMap(),
261261
track_par_cov_recalc.getX(), track_par_cov_recalc.getAlpha(), track_par_cov_recalc.getY(), track_par_cov_recalc.getZ(), track_par_cov_recalc.getSnp(), track_par_cov_recalc.getTgl(), isAssociatedToMPC);
262262

263263
emprimaryelectronscov(
@@ -378,7 +378,7 @@ struct skimmerSecondaryElectron {
378378

379379
event(collision.globalIndex(), bc.runNumber(), bc.globalBC(), collision.alias_raw(), collision.selection_raw(), bc.timestamp(),
380380
collision.posX(), collision.posY(), collision.posZ(),
381-
collision.numContrib(), collision.trackOccupancyInTimeRange());
381+
collision.numContrib(), collision.trackOccupancyInTimeRange(), collision.ft0cOccupancyInTimeRange());
382382
event_mult(collision.multFT0A(), collision.multFT0C(), collision.multNTracksPV(), collision.multNTracksPVeta1(), collision.multNTracksPVetaHalf());
383383
event_cent(collision.centFT0M(), collision.centFT0A(), collision.centFT0C());
384384
} // end of collision loop
@@ -439,7 +439,7 @@ struct skimmerSecondaryElectron {
439439

440440
event(collision.globalIndex(), bc.runNumber(), bc.globalBC(), collision.alias_raw(), collision.selection_raw(), bc.timestamp(),
441441
collision.posX(), collision.posY(), collision.posZ(),
442-
collision.numContrib(), collision.trackOccupancyInTimeRange());
442+
collision.numContrib(), collision.trackOccupancyInTimeRange(), collision.ft0cOccupancyInTimeRange());
443443
event_mult(collision.multFT0A(), collision.multFT0C(), collision.multNTracksPV(), collision.multNTracksPVeta1(), collision.multNTracksPVetaHalf());
444444
event_cent(collision.centFT0M(), collision.centFT0A(), collision.centFT0C());
445445
} // end of collision loop

‎PWGEM/Dilepton/TableProducer/treeCreatorElectronMLDDA.cxx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -469,7 +469,7 @@ struct TreeCreatorElectronMLDDA {
469469
track.tpcChi2NCl(), track.tpcInnerParam(),
470470
track.tpcSignal(), track.tpcNSigmaEl(), track.tpcNSigmaMu(), track.tpcNSigmaPi(), track.tpcNSigmaKa(), track.tpcNSigmaPr(),
471471
track.beta(), track.tofNSigmaEl(), track.tofNSigmaMu(), track.tofNSigmaPi(), track.tofNSigmaKa(), track.tofNSigmaPr(),
472-
track.itsClusterSizes(), track.itsChi2NCl(), track.detectorMap(), pidlabel, tracktype);
472+
track.itsClusterSizes(), track.itsChi2NCl(), track.tofChi2(), track.detectorMap(), pidlabel, tracktype);
473473
stored_trackIds.emplace_back(track.globalIndex());
474474
}
475475
}

0 commit comments

Comments
 (0)