Removing redundant files

Author: gvolpe79

DPG/Tasks/AOTTrack/PID/HMPID/CMakeLists.txt

@@ -10,26 +10,16 @@
 # or submit itself to any jurisdiction.
 
 # HMPID
-o2physics_add_dpl_workflow(hmpid-qa-pp
-    SOURCES hmpidQaPp.cxx
+o2physics_add_dpl_workflow(hmpid-qa
+    SOURCES hmpidQa.cxx
     PUBLIC_LINK_LIBRARIES O2::HMPIDBase O2Physics::AnalysisCore
     COMPONENT_NAME Analysis)
 
-o2physics_add_dpl_workflow(hmpid-qa-pb-pb
-    SOURCES hmpidQaPbPb.cxx
-    PUBLIC_LINK_LIBRARIES O2::HMPIDBase O2Physics::AnalysisCore
-    COMPONENT_NAME Analysis)
-
-o2physics_add_dpl_workflow(hmpid-table-producer-pp
-    SOURCES hmpidTableProducerPp.cxx
+o2physics_add_dpl_workflow(hmpid-table-producer
+    SOURCES hmpidTableProducer.cxx
     PUBLIC_LINK_LIBRARIES O2Physics::AnalysisCore
     COMPONENT_NAME Analysis)
 
-o2physics_add_dpl_workflow(hmpid-table-producer-pb-pb
-    SOURCES hmpidTableProducerPbPb.cxx
-    PUBLIC_LINK_LIBRARIES O2::Framework O2Physics::AnalysisCore O2::DetectorsBase
-    COMPONENT_NAME Analysis)
-
 o2physics_add_dpl_workflow(hmpid-deuteron
     SOURCES hmpidDeuteron.cxx
     PUBLIC_LINK_LIBRARIES O2::Framework O2::DetectorsBase O2::ReconstructionDataFormats O2Physics::AnalysisCore

DPG/Tasks/AOTTrack/PID/HMPID/hmpidDeuteron.cxx

@@ -9,7 +9,7 @@
 // granted to it by virtue of its status as an Intergovernmental Organization
 // or submit itself to any jurisdiction.
 
-#include "tableHMPIDPbPb.h"
+#include "tableHMPID.h"
 
 #include <Framework/AnalysisTask.h>
 #include <Framework/runDataProcessing.h>
@@ -81,7 +81,7 @@ struct HmpidDeuteron {
     registryDA.add("hmpidCkovvsMom", "hmpidCkovvsMom", kTH2F, {{500, 0, 10., "#it{p} (GeV/#it{c})"}, {800, 0., 0.8, "#theta_{Ch} (rad)"}});
   }
 
-  void process(aod::HmpidAnalysisPbPb const& hmpidTable)
+  void process(aod::HmpidAnalysis const& hmpidTable)
   {
     for (const auto& hmpid : hmpidTable) {
 

…G/Tasks/AOTTrack/PID/HMPID/hmpidQaPp.cxx DPG/Tasks/AOTTrack/PID/HMPID/hmpidQa.cxxDPG/Tasks/AOTTrack/PID/HMPID/hmpidQaPp.cxx renamed to DPG/Tasks/AOTTrack/PID/HMPID/hmpidQa.cxx DPG/Tasks/AOTTrack/PID/HMPID/hmpidQaPp.cxx renamed to DPG/Tasks/AOTTrack/PID/HMPID/hmpidQa.cxx

@@ -9,7 +9,7 @@
 // granted to it by virtue of its status as an Intergovernmental Organization
 // or submit itself to any jurisdiction.
 
-#include "tableHMPIDPbPb.h"
+#include "tableHMPID.h"
 
 #include "Common/Core/PID/PIDTOF.h"
 #include "Common/Core/trackUtilities.h"
@@ -38,14 +38,12 @@
 
 #include <string>
 
-// CREATE AND FILL TABLE FOR PBPB COLLISIONS
-
 using namespace o2;
 using namespace o2::framework;
 using namespace o2::framework::expressions;
 using namespace o2::constants::physics;
 
-struct HmpidTableProducerPbPb {
+struct HmpidTableProducer {
   HistogramRegistry histos{"histos", {}, OutputObjHandlingPolicy::AnalysisObject};
 
   const AxisSpec axisEvtCounter{1, 0, +1, ""};
@@ -56,7 +54,7 @@ struct HmpidTableProducerPbPb {
     Configurable<std::string> ccdbUrl{"ccdbUrl", "http://alice-ccdb.cern.ch", "URL of the CCDB repository"};
   } ccdbConfig;
 
-  Produces<aod::HmpidAnalysisPbPb> hmpidAnalysisPbPb;
+  Produces<aod::HmpidAnalysis> hmpidAnalysis;
 
   // using TrackCandidates = soa::Join<aod::Tracks, aod::TracksExtra, aod::TracksDCA, aod::TrackSelection>;
 
@@ -120,7 +118,7 @@ struct HmpidTableProducerPbPb {
       float centrality = col.centFV0A();
 
       /////FILL TABLE
-      hmpidAnalysisPbPb(
+      hmpidAnalysis(
         t.hmpidSignal(), globalTrack.phi(), globalTrack.eta(), t.hmpidMom(),
         globalTrack.p(), t.hmpidXTrack(), t.hmpidYTrack(), t.hmpidXMip(),
         t.hmpidYMip(), t.hmpidNPhotons(), t.hmpidQMip(), (t.hmpidClusSize() % 1000000) / 1000,
@@ -134,4 +132,4 @@ struct HmpidTableProducerPbPb {
   }
 };
 
-WorkflowSpec defineDataProcessing(ConfigContext const& cfg) { return WorkflowSpec{adaptAnalysisTask<HmpidTableProducerPbPb>(cfg)}; }
+WorkflowSpec defineDataProcessing(ConfigContext const& cfg) { return WorkflowSpec{adaptAnalysisTask<HmpidTableProducer>(cfg)}; }

DPG/Tasks/AOTTrack/PID/HMPID/hmpidQaPbPb.cxx

@@ -9,8 +9,8 @@
 // granted to it by virtue of its status as an Intergovernmental Organization
 // or submit itself to any jurisdiction.
 
-#ifndef DPG_TASKS_AOTTRACK_PID_HMPID_TABLEHMPIDPBPB_H_
-#define DPG_TASKS_AOTTRACK_PID_HMPID_TABLEHMPIDPBPB_H_
+#ifndef DPG_TASKS_AOTTRACK_PID_HMPID_TABLEHMPID_H_
+#define DPG_TASKS_AOTTRACK_PID_HMPID_TABLEHMPID_H_
 
 #include "Framework/ASoA.h"
 #include "Framework/AnalysisDataModel.h"
@@ -65,7 +65,7 @@ DECLARE_SOA_COLUMN(Centrality, centrality, float);
 
 } // namespace variables_table
 
-DECLARE_SOA_TABLE(HmpidAnalysisPbPb, "AOD", "HMPIDANALYSISPBPB",
+DECLARE_SOA_TABLE(HmpidAnalysis, "AOD", "HMPIDANALYSIS",
                   variables_table::ChAngle,
                   variables_table::Phi,
                   variables_table::Eta,
@@ -104,4 +104,4 @@ DECLARE_SOA_TABLE(HmpidAnalysisPbPb, "AOD", "HMPIDANALYSISPBPB",
 
 } // namespace o2::aod
 
-#endif // DPG_TASKS_AOTTRACK_PID_HMPID_TABLEHMPIDPBPB_H_
+#endif // DPG_TASKS_AOTTRACK_PID_HMPID_TABLEHMPID_H_