Renaming

Author: Marcello Di Costanzo

ALICE3/ML/Alice3MlResponse3Prong.h ALICE3/ML/MlResponse3Prong.hALICE3/ML/Alice3MlResponse3Prong.h renamed to ALICE3/ML/MlResponse3Prong.h

@@ -100,13 +100,13 @@ enum class InputFeatures3Prong : uint8_t {
 };
 
 template <typename TypeOutputScore = float>
-class Alice3MlResponse3Prong : public MlResponse<TypeOutputScore>
+class MlResponse3Prong : public MlResponse<TypeOutputScore>
 {
  public:
   /// Default constructor
-  Alice3MlResponse3Prong() = default;
+  MlResponse3Prong() = default;
   /// Default destructor
-  virtual ~Alice3MlResponse3Prong() = default;
+  virtual ~MlResponse3Prong() = default;
 
   /// Method to get the input features vector needed for ML inference
   /// \tparam T1 type of the 3-prong candidate

ALICE3/TableProducer/CMakeLists.txt

@@ -47,11 +47,11 @@ o2physics_add_dpl_workflow(alice3-correlatorddbar
                     COMPONENT_NAME Analysis)
 
 o2physics_add_dpl_workflow(alice3-hf-selector-3prong
-                    SOURCES alice3HfSelector3Prong.cxx
+                    SOURCES hfSelector3Prong.cxx
                     PUBLIC_LINK_LIBRARIES O2Physics::AnalysisCore O2::DCAFitter O2Physics::MLCore
                     COMPONENT_NAME Analysis)
 
 o2physics_add_dpl_workflow(alice3-hf-tree-creator-3prong
-                    SOURCES alice3HfTreeCreator3Prong.cxx
+                    SOURCES hfTreeCreator3Prong.cxx
                     PUBLIC_LINK_LIBRARIES O2Physics::AnalysisCore O2::DCAFitter
                     COMPONENT_NAME Analysis)

…TableProducer/alice3HfSelector3Prong.cxx ALICE3/TableProducer/hfSelector3Prong.cxxALICE3/TableProducer/alice3HfSelector3Prong.cxx renamed to ALICE3/TableProducer/hfSelector3Prong.cxx ALICE3/TableProducer/alice3HfSelector3Prong.cxx renamed to ALICE3/TableProducer/hfSelector3Prong.cxx

@@ -14,18 +14,19 @@
 ///
 /// \author Marcello Di Costanzo <marcello.di.costanzo@cern.ch>, Polytechnic University of Turin and INFN Turin
 
-#include "PWGHF/Core/SelectorCuts.h"
-#include "PWGHF/DataModel/CandidateReconstructionTables.h"
-#include "PWGHF/DataModel/CandidateSelectionTables.h"
-
 #include "ALICE3/DataModel/A3DecayFinderTables.h"
 #include "ALICE3/DataModel/OTFPIDTrk.h"
 #include "ALICE3/DataModel/OTFRICH.h"
 #include "ALICE3/DataModel/OTFTOF.h"
 #include "ALICE3/DataModel/RICH.h"
-#include "ALICE3/ML/Alice3MlResponse3Prong.h"
 #include "ALICE3/Utils/utilsHfAlice3.h"
 #include "ALICE3/Utils/utilsSelectionsAlice3.h"
+#include "ALICE3/ML/MlResponse3Prong.h"
+
+#include "PWGHF/Core/SelectorCuts.h"
+#include "PWGHF/DataModel/CandidateReconstructionTables.h"
+#include "PWGHF/DataModel/CandidateSelectionTables.h"
+
 #include "Common/Core/TrackSelectorPID.h"
 #include "Common/DataModel/PIDResponseCombined.h"
 
@@ -55,12 +56,8 @@ using namespace o2::analysis;
 using namespace o2::framework;
 using namespace o2::aod::a3_hf_sel_3prong;
 
-enum Particles {
-  Lc = 0
-};
-
 /// Struct for applying Lc selection cuts
-struct Alice3Selector3Prong {
+struct Alice3HfSelector3Prong {
   Produces<aod::Alice3Sel3Ps> candSelFlags; // flags for isSelLc
   Produces<aod::Alice3Ml3Ps> candMlScores;
 
@@ -105,7 +102,7 @@ struct Alice3Selector3Prong {
   Configurable<bool> loadModelsFromCCDB{"loadModelsFromCCDB", false, "Flag to enable or disable the loading of models from CCDB"};
 
   HfHelperAlice3 hfHelper;
-  o2::analysis::Alice3MlResponse3Prong<float> mlResponse;
+  o2::analysis::MlResponse3Prong<float> mlResponse;
   o2::ccdb::CcdbApi ccdbApi;
 
   using CandsLc = soa::Join<aod::Alice3Cand3Ps, aod::Alice3PidLcs>;
@@ -374,15 +371,14 @@ struct Alice3Selector3Prong {
 
   /// \brief process function for cand selection
   /// \param cands Lc cand table
-  /// \param tracks track table
   void processLc(CandsLcWMcTruth const& cands)
   {
     runSelect3Prong<CharmHadAlice3::Lc>(cands);
   }
-  PROCESS_SWITCH(Alice3Selector3Prong, processLc, "Process 3 prong selection for Lc", true);
+  PROCESS_SWITCH(Alice3HfSelector3Prong, processLc, "Process 3 prong selection for Lc", true);
 };
 
 WorkflowSpec defineDataProcessing(ConfigContext const& cfgc)
 {
-  return WorkflowSpec{adaptAnalysisTask<Alice3Selector3Prong>(cfgc)};
+  return WorkflowSpec{adaptAnalysisTask<Alice3HfSelector3Prong>(cfgc)};
 }

…leProducer/alice3HfTreeCreator3Prong.cxx …E3/TableProducer/hfTreeCreator3Prong.cxxALICE3/TableProducer/alice3HfTreeCreator3Prong.cxx renamed to ALICE3/TableProducer/hfTreeCreator3Prong.cxx ALICE3/TableProducer/alice3HfTreeCreator3Prong.cxx renamed to ALICE3/TableProducer/hfTreeCreator3Prong.cxx

@@ -240,7 +240,7 @@ DECLARE_SOA_TABLE(Alice3PidPr2s, "AOD", "ALICE3PIDPR2",
 } // namespace o2::aod
 
 /// Writes the full information in an output TTree
-struct Alice3TreeCreator3Prong {
+struct Alice3HfTreeCreator3Prong {
   Produces<o2::aod::Alice3CandVtxs> rowCandVtxs;
   Produces<o2::aod::Alice3CandTopos> rowCandTopos;
   Produces<o2::aod::Alice3DaugTopos> rowDaugTopos;
@@ -498,7 +498,7 @@ struct Alice3TreeCreator3Prong {
       fillRecoGenTables<CharmHadAlice3::Lc>(selCandsLcRec, parts);
     }
   }
-  PROCESS_SWITCH(Alice3TreeCreator3Prong, processLc, "Process Lc", true);
+  PROCESS_SWITCH(Alice3HfTreeCreator3Prong, processLc, "Process Lc", true);
 
   void processLcWMl(CandsLcRecWMl const& selCandsLcRec,
                     CandsMcGen const& parts,
@@ -512,10 +512,10 @@ struct Alice3TreeCreator3Prong {
       fillRecoGenTables<CharmHadAlice3::Lc>(selCandsLcRec, parts);
     }
   }
-  PROCESS_SWITCH(Alice3TreeCreator3Prong, processLcWMl, "Process Lc with ML", false);
+  PROCESS_SWITCH(Alice3HfTreeCreator3Prong, processLcWMl, "Process Lc with ML", false);
 };
 
 WorkflowSpec defineDataProcessing(ConfigContext const& cfgc)
 {
-  return WorkflowSpec{adaptAnalysisTask<Alice3TreeCreator3Prong>(cfgc)};
+  return WorkflowSpec{adaptAnalysisTask<Alice3HfTreeCreator3Prong>(cfgc)};
 }