Skip to content

Commit 0f85e5a

Browse files
pravatp98pravatp98
authored
Refactor track analysis to use hReg for histograms
1 parent d0814e2 commit 0f85e5a

1 file changed

Lines changed: 41 additions & 41 deletions

File tree

‎PWGCF/EbyEFluctuations/Tasks/nchCumulantsId.cxx‎

Lines changed: 41 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -1367,47 +1367,47 @@ struct NchCumulantsId {
13671367
void executeTrackAnalysisPart(const T& track, const int& trackIdTag, float& nP, float& nM,
13681368
const int& idMethodPi, const bool& trackIsPion, float& nAPi, float& nPi,
13691369
const int& idMethodKa, const bool& trackIsKaon, float& nAKa, float& nKa,
1370-
const int& idMethodPr, const bool& trackIsProton, float& nPr, float& nAPr, H& recoAnalysis)
1370+
const int& idMethodPr, const bool& trackIsProton, float& nPr, float& nAPr, H& hReg)
13711371
{
13721372
if (cfgEventSelection.flagUnusedVariableError)
13731373
LOG(info) << trackIdTag << idMethodPi << ":" << idMethodKa << ":" << idMethodPr;
13741374
if (track.sign() > 0) {
1375-
// fillRecoTrackQA<kPos>(recoAnalysis, track);
1375+
// fillRecoTrackQA<kPos>(hReg, track);
13761376
nP++;
1377-
recoAnalysis.fill(HIST("recoAnalysis/Charge/Pos/h12_p"), track.p());
1378-
recoAnalysis.fill(HIST("recoAnalysis/Charge/Pos/h13_pt"), track.pt());
1379-
recoAnalysis.fill(HIST("recoAnalysis/Charge/Pos/h14_eta"), track.eta());
1380-
recoAnalysis.fill(HIST("recoAnalysis/Charge/Pos/h15_phi"), track.phi());
1381-
recoAnalysis.fill(HIST("recoAnalysis/Charge/Pos/h16_rapidity"), track.y());
1382-
recoAnalysis.fill(HIST("recoAnalysis/Charge/Pos/h20_pt_eta"), track.pt(), track.eta());
1377+
hReg.fill(HIST("recoAnalysis/Charge/Pos/h12_p"), track.p());
1378+
hReg.fill(HIST("recoAnalysis/Charge/Pos/h13_pt"), track.pt());
1379+
hReg.fill(HIST("recoAnalysis/Charge/Pos/h14_eta"), track.eta());
1380+
hReg.fill(HIST("recoAnalysis/Charge/Pos/h15_phi"), track.phi());
1381+
hReg.fill(HIST("recoAnalysis/Charge/Pos/h16_rapidity"), track.y());
1382+
hReg.fill(HIST("recoAnalysis/Charge/Pos/h20_pt_eta"), track.pt(), track.eta());
13831383
}
13841384
if (track.sign() < 0) {
1385-
// fillRecoTrackQA<kNeg>(recoAnalysis, track);
1385+
// fillRecoTrackQA<kNeg>(hReg, track);
13861386
nM++;
1387-
recoAnalysis.fill(HIST("recoAnalysis/Charge/Neg/h12_p"), track.p());
1388-
recoAnalysis.fill(HIST("recoAnalysis/Charge/Neg/h13_pt"), track.pt());
1389-
recoAnalysis.fill(HIST("recoAnalysis/Charge/Neg/h14_eta"), track.eta());
1390-
recoAnalysis.fill(HIST("recoAnalysis/Charge/Neg/h15_phi"), track.phi());
1391-
recoAnalysis.fill(HIST("recoAnalysis/Charge/Neg/h16_rapidity"), track.y());
1392-
recoAnalysis.fill(HIST("recoAnalysis/Charge/Neg/h20_pt_eta"), track.pt(), track.eta());
1387+
hReg.fill(HIST("recoAnalysis/Charge/Neg/h12_p"), track.p());
1388+
hReg.fill(HIST("recoAnalysis/Charge/Neg/h13_pt"), track.pt());
1389+
hReg.fill(HIST("recoAnalysis/Charge/Neg/h14_eta"), track.eta());
1390+
hReg.fill(HIST("recoAnalysis/Charge/Neg/h15_phi"), track.phi());
1391+
hReg.fill(HIST("recoAnalysis/Charge/Neg/h16_rapidity"), track.y());
1392+
hReg.fill(HIST("recoAnalysis/Charge/Neg/h20_pt_eta"), track.pt(), track.eta());
13931393
}
13941394

13951395
if (trackIsPion) {
13961396
// if (idMethodPi == kTPCidentified) {
1397-
// fillIdentificationQA<recoAnalysisDir, kPi, tpcId, true>(hist, track); // set hist as recoAnalysis after tpcId etc add true
1397+
// fillIdentificationQA<recoAnalysisDir, kPi, tpcId, true>(hist, track); // set hist as hReg after tpcId etc add true
13981398
// } else if (idMethodPi == kTPCTOFidentified) {
13991399
// fillIdentificationQA<recoAnalysisDir, kPi, tpctofId, true>(hist, track);
14001400
// } else if (idMethodPi == kUnidentified) {
14011401
// fillIdentificationQA<recoAnalysisDir, kPi, NoId, true>(hist, track);
14021402
// }
14031403
if (track.sign() > 0) {
14041404
nPi++;
1405-
fillRecoTrackQA<recoAnalysisDir, kPi, kPos>(recoAnalysis, track);
1405+
fillRecoTrackQA<recoAnalysisDir, kPi, kPos>(hReg, track);
14061406
} else if (track.sign() < 0) {
14071407
nAPi++;
1408-
fillRecoTrackQA<recoAnalysisDir, kPi, kNeg>(recoAnalysis, track);
1408+
fillRecoTrackQA<recoAnalysisDir, kPi, kNeg>(hReg, track);
14091409
}
1410-
// fillRecoTrackQA<recoAnalysisDir, kPi>(recoAnalysis, track);
1410+
// fillRecoTrackQA<recoAnalysisDir, kPi>(hReg, track);
14111411
}
14121412
if (trackIsKaon) {
14131413
// if (idMethodKa == kTPCidentified) {
@@ -1419,12 +1419,12 @@ struct NchCumulantsId {
14191419
// }
14201420
if (track.sign() > 0) {
14211421
nKa++;
1422-
fillRecoTrackQA<recoAnalysisDir, kKa, kPos>(recoAnalysis, track);
1422+
fillRecoTrackQA<recoAnalysisDir, kKa, kPos>(hReg, track);
14231423
} else if (track.sign() < 0) {
14241424
nAKa++;
1425-
fillRecoTrackQA<recoAnalysisDir, kKa, kNeg>(recoAnalysis, track);
1425+
fillRecoTrackQA<recoAnalysisDir, kKa, kNeg>(hReg, track);
14261426
}
1427-
// fillRecoTrackQA<recoAnalysisDir, kKa>(recoAnalysis, track);
1427+
// fillRecoTrackQA<recoAnalysisDir, kKa>(hReg, track);
14281428
}
14291429
if (trackIsProton) {
14301430
// if (idMethodPr == kTPCidentified) {
@@ -1436,15 +1436,15 @@ struct NchCumulantsId {
14361436
// }
14371437
if (track.sign() > 0) {
14381438
nPr++;
1439-
fillRecoTrackQA<recoAnalysisDir, kPr, kPos>(recoAnalysis, track);
1439+
fillRecoTrackQA<recoAnalysisDir, kPr, kPos>(hReg, track);
14401440
} else if (track.sign() < 0) {
14411441
nAPr++;
1442-
fillRecoTrackQA<recoAnalysisDir, kPr, kNeg>(recoAnalysis, track);
1442+
fillRecoTrackQA<recoAnalysisDir, kPr, kNeg>(hReg, track);
14431443
}
1444-
// fillRecoTrackQA<recoAnalysisDir, kPr>(recoAnalysis, track);
1444+
// fillRecoTrackQA<recoAnalysisDir, kPr>(hReg, track);
14451445
}
14461446

1447-
// recoAnalysis.fill(HIST("recoAnalysis/SelectedTrack_IdentificationTag"), trackIdTag);
1447+
// hReg.fill(HIST("recoAnalysis/SelectedTrack_IdentificationTag"), trackIdTag);
14481448
}
14491449
// fill the basis for factorial cumulants
14501450

@@ -1459,22 +1459,22 @@ struct NchCumulantsId {
14591459
using MyCollisionsWithMcLabels = soa::Join<aod::Collisions, aod::Mults, aod::CentFT0Ms, aod::EvSels, aod::McCollisionLabels>;
14601460

14611461
template <typename CollisionType>
1462-
bool isEventSelected(const CollisionType& col)
1462+
bool isEventSelected(const CollisionType& coll)
14631463
{
14641464
if (cfgEventSelection.cfgEvSel01doNoSameBunchPileup &&
1465-
!col.selection_bit(aod::evsel::kNoSameBunchPileup))
1465+
!coll.selection_bit(aod::evsel::kNoSameBunchPileup))
14661466
return false;
14671467
if (cfgEventSelection.cfgEvSel02doIsGoodZvtxFT0vsPV &&
1468-
!col.selection_bit(aod::evsel::kIsGoodZvtxFT0vsPV))
1468+
!coll.selection_bit(aod::evsel::kIsGoodZvtxFT0vsPV))
14691469
return false;
14701470
if (cfgEventSelection.cfgEvSel03doIsGoodITSLayersAll &&
1471-
!col.selection_bit(aod::evsel::kIsGoodITSLayersAll))
1471+
!coll.selection_bit(aod::evsel::kIsGoodITSLayersAll))
14721472
return false;
14731473
return true;
14741474
}
14751475

