@@ -178,7 +178,7 @@ struct HfTaskElectronWeakBoson {
178178 // pp
179179 // using TrackEle = o2::soa::Filtered<o2::soa::Join<o2::aod::Tracks, o2::aod::FullTracks, o2::aod::TracksDCA, o2::aod::TrackSelection, o2::aod::pidTPCEl, o2::aod::pidTOFEl>>;
180180
181- Filter eventFilter = ( applySel8 ? ( o2::aod::evsel::sel8 == true ) : (o2::aod::evsel::sel8 == o2::aod::evsel::sel8)); // FIXME: both sides of overloaded operator are equivalent
181+ Filter eventFilter = ifnode(as< bool >( applySel8), o2::aod::evsel::sel8 == true , true );
182182 Filter posZFilter = (nabs(o2::aod::collision::posZ) < vtxZ);
183183
184184 Filter etafilter = (aod::track::eta < etaTrMax) && (aod::track::eta > etaTrMin);
@@ -307,9 +307,10 @@ struct HfTaskElectronWeakBoson {
307307 registry.add (" hEventCounterInit" , " hEventCounterInit" , kTH1D , {axisCounter});
308308 registry.add (" hEventCounter" , " hEventCounter" , kTH1D , {axisCounter});
309309 registry.add (" hCentrality" , " Centrality distribution" , kTH1D , {axisCentrality});
310- registry.add (" hCentMultCorr" , " Centrality distribution" , kTH2D , {{axisCentrality}, {axisMultFT0}});
311- registry.add (" hMultPV" , " multiplicity distribution for PV" , kTH1D , {axisMultPV});
312- registry.add (" hMultFT0" , " multiplicity distribution for FT0" , kTH1D , {axisMultFT0});
310+ registry.add (" hCentMultFT0Corr" , " Centrality distribution vs. FT0 Mult" , kTH2D , {{axisCentrality}, {axisMultFT0}});
311+ registry.add (" hCentMultPVCorr" , " Centrality distribution vs. PV Mult" , kTH2D , {{axisCentrality}, {axisMultPV}});
312+ registry.add (" hMultPV" , " multiplicity distribution for PV" , kTH2D , {{axisZvtx}, {axisMultPV}});
313+ registry.add (" hMultFT0" , " multiplicity distribution for FT0" , kTH2D , {{axisZvtx}, {axisMultFT0}});
313314 registry.add (" hMultFT0PV" , " multiplicity distribution" , kTH2D , {{axisMultFT0}, {axisMultPV}});
314315 registry.add (" hITSchi2" , " ITS #chi^{2}" , kTH1F , {axisChi2});
315316 registry.add (" hTPCchi2" , " TPC #chi^{2}" , kTH1F , {axisChi2});
@@ -320,6 +321,7 @@ struct HfTaskElectronWeakBoson {
320321 registry.add (" hPt" , " track pt" , kTH1F , {axisPt});
321322 registry.add (" hTPCNsigma" , " TPC electron Nsigma" , kTH2F , {{axisPt}, {axisNsigma}});
322323 registry.add (" hEnergy" , " EMC cluster energy" , kTH1F , {axisE});
324+ registry.add (" hEnergyMult" , " EMC cluster energy vs Multiplicity" , kTH2F , {{axisCentrality}, {axisE}});
323325 registry.add (" hEnergyNcell" , " EMC cluster energy and cell" , kTH2F , {{axisE}, {axisNcell}});
324326 registry.add (" hTrMatchR" , " Track EMC Match in radius" , kTH2F , {{axisPt}, {axisdR}});
325327 registry.add (" hTrMatch_mim" , " Track EMC Match minimu minimumm" , kTH2F , {{axisdPhi}, {axisdEta}});
@@ -506,10 +508,10 @@ struct HfTaskElectronWeakBoson {
506508 registry.fill (HIST (" hInvMassZee" ), centrality, track.sign () * charge, kfpIsoEle.GetPt (), invMassEE);
507509
508510 // reco by KFparticle
509- const KFParticle* electronPairs[ 2 ] = {&kfpIsoEle, &kfpAssEle};
511+ std::array< const KFParticle*, 2 > electronPairs = {&kfpIsoEle, &kfpAssEle};
510512 KFParticle zeeKF;
511513 zeeKF.SetConstructMethod (kfConstructMethod);
512- zeeKF.Construct (electronPairs, 2 );
514+ zeeKF.Construct (electronPairs. data () , 2 );
513515 // LOG(info) << "Invarimass cal by KF particle Chi2/NDF = " << zeeKF.GetChi2()/zeeKF.GetNDF();
514516 float const chiSqNdf = zeeKF.GetChi2 () / zeeKF.GetNDF ();
515517 if (zeeKF.GetNDF () < 1 ) {
@@ -610,18 +612,21 @@ struct HfTaskElectronWeakBoson {
610612 if (centrality < centralityMin || centrality > centralityMax) {
611613 return ;
612614 }
613- registry.fill (HIST (" hCentMultCorr" ), centrality, collision.multFT0M ());
615+ registry.fill (HIST (" hCentMultFT0Corr" ), centrality, collision.multFT0M ());
616+ registry.fill (HIST (" hCentMultPVCorr" ), centrality, collision.multNTracksPV ());
614617 }
615618
616619 if (enableMultiplicityFT0MAnalysis || enableMultiplicityPVAnalysis) {
617- if (enableMultiplicityFT0MAnalysis)
620+ if (enableMultiplicityFT0MAnalysis) {
618621 centrality = collision.multFT0M ();
619- if (enableMultiplicityPVAnalysis)
622+ }
623+ if (enableMultiplicityPVAnalysis) {
620624 centrality = collision.multNTracksPV ();
625+ }
621626 // LOG(info) << "raw mult PV = " << collision.multNTracksPV();
622627 // LOG(info) << "raw mult FT0M = " << collision.multFT0M();
623- registry.fill (HIST (" hMultPV" ), collision.multNTracksPV ());
624- registry.fill (HIST (" hMultFT0" ), collision.multFT0M ());
628+ registry.fill (HIST (" hMultPV" ), collision.posZ (), collision. multNTracksPV ());
629+ registry.fill (HIST (" hMultFT0" ), collision.posZ (), collision. multFT0M ());
625630 registry.fill (HIST (" hMultFT0PV" ), collision.multFT0M (), collision.multNTracksPV ());
626631 }
627632
@@ -752,6 +757,7 @@ struct HfTaskElectronWeakBoson {
752757 registry.fill (HIST (" hTHnTrMatch" ), match.track_as <TrackEle>().pt (), dPhi, dEta);
753758 registry.fill (HIST (" hEMCtime" ), timeEmc);
754759 registry.fill (HIST (" hEnergy" ), energyEmc);
760+ registry.fill (HIST (" hEnergyMult" ), centrality, energyEmc);
755761
756762 if (std::abs (dPhi) > rMatchMax || std::abs (dEta) > rMatchMax) {
757763 continue ;
0 commit comments