Skip to content

Commit eb8eec8

Browse files
author
Youssef El Mard Bouziani
committed
Apply formatting fixes
1 parent 48a19f9 commit eb8eec8

File tree

5 files changed

+15
-18
lines changed

5 files changed

+15
-18
lines changed

PWGEM/PhotonMeson/Core/Pi0EtaToGammaGamma.h

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -227,7 +227,8 @@ struct Pi0EtaToGammaGamma {
227227
// Preslices and partitions
228228
o2::framework::SliceCache cache;
229229
o2::framework::PresliceOptional<
230-
o2::soa::Filtered<o2::soa::Join<o2::aod::V0PhotonsKF, o2::aod::V0KFEMEventIds, o2::aod::V0PhotonsKFPrefilterBitDerived, o2::aod::V0PhotonOmegaMBWeights>>> perCollision_pcm = o2::aod::v0photonkf::emeventId;
230+
o2::soa::Filtered<o2::soa::Join<o2::aod::V0PhotonsKF, o2::aod::V0KFEMEventIds, o2::aod::V0PhotonsKFPrefilterBitDerived, o2::aod::V0PhotonOmegaMBWeights>>>
231+
perCollision_pcm = o2::aod::v0photonkf::emeventId;
231232
o2::framework::PresliceOptional<o2::soa::Join<o2::aod::EmEmcClusters, o2::aod::EMCEMEventIds>> perCollision_emc = o2::aod::emccluster::emeventId;
232233
o2::framework::PresliceOptional<o2::soa::Join<o2::aod::PHOSClusters, o2::aod::PHOSEMEventIds>> perCollision_phos = o2::aod::phoscluster::emeventId;
233234
o2::framework::PresliceOptional<o2::soa::Filtered<o2::soa::Join<o2::aod::EMPrimaryElectronsFromDalitz, o2::aod::EMPrimaryElectronEMEventIds, o2::aod::EMPrimaryElectronsPrefilterBitDerived>>> perCollision_electron = o2::aod::emprimaryelectron::emeventId;
@@ -839,8 +840,8 @@ struct Pi0EtaToGammaGamma {
839840
used_dileptonIds_per_col.emplace_back(tuple_tmp_id2);
840841
}
841842
ndiphoton++;
842-
} // end of dielectron loop
843-
} // end of g1 loop
843+
} // end of dielectron loop
844+
} // end of g1 loop
844845
} else { // PCM-PCM, EMC-EMC, PHOS-PHOS, PCM-EMC and PCM-PHOS.
845846
auto photons1_per_collision = photons1.sliceByCached(TDetectorTag1::perCollision(), collision.globalIndex(), cache);
846847
auto photons2_per_collision = photons2.sliceByCached(TDetectorTag2::perCollision(), collision.globalIndex(), cache);
@@ -900,7 +901,7 @@ struct Pi0EtaToGammaGamma {
900901
}
901902
ndiphoton++;
902903
} // end of pairing loop
903-
} // end of pairing in same event
904+
} // end of pairing in same event
904905

905906
used_photonIds_per_col.clear();
906907
used_photonIds_per_col.shrink_to_fit();

PWGEM/PhotonMeson/DataModel/gammaTables.h

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -433,9 +433,9 @@ using EMPrimaryElectronDaEMEventId = EMPrimaryElectronDaEMEventIds::iterator;
433433

