Skip to content

Commit e8ca434

Browse files
Andreas MikalsenAndreas Mikalsen
Andreas Mikalsen
authored and
Andreas Mikalsen
committed
Change: collisionID now from event not t1
1 parent 6276eec commit e8ca434

2 files changed

Lines changed: 15 additions & 11 deletions

File tree

‎PWGDQ/Tasks/dqEfficiency_withAssoc.cxx‎

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -236,6 +236,7 @@ using MyEvents = soa::Join<aod::ReducedEvents, aod::ReducedEventsExtended, aod::
236236
using MyEventsSelected = soa::Join<aod::ReducedEvents, aod::ReducedEventsExtended, aod::EventCuts, aod::ReducedMCEventLabels>;
237237
using MyEventsVtxCov = soa::Join<aod::ReducedEvents, aod::ReducedEventsExtended, aod::ReducedEventsVtxCov, aod::ReducedMCEventLabels>;
238238
using MyEventsVtxCovSelected = soa::Join<aod::ReducedEvents, aod::ReducedEventsExtended, aod::ReducedEventsVtxCov, aod::EventCuts, aod::ReducedMCEventLabels>;
239+
using MyEventsVtxCovSelectedInfo = soa::Join<aod::ReducedEvents, aod::ReducedEventsExtended, aod::ReducedEventsVtxCov, aod::EventCuts, aod::ReducedMCEventLabels, aod::ReducedEventsInfo>;
239240
using MyEventsVtxCovSelectedMultExtra = soa::Join<aod::ReducedEvents, aod::ReducedEventsExtended, aod::ReducedEventsVtxCov, aod::EventCuts, aod::ReducedEventsMultPV, aod::ReducedEventsMultAll, aod::ReducedMCEventLabels>;
240241
using MyEventsVtxCovSelectedQvector = soa::Join<aod::ReducedEvents, aod::ReducedEventsExtended, aod::ReducedEventsVtxCov, aod::EventCuts, aod::ReducedEventsQvector>;
241242
using MyEventsQvector = soa::Join<aod::ReducedEvents, aod::ReducedEventsExtended, aod::ReducedEventsQvector>;
@@ -2343,8 +2344,8 @@ struct AnalysisSameEventPairing {
23432344
t1.sign() + t2.sign(), twoTrackFilter, mcDecision);
23442345

