Skip to content

Commit 21ec6cc

Browse files
ilikmetaalibuild
ilikmeta
and
alibuild
authored
Fix centrality config and remove POI (#6094)
* Try to fix alibuilt error * Please consider the following formatting changes --------- Co-authored-by: ALICE Action Bot <alibuild@cern.ch>
1 parent 19be610 commit 21ec6cc

File tree

1 file changed

+22
-31
lines changed

1 file changed

+22
-31
lines changed

‎PWGCF/Flow/Tasks/FlowGFWPbPb.cxx‎

Lines changed: 22 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -44,8 +44,6 @@ using namespace o2::framework::expressions;
4444
struct FlowGFWPbPb {
4545

4646
O2_DEFINE_CONFIGURABLE(cfgCutVertex, float, 10.0f, "Accepted z-vertex range")
47-
O2_DEFINE_CONFIGURABLE(cfgCutPtPOIMin, float, 0.2f, "Minimal pT for poi tracks")
48-
O2_DEFINE_CONFIGURABLE(cfgCutPtPOIMax, float, 10.0f, "Maximal pT for poi tracks")
4947
O2_DEFINE_CONFIGURABLE(cfgCutPtMin, float, 0.2f, "Minimal pT for ref tracks")
5048
O2_DEFINE_CONFIGURABLE(cfgCutPtMax, float, 3.0f, "Maximal pT for ref tracks")
5149
O2_DEFINE_CONFIGURABLE(cfgCutEta, float, 0.8f, "Eta range for tracks")
@@ -66,12 +64,9 @@ struct FlowGFWPbPb {
6664
ConfigurableAxis axisEta{"axisEta", {40, -1., 1.}, "eta axis for histograms"};
6765
ConfigurableAxis axisPt{"axisPt", {VARIABLE_WIDTH, 0.2, 0.25, 0.30, 0.40, 0.45, 0.50, 0.55, 0.60, 0.65, 0.70, 0.75, 0.80, 0.85, 0.90, 0.95, 1.00, 1.10, 1.20, 1.30, 1.40, 1.50, 1.60, 1.70, 1.80, 1.90, 2.00, 2.20, 2.40, 2.60, 2.80, 3.00}, "pt axis for histograms"};
6866
ConfigurableAxis axisPtHist{"axisPtHist", {100, 0., 10.}, "pt axis for histograms"};
69-
ConfigurableAxis axisMultiplicity{"axisMultiplicity", {VARIABLE_WIDTH, 0, 5, 10, 20, 30, 40, 50, 60, 70, 80, 90}, "centrality axis for histograms"};
67+
ConfigurableAxis axisCentrality{"axisCentrality", {VARIABLE_WIDTH, 0, 5, 10, 20, 30, 40, 50, 60, 70, 80, 90}, "centrality axis for histograms"};
7068
ConfigurableAxis axisCentForQA{"axisCentForQA", {100, 0, 100}, "centrality for QA"};
7169
ConfigurableAxis axisNch{"axisNch", {4000, 0, 4000}, "N_{ch}"};
72-
ConfigurableAxis axisT0C{"axisT0C", {70, 0, 70000}, "N_{ch} (T0C)"};
73-
ConfigurableAxis axisT0A{"axisT0A", {200, 0, 200000}, "N_{ch} (T0A)"};
74-
ConfigurableAxis axisNchPV{"axisNchPV", {4000, 0, 4000}, "N_{ch} (PV)"};
7570

7671
Filter collisionFilter = nabs(aod::collision::posZ) < cfgCutVertex;
7772
Filter trackFilter = (nabs(aod::track::eta) < cfgCutEta) && (aod::track::pt > cfgCutPtMin) && (aod::track::pt < cfgCutPtMax) && ((requireGlobalTrackInFilter()) || (aod::track::isGlobalTrackSDD == (uint8_t) true)) && (aod::track::tpcChi2NCl < cfgCutChi2prTPCcls);
@@ -84,7 +79,7 @@ struct FlowGFWPbPb {
8479
// Connect to ccdb
8580
Service<ccdb::BasicCCDBManager> ccdb;
8681
Configurable<int64_t> nolaterthan{"ccdb-no-later-than", std::chrono::duration_cast<std::chrono::milliseconds>(std::chrono::system_clock::now().time_since_epoch()).count(), "latest acceptable timestamp of creation for the object"};
87-
Configurable<std::string> url{"ccdb-url", "http://ccdb-test.cern.ch:8080", "url of the ccdb repository"};
82+
Configurable<std::string> url{"ccdb-url", "http://alice-ccdb.cern.ch", "url of the ccdb repository"};
8883

8984
// Define output
9085
OutputObj<FlowContainer> fFC{FlowContainer("FlowContainer")};
@@ -132,17 +127,17 @@ struct FlowGFWPbPb {
132127
ccdb->setCreatedNotAfter(nolaterthan.value);
133128

134129
// Add some output objects to the histogram registry
135-
registry.add("hEventCount", "Number of Event;; Count", {HistType::kTH1D, {{5, 0, 5}}});
130+
registry.add("hEventCount", "Number of Events;; Count", {HistType::kTH1D, {{4, 0, 4}}});
136131
registry.get<TH1>(HIST("hEventCount"))->GetXaxis()->SetBinLabel(1, "Filtered event");
137132
registry.get<TH1>(HIST("hEventCount"))->GetXaxis()->SetBinLabel(2, "after sel8");
138-
registry.get<TH1>(HIST("hEventCount"))->GetXaxis()->SetBinLabel(3, "after strict Pile-up cut");
139-
registry.get<TH1>(HIST("hEventCount"))->GetXaxis()->SetBinLabel(4, "after additional event cut");
140-
registry.get<TH1>(HIST("hEventCount"))->GetXaxis()->SetBinLabel(5, "after correction loads");
133+
registry.get<TH1>(HIST("hEventCount"))->GetXaxis()->SetBinLabel(3, "after additional event cut");
134+
registry.get<TH1>(HIST("hEventCount"))->GetXaxis()->SetBinLabel(4, "after correction loads");
141135
registry.add("hPhi", "", {HistType::kTH1D, {axisPhi}});
142136
registry.add("hEta", "", {HistType::kTH1D, {axisEta}});
143137
registry.add("hVtxZ", "Vexter Z distribution", {HistType::kTH1D, {axisVertex}});
144138
registry.add("hMult", "Multiplicity distribution", {HistType::kTH1D, {{3000, 0.5, 3000.5}}});
145139
registry.add("hCent", "Centrality distribution", {HistType::kTH1D, {{90, 0, 90}}});
140+
registry.add("cent_vs_Nch", ";Centrality (%); M (|#eta| < 0.8);", {HistType::kTH2F, {axisCentrality, axisNch}});
146141

147142
// Track QA
148143
registry.add("hPt", "p_{T} distribution before cut", {HistType::kTH1D, {axisPtHist}});
@@ -154,11 +149,11 @@ struct FlowGFWPbPb {
154149
registry.add("hnTPCCrossedRow", "Number of crossed TPC Rows", {HistType::kTH1D, {{100, 40, 180}}});
155150

156151
// additional Output histograms
157-
registry.add("c22", ";Centrality (%) ; C_{2}{2} ", {HistType::kTProfile, {axisMultiplicity}});
158-
registry.add("c24", ";Centrality (%) ; C_{2}{4}", {HistType::kTProfile, {axisMultiplicity}});
159-
registry.add("c26", ";Centrality (%) ; C_{2}{6}", {HistType::kTProfile, {axisMultiplicity}});
160-
registry.add("c28", ";Centrality (%) ; C_{2}{8}", {HistType::kTProfile, {axisMultiplicity}});
161-
registry.add("c22etagap", ";Centrality (%) ; C_{2}{2} (|#eta| < 0.8) ", {HistType::kTProfile, {axisMultiplicity}});
152+
registry.add("c22", ";Centrality (%) ; C_{2}{2} ", {HistType::kTProfile, {axisCentrality}});
153+
registry.add("c24", ";Centrality (%) ; C_{2}{4}", {HistType::kTProfile, {axisCentrality}});
154+
registry.add("c26", ";Centrality (%) ; C_{2}{6}", {HistType::kTProfile, {axisCentrality}});
155+
registry.add("c28", ";Centrality (%) ; C_{2}{8}", {HistType::kTProfile, {axisCentrality}});
156+
registry.add("c22etagap", ";Centrality (%) ; C_{2}{2} (|#eta| < 0.8) ", {HistType::kTProfile, {axisCentrality}});
162157

163158
// initial array
164159
BootstrapArray.resize(cfgNbootstrap);
@@ -167,11 +162,11 @@ struct FlowGFWPbPb {
167162
}
168163

169164
for (int i = 0; i < cfgNbootstrap; i++) {
170-
BootstrapArray[i][kc22] = registry.add<TProfile>(Form("BootstrapContainer_%d/c22", i), ";Centrality (%) ; C_{2}{2}", {HistType::kTProfile, {axisMultiplicity}});
171-
BootstrapArray[i][kc24] = registry.add<TProfile>(Form("BootstrapContainer_%d/c24", i), ";Centrality (%) ; C_{2}{4}", {HistType::kTProfile, {axisMultiplicity}});
172-
BootstrapArray[i][kc26] = registry.add<TProfile>(Form("BootstrapContainer_%d/c26", i), ";Centrality (%) ; C_{2}{6}", {HistType::kTProfile, {axisMultiplicity}});
173-
BootstrapArray[i][kc28] = registry.add<TProfile>(Form("BootstrapContainer_%d/c28", i), ";Centrality (%) ; C_{2}{8}", {HistType::kTProfile, {axisMultiplicity}});
174-
BootstrapArray[i][kc22etagap] = registry.add<TProfile>(Form("BootstrapContainer_%d/c22etagap", i), ";Centrality (%) ; C_{2}{2} (|#eta| < 0.8)", {HistType::kTProfile, {axisMultiplicity}});
165+
BootstrapArray[i][kc22] = registry.add<TProfile>(Form("BootstrapContainer_%d/c22", i), ";Centrality (%) ; C_{2}{2}", {HistType::kTProfile, {axisCentrality}});
166+
BootstrapArray[i][kc24] = registry.add<TProfile>(Form("BootstrapContainer_%d/c24", i), ";Centrality (%) ; C_{2}{4}", {HistType::kTProfile, {axisCentrality}});
167+
BootstrapArray[i][kc26] = registry.add<TProfile>(Form("BootstrapContainer_%d/c26", i), ";Centrality (%) ; C_{2}{6}", {HistType::kTProfile, {axisCentrality}});
168+
BootstrapArray[i][kc28] = registry.add<TProfile>(Form("BootstrapContainer_%d/c28", i), ";Centrality (%) ; C_{2}{8}", {HistType::kTProfile, {axisCentrality}});
169+
BootstrapArray[i][kc22etagap] = registry.add<TProfile>(Form("BootstrapContainer_%d/c22etagap", i), ";Centrality (%) ; C_{2}{2} (|#eta| < 0.8)", {HistType::kTProfile, {axisCentrality}});
175170
}
176171

177172
o2::framework::AxisSpec axis = axisPt;
@@ -188,7 +183,7 @@ struct FlowGFWPbPb {
188183
TObjArray* oba = new TObjArray();
189184
fFC->SetXAxis(fPtAxis);
190185
fFC->SetName("FlowContainer");
191-
fFC->Initialize(oba, axisMultiplicity, cfgNbootstrap);
186+
fFC->Initialize(oba, axisCentrality, cfgNbootstrap);
192187
delete oba;
193188

194189
fGFW->AddRegion("full", -0.8, 0.8, 1, 1); // eta region -0.8 to 0.8
@@ -393,13 +388,12 @@ struct FlowGFWPbPb {
393388
if (Ntot < 1)
394389
return;
395390
registry.fill(HIST("hEventCount"), 1.5);
396-
// place holder for pile-up rejection
397-
registry.fill(HIST("hEventCount"), 2.5);
391+
398392
const auto cent = collision.centFT0C();
399393

400394
if (cfgUseAdditionalEventCut && !eventSelected(collision, tracks.size(), cent))
401395
return;
402-
registry.fill(HIST("hEventCount"), 3.5);
396+
registry.fill(HIST("hEventCount"), 2.5);
403397

404398
float vtxz = collision.posZ();
405399
float l_Random = fRndm->Rndm();
@@ -410,7 +404,7 @@ struct FlowGFWPbPb {
410404

411405
auto bc = collision.bc_as<aod::BCsWithTimestamps>();
412406
loadCorrections(bc.timestamp());
413-
registry.fill(HIST("hEventCount"), 4.5);
407+
registry.fill(HIST("hEventCount"), 3.5);
414408

415409
// track weights
416410
float weff = 1, wacc = 1;
@@ -432,7 +426,6 @@ struct FlowGFWPbPb {
432426
if (!setCurrentParticleWeights(weff, wacc, track.phi(), track.eta(), track.pt(), vtxz))
433427
continue;
434428

435-
bool WithinPtPOI = (cfgCutPtPOIMin < track.pt()) && (track.pt() < cfgCutPtPOIMax); // within POI pT range
436429
bool WithinPtRef = (cfgCutPtMin < track.pt()) && (track.pt() < cfgCutPtMax); // within RF pT range
437430
registry.fill(HIST("hPt"), track.pt());
438431

@@ -447,13 +440,11 @@ struct FlowGFWPbPb {
447440

448441
if (WithinPtRef)
449442
fGFW->Fill(track.eta(), fPtAxis->FindBin(track.pt()) - 1, track.phi(), wacc * weff, 1);
450-
if (WithinPtPOI)
451-
fGFW->Fill(track.eta(), fPtAxis->FindBin(track.pt()) - 1, track.phi(), wacc * weff, 2);
452-
if (WithinPtPOI && WithinPtRef)
453-
fGFW->Fill(track.eta(), fPtAxis->FindBin(track.pt()) - 1, track.phi(), wacc * weff, 4);
454443

455444
} // End of track loop
456445

446+
registry.fill(HIST("cent_vs_Nch"), cent, Ntot);
447+
457448
// Filling c22 with ROOT TProfile
458449
FillProfile(corrconfigs.at(0), HIST("c22"), cent);
459450
FillProfile(corrconfigs.at(1), HIST("c24"), cent);

0 commit comments

Comments
 (0)