434434
namespace v0photonsphivpsi
435435
{
436-
DECLARE_SOA_INDEX_COLUMN(EMEvent, emevent); //!
436+
DECLARE_SOA_INDEX_COLUMN(EMEvent, emevent); //!
437437
DECLARE_SOA_INDEX_COLUMN(EMPhotonEvent, emphotonevent); //!
438-
DECLARE_SOA_COLUMN(PhiV, phiv, float); //!
438+
DECLARE_SOA_COLUMN(PhiV, phiv, float); //!
439439
DECLARE_SOA_COLUMN(PsiPair, psipair, float);
440440
} // namespace v0photonsphivpsi
441441
DECLARE_SOA_TABLE(V0PhotonsPhiVPsi, "AOD", "V0PHOTONPHIVPSI", //!
@@ -727,9 +727,7 @@ DECLARE_SOA_COLUMN(OmegaMBWeight, omegaMBWeight, float);
727727

728728
DECLARE_SOA_TABLE(V0PhotonOmegaMBWeights, "AOD", "V0PHOTONMBW", v0photonMBweights::OmegaMBWeight); // store MB weights. To be joined with V0PhotonsKF table at analysis level.
729729

730-
using V0PhotonOmegaMBWeight = V0PhotonOmegaMBWeights::iterator;
730+
using V0PhotonOmegaMBWeight = V0PhotonOmegaMBWeights::iterator;
731731
} // namespace o2::aod
732732

733-
734-
735-
#endif // PWGEM_PHOTONMESON_DATAMODEL_GAMMATABLES_H_
733+
#endif // PWGEM_PHOTONMESON_DATAMODEL_GAMMATABLES_H_

PWGEM/PhotonMeson/TableProducer/materialBudgetWeights.cxx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,13 +15,13 @@
1515
///
1616
/// \author Youssef El Mard (youssef.el.mard.bouziani@cern.ch)
1717

18-
1918
#include "PWGEM/PhotonMeson/Utils/MaterialBudgetWeights.h"
19+
2020
#include "Framework/runDataProcessing.h"
2121

2222
using namespace o2::framework;
2323

2424
WorkflowSpec defineDataProcessing(ConfigContext const& cfgc)
2525
{
2626
return WorkflowSpec{adaptAnalysisTask<MaterialBudgetWeights>(cfgc)};
27-
}
27+
}

PWGEM/PhotonMeson/Tasks/Pi0EtaToGammaGammaPCMPCM.cxx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@
1515

1616
#include "PWGEM/PhotonMeson/Core/Pi0EtaToGammaGamma.h"
1717
#include "PWGEM/PhotonMeson/DataModel/gammaTables.h"
18-
#include "PWGEM/PhotonMeson/Utils/PairUtilities.h"
1918
#include "PWGEM/PhotonMeson/Utils/MaterialBudgetWeights.h"
19+
#include "PWGEM/PhotonMeson/Utils/PairUtilities.h"
2020

2121
#include <Framework/AnalysisDataModel.h>
2222
#include <Framework/AnalysisTask.h>

PWGEM/PhotonMeson/Utils/MaterialBudgetWeights.h

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -20,22 +20,21 @@
2020
#define PWGEM_PHOTONMESON_UTILS_MATERIALBUDGETWEIGHTS_H_
2121

2222
#include "PWGEM/PhotonMeson/DataModel/gammaTables.h"
23-
#include <CCDB/BasicCCDBManager.h>
2423

2524
#include "Framework/ASoAHelpers.h"
2625
#include "Framework/AnalysisDataModel.h"
2726
#include "Framework/AnalysisTask.h"
2827
#include "Framework/Logger.h"
28+
#include <CCDB/BasicCCDBManager.h>
2929
#include <Framework/Configurable.h>
3030
#include <Framework/InitContext.h>
3131

32-
3332
using namespace o2;
3433
using namespace o2::soa;
3534
using namespace o2::framework;
3635

3736
using MyV0PhotonsMB = o2::soa::Join<o2::aod::V0PhotonsKF, o2::aod::V0KFEMEventIds>;
38-
using MyV0PhotonMB = MyV0PhotonsMB::iterator;
37+
using MyV0PhotonMB = MyV0PhotonsMB::iterator;
3938

4039
struct MaterialBudgetWeights {
4140
Produces<aod::V0PhotonOmegaMBWeights> omegaMBWeight;
@@ -91,5 +90,4 @@ struct MaterialBudgetWeights {
9190
}
9291
};
9392

94-
95-
#endif // PWGEM_PHOTONMESON_UTILS_MATERIALBUDGETWEIGHTS_H_
93+
#endif // PWGEM_PHOTONMESON_UTILS_MATERIALBUDGETWEIGHTS_H_

0 commit comments

Comments
 (0)