Merge pull request #79 from alibuild/alibot-cleanup-15108

Please consider the following formatting changes to #15108

Author: dsekihat

PWGEM/Dilepton/Core/DileptonProducer.h

@@ -774,7 +774,7 @@ struct DileptonProducer {
         continue;
       }
 
-      normTable(collision.selection_raw(), collision.rct_raw(), collision.posZint8(), collision.centFT0Muint8(), collision.centFT0Cuint8(), collision.centNTPVuint8()/*, collision.centNGlobaluint8()*/);
+      normTable(collision.selection_raw(), collision.rct_raw(), collision.posZint8(), collision.centFT0Muint8(), collision.centFT0Cuint8(), collision.centNTPVuint8() /*, collision.centNGlobaluint8()*/);
 
     } // end of collision loop
   }

PWGEM/Dilepton/Core/EMEventCut.h

@@ -17,6 +17,7 @@
 #define PWGEM_DILEPTON_CORE_EMEVENTCUT_H_
 
 #include "PWGEM/Dilepton/DataModel/dileptonTables.h"
+
 #include "Common/CCDB/EventSelectionParams.h"
 #include "Common/CCDB/TriggerAliases.h"
 

PWGEM/Dilepton/TableProducer/Converters/eventMultConverter1.cxx

@@ -35,8 +35,7 @@ struct eventMultConverter1 {
       mult_001(
         collision.multFT0A(),
         collision.multFT0C(),
-        collision.multNTracksPV()
-        );
+        collision.multNTracksPV());
     } // end of mult row loop
   }
 };

PWGEM/Dilepton/TableProducer/Converters/qvec2Converter0.cxx

@@ -33,13 +33,13 @@ struct qvec2Converter0 {
   {
     for (const auto& collision : collisions) {
       qvec2_000(
-          collision.q2xft0m(), collision.q2yft0m(),
-          collision.q2xft0a(), collision.q2yft0a(),
-          collision.q2xft0c(), collision.q2yft0c(),
-          collision.q2xfv0a(), collision.q2yfv0a(),
-          collision.q2xbpos(), collision.q2ybpos(),
-          collision.q2xbneg(), collision.q2ybneg(),
-          collision.q2xbtot(), collision.q2ybtot());
+        collision.q2xft0m(), collision.q2yft0m(),
+        collision.q2xft0a(), collision.q2yft0a(),
+        collision.q2xft0c(), collision.q2yft0c(),
+        collision.q2xfv0a(), collision.q2yfv0a(),
+        collision.q2xbpos(), collision.q2ybpos(),
+        collision.q2xbneg(), collision.q2ybneg(),
+        collision.q2xbtot(), collision.q2ybtot());
     } // end of collision loop
   }
 };

PWGEM/Dilepton/TableProducer/Converters/qvec3Converter0.cxx

@@ -33,13 +33,13 @@ struct qvec3Converter0 {
   {
     for (const auto& collision : collisions) {
       qvec3_000(
-          collision.q3xft0m(), collision.q3yft0m(),
-          collision.q3xft0a(), collision.q3yft0a(),
-          collision.q3xft0c(), collision.q3yft0c(),
-          collision.q3xfv0a(), collision.q3yfv0a(),
-          collision.q3xbpos(), collision.q3ybpos(),
-          collision.q3xbneg(), collision.q3ybneg(),
-          collision.q3xbtot(), collision.q3ybtot());
+        collision.q3xft0m(), collision.q3yft0m(),
+        collision.q3xft0a(), collision.q3yft0a(),
+        collision.q3xft0c(), collision.q3yft0c(),
+        collision.q3xfv0a(), collision.q3yfv0a(),
+        collision.q3xbpos(), collision.q3ybpos(),
+        collision.q3xbneg(), collision.q3ybneg(),
+        collision.q3xbtot(), collision.q3ybtot());
     } // end of collision loop
   }
 };

PWGEM/Dilepton/TableProducer/createEMEventDilepton.cxx

