Merge pull request #30 from alibuild/alibot-cleanup-12451

Please consider the following formatting changes to #12451

Author: Marcellocosti

PWGHF/D2H/DataModel/ReducedDataModel.h

@@ -556,8 +556,7 @@ DECLARE_SOA_TABLE(HfRedSoftPiPid, "AOD", "HFREDSOFTPIPID",
                   hf_track_vars_reduced::HasTOF,
                   hf_track_vars_reduced::HasTPC,
                   hf_cand_dstar::TPCTOFNSigmaPiSoftPi<hf_cand_dstar::TPCNSigmaPiSoftPi, hf_cand_dstar::TOFNSigmaPiSoftPi>,
-                  hf_cand_dstar::TPCTOFNSigmaKaSoftPi<hf_cand_dstar::TPCNSigmaKaSoftPi, hf_cand_dstar::TOFNSigmaKaSoftPi>
-)
+                  hf_cand_dstar::TPCTOFNSigmaKaSoftPi<hf_cand_dstar::TPCNSigmaKaSoftPi, hf_cand_dstar::TOFNSigmaKaSoftPi>)
 
 namespace hf_track_index_reduced
 {
@@ -568,7 +567,7 @@ DECLARE_SOA_INDEX_COLUMN_FULL(SoftPi, softPi, int, HfRedSoftPiBases, ""); //! Re
 // to call DECLARE_SOA_INDEX_COLUMN_FULL later on
 DECLARE_SOA_TABLE(HfRedDStars, "AOD", "HFREDDSTAR", //! Table with 2prong candidate information for reduced workflow
                   o2::soa::Index<>,
-                  hf_track_index_reduced::Prong0Id, hf_track_index_reduced::Prong1Id, hf_track_index_reduced::Prong2Id, 
+                  hf_track_index_reduced::Prong0Id, hf_track_index_reduced::Prong1Id, hf_track_index_reduced::Prong2Id,
                   hf_track_index_reduced::SoftPiId, hf_track_index_reduced::HfRedCollisionId,
                   HFTRACKPAR_COLUMNS,
                   hf_cand::XSecondaryVertex, hf_cand::YSecondaryVertex, hf_cand::ZSecondaryVertex,
@@ -767,7 +766,7 @@ namespace hf_cand_b0_reduced
 {
 DECLARE_SOA_INDEX_COLUMN_FULL(Prong0, prong0, int, HfRed3Prongs, "_0");    //! Prong0 index
 DECLARE_SOA_INDEX_COLUMN_FULL(Prong1, prong1, int, HfRedTrackBases, "_1"); //! Prong1 index
-DECLARE_SOA_INDEX_COLUMN_FULL(ProngDStar, prongDStar, int, HfRedDStars, ""); //! ProngDStar index
+DECLARE_SOA_INDEX_COLUMN_FULL(ProngDStar, prongDStar, int, HfRedDStars, "");     //! ProngDStar index
 DECLARE_SOA_INDEX_COLUMN_FULL(ProngSoftPi, prongSoftPi, int, HfRedB0SoftPi, ""); //! ProngSoftPi index
 DECLARE_SOA_COLUMN(Prong0MlScoreBkg, prong0MlScoreBkg, float);             //! Bkg ML score of the D daughter
 DECLARE_SOA_COLUMN(Prong0MlScorePrompt, prong0MlScorePrompt, float);       //! Prompt ML score of the D daughter

PWGHF/D2H/TableProducer/candidateCreatorB0Reduced.cxx

@@ -120,7 +120,6 @@ struct HfCandidateCreatorB0Reduced {
     df3.setUseAbsDCA(useAbsDCA);
     df3.setWeightedFinalPCA(useWeightedFinalPCA);
 
-
     // histograms
     if (doprocessDataDplusPi || doprocessDataDplusPiWithDmesMl) {
       registry.add("hMassB0ToDPi", "2-prong candidates;inv. mass (B^{0} #rightarrow D^{#minus}#pi^{#plus} #rightarrow #pi^{#minus}K^{#plus}#pi^{#minus}#pi^{#plus}) (GeV/#it{c}^{2});entries", {HistType::kTH1F, {{500, 3., 8.}}});
@@ -145,10 +144,10 @@ struct HfCandidateCreatorB0Reduced {
   /// \param invMass2DPiMax maximum B0 invariant-mass
   template <bool withDmesMl, typename Cands, typename Pions, typename Coll>
   void runCandidateCreationDStar(Coll const& collision,
-                            Cands const& candsDThisColl,
-                            Pions const& tracksPionThisCollision,
-                            const float& invMass2DPiMin,
-                            const float& invMass2DPiMax)
+                                 Cands const& candsDThisColl,
+                                 Pions const& tracksPionThisCollision,
+                                 const float& invMass2DPiMin,
+                                 const float& invMass2DPiMax)
   {
     auto primaryVertex = getPrimaryVertex(collision);
     auto covMatrixPV = primaryVertex.getCov();
@@ -164,7 +163,7 @@ struct HfCandidateCreatorB0Reduced {
       std::array<float, 3> pVecSoftPi = softPi.pVector();
       auto trackParCovSoftPi = getTrackParCov(softPi);
       std::array<float, 3> pVecD = RecoDecay::sumOfVec(pVecD0, pVecSoftPi);
-      
+
       for (const auto& trackPion : tracksPionThisCollision) {
         // this track is among daughters
         if (trackPion.trackId() == candD.prong0Id() || trackPion.trackId() == candD.prong1Id() || trackPion.trackId() == candD.prong2Id()) {
@@ -173,7 +172,7 @@ struct HfCandidateCreatorB0Reduced {
 
         auto trackParCovPi = getTrackParCov(trackPion);
         std::array<float, 3> pVecPion = trackPion.pVector();
-        
+
         // compute invariant mass square and apply selection
         auto invMass2DPi = RecoDecay::m2(std::array{pVecD, pVecSoftPi, pVecPion}, std::array{massDstar, massPi, massPi});
         if ((invMass2DPi < invMass2DPiMin) || (invMass2DPi > invMass2DPiMax)) {

PWGHF/D2H/TableProducer/dataCreatorCharmHadPiReduced.cxx

@@ -1412,7 +1412,7 @@ struct HfDataCreatorCharmHadPiReduced {
             tables.hfCand2ProngMl(mlScores[0], mlScores[1], mlScores[2], mlScores[3], mlScores[4], mlScores[5]);
           }
         } else if constexpr (decChannel == DecayChannel::B0ToDstarPi) {
-          tables.hfCandDStar(charmHadDauTracks[0].globalIndex(), charmHadDauTracks[1].globalIndex(), charmHadDauTracks[2].globalIndex(), 
+          tables.hfCandDStar(charmHadDauTracks[0].globalIndex(), charmHadDauTracks[1].globalIndex(), charmHadDauTracks[2].globalIndex(),
                              indexHfCandCharm, indexHfReducedCollision,
                              trackParCovCharmHad.getX(), trackParCovCharmHad.getAlpha(),
                              trackParCovCharmHad.getY(), trackParCovCharmHad.getZ(), trackParCovCharmHad.getSnp(),

PWGHF/D2H/Tasks/taskB0Reduced.cxx

@@ -202,7 +202,7 @@ struct HfTaskB0Reduced {
 
   void init(InitContext&)
   {
-    std::array<bool, 6> processFuncData{doprocessDataDplusPi, doprocessDataDplusPiWithDmesMl, doprocessDataDplusPiWithB0Ml, 
+    std::array<bool, 6> processFuncData{doprocessDataDplusPi, doprocessDataDplusPiWithDmesMl, doprocessDataDplusPiWithB0Ml,
                                         doprocessDataDstarPi, doprocessDataDstarPiWithDmesMl};
     if ((std::accumulate(processFuncData.begin(), processFuncData.end(), 0)) > 1) {
       LOGP(fatal, "Only one process function for data can be enabled at a time.");
@@ -228,9 +228,9 @@ struct HfTaskB0Reduced {
     const AxisSpec axisPtPi{100, 0.f, 10.f};
 
     std::string dMesSpecie{""};
-    std::array<bool, 9> processFuncDplusPi = {doprocessDataDplusPi, doprocessDataDplusPiWithDmesMl, doprocessDataDplusPiWithB0Ml, 
-                                              doprocessMcDplusPi, doprocessMcDplusPiWithDecayTypeCheck, doprocessMcDplusPiWithDmesMl, 
-                                              doprocessMcDplusPiWithDmesMlAndDecayTypeCheck, doprocessMcDplusPiWithB0Ml, 
+    std::array<bool, 9> processFuncDplusPi = {doprocessDataDplusPi, doprocessDataDplusPiWithDmesMl, doprocessDataDplusPiWithB0Ml,
+                                              doprocessMcDplusPi, doprocessMcDplusPiWithDecayTypeCheck, doprocessMcDplusPiWithDmesMl,
+                                              doprocessMcDplusPiWithDmesMlAndDecayTypeCheck, doprocessMcDplusPiWithB0Ml,
                                               doprocessMcDplusPiWithB0MlAndDecayTypeCheck};
     if ((std::accumulate(processFuncDplusPi.begin(), processFuncDplusPi.end(), 0)) > 1) {
       dMesSpecie += "D^{#minus}";

PWGHF/DataModel/CandidateReconstructionTables.h

@@ -2240,7 +2240,7 @@ DECLARE_SOA_TABLE(HfCandB0Base, "AOD", "HFCANDB0BASE",
 // extended table with expression columns that can be used as arguments of dynamic columns
 DECLARE_SOA_EXTENDED_TABLE_USER(HfCandB0Ext, HfCandB0Base, "HFCANDB0EXT",
                                 hf_cand_2prong::Px, hf_cand_2prong::Py, hf_cand_2prong::Pz);
-                                
+
 DECLARE_SOA_TABLE(HfCandB0Prongs, "AOD", "HFCANDB0PRONGS",
                   hf_cand_b0::Prong0Id, hf_track_index::Prong1Id);