Skip to content

Commit d02dc76

Browse files
RafRaf11RafRaf11
authored
Merge pull request #31 from alibuild/alibot-cleanup-8541
Please consider the following formatting changes to AliceO2Group#8541
2 parents d08612a + a179e32 commit d02dc76

1 file changed

Lines changed: 68 additions & 39 deletions

File tree

‎PWGLF/Tasks/Nuspex/NucleiHistTask.cxx‎

Lines changed: 68 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -75,24 +75,24 @@ struct NucleiHistTask {
7575
histTrackcuts_data->GetXaxis()->SetBinLabel(3, "Rap. cut passed");
7676
histTrackcuts_data->GetXaxis()->SetBinLabel(4, "DCA cut passed");
7777
histTrackcuts_data->GetXaxis()->SetBinLabel(5, "TPCnCls cut passed");
78-
histTrackcuts_data->GetXaxis()->SetBinLabel(6, "TPCCrossedRowsOverFindable cut passed");
79-
histTrackcuts_data->GetXaxis()->SetBinLabel(7, "Chi2 cut passed");
80-
histTrackcuts_data->GetXaxis()->SetBinLabel(8, "Passed TPC refit cut");
78+
histTrackcuts_data->GetXaxis()->SetBinLabel(6, "TPCCrossedRowsOverFindable cut passed");
79+
histTrackcuts_data->GetXaxis()->SetBinLabel(7, "Chi2 cut passed");
80+
histTrackcuts_data->GetXaxis()->SetBinLabel(8, "Passed TPC refit cut");
8181
histTrackcuts_data->GetXaxis()->SetBinLabel(9, "Passed ITS refit cut");
8282
histTrackcuts_data->GetXaxis()->SetBinLabel(10, "ITSnCls cut passed");
8383
histTrackcuts_data->GetXaxis()->SetBinLabel(11, "Momentum cut passed");
8484
histTrackcuts_data->GetXaxis()->SetBinLabel(12, "hasITS & hasTPC cut passed");
8585
histTrackcuts_data->GetXaxis()->SetBinLabel(13, "GoldenChi2 cut passed");
86-
86+
8787
// +++++++++++++++++++++ MC ++++++++++++++++++++++++
8888
histTrackcuts_MC->GetXaxis()->SetBinLabel(1, "Events read");
8989
histTrackcuts_MC->GetXaxis()->SetBinLabel(2, "Prim. particle. sel. passed");
9090
histTrackcuts_MC->GetXaxis()->SetBinLabel(3, "Rap. cut passed");
9191
histTrackcuts_MC->GetXaxis()->SetBinLabel(4, "DCA cut passed");
9292
histTrackcuts_MC->GetXaxis()->SetBinLabel(5, "TPCnCls cut passed");
93-
histTrackcuts_MC->GetXaxis()->SetBinLabel(6, "TPCCrossedRowsOverFindable cut passed");
94-
histTrackcuts_MC->GetXaxis()->SetBinLabel(7, "Chi2 cut passed");
95-
histTrackcuts_MC->GetXaxis()->SetBinLabel(8, "Passed TPC refit cut");
93+
histTrackcuts_MC->GetXaxis()->SetBinLabel(6, "TPCCrossedRowsOverFindable cut passed");
94+
histTrackcuts_MC->GetXaxis()->SetBinLabel(7, "Chi2 cut passed");
95+
histTrackcuts_MC->GetXaxis()->SetBinLabel(8, "Passed TPC refit cut");
9696
histTrackcuts_MC->GetXaxis()->SetBinLabel(9, "Passed ITS refit cut");
9797
histTrackcuts_MC->GetXaxis()->SetBinLabel(10, "ITSnCls cut passed");
9898
histTrackcuts_MC->GetXaxis()->SetBinLabel(11, "Momentum cut passed");
@@ -450,8 +450,7 @@ struct NucleiHistTask {
450450
Configurable<int> lastRequiredTrdCluster{"lastRequiredTrdCluster", -1, "Last cluster to required in TRD for track selection. -1 does not require any TRD cluster"};
451451
Configurable<bool> requireGoldenChi2{"requireGoldenChi2", false, "Enable the requirement of GoldenChi2"};
452452
Configurable<bool> event_selection_sel8{"event_selection_sel8", true, "Enable sel8 event selection"};
453-
Configurable<bool> event_selection_MC_sel8{"event_selection_MC_sel8", true, "Enable sel8 event selection in MC processing"};
454-
453+
Configurable<bool> event_selection_MC_sel8{"event_selection_MC_sel8", true, "Enable sel8 event selection in MC processing"};
455454

456455
template <typename CollisionType, typename TracksType>
457456
void fillHistograms(const CollisionType& event, const TracksType& tracks)
@@ -576,25 +575,35 @@ struct NucleiHistTask {
576575
spectra_reg.fill(HIST("histChi2TPC"), track.pt(), track.tpcChi2NCl());
577576
spectra_reg.fill(HIST("histChi2ITS"), track.pt(), track.itsChi2NCl());
578577

579-
if (TMath::Abs(track.dcaXY()) > maxDCA_XY || TMath::Abs(track.dcaZ()) > maxDCA_Z) continue;
578+
if (TMath::Abs(track.dcaXY()) > maxDCA_XY || TMath::Abs(track.dcaZ()) > maxDCA_Z)
579+
continue;
580580
histTrackcuts_data->AddBinContent(4);
581-
if (TPCnumberClsFound < minTPCnClsFound || TPC_nCls_Crossed_Rows < minNCrossedRowsTPC) continue;
581+
if (TPCnumberClsFound < minTPCnClsFound || TPC_nCls_Crossed_Rows < minNCrossedRowsTPC)
582+
continue;
582583
histTrackcuts_data->AddBinContent(5);
583-
if (RatioCrossedRowsOverFindableTPC < minRatioCrossedRowsTPC || RatioCrossedRowsOverFindableTPC > maxRatioCrossedRowsTPC) continue;
584+
if (RatioCrossedRowsOverFindableTPC < minRatioCrossedRowsTPC || RatioCrossedRowsOverFindableTPC > maxRatioCrossedRowsTPC)
585+
continue;
584586
histTrackcuts_data->AddBinContent(6);
585-
if (Chi2perClusterTPC > maxChi2PerClusterTPC || Chi2perClusterTPC < minChi2PerClusterTPC || Chi2perClusterITS > maxChi2PerClusterITS) continue;
587+
if (Chi2perClusterTPC > maxChi2PerClusterTPC || Chi2perClusterTPC < minChi2PerClusterTPC || Chi2perClusterITS > maxChi2PerClusterITS)
588+
continue;
586589
histTrackcuts_data->AddBinContent(7);
587-
if (!(track.passedTPCRefit())) continue;
590+
if (!(track.passedTPCRefit()))
591+
continue;
588592
histTrackcuts_data->AddBinContent(8);
589-
if (!(track.passedITSRefit())) continue;
593+
if (!(track.passedITSRefit()))
594+
continue;
590595
histTrackcuts_data->AddBinContent(9);
591-
if ((track.itsNClsInnerBarrel()) < minReqClusterITSib || (track.itsNCls()) < minReqClusterITS) continue;
596+
if ((track.itsNClsInnerBarrel()) < minReqClusterITSib || (track.itsNCls()) < minReqClusterITS)
597+
continue;
592598
histTrackcuts_data->AddBinContent(10);
593-
if (track.pt() < p_min || track.pt() > p_max) continue;
599+
if (track.pt() < p_min || track.pt() > p_max)
600+
continue;
594601
histTrackcuts_data->AddBinContent(11);
595-
if ((requireITS && !(track.hasITS())) || (requireTPC && !(track.hasTPC()))) continue;
602+
if ((requireITS && !(track.hasITS())) || (requireTPC && !(track.hasTPC())))
603+
continue;
596604
histTrackcuts_data->AddBinContent(12);
597-
if (requireGoldenChi2 && !(track.passedGoldenChi2())) continue;
605+
if (requireGoldenChi2 && !(track.passedGoldenChi2()))
606+
continue;
598607
histTrackcuts_data->AddBinContent(13);
599608

600609
spectra_reg.fill(HIST("histTpcSignalData"), momentum * track.sign(), track.tpcSignal());
@@ -1179,16 +1188,26 @@ struct NucleiHistTask {
11791188
float Chi2perClusterTPC = track.tpcChi2NCl();
11801189
float Chi2perClusterITS = track.itsChi2NCl();
11811190

1182-
if (TMath::Abs(track.dcaXY()) > maxDCA_XY || TMath::Abs(track.dcaZ()) > maxDCA_Z) continue;
1183-
if (TPCnumberClsFound < minTPCnClsFound || TPC_nCls_Crossed_Rows < minNCrossedRowsTPC) continue;
1184-
if (RatioCrossedRowsOverFindableTPC < minRatioCrossedRowsTPC || RatioCrossedRowsOverFindableTPC > maxRatioCrossedRowsTPC) continue;
1185-
if (Chi2perClusterTPC > maxChi2PerClusterTPC || Chi2perClusterTPC < minChi2PerClusterTPC || Chi2perClusterITS > maxChi2PerClusterITS) continue;
1186-
if (!(track.passedTPCRefit())) continue;
1187-
if (!(track.passedITSRefit())) continue;
1188-
if ((track.itsNClsInnerBarrel()) < minReqClusterITSib || (track.itsNCls()) < minReqClusterITS) continue;
1189-
if (track.pt() < p_min || track.pt() > p_max) continue;
1190-
if ((requireITS && !(track.hasITS())) || (requireTPC && !(track.hasTPC()))) continue;
1191-
if (requireGoldenChi2 && !(track.passedGoldenChi2())) continue;
1191+
if (TMath::Abs(track.dcaXY()) > maxDCA_XY || TMath::Abs(track.dcaZ()) > maxDCA_Z)
1192+
continue;
1193+
if (TPCnumberClsFound < minTPCnClsFound || TPC_nCls_Crossed_Rows < minNCrossedRowsTPC)
1194+
continue;
1195+
if (RatioCrossedRowsOverFindableTPC < minRatioCrossedRowsTPC || RatioCrossedRowsOverFindableTPC > maxRatioCrossedRowsTPC)
1196+
continue;
1197+
if (Chi2perClusterTPC > maxChi2PerClusterTPC || Chi2perClusterTPC < minChi2PerClusterTPC || Chi2perClusterITS > maxChi2PerClusterITS)
1198+
continue;
1199+
if (!(track.passedTPCRefit()))
1200+
continue;
1201+
if (!(track.passedITSRefit()))
1202+
continue;
1203+
if ((track.itsNClsInnerBarrel()) < minReqClusterITSib || (track.itsNCls()) < minReqClusterITS)
1204+
continue;
1205+
if (track.pt() < p_min || track.pt() > p_max)
1206+
continue;
1207+
if ((requireITS && !(track.hasITS())) || (requireTPC && !(track.hasTPC())))
1208+
continue;
1209+
if (requireGoldenChi2 && !(track.passedGoldenChi2()))
1210+
continue;
11921211

11931212
TLorentzVector lorentzVector_pion{};
11941213
TLorentzVector lorentzVector_proton{};
@@ -1518,26 +1537,36 @@ struct NucleiHistTask {
15181537
float Chi2perClusterTPC = track.tpcChi2NCl();
15191538
float Chi2perClusterITS = track.itsChi2NCl();
15201539

1521-
if (TMath::Abs(track.dcaXY()) > maxDCA_XY || TMath::Abs(track.dcaZ()) > maxDCA_Z) continue;
1540+
if (TMath::Abs(track.dcaXY()) > maxDCA_XY || TMath::Abs(track.dcaZ()) > maxDCA_Z)
1541+
continue;
15221542
histTrackcuts_MC->AddBinContent(4);
1523-
if (TPCnumberClsFound < minTPCnClsFound || TPC_nCls_Crossed_Rows < minNCrossedRowsTPC) continue;
1543+
if (TPCnumberClsFound < minTPCnClsFound || TPC_nCls_Crossed_Rows < minNCrossedRowsTPC)
1544+
continue;
15241545
histTrackcuts_MC->AddBinContent(5);
1525-
if (RatioCrossedRowsOverFindableTPC < minRatioCrossedRowsTPC || RatioCrossedRowsOverFindableTPC > maxRatioCrossedRowsTPC) continue;
1546+
if (RatioCrossedRowsOverFindableTPC < minRatioCrossedRowsTPC || RatioCrossedRowsOverFindableTPC > maxRatioCrossedRowsTPC)
1547+
continue;
15261548
histTrackcuts_MC->AddBinContent(6);
1527-
if (Chi2perClusterTPC > maxChi2PerClusterTPC || Chi2perClusterTPC < minChi2PerClusterTPC || Chi2perClusterITS > maxChi2PerClusterITS) continue;
1549+
if (Chi2perClusterTPC > maxChi2PerClusterTPC || Chi2perClusterTPC < minChi2PerClusterTPC || Chi2perClusterITS > maxChi2PerClusterITS)
1550+
continue;
15281551
histTrackcuts_MC->AddBinContent(7);
1529-
if (!(track.passedTPCRefit())) continue;
1552+
if (!(track.passedTPCRefit()))
1553+
continue;
15301554
histTrackcuts_MC->AddBinContent(8);
1531-
if (!(track.passedITSRefit())) continue;
1555+
if (!(track.passedITSRefit()))
1556+
continue;
15321557
histTrackcuts_MC->AddBinContent(9);
1533-
if ((track.itsNClsInnerBarrel()) < minReqClusterITSib || (track.itsNCls()) < minReqClusterITS) continue;
1558+
if ((track.itsNClsInnerBarrel()) < minReqClusterITSib || (track.itsNCls()) < minReqClusterITS)
1559+
continue;
15341560
histTrackcuts_MC->AddBinContent(10);
1535-
if (track.pt() < p_min || track.pt() > p_max) continue;
1561+
if (track.pt() < p_min || track.pt() > p_max)
1562+
continue;
15361563
histTrackcuts_MC->AddBinContent(11);
15371564

1538-
if ((requireITS && !(track.hasITS())) || (requireTPC && !(track.hasTPC()))) continue;
1565+
if ((requireITS && !(track.hasITS())) || (requireTPC && !(track.hasTPC())))
1566+
continue;
15391567
histTrackcuts_MC->AddBinContent(12);
1540-
if (requireGoldenChi2 && !(track.passedGoldenChi2())) continue;
1568+
if (requireGoldenChi2 && !(track.passedGoldenChi2()))
1569+
continue;
15411570
histTrackcuts_MC->AddBinContent(13);
15421571

15431572
float nSigmaPion = track.tpcNSigmaPi();

0 commit comments

Comments
 (0)