Apply formatting fixes

Author: Youssef El Mard Bouziani

PWGEM/PhotonMeson/DataModel/gammaTables.h

@@ -726,9 +726,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_

PWGEM/PhotonMeson/TableProducer/materialBudgetWeights.cxx

@@ -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)};
-}
+}

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 <Framework/AnalysisDataModel.h>
 #include <Framework/AnalysisTask.h>

PWGEM/PhotonMeson/Utils/MaterialBudgetWeights.h

@@ -19,6 +19,9 @@
 #ifndef PWGEM_PHOTONMESON_UTILS_MATERIALBUDGETWEIGHTS_H_
 #define PWGEM_PHOTONMESON_UTILS_MATERIALBUDGETWEIGHTS_H_
 
+#include <map>
+#include <string>
+
 #include "PWGEM/PhotonMeson/DataModel/gammaTables.h"
 
 #include "Framework/ASoAHelpers.h"
@@ -29,9 +32,12 @@
 #include <Framework/Configurable.h>
 #include <Framework/InitContext.h>
 
+<<<<<<< HEAD
 #include <map>
 #include <string>
 
+=======
+>>>>>>> 947616059 (Apply formatting fixes)
 using namespace o2;
 using namespace o2::soa;
 using namespace o2::framework;
@@ -112,4 +118,4 @@ struct MaterialBudgetWeights {
   PROCESS_SWITCH(MaterialBudgetWeights, processDummy, "Fill dummy MB weights (=1)", true);
 };
 
-#endif // PWGEM_PHOTONMESON_UTILS_MATERIALBUDGETWEIGHTS_H_
+#endif // PWGEM_PHOTONMESON_UTILS_MATERIALBUDGETWEIGHTS_H_