Skip to content

Commit aaddf69

Browse files
KotliarovArKotliarovAr
committed
[PWGJE]: replace iterator in Jet matching with direct access to mcColl
1 parent 4317780 commit aaddf69

File tree

1 file changed

+28
-21
lines changed

1 file changed

+28
-21
lines changed

‎PWGJE/Tasks/recoilJets.cxx‎

Lines changed: 28 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -62,10 +62,10 @@ using CollDetIt = soa::Filtered<aod::JetCollisionsMCD>::iterator;
6262
using CollRhoDetIt = soa::Filtered<soa::Join<aod::JetCollisionsMCD, aod::BkgChargedRhos>>::iterator;
6363

6464
using CollPartIt = soa::Filtered<aod::JetMcCollisions>::iterator;
65-
using CollRhoPartTbl = soa::Filtered<soa::Join<aod::JetMcCollisions, aod::BkgChargedMcRhos>>;
65+
using CollRhoPartTbl = soa::Join<aod::JetMcCollisions, aod::BkgChargedMcRhos>;
6666
using CollRhoPartIt = soa::Filtered<soa::Join<aod::JetMcCollisions, aod::BkgChargedMcRhos>>::iterator;
6767
using CollRhoOutlierPartIt = soa::Filtered<soa::Join<aod::JetMcCollisions, aod::BkgChargedMcRhos, aod::JMcCollisionOutliers>>::iterator;
68-
using CollRhoOutlierPartTbl = soa::Filtered<soa::Join<aod::JetMcCollisions, aod::BkgChargedMcRhos, aod::JMcCollisionOutliers>>;
68+
using CollRhoOutlierPartTbl = soa::Join<aod::JetMcCollisions, aod::BkgChargedMcRhos, aod::JMcCollisionOutliers>;
6969

