diff --git a/PWGEM/PhotonMeson/Core/Pi0EtaToGammaGamma.h b/PWGEM/PhotonMeson/Core/Pi0EtaToGammaGamma.h index 998c6400af2..bb2bbd88633 100644 --- a/PWGEM/PhotonMeson/Core/Pi0EtaToGammaGamma.h +++ b/PWGEM/PhotonMeson/Core/Pi0EtaToGammaGamma.h @@ -227,7 +227,8 @@ struct Pi0EtaToGammaGamma { // Preslices and partitions o2::framework::SliceCache cache; o2::framework::PresliceOptional< - o2::soa::Filtered>> perCollision_pcm = o2::aod::v0photonkf::emeventId; + o2::soa::Filtered>> + perCollision_pcm = o2::aod::v0photonkf::emeventId; o2::framework::PresliceOptional> perCollision_emc = o2::aod::emccluster::emeventId; o2::framework::PresliceOptional> perCollision_phos = o2::aod::phoscluster::emeventId; o2::framework::PresliceOptional>> perCollision_electron = o2::aod::emprimaryelectron::emeventId; diff --git a/PWGEM/PhotonMeson/DataModel/gammaTables.h b/PWGEM/PhotonMeson/DataModel/gammaTables.h index 51f3cd46c29..02b7a1b5fc7 100644 --- a/PWGEM/PhotonMeson/DataModel/gammaTables.h +++ b/PWGEM/PhotonMeson/DataModel/gammaTables.h @@ -433,9 +433,9 @@ using EMPrimaryElectronDaEMEventId = EMPrimaryElectronDaEMEventIds::iterator; namespace v0photonsphivpsi { -DECLARE_SOA_INDEX_COLUMN(EMEvent, emevent); //! +DECLARE_SOA_INDEX_COLUMN(EMEvent, emevent); //! DECLARE_SOA_INDEX_COLUMN(EMPhotonEvent, emphotonevent); //! -DECLARE_SOA_COLUMN(PhiV, phiv, float); //! +DECLARE_SOA_COLUMN(PhiV, phiv, float); //! DECLARE_SOA_COLUMN(PsiPair, psipair, float); } // namespace v0photonsphivpsi DECLARE_SOA_TABLE(V0PhotonsPhiVPsi, "AOD", "V0PHOTONPHIVPSI", //! @@ -727,9 +727,7 @@ DECLARE_SOA_COLUMN(OmegaMBWeight, omegaMBWeight, float); DECLARE_SOA_TABLE(V0PhotonOmegaMBWeights, "AOD", "V0PHOTONMBW", v0photonMBweights::OmegaMBWeight); // store MB weights. To be joined with V0PhotonsKF table at analysis level. -using V0PhotonOmegaMBWeight = V0PhotonOmegaMBWeights::iterator; +using V0PhotonOmegaMBWeight = V0PhotonOmegaMBWeights::iterator; } // namespace o2::aod - - #endif // PWGEM_PHOTONMESON_DATAMODEL_GAMMATABLES_H_ diff --git a/PWGEM/PhotonMeson/TableProducer/materialBudgetWeights.cxx b/PWGEM/PhotonMeson/TableProducer/materialBudgetWeights.cxx index 12a0ea2e6d8..9759d1ec5a1 100644 --- a/PWGEM/PhotonMeson/TableProducer/materialBudgetWeights.cxx +++ b/PWGEM/PhotonMeson/TableProducer/materialBudgetWeights.cxx @@ -15,8 +15,8 @@ /// /// \author Youssef El Mard (youssef.el.mard.bouziani@cern.ch) - #include "PWGEM/PhotonMeson/Utils/MaterialBudgetWeights.h" + #include "Framework/runDataProcessing.h" using namespace o2::framework; @@ -24,4 +24,4 @@ using namespace o2::framework; WorkflowSpec defineDataProcessing(ConfigContext const& cfgc) { return WorkflowSpec{adaptAnalysisTask(cfgc)}; -} \ No newline at end of file +} diff --git a/PWGEM/PhotonMeson/Tasks/Pi0EtaToGammaGammaPCMPCM.cxx b/PWGEM/PhotonMeson/Tasks/Pi0EtaToGammaGammaPCMPCM.cxx index 8894b6f3ec8..8a1c1c9992c 100644 --- a/PWGEM/PhotonMeson/Tasks/Pi0EtaToGammaGammaPCMPCM.cxx +++ b/PWGEM/PhotonMeson/Tasks/Pi0EtaToGammaGammaPCMPCM.cxx @@ -15,8 +15,8 @@ #include "PWGEM/PhotonMeson/Core/Pi0EtaToGammaGamma.h" #include "PWGEM/PhotonMeson/DataModel/gammaTables.h" -#include "PWGEM/PhotonMeson/Utils/PairUtilities.h" #include "PWGEM/PhotonMeson/Utils/MaterialBudgetWeights.h" +#include "PWGEM/PhotonMeson/Utils/PairUtilities.h" #include #include diff --git a/PWGEM/PhotonMeson/Utils/MaterialBudgetWeights.h b/PWGEM/PhotonMeson/Utils/MaterialBudgetWeights.h index f347bece074..7cc1c3a6587 100644 --- a/PWGEM/PhotonMeson/Utils/MaterialBudgetWeights.h +++ b/PWGEM/PhotonMeson/Utils/MaterialBudgetWeights.h @@ -20,22 +20,21 @@ #define PWGEM_PHOTONMESON_UTILS_MATERIALBUDGETWEIGHTS_H_ #include "PWGEM/PhotonMeson/DataModel/gammaTables.h" -#include #include "Framework/ASoAHelpers.h" #include "Framework/AnalysisDataModel.h" #include "Framework/AnalysisTask.h" #include "Framework/Logger.h" +#include #include #include - using namespace o2; using namespace o2::soa; using namespace o2::framework; using MyV0PhotonsMB = o2::soa::Join; -using MyV0PhotonMB = MyV0PhotonsMB::iterator; +using MyV0PhotonMB = MyV0PhotonsMB::iterator; struct MaterialBudgetWeights { Produces omegaMBWeight; @@ -91,5 +90,4 @@ struct MaterialBudgetWeights { } }; - -#endif // PWGEM_PHOTONMESON_UTILS_MATERIALBUDGETWEIGHTS_H_ \ No newline at end of file +#endif // PWGEM_PHOTONMESON_UTILS_MATERIALBUDGETWEIGHTS_H_