@@ -138,15 +138,15 @@ struct CreateEMEventDilepton {
           }
         }
         if constexpr (eventtype == EMEventType::kEvent) {
-          event_norm_info(o2::aod::emevsel::reduceSelectionBit(collision), collision.rct_raw(), posZint8, static_cast<uint8_t>(105.f + 110.f), static_cast<uint8_t>(105.f + 110.f), static_cast<uint8_t>(105.f + 110.f)/*, static_cast<uint8_t>(105.f + 110.f)*/);
+          event_norm_info(o2::aod::emevsel::reduceSelectionBit(collision), collision.rct_raw(), posZint8, static_cast<uint8_t>(105.f + 110.f), static_cast<uint8_t>(105.f + 110.f), static_cast<uint8_t>(105.f + 110.f) /*, static_cast<uint8_t>(105.f + 110.f)*/);
         } else if constexpr (eventtype == EMEventType::kEvent_Cent || eventtype == EMEventType::kEvent_Cent_Qvec) {
           uint8_t centFT0Muint8 = collision.centFT0M() < 1.f ? static_cast<uint8_t>(collision.centFT0M() * 100.f) : static_cast<uint8_t>(collision.centFT0M() + 110.f);
           uint8_t centFT0Cuint8 = collision.centFT0C() < 1.f ? static_cast<uint8_t>(collision.centFT0C() * 100.f) : static_cast<uint8_t>(collision.centFT0C() + 110.f);
           uint8_t centNTPVuint8 = collision.centNTPV() < 1.f ? static_cast<uint8_t>(collision.centNTPV() * 100.f) : static_cast<uint8_t>(collision.centNTPV() + 110.f);
           // uint8_t centNGlobaluint8 = collision.centNGlobal() < 1.f ? static_cast<uint8_t>(collision.centNGlobal() * 100.f) : static_cast<uint8_t>(collision.centNGlobal() + 110.f);
-          event_norm_info(o2::aod::emevsel::reduceSelectionBit(collision), collision.rct_raw(), posZint8, centFT0Muint8, centFT0Cuint8, centNTPVuint8/*, centNGlobaluint8*/);
+          event_norm_info(o2::aod::emevsel::reduceSelectionBit(collision), collision.rct_raw(), posZint8, centFT0Muint8, centFT0Cuint8, centNTPVuint8 /*, centNGlobaluint8*/);
         } else {
-          event_norm_info(o2::aod::emevsel::reduceSelectionBit(collision), collision.rct_raw(), posZint8, static_cast<uint8_t>(105.f + 110.f), static_cast<uint8_t>(105.f + 110.f), static_cast<uint8_t>(105.f + 110.f)/*, static_cast<uint8_t>(105.f + 110.f)*/);
+          event_norm_info(o2::aod::emevsel::reduceSelectionBit(collision), collision.rct_raw(), posZint8, static_cast<uint8_t>(105.f + 110.f), static_cast<uint8_t>(105.f + 110.f), static_cast<uint8_t>(105.f + 110.f) /*, static_cast<uint8_t>(105.f + 110.f)*/);
         }
       }
 
