Skip to content

Commit 5d9e443

Browse files
ilikmetaalibuild
ilikmeta
and
alibuild
authored
[PWGCF] Fix hEventCounter histogram (AliceO2Group#10404)
Co-authored-by: ALICE Action Bot <[email protected]>
1 parent 1dbe159 commit 5d9e443

File tree

1 file changed

+26
-33
lines changed

1 file changed

+26
-33
lines changed

‎PWGCF/Flow/Tasks/flowGfwTask.cxx‎

Lines changed: 26 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -57,16 +57,8 @@ using namespace o2::aod::evsel;
5757

5858
#define O2_DEFINE_CONFIGURABLE(NAME, TYPE, DEFAULT, HELP) Configurable<TYPE> NAME{#NAME, DEFAULT, HELP};
5959

60-
namespace o2::aod
61-
{
62-
using SimCollisions = soa::Join<aod::Collisions, aod::EvSels, aod::Mults,
63-
aod::McCollisionLabels, o2::aod::CentFT0Cs,
64-
aod::CentFT0As, aod::CentFT0Ms, aod::CentFV0As, aod::CentFT0CVariant1s>;
65-
66-
using SimTracks = soa::Join<aod::Tracks, aod::TrackSelection, aod::TracksExtra,
67-
aod::TracksDCA, aod::McTrackLabels>;
68-
} // namespace o2::aod
69-
60+
using SimCollisions = soa::Join<aod::Collisions, aod::EvSels, aod::Mults, aod::McCollisionLabels, o2::aod::CentFT0Cs, aod::CentFT0As, aod::CentFT0Ms, aod::CentFV0As, aod::CentFT0CVariant1s>;
61+
using SimTracks = soa::Join<aod::Tracks, aod::TrackSelection, aod::TracksExtra, aod::TracksDCA, aod::McTrackLabels>;
7062
using Colls = soa::Filtered<soa::Join<aod::Collisions, aod::EvSels, aod::Mults, aod::CentFT0Cs, aod::CentFT0As, aod::CentFT0Ms, aod::CentFV0As, aod::CentFT0CVariant1s>>;
7163
using AodTracks = soa::Filtered<soa::Join<aod::Tracks, aod::TrackSelection, aod::TracksDCA, aod::TracksExtra>>;
7264
using BCsRun3 = soa::Join<aod::BCs, aod::Timestamps, aod::BcSels, aod::Run3MatchedToBCSparse>;
@@ -255,20 +247,21 @@ struct FlowGfwTask {
255247
ccdb->setCreatedNotAfter(ccdbNoLaterThan.value);
256248

257249
// Add some output objects to the histogram registry
250+
registry.add("hEventCount", "Number of Events;; No. of Events", {HistType::kTH1D, {{kNOOFEVENTSTEPS, -0.5, static_cast<int>(kNOOFEVENTSTEPS) - 0.5}}});
251+
registry.get<TH1>(HIST("hEventCount"))->GetXaxis()->SetBinLabel(kFILTERED + 1, "Filtered events");
252+
registry.get<TH1>(HIST("hEventCount"))->GetXaxis()->SetBinLabel(kSEL8 + 1, "Sel8");
253+
registry.get<TH1>(HIST("hEventCount"))->GetXaxis()->SetBinLabel(kOCCUPANCY + 1, "Occupancy");
254+
registry.get<TH1>(HIST("hEventCount"))->GetXaxis()->SetBinLabel(kNOTIMEFRAMEBORDER + 1, "kNoTimeFrameBorder");
255+
registry.get<TH1>(HIST("hEventCount"))->GetXaxis()->SetBinLabel(kNOITSROFRAMEBORDER + 1, "kNoITSROFrameBorder");
256+
registry.get<TH1>(HIST("hEventCount"))->GetXaxis()->SetBinLabel(kNOPSAMEBUNCHPILEUP + 1, "kNoSameBunchPileup");
257+
registry.get<TH1>(HIST("hEventCount"))->GetXaxis()->SetBinLabel(kISGOODZVTXFT0VSPV + 1, "kIsGoodZvtxFT0vsPV");
258+
registry.get<TH1>(HIST("hEventCount"))->GetXaxis()->SetBinLabel(kISVERTEXITSTPC + 1, "kIsVertexITSTPC");
259+
registry.get<TH1>(HIST("hEventCount"))->GetXaxis()->SetBinLabel(kNOCOLLINTIMERANGESTANDART + 1, "kNoCollInTimeRangeStandard");
260+
registry.get<TH1>(HIST("hEventCount"))->GetXaxis()->SetBinLabel(kISGOODITSLAYERSALL + 1, "kIsGoodITSLayersAll");
261+
registry.get<TH1>(HIST("hEventCount"))->GetXaxis()->SetBinLabel(kAFTERMULTCUTS + 1, "After Mult cuts");
262+
registry.get<TH1>(HIST("hEventCount"))->GetXaxis()->SetBinLabel(kCENTRALITY + 1, "Centrality");
263+
258264
if (doprocessData) {
259-
registry.add("hEventCount", "Number of Events;; No. of Events", {HistType::kTH1D, {{kNOOFEVENTSTEPS, -0.5, static_cast<int>(kNOOFEVENTSTEPS) - 0.5}}});
260-
registry.get<TH1>(HIST("hEventCount"))->GetXaxis()->SetBinLabel(kFILTERED + 1, "Filtered events");
261-
registry.get<TH1>(HIST("hEventCount"))->GetXaxis()->SetBinLabel(kSEL8 + 1, "Sel8");
262-
registry.get<TH1>(HIST("hEventCount"))->GetXaxis()->SetBinLabel(kOCCUPANCY + 1, "Occupancy");
263-
registry.get<TH1>(HIST("hEventCount"))->GetXaxis()->SetBinLabel(kNOTIMEFRAMEBORDER + 1, "kNoTimeFrameBorder");
264-
registry.get<TH1>(HIST("hEventCount"))->GetXaxis()->SetBinLabel(kNOITSROFRAMEBORDER + 1, "kNoITSROFrameBorder");
265-
registry.get<TH1>(HIST("hEventCount"))->GetXaxis()->SetBinLabel(kNOPSAMEBUNCHPILEUP + 1, "kNoSameBunchPileup");
266-
registry.get<TH1>(HIST("hEventCount"))->GetXaxis()->SetBinLabel(kISGOODZVTXFT0VSPV + 1, "kIsGoodZvtxFT0vsPV");
267-
registry.get<TH1>(HIST("hEventCount"))->GetXaxis()->SetBinLabel(kISVERTEXITSTPC + 1, "kIsVertexITSTPC");
268-
registry.get<TH1>(HIST("hEventCount"))->GetXaxis()->SetBinLabel(kNOCOLLINTIMERANGESTANDART + 1, "kNoCollInTimeRangeStandard");
269-
registry.get<TH1>(HIST("hEventCount"))->GetXaxis()->SetBinLabel(kISGOODITSLAYERSALL + 1, "kIsGoodITSLayersAll");
270-
registry.get<TH1>(HIST("hEventCount"))->GetXaxis()->SetBinLabel(kAFTERMULTCUTS + 1, "After Mult cuts");
271-
registry.get<TH1>(HIST("hEventCount"))->GetXaxis()->SetBinLabel(kCENTRALITY + 1, "Centrality");
272265
registry.add("hPhi", "#phi distribution", {HistType::kTH1D, {axisPhi}});
273266
registry.add("hPhiWeighted", "corrected #phi distribution", {HistType::kTH1D, {axisPhi}});
274267
registry.add("hEta", "", {HistType::kTH1D, {axisEta}});
@@ -390,7 +383,7 @@ struct FlowGfwTask {
390383
} // End doprocessData
391384

392385
const AxisSpec axisZpos{48, -12., 12., "Vtx_{z} (cm)"};
393-
const AxisSpec axisEvent{2, 0, +2, ""};
386+
const AxisSpec axisEvent{3, 0, 3, ""};
394387
// MC Histograms
395388
if (doprocesspTEff) {
396389
registry.add("hEventCounterMCRec", "Event counter", kTH1F, {axisEvent});
@@ -773,10 +766,11 @@ struct FlowGfwTask {
773766
if (!collision.sel8())
774767
return;
775768

776-
int nTotal = tracks.size();
777-
if (nTotal < 1)
769+
if (tracks.size() < 1)
778770
return;
779771

772+
registry.fill(HIST("hEventCount"), kSEL8);
773+
780774
// Choose centrality estimator -- Only one can be true
781775
auto centrality = -1;
782776
if (cfgcentEstFt0c) {
@@ -815,7 +809,6 @@ struct FlowGfwTask {
815809
registry.fill(HIST("BeforeCut_multT0C_centT0C"), collision.centFT0C(), collision.multFT0C());
816810
registry.fill(HIST("BeforeCut_multT0A_centT0A"), collision.centFT0A(), collision.multFT0A());
817811
registry.fill(HIST("BeforeCut_multFT0M_centFT0M"), collision.centFT0M(), collision.multFT0M());
818-
registry.fill(HIST("hEventCount"), kSEL8);
819812

820813
if (cfgOccupancy) {
821814
int occupancy = collision.trackOccupancyInTimeRange();
@@ -893,9 +886,9 @@ struct FlowGfwTask {
893886
float vtxz = collision.posZ();
894887
float lRandom = fRndm->Rndm();
895888
registry.fill(HIST("hVtxZ"), vtxz);
896-
registry.fill(HIST("hMult"), nTotal);
889+
registry.fill(HIST("hMult"), tracks.size());
897890
registry.fill(HIST("hCent"), centrality);
898-
registry.fill(HIST("cent_vs_Nch"), centrality, nTotal);
891+
registry.fill(HIST("cent_vs_Nch"), centrality, tracks.size());
899892

900893
fGFW->Clear();
901894

@@ -1065,12 +1058,12 @@ struct FlowGfwTask {
10651058
} // End of process
10661059
PROCESS_SWITCH(FlowGfwTask, processData, "Process analysis for Run 3 data", false);
10671060

1068-
using TheFilteredSimTracks = soa::Filtered<o2::aod::SimTracks>;
1061+
using TheFilteredSimTracks = soa::Filtered<SimTracks>;
10691062

10701063
Preslice<aod::McParticles> perMCCollision = aod::mcparticle::mcCollisionId;
10711064
Preslice<TheFilteredSimTracks> perCollision = aod::track::collisionId;
10721065
void processpTEff(aod::McCollisions::iterator const& mccollision,
1073-
soa::SmallGroups<o2::aod::SimCollisions> const& collisions,
1066+
soa::SmallGroups<SimCollisions> const& collisions,
10741067
aod::McParticles const& mcParticles,
10751068
TheFilteredSimTracks const& simTracks)
10761069
{
@@ -1137,7 +1130,7 @@ struct FlowGfwTask {
11371130
if (std::fabs(mccollision.posZ()) > cfgCutVertex)
11381131
continue;
11391132
registry.fill(HIST("zPosMC"), mccollision.posZ());
1140-
registry.fill(HIST("hEventCounterMCGen"), 1);
1133+
registry.fill(HIST("hEventCounterMCGen"), 1.5);
11411134

11421135
for (const auto& particle : mcParticles) {
11431136
if (particle.eta() < -cfgCutEta || particle.eta() > cfgCutEta) {
@@ -1149,7 +1142,7 @@ struct FlowGfwTask {
11491142
if (!particle.isPhysicalPrimary()) {
11501143
continue;
11511144
}
1152-
registry.fill(HIST("hEventCounterMCGen"), 1.5);
1145+
registry.fill(HIST("hEventCounterMCGen"), 2.5);
11531146
registry.fill(HIST("hPtMCGen"), particle.pt());
11541147
registry.fill(HIST("hCenMCGen"), centrality);
11551148
registry.fill(HIST("PtMC_ch"), centrality, particle.pt());

0 commit comments

Comments
 (0)