23452346
if constexpr ((TTrackFillMap & VarManager::ObjTypes::ReducedTrackCollInfo) > 0) {
2346-
dielectronInfoList(t1.collisionId(), t1.trackId(), t2.trackId());
2347-
dileptonInfoList(t1.collisionId(), event.posX(), event.posY(), event.posZ());
2347+
dielectronInfoList(event.collisionId(), t1.trackId(), t2.trackId());
2348+
dileptonInfoList(event.collisionId(), event.posX(), event.posY(), event.posZ());
23482349
}
23492350
if constexpr (trackHasCov && TTwoProngFitter) {
23502351
dielectronsExtraList(t1.globalIndex(), t2.globalIndex(), VarManager::fgValues[VarManager::kVertexingTauzProjected], VarManager::fgValues[VarManager::kVertexingLzProjected], VarManager::fgValues[VarManager::kVertexingLxyProjected]);
@@ -2433,7 +2434,7 @@ struct AnalysisSameEventPairing {
24332434
VarManager::fgValues[VarManager::kPt], VarManager::fgValues[VarManager::kEta], VarManager::fgValues[VarManager::kPhi],
24342435
t1.sign() + t2.sign(), twoTrackFilter, mcDecision);
24352436
if constexpr ((TTrackFillMap & VarManager::ObjTypes::ReducedMuonCollInfo) > 0) {
2436-
dileptonInfoList(t1.collisionId(), event.posX(), event.posY(), event.posZ());
2437+
dileptonInfoList(event.collisionId(), event.posX(), event.posY(), event.posZ());
24372438
}
24382439

24392440
if constexpr (TTwoProngFitter) {
@@ -2610,8 +2611,10 @@ struct AnalysisSameEventPairing {
26102611

26112612
PresliceUnsorted<ReducedMCTracks> perReducedMcEvent = aod::reducedtrackMC::reducedMCeventId;
26122613

2613-
template <int TPairType>
2614-
void runMCGen(MyEventsVtxCovSelected const& events, ReducedMCEvents const& mcEvents, ReducedMCTracks const& mcTracks)
2614+
template <int TPairType, typename TEvents>
2615+
void runMCGen(TEvents const& events,
2616+
ReducedMCEvents const& mcEvents,
2617+
ReducedMCTracks const& mcTracks)
26152618
{
26162619
uint32_t mcDecision = 0;
26172620
int isig = 0;
@@ -3068,7 +3071,7 @@ struct AnalysisSameEventPairing {
30683071
runMCGen<VarManager::kDecayToEE>(events, mcEvents, mcTracks);
30693072
}
30703073

3071-
void processBarrelOnlyWithCollSkimmed(MyEventsVtxCovSelected const& events,
3074+
void processBarrelOnlyWithCollSkimmed(MyEventsVtxCovSelectedInfo const& events,
30723075
soa::Join<aod::ReducedTracksAssoc, aod::BarrelTrackCuts, aod::Prefilter> const& barrelAssocs,
30733076
MyBarrelTracksWithCovWithAmbiguitiesWithColl const& barrelTracks, ReducedMCEvents const& mcEvents, ReducedMCTracks const& mcTracks)
30743077
{

‎PWGDQ/Tasks/tableReader_withAssoc.cxx‎

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -233,6 +233,7 @@ using MyEventsVtxCovSelectedMultExtra = soa::Join<aod::ReducedEvents, aod::Reduc
233233
using MyEventsHashSelected = soa::Join<aod::ReducedEvents, aod::ReducedEventsExtended, aod::EventCuts, aod::MixingHashes>;
234234
using MyEventsVtxCov = soa::Join<aod::ReducedEvents, aod::ReducedEventsExtended, aod::ReducedEventsVtxCov>;
235235
using MyEventsVtxCovSelected = soa::Join<aod::ReducedEvents, aod::ReducedEventsExtended, aod::ReducedEventsVtxCov, aod::EventCuts>;
236+
using MyEventsVtxCovSelectedInfo = soa::Join<aod::ReducedEvents, aod::ReducedEventsExtended, aod::ReducedEventsVtxCov, aod::EventCuts, aod::ReducedEventsInfo>;
236237
using MyEventsVtxCovSelectedQvector = soa::Join<aod::ReducedEvents, aod::ReducedEventsExtended, aod::ReducedEventsMultPV, aod::ReducedEventsMultAll, aod::ReducedEventsVtxCov, aod::EventCuts, aod::ReducedEventsQvectorCentr, aod::ReducedEventsQvectorCentrExtra>;
237238
using MyEventsVtxCovSelectedQvectorWithHash = soa::Join<aod::ReducedEvents, aod::ReducedEventsExtended, aod::ReducedEventsMultPV, aod::ReducedEventsMultAll, aod::ReducedEventsVtxCov, aod::EventCuts, aod::ReducedEventsQvectorCentr, aod::ReducedEventsQvectorCentrExtra, aod::MixingHashes>;
238239
using MyEventsVtxCovZdcFitSelected = soa::Join<aod::ReducedEvents, aod::ReducedEventsExtended, aod::ReducedEventsVtxCov, aod::ReducedZdcs, aod::ReducedFITs, aod::EventCuts>;
@@ -2053,8 +2054,8 @@ struct AnalysisSameEventPairing {
20532054
t1.sign() + t2.sign(), twoTrackFilter, 0);
20542055

20552056
if constexpr ((TTrackFillMap & VarManager::ObjTypes::ReducedTrackCollInfo) > 0) {
2056-
dielectronInfoList(t1.collisionId(), t1.trackId(), t2.trackId());
2057-
dileptonInfoList(t1.collisionId(), event.posX(), event.posY(), event.posZ());
2057+
dielectronInfoList(event.collisionId(), t1.trackId(), t2.trackId());
2058+
dileptonInfoList(event.collisionId(), event.posX(), event.posY(), event.posZ());
20582059
}
20592060
if (fConfigOptions.polarTables.value) {
20602061
dileptonPolarList(VarManager::fgValues[VarManager::kCosThetaHE], VarManager::fgValues[VarManager::kPhiHE], VarManager::fgValues[VarManager::kPhiTildeHE],
@@ -2175,7 +2176,7 @@ struct AnalysisSameEventPairing {
21752176
VarManager::fgValues[VarManager::kPt], VarManager::fgValues[VarManager::kEta], VarManager::fgValues[VarManager::kPhi],
21762177
t1.sign() + t2.sign(), twoTrackFilter, 0);
21772178
if constexpr ((TTrackFillMap & VarManager::ObjTypes::ReducedMuonCollInfo) > 0) {
2178-
dileptonInfoList(t1.collisionId(), event.posX(), event.posY(), event.posZ());
2179+
dileptonInfoList(event.collisionId(), event.posX(), event.posY(), event.posZ());
21792180
}
21802181

21812182
if constexpr (TTwoProngFitter) {
@@ -2211,7 +2212,7 @@ struct AnalysisSameEventPairing {
22112212
}
22122213
if constexpr ((TTrackFillMap & VarManager::ObjTypes::ReducedMuonCollInfo) > 0) {
22132214
if constexpr (eventHasQvector || eventHasQvectorCentr) {
2214-
dileptonFlowList(t1.collisionId(), VarManager::fgValues[VarManager::kMass], VarManager::fgValues[VarManager::kCentFT0C],
2215+
dileptonFlowList(event.collisionId(), VarManager::fgValues[VarManager::kMass], VarManager::fgValues[VarManager::kCentFT0C],
22152216
VarManager::fgValues[VarManager::kPt], VarManager::fgValues[VarManager::kEta], VarManager::fgValues[VarManager::kPhi], t1.sign() + t2.sign(), isFirst,
22162217
VarManager::fgValues[VarManager::kU2Q2], VarManager::fgValues[VarManager::kR2SP_AB], VarManager::fgValues[VarManager::kR2SP_AC], VarManager::fgValues[VarManager::kR2SP_BC],
22172218
VarManager::fgValues[VarManager::kU3Q3], VarManager::fgValues[VarManager::kR3SP],
@@ -3001,7 +3002,7 @@ struct AnalysisSameEventPairing {
30013002
runSameEventPairing<false, VarManager::kDecayToEE, gkEventFillMapWithMultExtra, gkTrackFillMap>(events, trackAssocsPerCollision, barrelAssocs, barrelTracks);
30023003
}
30033004

3004-
void processBarrelOnlyWithCollSkimmed(MyEventsVtxCovSelected const& events,
3005+
void processBarrelOnlyWithCollSkimmed(MyEventsVtxCovSelectedInfo const& events,
30053006
soa::Join<aod::ReducedTracksAssoc, aod::BarrelTrackCuts, aod::Prefilter> const& barrelAssocs,
30063007
MyBarrelTracksWithCovWithAmbiguitiesWithColl const& barrelTracks)
30073008
{

0 commit comments

Comments
 (0)