Skip to content

Commit 85fe093

Browse files
nstrangmNicolas Strangmannalibuild
authored
[PWGEM/PhotonMeson,PWGJE/EMCal] Include BCWise centrality and qa histograms (#11694)
Co-authored-by: Nicolas Strangmann <nicolas.strangmann@.cern.ch> Co-authored-by: ALICE Action Bot <alibuild@cern.ch>
1 parent b0d55a0 commit 85fe093

File tree

4 files changed

+24
-23
lines changed

4 files changed

+24
-23
lines changed

PWGEM/PhotonMeson/TableProducer/bcWiseClusterSkimmer.cxx

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ using namespace o2::framework::expressions;
4343

4444
using MyCollisions = soa::Join<aod::Collisions, aod::EvSels, aod::CentFT0Ms>;
4545
using MyMCCollisions = soa::Join<aod::Collisions, aod::EvSels, aod::CentFT0Ms, aod::McCollisionLabels>;
46-
using MyBCs = soa::Join<aod::BCs, aod::BcSels, aod::Timestamps>;
46+
using MyBCs = soa::Join<aod::BCs, aod::BcSels, aod::Timestamps, aod::BCCentFT0Ms>;
4747

4848
using SelectedUniqueClusters = soa::Filtered<aod::EMCALClusters>; // Clusters from collisions with only one collision in the BC
4949
using SelectedUniqueMCClusters = soa::Filtered<soa::Join<aod::EMCALClusters, aod::EMCALMCClusters>>; // Clusters from collisions with only one collision in the BC
@@ -100,6 +100,7 @@ struct bcWiseClusterSkimmer {
100100
mHistManager.get<TH1>(HIST("nBCs"))->GetXaxis()->SetBinLabel(iBin + 1, binLabels[iBin]);
101101

102102
mHistManager.add("CentralityVsGenMultiplicity", "Centrality vs number of generated MC particles;Centrality;#bf{#it{N}_{gen}}", HistType::kTH2F, {{102, 0., 102}, cfgMultiplicityBinning});
103+
mHistManager.add("BCCentVsCollCent", "Centrality of the BC vs Centrality of the collision;BC Centrality;Collision Centrality", HistType::kTH2F, {{102, 0., 102}, {102, 0., 102}});
103104

104105
LOG(info) << "BC wise cluster skimmer cuts:";
105106
LOG(info) << "------------------------------------";
@@ -232,11 +233,14 @@ struct bcWiseClusterSkimmer {
232233

233234
double mu = cfgStoreMu ? calculateMu(bc) : 0.;
234235
float ft0Amp = hasFT0 ? bc.foundFT0().sumAmpA() + bc.foundFT0().sumAmpC() : 0.;
235-
double centrality = 101.5;
236+
double centralityOfCollision = 101.5;
236237
if (collisionsInBC.size() > 0)
237-
centrality = collisionsInBC.iteratorAt(0).centFT0M();
238+
centralityOfCollision = collisionsInBC.iteratorAt(0).centFT0M();
239+
double centralityOfBC = bc.centFT0M();
238240

239-
bcTable(hasFT0, hasTVX, haskTVXinEMC, hasEMCCell, hasNoTFROFBorder, convertForStorage<uint8_t>(centrality, kFT0MCent), convertForStorage<uint16_t>(ft0Amp, kFT0Amp), convertForStorage<uint16_t>(mu, kMu));
241+
mHistManager.fill(HIST("BCCentVsCollCent"), centralityOfBC, centralityOfCollision);
242+
243+
bcTable(hasFT0, hasTVX, haskTVXinEMC, hasEMCCell, hasNoTFROFBorder, convertForStorage<uint8_t>(centralityOfBC, kFT0MCent), convertForStorage<uint16_t>(ft0Amp, kFT0Amp), convertForStorage<uint16_t>(mu, kMu));
240244

241245
for (const auto& collision : collisionsInBC)
242246
collisionTable(bcTable.lastIndex(), convertForStorage<uint8_t>(collision.centFT0M(), kFT0MCent), convertForStorage<int16_t>(collision.posZ(), kZVtx));
@@ -313,10 +317,7 @@ struct bcWiseClusterSkimmer {
313317
auto mcCollisionsBC = mcCollisions.sliceBy(mcCollperBC, bc.globalIndex());
314318
for (const auto& mcCollision : mcCollisionsBC) {
315319
auto mcParticlesInColl = mcParticles.sliceBy(perMcCollision, mcCollision.globalIndex());
316-
double centrality = 101.5;
317-
if (collisionsInBC.size() > 0)
318-
centrality = collisionsInBC.iteratorAt(0).centFT0M();
319-
mHistManager.fill(HIST("CentralityVsGenMultiplicity"), centrality, mcParticlesInColl.size());
320+
mHistManager.fill(HIST("CentralityVsGenMultiplicity"), bc.centFT0M(), mcParticlesInColl.size());
320321
for (const auto& mcParticle : mcParticlesInColl) {
321322
if (mcParticle.pdgCode() != 111 || std::abs(mcParticle.y()) > cfgRapidityCut || !isGammaGammaDecay(mcParticle, mcParticles) || mcParticle.pt() < cfgMinPtGenPi0)
322323
continue;

PWGEM/PhotonMeson/Tasks/CMakeLists.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,8 @@ o2physics_add_dpl_workflow(emc-pi0-qc
2424
PUBLIC_LINK_LIBRARIES O2::Framework O2::EMCALBase O2::EMCALCalib O2Physics::AnalysisCore
2525
COMPONENT_NAME Analysis)
2626

27-
o2physics_add_dpl_workflow(emc-bc-wise-pi0
28-
SOURCES emcalBcWisePi0.cxx
27+
o2physics_add_dpl_workflow(emc-bc-wise-gammagamma
28+
SOURCES emcalBcWiseGammaGamma.cxx
2929
PUBLIC_LINK_LIBRARIES O2::Framework O2::EMCALBase O2::EMCALCalib O2Physics::AnalysisCore
3030
COMPONENT_NAME Analysis)
3131

PWGEM/PhotonMeson/Tasks/emcalBcWisePi0.cxx renamed to PWGEM/PhotonMeson/Tasks/emcalBcWiseGammaGamma.cxx

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -17,20 +17,20 @@
1717
/// \author Nicolas Strangmann (nicolas.strangmann@cern.ch) Goethe University Frankfurt
1818
///
1919

20-
#include "Framework/runDataProcessing.h"
20+
#include "PWGEM/PhotonMeson/DataModel/bcWiseTables.h"
21+
22+
#include "CommonConstants/MathConstants.h"
23+
#include "EMCALBase/Geometry.h"
2124
#include "Framework/AnalysisTask.h"
2225
#include "Framework/HistogramRegistry.h"
26+
#include "Framework/runDataProcessing.h"
2327

24-
#include "TString.h"
25-
#include "Math/Vector4D.h"
26-
#include "Math/Vector3D.h"
28+
#include "Math/AxisAngle.h"
2729
#include "Math/LorentzRotation.h"
2830
#include "Math/Rotation3D.h"
29-
#include "Math/AxisAngle.h"
30-
31-
#include "CommonConstants/MathConstants.h"
32-
#include "EMCALBase/Geometry.h"
33-
#include "PWGEM/PhotonMeson/DataModel/bcWiseTables.h"
31+
#include "Math/Vector3D.h"
32+
#include "Math/Vector4D.h"
33+
#include "TString.h"
3434

3535
using namespace o2;
3636
using namespace o2::framework;
@@ -39,7 +39,7 @@ using namespace o2::framework::expressions;
3939
using SelectedClusters = soa::Filtered<aod::BCWiseClusters>;
4040
using SelectedMCClusters = soa::Filtered<soa::Join<aod::BCWiseClusters, aod::BCWiseMCClusters>>;
4141

42-
struct EmcalBcWisePi0 {
42+
struct EmcalBcWiseGammaGamma {
4343
HistogramRegistry mHistManager{"EmcalGammaGammaBcWiseHistograms"};
4444

4545
Configurable<bool> cfgRequirekTVXinEMC{"cfgRequirekTVXinEMC", true, "Reconstruct pi0s only in kTVXinEMC triggered BCs"};
@@ -313,7 +313,7 @@ struct EmcalBcWisePi0 {
313313

314314
reconstructTrueMesons(clusters, mcPi0s, bc);
315315
}
316-
PROCESS_SWITCH(EmcalBcWisePi0, processMCInfo, "Run true and gen", false);
316+
PROCESS_SWITCH(EmcalBcWiseGammaGamma, processMCInfo, "Run true and gen", false);
317317
};
318318

319-
WorkflowSpec defineDataProcessing(o2::framework::ConfigContext const& cfgc) { return WorkflowSpec{adaptAnalysisTask<EmcalBcWisePi0>(cfgc)}; }
319+
WorkflowSpec defineDataProcessing(o2::framework::ConfigContext const& cfgc) { return WorkflowSpec{adaptAnalysisTask<EmcalBcWiseGammaGamma>(cfgc)}; }

PWGJE/Tasks/emcEventSelectionQA.cxx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -145,7 +145,7 @@ struct EmcEventSelectionQA {
145145
if (bc.runNumber() > mRun3MinNumber) {
146146
// in case of run3 not all BCs contain EMCAL data, require trigger selection also for min. bias
147147
// in addition select also L0/L1 triggers as triggers with EMCAL in reaodut
148-
if (bc.alias_bit(kTVXinEMC) || bc.alias_bit(kEMC7) || bc.alias_bit(kEG1) || bc.alias_bit(kEG2) || bc.alias_bit(kDG1) || bc.alias_bit(kDG2) || bc.alias_bit(kEJ1) || bc.alias_bit(kEJ2) || bc.alias_bit(kDJ1) || bc.alias_bit(kDJ2)) {
148+
if (bc.alias_bit(kTVXinEMC) || bc.alias_bit(kEMC7) || bc.alias_bit(kDMC7) || bc.alias_bit(kEG1) || bc.alias_bit(kEG2) || bc.alias_bit(kDG1) || bc.alias_bit(kDG2) || bc.alias_bit(kEJ1) || bc.alias_bit(kEJ2) || bc.alias_bit(kDJ1) || bc.alias_bit(kDJ2)) {
149149
isEMCALreadout = true;
150150
}
151151
} else {

0 commit comments

Comments
 (0)