diff --git a/PWGEM/PhotonMeson/TableProducer/bcWiseClusterSkimmer.cxx b/PWGEM/PhotonMeson/TableProducer/bcWiseClusterSkimmer.cxx index 8a09995167d..bc24734ee2d 100644 --- a/PWGEM/PhotonMeson/TableProducer/bcWiseClusterSkimmer.cxx +++ b/PWGEM/PhotonMeson/TableProducer/bcWiseClusterSkimmer.cxx @@ -43,7 +43,7 @@ using namespace o2::framework::expressions; using MyCollisions = soa::Join; using MyMCCollisions = soa::Join; -using MyBCs = soa::Join; +using MyBCs = soa::Join; using SelectedUniqueClusters = soa::Filtered; // Clusters from collisions with only one collision in the BC using SelectedUniqueMCClusters = soa::Filtered>; // Clusters from collisions with only one collision in the BC @@ -100,6 +100,7 @@ struct bcWiseClusterSkimmer { mHistManager.get(HIST("nBCs"))->GetXaxis()->SetBinLabel(iBin + 1, binLabels[iBin]); mHistManager.add("CentralityVsGenMultiplicity", "Centrality vs number of generated MC particles;Centrality;#bf{#it{N}_{gen}}", HistType::kTH2F, {{102, 0., 102}, cfgMultiplicityBinning}); + mHistManager.add("BCCentVsCollCent", "Centrality of the BC vs Centrality of the collision;BC Centrality;Collision Centrality", HistType::kTH2F, {{102, 0., 102}, {102, 0., 102}}); LOG(info) << "BC wise cluster skimmer cuts:"; LOG(info) << "------------------------------------"; @@ -232,11 +233,14 @@ struct bcWiseClusterSkimmer { double mu = cfgStoreMu ? calculateMu(bc) : 0.; float ft0Amp = hasFT0 ? bc.foundFT0().sumAmpA() + bc.foundFT0().sumAmpC() : 0.; - double centrality = 101.5; + double centralityOfCollision = 101.5; if (collisionsInBC.size() > 0) - centrality = collisionsInBC.iteratorAt(0).centFT0M(); + centralityOfCollision = collisionsInBC.iteratorAt(0).centFT0M(); + double centralityOfBC = bc.centFT0M(); - bcTable(hasFT0, hasTVX, haskTVXinEMC, hasEMCCell, hasNoTFROFBorder, convertForStorage(centrality, kFT0MCent), convertForStorage(ft0Amp, kFT0Amp), convertForStorage(mu, kMu)); + mHistManager.fill(HIST("BCCentVsCollCent"), centralityOfBC, centralityOfCollision); + + bcTable(hasFT0, hasTVX, haskTVXinEMC, hasEMCCell, hasNoTFROFBorder, convertForStorage(centralityOfBC, kFT0MCent), convertForStorage(ft0Amp, kFT0Amp), convertForStorage(mu, kMu)); for (const auto& collision : collisionsInBC) collisionTable(bcTable.lastIndex(), convertForStorage(collision.centFT0M(), kFT0MCent), convertForStorage(collision.posZ(), kZVtx)); @@ -313,10 +317,7 @@ struct bcWiseClusterSkimmer { auto mcCollisionsBC = mcCollisions.sliceBy(mcCollperBC, bc.globalIndex()); for (const auto& mcCollision : mcCollisionsBC) { auto mcParticlesInColl = mcParticles.sliceBy(perMcCollision, mcCollision.globalIndex()); - double centrality = 101.5; - if (collisionsInBC.size() > 0) - centrality = collisionsInBC.iteratorAt(0).centFT0M(); - mHistManager.fill(HIST("CentralityVsGenMultiplicity"), centrality, mcParticlesInColl.size()); + mHistManager.fill(HIST("CentralityVsGenMultiplicity"), bc.centFT0M(), mcParticlesInColl.size()); for (const auto& mcParticle : mcParticlesInColl) { if (mcParticle.pdgCode() != 111 || std::abs(mcParticle.y()) > cfgRapidityCut || !isGammaGammaDecay(mcParticle, mcParticles) || mcParticle.pt() < cfgMinPtGenPi0) continue; diff --git a/PWGEM/PhotonMeson/Tasks/CMakeLists.txt b/PWGEM/PhotonMeson/Tasks/CMakeLists.txt index 6483af43f4c..f06ad37b67a 100644 --- a/PWGEM/PhotonMeson/Tasks/CMakeLists.txt +++ b/PWGEM/PhotonMeson/Tasks/CMakeLists.txt @@ -24,8 +24,8 @@ o2physics_add_dpl_workflow(emc-pi0-qc PUBLIC_LINK_LIBRARIES O2::Framework O2::EMCALBase O2::EMCALCalib O2Physics::AnalysisCore COMPONENT_NAME Analysis) -o2physics_add_dpl_workflow(emc-bc-wise-pi0 - SOURCES emcalBcWisePi0.cxx +o2physics_add_dpl_workflow(emc-bc-wise-gammagamma + SOURCES emcalBcWiseGammaGamma.cxx PUBLIC_LINK_LIBRARIES O2::Framework O2::EMCALBase O2::EMCALCalib O2Physics::AnalysisCore COMPONENT_NAME Analysis) diff --git a/PWGEM/PhotonMeson/Tasks/emcalBcWisePi0.cxx b/PWGEM/PhotonMeson/Tasks/emcalBcWiseGammaGamma.cxx similarity index 98% rename from PWGEM/PhotonMeson/Tasks/emcalBcWisePi0.cxx rename to PWGEM/PhotonMeson/Tasks/emcalBcWiseGammaGamma.cxx index ec420371e54..03c5cfb1b5c 100644 --- a/PWGEM/PhotonMeson/Tasks/emcalBcWisePi0.cxx +++ b/PWGEM/PhotonMeson/Tasks/emcalBcWiseGammaGamma.cxx @@ -17,20 +17,20 @@ /// \author Nicolas Strangmann (nicolas.strangmann@cern.ch) Goethe University Frankfurt /// -#include "Framework/runDataProcessing.h" +#include "PWGEM/PhotonMeson/DataModel/bcWiseTables.h" + +#include "CommonConstants/MathConstants.h" +#include "EMCALBase/Geometry.h" #include "Framework/AnalysisTask.h" #include "Framework/HistogramRegistry.h" +#include "Framework/runDataProcessing.h" -#include "TString.h" -#include "Math/Vector4D.h" -#include "Math/Vector3D.h" +#include "Math/AxisAngle.h" #include "Math/LorentzRotation.h" #include "Math/Rotation3D.h" -#include "Math/AxisAngle.h" - -#include "CommonConstants/MathConstants.h" -#include "EMCALBase/Geometry.h" -#include "PWGEM/PhotonMeson/DataModel/bcWiseTables.h" +#include "Math/Vector3D.h" +#include "Math/Vector4D.h" +#include "TString.h" using namespace o2; using namespace o2::framework; @@ -39,7 +39,7 @@ using namespace o2::framework::expressions; using SelectedClusters = soa::Filtered; using SelectedMCClusters = soa::Filtered>; -struct EmcalBcWisePi0 { +struct EmcalBcWiseGammaGamma { HistogramRegistry mHistManager{"EmcalGammaGammaBcWiseHistograms"}; Configurable cfgRequirekTVXinEMC{"cfgRequirekTVXinEMC", true, "Reconstruct pi0s only in kTVXinEMC triggered BCs"}; @@ -313,7 +313,7 @@ struct EmcalBcWisePi0 { reconstructTrueMesons(clusters, mcPi0s, bc); } - PROCESS_SWITCH(EmcalBcWisePi0, processMCInfo, "Run true and gen", false); + PROCESS_SWITCH(EmcalBcWiseGammaGamma, processMCInfo, "Run true and gen", false); }; -WorkflowSpec defineDataProcessing(o2::framework::ConfigContext const& cfgc) { return WorkflowSpec{adaptAnalysisTask(cfgc)}; } +WorkflowSpec defineDataProcessing(o2::framework::ConfigContext const& cfgc) { return WorkflowSpec{adaptAnalysisTask(cfgc)}; } diff --git a/PWGJE/Tasks/emcEventSelectionQA.cxx b/PWGJE/Tasks/emcEventSelectionQA.cxx index 49fa5d97b7b..8ba3f5168c8 100644 --- a/PWGJE/Tasks/emcEventSelectionQA.cxx +++ b/PWGJE/Tasks/emcEventSelectionQA.cxx @@ -145,7 +145,7 @@ struct EmcEventSelectionQA { if (bc.runNumber() > mRun3MinNumber) { // in case of run3 not all BCs contain EMCAL data, require trigger selection also for min. bias // in addition select also L0/L1 triggers as triggers with EMCAL in reaodut - 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)) { + 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)) { isEMCALreadout = true; } } else {