Skip to content

Please consider the following formatting changes to #15139 #2

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
alibuild wants to merge 2 commits into from
Closed

Please consider the following formatting changes to #15139 #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
eb8eec8
Apply formatting fixes
Feb 24, 2026
00c8efa
Please consider the following formatting changes
alibuild Feb 24, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion PWGEM/PhotonMeson/Core/Pi0EtaToGammaGamma.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -227,7 +227,8 @@ struct Pi0EtaToGammaGamma {
// Preslices and partitions
o2::framework::SliceCache cache;
o2::framework::PresliceOptional<
o2::soa::Filtered<o2::soa::Join<o2::aod::V0PhotonsKF, o2::aod::V0KFEMEventIds, o2::aod::V0PhotonsKFPrefilterBitDerived, o2::aod::V0PhotonOmegaMBWeights>>> perCollision_pcm = o2::aod::v0photonkf::emeventId;
o2::soa::Filtered<o2::soa::Join<o2::aod::V0PhotonsKF, o2::aod::V0KFEMEventIds, o2::aod::V0PhotonsKFPrefilterBitDerived, o2::aod::V0PhotonOmegaMBWeights>>>
perCollision_pcm = o2::aod::v0photonkf::emeventId;
o2::framework::PresliceOptional<o2::soa::Join<o2::aod::EmEmcClusters, o2::aod::EMCEMEventIds>> perCollision_emc = o2::aod::emccluster::emeventId;
o2::framework::PresliceOptional<o2::soa::Join<o2::aod::PHOSClusters, o2::aod::PHOSEMEventIds>> perCollision_phos = o2::aod::phoscluster::emeventId;
o2::framework::PresliceOptional<o2::soa::Filtered<o2::soa::Join<o2::aod::EMPrimaryElectronsFromDalitz, o2::aod::EMPrimaryElectronEMEventIds, o2::aod::EMPrimaryElectronsPrefilterBitDerived>>> perCollision_electron = o2::aod::emprimaryelectron::emeventId;
Expand Down
8 changes: 3 additions & 5 deletions PWGEM/PhotonMeson/DataModel/gammaTables.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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", //!
Expand Down Expand Up @@ -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_
4 changes: 2 additions & 2 deletions PWGEM/PhotonMeson/TableProducer/materialBudgetWeights.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,13 +15,13 @@
///
/// \author Youssef El Mard (youssef.el.mard.bouziani@cern.ch)


#include "PWGEM/PhotonMeson/Utils/MaterialBudgetWeights.h"

#include "Framework/runDataProcessing.h"

using namespace o2::framework;

WorkflowSpec defineDataProcessing(ConfigContext const& cfgc)
{
return WorkflowSpec{adaptAnalysisTask<MaterialBudgetWeights>(cfgc)};
}
}
2 changes: 1 addition & 1 deletion PWGEM/PhotonMeson/Tasks/Pi0EtaToGammaGammaPCMPCM.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 <Framework/AnalysisDataModel.h>
#include <Framework/AnalysisTask.h>
Expand Down
8 changes: 3 additions & 5 deletions PWGEM/PhotonMeson/Utils/MaterialBudgetWeights.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,22 +20,21 @@
#define PWGEM_PHOTONMESON_UTILS_MATERIALBUDGETWEIGHTS_H_

#include "PWGEM/PhotonMeson/DataModel/gammaTables.h"
#include <CCDB/BasicCCDBManager.h>

#include "Framework/ASoAHelpers.h"
#include "Framework/AnalysisDataModel.h"
#include "Framework/AnalysisTask.h"
#include "Framework/Logger.h"
#include <CCDB/BasicCCDBManager.h>
#include <Framework/Configurable.h>
#include <Framework/InitContext.h>


using namespace o2;
using namespace o2::soa;
using namespace o2::framework;

using MyV0PhotonsMB = o2::soa::Join<o2::aod::V0PhotonsKF, o2::aod::V0KFEMEventIds>;
using MyV0PhotonMB = MyV0PhotonsMB::iterator;
using MyV0PhotonMB = MyV0PhotonsMB::iterator;

struct MaterialBudgetWeights {
Produces<aod::V0PhotonOmegaMBWeights> omegaMBWeight;
Expand Down Expand Up @@ -91,5 +90,4 @@ struct MaterialBudgetWeights {
}
};


#endif // PWGEM_PHOTONMESON_UTILS_MATERIALBUDGETWEIGHTS_H_
#endif // PWGEM_PHOTONMESON_UTILS_MATERIALBUDGETWEIGHTS_H_
Loading