@@ -174,7 +174,7 @@ struct CreateEMEventDilepton {
 
       // eventcov(collision.covXX(), collision.covXY(), collision.covXZ(), collision.covYY(), collision.covYZ(), collision.covZZ(), collision.chi2());
 
-      event_mult(collision.multFT0A(), collision.multFT0C(), collision.multNTracksPV()/*, collision.multNTracksGlobal()*/);
+      event_mult(collision.multFT0A(), collision.multFT0C(), collision.multNTracksPV() /*, collision.multNTracksGlobal()*/);
 
       if constexpr (eventtype == EMEventType::kEvent) {
         event_cent(105.f, 105.f, 105.f, 105.f);
@@ -190,7 +190,7 @@ struct CreateEMEventDilepton {
         registry.fill(HIST("hCentNTPV"), collision.centNTPV());
         registry.fill(HIST("hCentNGlobal"), collision.centFT0M());
 
-        event_cent(collision.centFT0M(), collision.centFT0A(), collision.centFT0C(), collision.centNTPV()/*, collision.centNGlobal()*/);
+        event_cent(collision.centFT0M(), collision.centFT0A(), collision.centFT0C(), collision.centNTPV() /*, collision.centNGlobal()*/);
         event_qvec2(999.f, 999.f, 999.f, 999.f, 999.f, 999.f, 999.f, 999.f, 999.f, 999.f, 999.f, 999.f, 999.f, 999.f);
         event_qvec3(999.f, 999.f, 999.f, 999.f, 999.f, 999.f, 999.f, 999.f, 999.f, 999.f, 999.f, 999.f, 999.f, 999.f);
         // event_qvec(
@@ -203,7 +203,7 @@ struct CreateEMEventDilepton {
         registry.fill(HIST("hCentNTPV"), collision.centNTPV());
         registry.fill(HIST("hCentNGlobal"), collision.centFT0M());
 
-        event_cent(collision.centFT0M(), collision.centFT0A(), collision.centFT0C(), collision.centNTPV()/*, collision.centNGlobal()*/);
+        event_cent(collision.centFT0M(), collision.centFT0A(), collision.centFT0C(), collision.centNTPV() /*, collision.centNGlobal()*/);
         float q2xft0m = 999.f, q2yft0m = 999.f, q2xft0a = 999.f, q2yft0a = 999.f, q2xft0c = 999.f, q2yft0c = 999.f, q2xfv0a = 999.f, q2yfv0a = 999.f, q2xbpos = 999.f, q2ybpos = 999.f, q2xbneg = 999.f, q2ybneg = 999.f, q2xbtot = 999.f, q2ybtot = 999.f;
         float q3xft0m = 999.f, q3yft0m = 999.f, q3xft0a = 999.f, q3yft0a = 999.f, q3xft0c = 999.f, q3yft0c = 999.f, q3xfv0a = 999.f, q3yfv0a = 999.f, q3xbpos = 999.f, q3ybpos = 999.f, q3xbneg = 999.f, q3ybneg = 999.f, q3xbtot = 999.f, q3ybtot = 999.f;
 

PWGEM/PhotonMeson/DataModel/gammaTables.h

@@ -345,7 +345,7 @@ using V0PhotonsKF = V0PhotonsKF_001;
 // iterators
 using V0PhotonKF = V0PhotonsKF::iterator;
 
-DECLARE_SOA_TABLE(V0KFEMEventIds_000, "AOD", "V0KFEMEVENTID", v0photonkf::EMEventId); // To be joined with V0PhotonsKF table at analysis level.
+DECLARE_SOA_TABLE(V0KFEMEventIds_000, "AOD", "V0KFEMEVENTID", v0photonkf::EMEventId);                    // To be joined with V0PhotonsKF table at analysis level.
 DECLARE_SOA_TABLE_VERSIONED(V0KFEMEventIds_001, "AOD", "V0KFEMEVENTID", 1, v0photonkf::EMPhotonEventId); // To be joined with V0PhotonsKF table at analysis level.
 using V0KFEMEventIds = V0KFEMEventIds_001;
 using V0KFEMEventId = V0KFEMEventIds::iterator;
@@ -423,9 +423,9 @@ using EMPrimaryElectronFromDalitz = EMPrimaryElectronsFromDalitz::iterator;
 
 namespace emprimaryelectronda
 {
-DECLARE_SOA_INDEX_COLUMN(EMEvent, emevent);                             //!
-DECLARE_SOA_INDEX_COLUMN(EMPhotonEvent, emphotonevent);                 //!
-}
+DECLARE_SOA_INDEX_COLUMN(EMEvent, emevent);             //!
+DECLARE_SOA_INDEX_COLUMN(EMPhotonEvent, emphotonevent); //!
+} // namespace emprimaryelectronda
 
 DECLARE_SOA_TABLE_VERSIONED(EMPrimaryElectronDaEMEventIds_001, "AOD", "PRMELDAEVENTID", 1, emprimaryelectronda::EMPhotonEventId); // To be joined with EMPrimaryElectronsFromDalitz table at analysis level.
 using EMPrimaryElectronDaEMEventIds = EMPrimaryElectronDaEMEventIds_001;
@@ -434,7 +434,7 @@ using EMPrimaryElectronDaEMEventId = EMPrimaryElectronDaEMEventIds::iterator;
 namespace v0photonsphivpsi
 {
 DECLARE_SOA_INDEX_COLUMN(EMEvent, emevent); //!
-DECLARE_SOA_INDEX_COLUMN(EMPhotonEvent, emphotonevent);                 //!
+DECLARE_SOA_INDEX_COLUMN(EMPhotonEvent, emphotonevent); //!
 DECLARE_SOA_COLUMN(PhiV, phiv, float);      //!
 DECLARE_SOA_COLUMN(PsiPair, psipair, float);
 } // namespace v0photonsphivpsi
@@ -446,7 +446,7 @@ using V0PhotonsPhiVPsi = V0PhotonsPhiVPsi;
 namespace dalitzee
 {
 DECLARE_SOA_INDEX_COLUMN(EMEvent, emevent);                                         //!
-DECLARE_SOA_INDEX_COLUMN(EMPhotonEvent, emphotonevent);                 //!
+DECLARE_SOA_INDEX_COLUMN(EMPhotonEvent, emphotonevent);                             //!
 DECLARE_SOA_INDEX_COLUMN_FULL(PosTrack, posTrack, int, EMPrimaryElectrons, "_Pos"); //!
 DECLARE_SOA_INDEX_COLUMN_FULL(NegTrack, negTrack, int, EMPrimaryElectrons, "_Neg"); //!
 DECLARE_SOA_COLUMN(CollisionId, collisionId, int);                                  //!
@@ -475,7 +475,7 @@ using DalitzEEEMEventId = DalitzEEEMEventIds::iterator;
 namespace pwgem::photon::swtinfo
 {
 DECLARE_SOA_INDEX_COLUMN(EMEvent, emevent);                                                                              //!
-DECLARE_SOA_INDEX_COLUMN(EMPhotonEvent, emphotonevent);                 //!
+DECLARE_SOA_INDEX_COLUMN(EMPhotonEvent, emphotonevent);                                                                  //!
 DECLARE_SOA_COLUMN(CollisionId, collisionId, int);                                                                       //!
 DECLARE_SOA_INDEX_COLUMN_FULL(TriggerV0PhotonHighPt, triggerV0PhotonHighPt, int, V0PhotonsKF, "_TriggerV0PhotonHighPt"); //! high pT PCM trigger is fired by this v0 photon
 DECLARE_SOA_INDEX_COLUMN_FULL(TriggerV0PhotonPair, triggerV0PhotonPair, int, V0PhotonsKF, "_TriggerV0PhotonPair");       //! PCM+EE trigger is fired by this v0 photon and dielectron
@@ -575,7 +575,7 @@ DECLARE_SOA_TABLE(McGammasTrue, "AOD", "MCGATRUE",
 namespace skimmedcluster
 {
 DECLARE_SOA_INDEX_COLUMN(EMEvent, emevent);                            //!
-DECLARE_SOA_INDEX_COLUMN(EMPhotonEvent, emphotonevent);                 //!
+DECLARE_SOA_INDEX_COLUMN(EMPhotonEvent, emphotonevent);                //!
 DECLARE_SOA_COLUMN(CollisionId, collisionId, int);                     //!
 DECLARE_SOA_COLUMN(ID, id, int);                                       //! cluster ID identifying cluster in event
 DECLARE_SOA_COLUMN(E, e, float);                                       //! cluster energy (GeV)
@@ -592,7 +592,7 @@ DECLARE_SOA_COLUMN(NLM, nlm, int);                                     //! numbe
 namespace emccluster
 {
 DECLARE_SOA_INDEX_COLUMN(EMEvent, emevent);                                                                                             //!
-DECLARE_SOA_INDEX_COLUMN(EMPhotonEvent, emphotonevent);                 //!
+DECLARE_SOA_INDEX_COLUMN(EMPhotonEvent, emphotonevent);                                                                                 //!
 DECLARE_SOA_COLUMN(CoreEnergy, coreEnergy, float);                                                                                      //! cluster core energy (GeV)
 DECLARE_SOA_COLUMN(Time, time, float);                                                                                                  //! cluster time (ns)
 DECLARE_SOA_COLUMN(IsExotic, isExotic, bool);                                                                                           //! flag to mark cluster as exotic
@@ -649,15 +649,15 @@ DECLARE_SOA_TABLE(EmEmcMTracks, "AOD", "EMEMCMTRACK", //!
 DECLARE_SOA_TABLE(EmEmcMSTracks, "AOD", "EMEMCMSTRACK", //!
                   trackmatching::EmEmcClusterId, emctm::DeltaPhi, emctm::DeltaEta, emctm::TrackP, emctm::TrackPt);
 
-DECLARE_SOA_TABLE(EMCEMEventIds_000, "AOD", "EMCEMEVENTID", emccluster::EMEventId); // To be joined with SkimEMCClusters table at analysis level.
+DECLARE_SOA_TABLE(EMCEMEventIds_000, "AOD", "EMCEMEVENTID", emccluster::EMEventId);                    // To be joined with SkimEMCClusters table at analysis level.
 DECLARE_SOA_TABLE_VERSIONED(EMCEMEventIds_001, "AOD", "EMCEMEVENTID", 1, emccluster::EMPhotonEventId); // To be joined with SkimEMCClusters table at analysis level.
 using EMCEMEventIds = EMCEMEventIds_001;
 using EMCEMEventId = EMCEMEventIds::iterator;
 
 namespace phoscluster
 {
 DECLARE_SOA_INDEX_COLUMN(EMEvent, emevent);                                         //!
-DECLARE_SOA_INDEX_COLUMN(EMPhotonEvent, emphotonevent);                 //!
+DECLARE_SOA_INDEX_COLUMN(EMPhotonEvent, emphotonevent);                             //!
 DECLARE_SOA_INDEX_COLUMN_FULL(MatchedTrack, matchedTrack, int, Tracks, "_Matched"); //! matched track index
 DECLARE_SOA_COLUMN(X, x, float);                                                    //! cluster hit position in ALICE global coordinate
 DECLARE_SOA_COLUMN(Y, y, float);                                                    //! cluster hit position in ALICE global coordinate
@@ -692,7 +692,7 @@ DECLARE_SOA_TABLE(PHOSClusters, "AOD", "PHOSCLUSTERS", //!
                   phoscluster::Phi<phoscluster::X, phoscluster::Y>);
 using PHOSCluster = PHOSClusters::iterator;
 
-DECLARE_SOA_TABLE(PHOSEMEventIds_000, "AOD", "PHOSEMEVENTID", phoscluster::EMEventId); // To be joined with PHOSClusters table at analysis level.
+DECLARE_SOA_TABLE(PHOSEMEventIds_000, "AOD", "PHOSEMEVENTID", phoscluster::EMEventId);                    // To be joined with PHOSClusters table at analysis level.
 DECLARE_SOA_TABLE_VERSIONED(PHOSEMEventIds_001, "AOD", "PHOSEMEVENTID", 1, phoscluster::EMPhotonEventId); // To be joined with PHOSClusters table at analysis level.
 using PHOSEMEventIds = PHOSEMEventIds_001;
 using PHOSEMEventId = PHOSEMEventIds::iterator;