14761476
// tracks and collision filters
1477-
Filter col = aod::evsel::sel8 == true;
1477+
Filter colSel8 = aod::evsel::sel8 == true;
14781478
Filter colFilter = nabs(aod::collision::posZ) < cfgCutPosZ;
14791479
Filter trackFilter = requireGlobalTrackInFilter();
14801480
Filter trackPt = (aod::track::pt > cfgCutPtMin) && (aod::track::pt < cfgCutPtMax);
@@ -1620,16 +1620,16 @@ struct NchCumulantsId {
16201620
}
16211621
if (!isEventSelected(col))
16221622
continue;
1623-
float nP = 0;
1624-
float nM = 0;
1625-
float nCh = 0;
1626-
float nT = 0;
1627-
float nPr = 0;
1628-
float nAPr = 0;
1629-
float nKa = 0;
1630-
float nAKa = 0;
1631-
float nPi = 0;
1632-
float nAPi = 0;
1623+
nP = 0;
1624+
nM = 0;
1625+
nCh = 0;
1626+
nT = 0;
1627+
nPr = 0;
1628+
nAPr = 0;
1629+
nKa = 0;
1630+
nAKa = 0;
1631+
nPi = 0;
1632+
nAPi = 0;
16331633
// group tracks manually with corresponding collision using col id;
16341634
const uint64_t collIdx = col.globalIndex();
16351635
const auto tracksTablePerColl = tracks.sliceBy(mctracksPerCollisionPreslice, collIdx);

0 commit comments

Comments
 (0)