Rename workflow for clarity: zdc-task-inter-calib -> zdc-extra-table-producer; update related files

Author: udmitrie

Common/DataModel/CMakeLists.txt

@@ -25,6 +25,6 @@ o2physics_add_header_only_library(DataModel
                                           Qvectors.h
                                           MatchMFTFT0.h
                                           MftmchMatchingML.h
-                                          ZDCInterCalib.h
+                                          ZDCExtra.h
                                           EseTable.h
                                           FwdTrackReAlignTables.h)

Common/DataModel/ZDCInterCalib.h Common/DataModel/ZDCExtra.hCommon/DataModel/ZDCInterCalib.h renamed to Common/DataModel/ZDCExtra.h

@@ -9,20 +9,21 @@
 // granted to it by virtue of its status as an Intergovernmental Organization
 // or submit itself to any jurisdiction.
 
-/// \file ZDCInterCalib.h
-/// \brief ZDC tower intercalibration task
+/// \file ZDCExtra.h
+/// \brief ZDC extra table producer
 /// \author Chiara Oppedisano <chiara.oppedisano@cern.ch>, INFN Torino
+/// \author Uliana Dmitrieva <uliana.dmitrieva@cern.ch>, INFN Torino
 
-#ifndef COMMON_DATAMODEL_ZDCINTERCALIB_H_
-#define COMMON_DATAMODEL_ZDCINTERCALIB_H_
+#ifndef COMMON_DATAMODEL_ZDCEXTRA_H_
+#define COMMON_DATAMODEL_ZDCEXTRA_H_
 
 #include <Framework/AnalysisDataModel.h>
 
 #include <cstdint>
 
 namespace o2::aod
 {
-namespace znoutput // o2-linter: disable=name/workflow-file
+namespace zdcextra
 {
 DECLARE_SOA_COLUMN(ZNApmc, commonPMZNA, float);            //! PMC ZNA         // o2-linter: disable=name/o2-column
 DECLARE_SOA_COLUMN(ZNApm1, ZNAPM1, float);                 //! PM1 ZNA         // o2-linter: disable=name/o2-column
@@ -39,24 +40,24 @@ DECLARE_SOA_COLUMN(ZNCtdc, ZNCTDC, float);                 //! TDC ZNC         /
 DECLARE_SOA_COLUMN(Centrality, centrality, float);         //! Centrality
 DECLARE_SOA_COLUMN(Timestamp, timestamp, uint64_t);        //! Timestamp
 DECLARE_SOA_COLUMN(SelectionBits, selectionBits, uint8_t); //! Selection Flags
-} // namespace znoutput
+} // namespace zdcextra
 
-DECLARE_SOA_TABLE(ZDCInterCalib, "AOD", "ZDCIC", o2::soa::Index<>,
-                  znoutput::ZNApmc,
-                  znoutput::ZNApm1,
-                  znoutput::ZNApm2,
-                  znoutput::ZNApm3,
-                  znoutput::ZNApm4,
-                  znoutput::ZNAtdc,
-                  znoutput::ZNCpmc,
-                  znoutput::ZNCpm1,
-                  znoutput::ZNCpm2,
-                  znoutput::ZNCpm3,
-                  znoutput::ZNCpm4,
-                  znoutput::ZNCtdc,
-                  znoutput::Centrality,
-                  znoutput::Timestamp,
-                  znoutput::SelectionBits);
+DECLARE_SOA_TABLE(ZdcExtras, "AOD", "ZDCEXTRA", o2::soa::Index<>,
+                  zdcextra::ZNApmc,
+                  zdcextra::ZNApm1,
+                  zdcextra::ZNApm2,
+                  zdcextra::ZNApm3,
+                  zdcextra::ZNApm4,
+                  zdcextra::ZNAtdc,
+                  zdcextra::ZNCpmc,
+                  zdcextra::ZNCpm1,
+                  zdcextra::ZNCpm2,
+                  zdcextra::ZNCpm3,
+                  zdcextra::ZNCpm4,
+                  zdcextra::ZNCtdc,
+                  zdcextra::Centrality,
+                  zdcextra::Timestamp,
+                  zdcextra::SelectionBits);
 } // namespace o2::aod
 
-#endif // COMMON_DATAMODEL_ZDCINTERCALIB_H_
+#endif // COMMON_DATAMODEL_ZDCEXTRA_H_

