Skip to content

Commit 7cd6cc2

Browse files
axti98axti98
committed
Update Global Track Estimator
1 parent c7819f0 commit 7cd6cc2

9 files changed

Lines changed: 136 additions & 46 deletions

‎PWGDQ/Core/HistogramsLibrary.cxx‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -154,19 +154,22 @@ void o2::aod::dqhistograms::DefineHistograms(HistogramManager* hm, const char* h
154154
hm->AddHistogram(histClass, "VtxZ_MultITSTPCWithPV", "VtxZ vs MultITSTPCWithPV", false, 240, -12.0, 12.0, VarManager::kVtxZ, 400, 0, 400.0, VarManager::kMultNTracksITSTPC);
155155
hm->AddHistogram(histClass, "VtxZ_MultITSOnly", "VtxZ vs MultITSOnly", false, 240, -12.0, 12.0, VarManager::kVtxZ, 400, 0, 400.0, VarManager::kMultNTracksITSOnly);
156156
hm->AddHistogram(histClass, "VtxZ_VtxNcontribReal", "VtxZ vs VtxNcontribReal", false, 100, -10.0, 10.0, VarManager::kVtxZ, 150, 0, 150.0, VarManager::kVtxNcontribReal);
157+
hm->AddHistogram(histClass, "VtxZ_MultNtrkGlobal", "VtxZ vs MultNtrkGlobal", false, 100, -10.0, 10.0, VarManager::kVtxZ, 150, 0, 150.0, VarManager::kMultNtrkGlobal);
157158
hm->AddHistogram(histClass, "VtxZ_MultNTracksPVeta1", "VtxZ vs MultNTracksPVeta1", false, 100, -10.0, 10.0, VarManager::kVtxZ, 150, 0, 150.0, VarManager::kMultNTracksPVeta1);
158159
hm->AddHistogram(histClass, "VtxZ_MultNTracksPVetaHalf", "VtxZ vs MultNTracksPVetaHalf", false, 100, -10.0, 10.0, VarManager::kVtxZ, 150, 0, 150.0, VarManager::kMultNTracksPVetaHalf);
159160
hm->AddHistogram(histClass, "VtxZ_MultFV0A", "VtxZ vs MultFV0A", false, 20, -10.0, 10.0, VarManager::kVtxZ, 200, 0, 25000.0, VarManager::kMultFV0A);
160161
hm->AddHistogram(histClass, "VtxZ_MultFT0A", "VtxZ vs MultFT0A", false, 20, -10.0, 10.0, VarManager::kVtxZ, 200, 0, 25000.0, VarManager::kMultFT0A);
161162
hm->AddHistogram(histClass, "VtxZ_MultFT0C", "VtxZ vs MultFT0C", false, 20, -10.0, 10.0, VarManager::kVtxZ, 200, 0, 25000.0, VarManager::kMultFT0C);
162163
hm->AddHistogram(histClass, "VtxZ_MultFDDA", "VtxZ vs MultFDDA", false, 20, -10.0, 10.0, VarManager::kVtxZ, 200, 0, 25000.0, VarManager::kMultFDDA);
163164
hm->AddHistogram(histClass, "VtxZ_MultFDDC", "VtxZ vs MultFDDC", false, 20, -10.0, 10.0, VarManager::kVtxZ, 200, 0, 25000.0, VarManager::kMultFDDC);
165+
hm->AddHistogram(histClass, "MultNtrkGlobal_VtxNcontribReal", "MultNtrkGlobal vs VtxNcontribReal", false, 150, 0, 150.0, VarManager::kMultNtrkGlobal, 150, 0, 150.0, VarManager::kVtxNcontribReal);
164166
hm->AddHistogram(histClass, "MultNTracksPVetaHalf_MultMCNParticlesEta05", "MultNTracksPVetaHalf vs MultMCNParticlesEta05", false, 150, 0, 150.0, VarManager::kMultNTracksPVetaHalf, 150, 0, 150.0, VarManager::kMultMCNParticlesEta05);
165167
hm->AddHistogram(histClass, "VtxNcontribReal_MultMCNParticlesEta08", "VtxNcontribReal vs MultMCNParticlesEta08", false, 150, 0, 150.0, VarManager::kVtxNcontribReal, 150, 0, 150.0, VarManager::kMultMCNParticlesEta08);
166168
hm->AddHistogram(histClass, "MultNTracksPVeta1_MultMCNParticlesEta10", "MultNTracksPVeta1 vs MultMCNParticlesEta10", false, 150, 0, 150.0, VarManager::kMultNTracksPVeta1, 150, 0, 150.0, VarManager::kMultMCNParticlesEta10);
167169
hm->AddHistogram(histClass, "MultNtrkGlobal_MultMCNParticlesEta05", "MultNtrkGlobal vs MultMCNParticlesEta05", false, 150, 0, 150.0, VarManager::kMultNtrkGlobal, 150, 0, 150.0, VarManager::kMultMCNParticlesEta05);
168170
hm->AddHistogram(histClass, "MultNtrkGlobal_MultMCNParticlesEta08", "MultNtrkGlobal vs MultMCNParticlesEta08", false, 150, 0, 150.0, VarManager::kMultNtrkGlobal, 150, 0, 150.0, VarManager::kMultMCNParticlesEta08);
169171
hm->AddHistogram(histClass, "MultNtrkGlobal_MultMCNParticlesEta10", "MultNtrkGlobal vs MultMCNParticlesEta10", false, 150, 0, 150.0, VarManager::kMultNtrkGlobal, 150, 0, 150.0, VarManager::kMultMCNParticlesEta10);
172+
hm->AddHistogram(histClass, "MultNtrkGlobal_MultMCNParticlesGlobal", "MultNtrkGlobal vs MultMCNParticlesEta10", false, 150, 0, 150.0, VarManager::kMultNtrkGlobal, 150, 0, 150.0, VarManager::kMultMCGlobalParticles);
170173
} else {
171174
hm->AddHistogram(histClass, "MultTPC", "MultTPC", false, 200, 0.0, 50000.0, VarManager::kMultTPC);
172175
hm->AddHistogram(histClass, "MultTPC_vsTimeSOR", "MultTPC vs time from SOR", true, 10000, 0.0, 1000.0, VarManager::kTimeFromSOR, 10, 0.0, 50000.0, VarManager::kMultTPC);
@@ -275,6 +278,7 @@ void o2::aod::dqhistograms::DefineHistograms(HistogramManager* hm, const char* h
275278
hm->AddHistogram(histClass, "MultMCNParticlesEta05", "MultMCNParticlesEta05", false, 150, 0.0, 150.0, VarManager::kMultMCNParticlesEta05);
276279
hm->AddHistogram(histClass, "MultMCNParticlesEta08", "MultMCNParticlesEta08", false, 150, 0.0, 150.0, VarManager::kMultMCNParticlesEta08);
277280
hm->AddHistogram(histClass, "MultMCNParticlesEta10", "MultMCNParticlesEta10", false, 150, 0.0, 150.0, VarManager::kMultMCNParticlesEta10);
281+
hm->AddHistogram(histClass, "MultMCGlobalParticles", "MultMCGlobalParticles", false, 150, 0.0, 150.0, VarManager::kMultMCGlobalParticles);
278282
}
279283
if (subGroupStr.Contains("subgen")) {
280284
hm->AddHistogram(histClass, "SubGenID", "SubGenerator ID", false, 11, -0.5, 10.5, VarManager::kMCEventSubGeneratorId);

‎PWGDQ/Core/VarManager.cxx‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -831,6 +831,7 @@ void VarManager::SetDefaultVarNames()
831831
fgVariableNames[kMultMCNParticlesEta05] = "MC Multiplicity Central Barrel for |eta| < 0.5";
832832
fgVariableNames[kMultMCNParticlesEta08] = "MC Multiplicity Central Barrel for |eta| < 0.8";
833833
fgVariableNames[kMultMCNParticlesEta10] = "MC Multiplicity Central Barrel for |eta| < 1.0";
834+
fgVariableNames[kMultMCGlobalParticles] = "MC Multiplicity corresponding to global track definition";
834835
fgVariableUnits[kMCEventGeneratorId] = "";
835836
fgVariableUnits[kMCEventSubGeneratorId] = "";
836837
fgVariableUnits[kMCVtxX] = "cm";
@@ -844,6 +845,7 @@ void VarManager::SetDefaultVarNames()
844845
fgVariableUnits[kMultMCNParticlesEta05] = "Multiplicity_eta05";
845846
fgVariableUnits[kMultMCNParticlesEta08] = "Multiplicity_eta08";
846847
fgVariableUnits[kMultMCNParticlesEta10] = "Multiplicity_eta10";
848+
fgVariableUnits[kMultMCGlobalParticles] = "Multiplicity_globalTrk";
847849
fgVariableNames[kTwoEvPosZ1] = "vtx-z_{1}";
848850
fgVariableUnits[kTwoEvPosZ1] = "cm";
849851
fgVariableNames[kTwoEvPosZ2] = "vtx-z_{2}";
@@ -2220,6 +2222,7 @@ void VarManager::SetDefaultVarNames()
22202222
fgVarNamesMap["kMultMCNParticlesEta05"] = kMultMCNParticlesEta05;
22212223
fgVarNamesMap["kMultMCNParticlesEta08"] = kMultMCNParticlesEta08;
22222224
fgVarNamesMap["kMultMCNParticlesEta10"] = kMultMCNParticlesEta10;
2225+
fgVarNamesMap["kMultMCGlobalParticles"] = kMultMCGlobalParticles;
22232226
fgVarNamesMap["kQ1ZNAX"] = kQ1ZNAX;
22242227
fgVarNamesMap["kQ1ZNAY"] = kQ1ZNAY;
22252228
fgVarNamesMap["kQ1ZNCX"] = kQ1ZNCX;

‎PWGDQ/Core/VarManager.h‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -121,6 +121,7 @@ class VarManager : public TObject
121121
Fit = BIT(22),
122122
ReducedFit = BIT(23),
123123
ReducedEventGlobalMult = BIT(24),
124+
ReducedEventGlobalMultMC = BIT(25),
124125
Track = BIT(0),
125126
TrackCov = BIT(1),
126127
TrackExtra = BIT(2),
@@ -349,6 +350,7 @@ class VarManager : public TObject
349350
kMultMCNParticlesEta10,
350351
kMultMCNParticlesEta08,
351352
kMultMCNParticlesEta05,
353+
kMultMCGlobalParticles,
352354
kQ1ZNAX,
353355
kQ1ZNAY,
354356
kQ1ZNCX,
@@ -2662,10 +2664,14 @@ void VarManager::FillEvent(T const& event, float* values)
26622664
FillZDC(event, values);
26632665
}
26642666

2665-
if constexpr ((fillMap & ReducedEventGlobalMult) > 0) {
2667+
if constexpr (requires { event.multNtrkGlobal(); }) {
26662668
values[kMultNtrkGlobal] = event.multNtrkGlobal();
26672669
}
26682670

2671+
if constexpr (requires { event.multMCGlobalParticles(); }) {
2672+
values[kMultMCGlobalParticles] = event.multMCGlobalParticles();
2673+
}
2674+
26692675
if constexpr ((fillMap & ReducedFit) > 0) {
26702676
values[kAmplitudeFT0A] = event.amplitudeFT0A();
26712677
values[kAmplitudeFT0C] = event.amplitudeFT0C();

‎PWGDQ/DataModel/ReducedInfoTables.h‎

Lines changed: 19 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -157,14 +157,6 @@ DECLARE_SOA_COLUMN(Psi2Random, psi2random, float); //! Event plane angle from r
157157
DECLARE_SOA_COLUMN(Psi2A, psi2a, float); //! Event plane angle from Q-vector A
158158
DECLARE_SOA_COLUMN(Psi2B, psi2b, float); //! Event plane angle from Q-vector B
159159
DECLARE_SOA_COLUMN(Psi2C, psi2c, float); //! Event plane angle from Q-vector C
160-
161-
DECLARE_SOA_COLUMN(MultNtrkGlobal, multNtrkGlobal, int);
162-
163-
DECLARE_SOA_COLUMN(MultNtrkGlobalToward, multNtrkGlobalToward, int);
164-
DECLARE_SOA_COLUMN(MultNtrkGlobalTransverseRight, multNtrkGlobalTransverseRight, int);
165-
DECLARE_SOA_COLUMN(MultNtrkGlobalTransverseLeft, multNtrkGlobalTransverseLeft, int);
166-
DECLARE_SOA_COLUMN(MultNtrkGlobalBackward, multNtrkGlobalBackward, int);
167-
168160
} // namespace reducedevent
169161

170162
DECLARE_SOA_TABLE_STAGED(ReducedEvents, "REDUCEDEVENT", //! Main event information table
@@ -192,12 +184,27 @@ DECLARE_SOA_TABLE(ReducedEventsMultPV_000, "AOD", "REMULTPV", //! Multiplicity
192184
mult::MultNTracksITSOnly, mult::MultNTracksTPCOnly, mult::MultNTracksITSTPC,
193185
evsel::NumTracksInTimeRange);
194186

187+
namespace globalmult
188+
{
189+
DECLARE_SOA_COLUMN(MultNtrkGlobal, multNtrkGlobal, int);
190+
} // namespace globalmult
191+
192+
DECLARE_SOA_TABLE(GlobalTrackMultiplicity, "AOD", "GLOBALTRKMULT",
193+
globalmult::MultNtrkGlobal);
194+
195195
DECLARE_SOA_TABLE(ReducedEventsGlobalTrk, "AOD", "REGLOBALTRK",
196-
reducedevent::MultNtrkGlobal);
196+
globalmult::MultNtrkGlobal);
197+
198+
namespace mcglobalmult
199+
{
200+
DECLARE_SOA_COLUMN(MultMCGlobalParticles, multMCGlobalParticles, int);
201+
} // namespace mcglobalmult
202+
203+
DECLARE_SOA_TABLE(McGlobalMultiplicities, "AOD", "MCGLOBALMULT",
204+
mcglobalmult::MultMCGlobalParticles);
197205

198-
DECLARE_SOA_TABLE(ReducedEventsMultAzimuth, "AOD", "REMULTAZIMUTH",
199-
reducedevent::MultNtrkGlobalToward, reducedevent::MultNtrkGlobalTransverseRight,
200-
reducedevent::MultNtrkGlobalTransverseLeft, reducedevent::MultNtrkGlobalBackward);
206+
DECLARE_SOA_TABLE(ReducedMCGlobalMultiplicities, "AOD", "REMCGLOBALMULT",
207+
mcglobalmult::MultMCGlobalParticles);
201208

202209
DECLARE_SOA_TABLE_VERSIONED(ReducedEventsMultPV_001, "AOD", "REMULTPV", 1, //! Multiplicity information for primary vertex
203210
mult::MultNTracksHasITS, mult::MultNTracksHasTPC, mult::MultNTracksHasTOF, mult::MultNTracksHasTRD,

‎PWGDQ/TableProducer/globalTrackEstimator.cxx‎

Lines changed: 63 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -24,13 +24,16 @@
2424

2525
#include "Common/Core/trackUtilities.h"
2626
#include "Common/DataModel/CollisionAssociationTables.h"
27+
#include "Common/DataModel/EventSelection.h"
28+
#include "Common/DataModel/McCollisionExtra.h"
2729

2830
#include <Framework/ASoA.h>
2931
#include <Framework/AnalysisDataModel.h>
3032
#include <Framework/AnalysisHelpers.h>
3133
#include <Framework/AnalysisTask.h>
3234
#include <Framework/Configurable.h>
3335
#include <Framework/InitContext.h>
36+
#include <Framework/O2DatabasePDGPlugin.h>
3437
#include <Framework/runDataProcessing.h>
3538

3639
#include <string>
@@ -46,6 +49,7 @@ using MyBarrelTracks = o2::soa::Join<o2::aod::ReducedTracks, o2::aod::ReducedTra
4649

4750
using MyEventsDirect = o2::soa::Join<aod::Collisions, aod::EvSels>;
4851
using MyTracksDirect = o2::soa::Join<aod::Tracks, aod::TracksExtra, aod::TracksCov, aod::TracksDCA>;
52+
using MyEventsMcWithMults = soa::Join<aod::McCollisions, aod::McCollsExtra, aod::MultMCExtras_001>;
4953

5054
constexpr static uint32_t GkEventFillMap = VarManager::ObjTypes::ReducedEvent | VarManager::ObjTypes::ReducedEventExtended;
5155
constexpr static uint32_t GkTrackFillMap = VarManager::ObjTypes::ReducedTrackBarrel | VarManager::ObjTypes::ReducedTrackBarrelCov;
@@ -54,29 +58,38 @@ constexpr static uint32_t GkEventDirectFillMap = VarManager::ObjTypes::Collision
5458
constexpr static uint32_t GkTrackDirectFillMap = VarManager::ObjTypes::Track | VarManager::ObjTypes::TrackExtra | VarManager::ObjTypes::TrackCov | VarManager::ObjTypes::TrackDCA;
5559

5660
struct GlobalTrackEstimator {
57-
Produces<o2::aod::ReducedEventsGlobalTrk> reducedEventsGlobalTrk;
58-
Produces<o2::aod::ReducedEventsMultAzimuth> reducedEventsMultAzimuth;
61+
Produces<ReducedEventsGlobalTrk> reducedEventsGlobalTrk;
62+
Produces<GlobalTrackMultiplicity> globalTrackMultiplicity;
63+
64+
Produces<ReducedMCGlobalMultiplicities> reducedMCGlobalMultiplicities;
65+
Produces<McGlobalMultiplicities> mcGlobalMultiplicities;
66+
67+
Service<o2::framework::O2DatabasePDG> pdg;
68+
69+
PresliceUnsorted<ReducedMCTracks> mcTracksPerReducedEvent = aod::reducedtrackMC::reducedMCeventId;
5970

6071
Configurable<float> cfgShiftDCAxy{"cfgShiftDCAxy", 0.0105, "Constant shift of DCAxy paramterization"};
6172
Configurable<float> cfgPtMagnitudeDCAxy{"cfgPtMagnitudeDCAxy", 0.035, "Magnitude of the pT dependency of the DCAxy paramterization"};
6273
Configurable<float> cfgExponentDCAxy{"cfgExponentDCAxy", 1.1, "Exponent of the pT dependency of the DCAxy paramterization"};
6374
Configurable<float> cfgMaxDCAz{"cfgMaxDCAz", 2.0, "Maximum DCAz"};
6475
Configurable<float> cfgMinPt{"cfgMinPt", 0.1, "Minimum required pT"};
76+
Configurable<float> cfgMinMCPt{"cfgMinMCPt", 0.0, "Minimum required pT for MC particles"};
6577
Configurable<float> cfgEtaRange{"cfgEtaRange", 0.8, "Absolute pseudorapidity range"};
6678
Configurable<float> cfgMinTPCCluster{"cfgMinTPCCluster", 70, "Minimum number of crossed TPC rows"};
6779
Configurable<float> cfgRatioTPCClusterOverFindableCluster{"cfgRatioTPCClusterOverFindableCluster", 0.8, "Minimum ratio of crossed TPC rows over findable clusters"};
6880
Configurable<float> cfgMaxChi2TPC{"cfgMaxChi2TPC", 4.0, "Maximum chi2 per cluster in TPC"};
6981
Configurable<float> cfgMaxChi2ITS{"cfgMaxChi2ITS", 36.0, "Maximum chi2 per cluster in ITS"};
7082
Configurable<bool> cfgRequireITSibAny{"cfgRequireITSibAny", true, "Require a hit in the ITS inner barrel"};
83+
Configurable<bool> cfgRequirePVContributor{"cfgRequirePVContributor", false, "Require the track to be a PV contributor"};
7184
Configurable<bool> cfgRecalculateDCA{"cfgRecalculateDCA", true, "Recalculate DCA vector with associations"};
7285

73-
o2::framework::Preslice<o2::aod::ReducedTracksAssoc> preslice = o2::aod::reducedtrack_association::reducedeventId;
74-
o2::framework::Preslice<o2::aod::TrackAssoc> presliceDirect = o2::aod::track_association::collisionId;
86+
o2::framework::Preslice<ReducedTracksAssoc> preslice = o2::aod::reducedtrack_association::reducedeventId;
87+
o2::framework::Preslice<TrackAssoc> presliceDirect = o2::aod::track_association::collisionId;
7588

7689
void init(InitContext& context)
7790
{
78-
bool isSkimmedEnabled = context.mOptions.get<bool>("processGlobalTracksSkimmed");
79-
bool isDirectEnabled = context.mOptions.get<bool>("processGlobalTracksDirect");
91+
bool isSkimmedEnabled = context.mOptions.get<bool>("processGlobalTracksSkimmed") || context.mOptions.get<bool>("processMCSkimmed");
92+
bool isDirectEnabled = context.mOptions.get<bool>("processGlobalTracksDirect") || context.mOptions.get<bool>("processMCDirect");
8093
bool isDummyEnabled = context.mOptions.get<bool>("processDummy");
8194

8295
if (isDummyEnabled) {
@@ -111,6 +124,10 @@ struct GlobalTrackEstimator {
111124
return false;
112125
}
113126

127+
if (cfgRequirePVContributor && !track.isPVContributor()) {
128+
return false;
129+
}
130+
114131
if (track.tpcChi2NCl() > cfgMaxChi2TPC || track.itsChi2NCl() > cfgMaxChi2ITS) {
115132
return false;
116133
}
@@ -147,7 +164,28 @@ struct GlobalTrackEstimator {
147164
return true;
148165
}
149166

150-
void processGlobalTracksSkimmed(MyEventsBasic const& events, o2::aod::ReducedTracksAssoc const& assocs, MyBarrelTracks const& tracks)
167+
template <typename TParticles>
168+
int countMCGlobalParticles(TParticles const& particles)
169+
{
170+
int count = 0;
171+
172+
for (auto const& particle : particles) {
173+
if (!particle.isPhysicalPrimary() || particle.pt() < cfgMinMCPt.value || std::abs(particle.eta()) > cfgEtaRange.value) {
174+
continue;
175+
}
176+
177+
const auto* pdgParticle = pdg->GetParticle(particle.pdgCode());
178+
if (pdgParticle == nullptr || std::abs(pdgParticle->Charge()) < 1.e-3) {
179+
continue;
180+
}
181+
182+
++count;
183+
}
184+
185+
return count;
186+
}
187+
188+
void processGlobalTracksSkimmed(MyEventsBasic const& events, ReducedTracksAssoc const& assocs, MyBarrelTracks const& tracks)
151189
{
152190
std::unordered_set<int64_t> selectedTrackIds;
153191
selectedTrackIds.reserve(tracks.size());
@@ -215,12 +253,29 @@ struct GlobalTrackEstimator {
215253
++nTrkGlobal;
216254
}
217255

218-
reducedEventsGlobalTrk(nTrkGlobal);
256+
globalTrackMultiplicity(nTrkGlobal);
219257
}
220258
}
221259

222260
PROCESS_SWITCH(GlobalTrackEstimator, processGlobalTracksDirect, "Count global tracks from unskimmed data", false);
223261

262+
void processMCSkimmed(ReducedMCEvents const& events, ReducedMCTracks const& particles)
263+
{
264+
for (auto const& event : events) {
265+
auto eventParticles = particles.sliceBy(mcTracksPerReducedEvent, event.globalIndex());
266+
reducedMCGlobalMultiplicities(countMCGlobalParticles(eventParticles));
267+
}
268+
}
269+
270+
PROCESS_SWITCH(GlobalTrackEstimator, processMCSkimmed, "Count primary charged particles in DQ skimmed MC", false);
271+
272+
void processMCDirect(McCollision const&, McParticles const& particles)
273+
{
274+
mcGlobalMultiplicities(countMCGlobalParticles(particles));
275+
}
276+
277+
PROCESS_SWITCH(GlobalTrackEstimator, processMCDirect, "Count primary charged particles in unskimmed MC", false);
278+
224279
void processDummy(MyEventsBasic const&)
225280
{
226281
// do nothing

‎PWGDQ/Tasks/dqEfficiency_withAssoc.cxx‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -287,7 +287,6 @@ using MyMuonTracksWithCovWithAmbiguities = soa::Join<aod::ReducedMuons, aod::Red
287287
constexpr static uint32_t gkEventFillMap = VarManager::ObjTypes::ReducedEvent | VarManager::ObjTypes::ReducedEventExtended;
288288
constexpr static uint32_t gkEventFillMapWithCov = VarManager::ObjTypes::ReducedEvent | VarManager::ObjTypes::ReducedEventExtended | VarManager::ObjTypes::ReducedEventVtxCov;
289289
constexpr static uint32_t gkEventFillMapWithCovMultExtra = VarManager::ObjTypes::ReducedEvent | VarManager::ObjTypes::ReducedEventExtended | VarManager::ObjTypes::ReducedEventVtxCov | VarManager::ObjTypes::ReducedEventMultExtra;
290-
constexpr static uint32_t gkEventFillMapGlobalMult = VarManager::ObjTypes::ReducedEvent | VarManager::ObjTypes::ReducedEventExtended | VarManager::ObjTypes::ReducedEventVtxCov | VarManager::ReducedEventGlobalMult;
291290
// constexpr static uint32_t gkEventFillMapWithQvector = VarManager::ObjTypes::ReducedEvent | VarManager::ObjTypes::ReducedEventExtended | VarManager::ObjTypes::ReducedEventQvector;
292291
// constexpr static uint32_t gkEventFillMapWithCovQvector = VarManager::ObjTypes::ReducedEvent | VarManager::ObjTypes::ReducedEventExtended | VarManager::ObjTypes::ReducedEventVtxCov | VarManager::ObjTypes::ReducedEventQvector;
293292
constexpr static uint32_t gkTrackFillMap = VarManager::ObjTypes::ReducedTrack | VarManager::ObjTypes::ReducedTrackBarrel | VarManager::ObjTypes::ReducedTrackBarrelPID;
@@ -612,10 +611,10 @@ struct AnalysisEventSelection {
612611
runEventSelection<gkEventFillMap>(events, mcEvents);
613612
publishSelections<gkEventFillMap>(events);
614613
}
615-
void processSkimmedWithGlobalMults(MyEventsVtxCovGlobalMult const& events, aod::ReducedMCEvents const& mcEvents)
614+
void processSkimmedWithGlobalMults(MyEventsVtxCovGlobalMult const& events, soa::Join<aod::ReducedMCEvents, aod::ReducedMCGlobalMultiplicities> const& mcEvents)
616615
{
617-
runEventSelection<gkEventFillMapGlobalMult>(events, mcEvents);
618-
publishSelections<gkEventFillMapGlobalMult>(events);
616+
runEventSelection<gkEventFillMapWithCov>(events, mcEvents);
617+
publishSelections<gkEventFillMapWithCov>(events);
619618
}
620619
void processFillEvents(MyEvents const& events) // Used to forward the event table from tablemaker, typical use for now is jet analysis.
621620
{
@@ -3198,7 +3197,7 @@ struct AnalysisSameEventPairing {
31983197
soa::Join<aod::ReducedTracksAssoc, aod::BarrelTrackCuts, aod::Prefilter> const& barrelAssocs,
31993198
MyBarrelTracksWithCovWithAmbiguities const& barrelTracks, ReducedMCEvents const& mcEvents, ReducedMCTracks const& mcTracks)
32003199
{
3201-
runSameEventPairing<true, VarManager::kDecayToEE, gkEventFillMapGlobalMult, gkTrackFillMapWithCov>(events, trackAssocsPerCollision, barrelAssocs, barrelTracks, mcEvents, mcTracks);
3200+
runSameEventPairing<true, VarManager::kDecayToEE, gkEventFillMapWithCov, gkTrackFillMapWithCov>(events, trackAssocsPerCollision, barrelAssocs, barrelTracks, mcEvents, mcTracks);
32023201
runMCGen<VarManager::kDecayToEE>(events, mcEvents, mcTracks);
32033202
}
32043203

0 commit comments

Comments
 (0)