7070
// --- Event multiplicity (+ ZDC etc.)
7171
using EvMultZDCDataIt = soa::Filtered<soa::Join<aod::JetCollisions, aod::ZDCMults>>::iterator;
@@ -2138,7 +2138,6 @@ struct RecoilJets {
21382138
//=============================================================================
21392139
// Pt and Phi smearing of TT
21402140
//=============================================================================
2141-
21422141
template <typename JColl, typename JTracks, typename JParticles>
21432142
void fillTTSmearingPtPhi(JColl const& collision,
21442143
JTracks const& tracks,
@@ -2205,23 +2204,23 @@ struct RecoilJets {
22052204
bool bPartWithinPtOfTT = (particlePt > ptTTMin) && (particlePt < ptTTMax);
22062205

22072206
if (bPartWithinEta && bPartWithinPtOfTT) {
2208-
spectra.fill(HIST("hScaledFT0C_FractionOfPartTTSigSatisfCond"), scaledFT0C, 0.5, 0.5, weight);
2209-
spectra.fill(HIST("hScaledFT0M_FractionOfPartTTSigSatisfCond"), scaledFT0M, 0.5, 0.5, weight);
2207+
spectra.fill(HIST("hScaledFT0C_FractionOfPartTTSigSatisfCond"), scaledFT0C, 0.5, 0.5);
2208+
spectra.fill(HIST("hScaledFT0M_FractionOfPartTTSigSatisfCond"), scaledFT0M, 0.5, 0.5);
22102209
}
22112210

22122211
if (!bPartWithinEta && bPartWithinPtOfTT) {
2213-
spectra.fill(HIST("hScaledFT0C_FractionOfPartTTSigSatisfCond"), scaledFT0C, 1.5, 0.5, weight);
2214-
spectra.fill(HIST("hScaledFT0C_FractionOfPartTTSigSatisfCond"), scaledFT0M, 1.5, 0.5, weight);
2212+
spectra.fill(HIST("hScaledFT0C_FractionOfPartTTSigSatisfCond"), scaledFT0C, 1.5, 0.5);
2213+
spectra.fill(HIST("hScaledFT0C_FractionOfPartTTSigSatisfCond"), scaledFT0M, 1.5, 0.5);
22152214
}
22162215

22172216
if (bPartWithinEta && !bPartWithinPtOfTT) {
2218-
spectra.fill(HIST("hScaledFT0C_FractionOfPartTTSigSatisfCond"), scaledFT0C, 0.5, 1.5, weight);
2219-
spectra.fill(HIST("hScaledFT0M_FractionOfPartTTSigSatisfCond"), scaledFT0M, 0.5, 1.5, weight);
2217+
spectra.fill(HIST("hScaledFT0C_FractionOfPartTTSigSatisfCond"), scaledFT0C, 0.5, 1.5);
2218+
spectra.fill(HIST("hScaledFT0M_FractionOfPartTTSigSatisfCond"), scaledFT0M, 0.5, 1.5);
22202219
}
22212220

22222221
if (!bPartWithinEta && !bPartWithinPtOfTT) {
2223-
spectra.fill(HIST("hScaledFT0C_FractionOfPartTTSigSatisfCond"), scaledFT0C, 1.5, 1.5, weight);
2224-
spectra.fill(HIST("hScaledFT0M_FractionOfPartTTSigSatisfCond"), scaledFT0M, 1.5, 1.5, weight);
2222+
spectra.fill(HIST("hScaledFT0C_FractionOfPartTTSigSatisfCond"), scaledFT0C, 1.5, 1.5);
2223+
spectra.fill(HIST("hScaledFT0M_FractionOfPartTTSigSatisfCond"), scaledFT0M, 1.5, 1.5);
22252224
}
22262225
}
22272226
if (!bPartWithinEta)
@@ -2368,7 +2367,7 @@ struct RecoilJets {
23682367
// Construction of response matrix
23692368
//=============================================================================
23702369
void processJetsGeoMatching(CollRhoDetIt const& collision,
2371-
CollRhoPartTbl const& mcCollisions,
2370+
CollRhoPartTbl const&,
23722371
TrackTbl const& tracksPerColl,
23732372
MatchedJetsDetToPartTbl const& mcDetJetsPerColl,
23742373
MatchedJetsPartToDetTbl const& mcPartJets)
@@ -2379,7 +2378,9 @@ struct RecoilJets {
23792378

23802379
auto mcCollisionId = collision.mcCollisionId();
23812380
auto detLevelCollRho = collision.rho();
2382-
auto partLevelCollRho = mcCollisions.iteratorAt(mcCollisionId).rho();
2381+
2382+
auto mcColl = collision.mcCollision_as<CollRhoPartTbl>();
2383+
auto partLevelCollRho = mcColl.rho();
23832384

23842385
// Slice for mc part level jets associated to a given mcCollisionId
23852386
auto mcPartJetsPerMcCollision = mcPartJets.sliceBy(partJetsPerMcCollision, mcCollisionId); // signature: (__column to slice___, __index__)
@@ -2390,7 +2391,7 @@ struct RecoilJets {
23902391

23912392
//___________________________
23922393
void processJetsGeoPtMatching(CollRhoDetIt const& collision,
2393-
CollRhoPartTbl const& mcCollisions,
2394+
CollRhoPartTbl const&,
23942395
TrackTbl const& tracksPerColl,
23952396
MatchedJetsDetToPartTbl const& mcDetJetsPerColl,
23962397
MatchedJetsPartToDetTbl const& mcPartJets)
@@ -2401,7 +2402,9 @@ struct RecoilJets {
24012402

24022403
auto mcCollisionId = collision.mcCollisionId();
24032404
auto detLevelCollRho = collision.rho();
2404-
auto partLevelCollRho = mcCollisions.iteratorAt(mcCollisionId).rho();
2405+
2406+
auto mcColl = collision.mcCollision_as<CollRhoPartTbl>();
2407+
auto partLevelCollRho = mcColl.rho();
24052408

24062409
// Slice for mc part level jets associated to a given mcCollisionId
24072410
auto mcPartJetsPerMcCollision = mcPartJets.sliceBy(partJetsPerMcCollision, mcCollisionId); // signature: (__column to slice___, __index__)
@@ -2412,7 +2415,7 @@ struct RecoilJets {
24122415

24132416
//_________________________________
24142417
void processJetsGeoMatchingWeighted(CollRhoOutlierDetIt const& collision,
2415-
CollRhoOutlierPartTbl const& mcCollisions,
2418+
CollRhoOutlierPartTbl const&,
24162419
TrackTbl const& tracksPerColl,
24172420
MatchedJetsDetToPartTbl const& mcDetJetsPerColl,
24182421
MatchedJetsPartToDetTbl const& mcPartJets)
@@ -2423,9 +2426,11 @@ struct RecoilJets {
24232426

24242427
auto mcCollisionId = collision.mcCollisionId();
24252428
auto detLevelCollRho = collision.rho();
2426-
auto partLevelCollRho = mcCollisions.iteratorAt(mcCollisionId).rho();
2427-
auto weight = mcCollisions.iteratorAt(mcCollisionId).weight();
24282429

2430+
auto mcColl = collision.mcCollision_as<CollRhoOutlierPartTbl>();
2431+
auto partLevelCollRho = mcColl.rho();
2432+
auto weight = mcColl.weight();
2433+
24292434
// Slice for mc part level jets associated to a given mcCollisionId
24302435
auto mcPartJetsPerMcCollision = mcPartJets.sliceBy(partJetsPerMcCollision, mcCollisionId); // signature: (__column to slice___, __index__)
24312436

@@ -2435,7 +2440,7 @@ struct RecoilJets {
24352440

24362441
//___________________________________
24372442
void processJetsGeoPtMatchingWeighted(CollRhoOutlierDetIt const& collision,
2438-
CollRhoOutlierPartTbl const& mcCollisions,
2443+
CollRhoOutlierPartTbl const&,
24392444
TrackTbl const& tracksPerColl,
24402445
MatchedJetsDetToPartTbl const& mcDetJetsPerColl,
24412446
MatchedJetsPartToDetTbl const& mcPartJets)
@@ -2446,8 +2451,10 @@ struct RecoilJets {
24462451

24472452
auto mcCollisionId = collision.mcCollisionId();
24482453
auto detLevelCollRho = collision.rho();
2449-
auto partLevelCollRho = mcCollisions.iteratorAt(mcCollisionId).rho();
2450-
auto weight = mcCollisions.iteratorAt(mcCollisionId).weight();
2454+
2455+
auto mcColl = collision.mcCollision_as<CollRhoOutlierPartTbl>();
2456+
auto partLevelCollRho = mcColl.rho();
2457+
auto weight = mcColl.weight();
24512458

24522459
// Slice for mc part level jets associated to a given mcCollisionId
24532460
auto mcPartJetsPerMcCollision = mcPartJets.sliceBy(partJetsPerMcCollision, mcCollisionId); // signature: (__column to slice___, __index__)

0 commit comments

Comments
 (0)