Common/TableProducer/CMakeLists.txt

@@ -148,8 +148,8 @@ o2physics_add_dpl_workflow(match-mft-ft0
                                           O2::DetectorsBase O2::DetectorsCommonDataFormats
                     COMPONENT_NAME Analysis)
 
-o2physics_add_dpl_workflow(zdc-task-inter-calib
-                    SOURCES zdcTaskInterCalib.cxx
+o2physics_add_dpl_workflow(zdc-extra-table-producer
+                    SOURCES zdcExtraTableProducer.cxx
                     PUBLIC_LINK_LIBRARIES O2::Framework O2Physics::AnalysisCore
                     COMPONENT_NAME Analysis)
 

…mmon/TableProducer/zdcTaskInterCalib.cxx …/TableProducer/zdcExtraTableProducer.cxxCommon/TableProducer/zdcTaskInterCalib.cxx renamed to Common/TableProducer/zdcExtraTableProducer.cxx Common/TableProducer/zdcTaskInterCalib.cxx renamed to Common/TableProducer/zdcExtraTableProducer.cxx

@@ -9,14 +9,15 @@
 // granted to it by virtue of its status as an Intergovernmental Organization
 // or submit itself to any jurisdiction.
 
-/// \file zdcTaskInterCalib.cxx
-/// \brief Task for ZDC tower inter-calibration
-/// \author chiara.oppedisano@cern.ch
+/// \file zdcExtraTableProducer.cxx
+/// \brief Task creating table with ZDC PMTs energies and calculated centroid (Q-vector) to be used for spectator plane measurement
+/// \author Chiara Oppedisano <chiara.oppedisano@cern.ch>, INFN Torino
+/// \author Uliana Dmitrieva <uliana.dmitrieva@cern.ch>, INFN Torino
 
 #include "Common/CCDB/EventSelectionParams.h"
 #include "Common/DataModel/Centrality.h"
 #include "Common/DataModel/EventSelection.h"
-#include "Common/DataModel/ZDCInterCalib.h"
+#include "Common/DataModel/ZDCExtra.h"
 
 #include <Framework/AnalysisDataModel.h>
 #include <Framework/AnalysisHelpers.h>
@@ -29,6 +30,7 @@
 #include <Framework/runDataProcessing.h>
 
 #include <TH1.h>
+#include <TH2.h>
 
 #include <cstdint>
 
@@ -40,9 +42,9 @@ using namespace o2::aod::evsel;
 using BCsRun3 = soa::Join<aod::BCs, aod::Timestamps, aod::BcSels, aod::Run3MatchedToBCSparse>;
 using ColEvSels = soa::Join<aod::Collisions, aod::EvSels, aod::CentFT0Cs>;
 
-struct ZdcTaskInterCalib {
+struct ZdcExtraTableProducer {
 
-  Produces<aod::ZDCInterCalib> zTab;
+  Produces<aod::ZdcExtras> zdcextras;
 
   // Configurable parameters
   //
@@ -245,14 +247,14 @@ struct ZdcTaskInterCalib {
           registry.get<TH1>(HIST("ZNAsumq"))->Fill(sumZNA);
         }
         if (isZNAhit || isZNChit)
-          zTab(pmcZNA, pmqZNA[0], pmqZNA[1], pmqZNA[2], pmqZNA[3], tdcZNC, pmcZNC, pmqZNC[0], pmqZNC[1], pmqZNC[2], pmqZNC[3], tdcZNA, centrality, foundBC.timestamp(), evSelection);
+          zdcextras(pmcZNA, pmqZNA[0], pmqZNA[1], pmqZNA[2], pmqZNA[3], tdcZNC, pmcZNC, pmqZNC[0], pmqZNC[1], pmqZNC[2], pmqZNC[3], tdcZNA, centrality, foundBC.timestamp(), evSelection);
       }
     }
   }
 };
 
-WorkflowSpec defineDataProcessing(ConfigContext const& cfgc) // o2-linter: disable=name/file-cpp
+WorkflowSpec defineDataProcessing(ConfigContext const& cfgc)
 {
   return WorkflowSpec{
-    adaptAnalysisTask<ZdcTaskInterCalib>(cfgc)};
+    adaptAnalysisTask<ZdcExtraTableProducer>(cfgc)};
 }