[EMCAL-556] Move EMCAL DCS processor to library EMCALCalibration

Author: mfasDa

Detectors/EMCAL/calib/CMakeLists.txt

@@ -23,8 +23,7 @@ o2_add_library(EMCALCalib
                        src/FeeDCS.cxx
                        src/CalibDB.cxx
                        src/ElmbMeasurement.cxx
-                       src/EMCDCSProcessor.cxx
-               PUBLIC_LINK_LIBRARIES O2::CCDB O2::DetectorsDCS O2::EMCALBase)
+               PUBLIC_LINK_LIBRARIES O2::CCDB O2::EMCALBase)
 
 o2_target_root_dictionary(EMCALCalib
                           HEADERS include/EMCALCalib/BadChannelMap.h
@@ -41,7 +40,6 @@ o2_target_root_dictionary(EMCALCalib
                                   include/EMCALCalib/CalibDB.h
                                   include/EMCALCalib/ElmbData.h
                                   include/EMCALCalib/ElmbMeasurement.h
-                                  include/EMCALCalib/EMCDCSProcessor.h
                           LINKDEF src/EMCALCalibLinkDef.h)
 
 o2_add_test(BadChannelMap
@@ -165,14 +163,5 @@ o2_add_test_root_macro(macros/TriggerDCS_CalibDBTest.C
             PUBLIC_LINK_LIBRARIES O2::EMCALCalib
             LABELS emcal COMPILE_ONLY)
 
-o2_add_test_root_macro(macros/makeEMCALCCDBEntryForDCS.C
-                                PUBLIC_LINK_LIBRARIES O2::DetectorsDCS O2::CCDB
-                                LABELS emcal COMPILE_ONLY)
-
-o2_add_test_root_macro(macros/readEMCALDCSentries.C
-                                PUBLIC_LINK_LIBRARIES O2::DetectorsDCS O2::CCDB O2::EMCALCalib
-                                LABELS emcal COMPILE_ONLY)
-
-
 o2_data_file(COPY files DESTINATION Detectors/EMC)
 

Detectors/EMCAL/calib/src/EMCALCalibLinkDef.h

@@ -29,6 +29,5 @@
 #pragma link C++ class o2::emcal::FeeDCS + ;
 #pragma link C++ class o2::emcal::ElmbData + ;
 #pragma link C++ class o2::emcal::ElmbMeasurement + ;
-#pragma link C++ class o2::emcal::EMCDCSProcessor + ;
 
 #endif

Detectors/EMCAL/calibration/CMakeLists.txt

@@ -15,10 +15,12 @@ o2_add_library(EMCALCalibration
                         src/EMCALTimeCalibData.cxx
                         src/EMCALCalibExtractor.cxx
                         src/EMCALCalibParams.cxx
+                        src/EMCDCSProcessor.cxx
                PUBLIC_LINK_LIBRARIES O2::CCDB O2::EMCALBase
                                      O2::EMCALCalib
                                      O2::CommonUtils
                                      O2::DetectorsCalibration
+                                     O2::DetectorsDCS
                                      O2::DataFormatsEMCAL
                                      O2::Framework
                                      O2::Algorithm
@@ -31,6 +33,7 @@ o2_target_root_dictionary(EMCALCalibration
                                   include/EMCALCalibration/EMCALChannelData.h
                                   include/EMCALCalibration/EMCALTimeCalibData.h
                                   include/EMCALCalibration/EMCALCalibParams.h
+                                  include/EMCALCalibration/EMCDCSProcessor.h
                           LINKDEF src/EMCALCalibrationLinkDef.h)
 
 o2_add_executable(emcal-channel-calib-workflow
@@ -51,4 +54,12 @@ o2_add_executable(run-calib-offline
 if (OpenMP_CXX_FOUND)
     target_compile_definitions(${targetName} PRIVATE WITH_OPENMP)
     target_link_libraries(${targetName} PRIVATE OpenMP::OpenMP_CXX)
-endif()
+endif()
+
+o2_add_test_root_macro(macros/makeEMCALCCDBEntryForDCS.C
+                                PUBLIC_LINK_LIBRARIES O2::DetectorsDCS O2::CCDB
+                                LABELS emcal COMPILE_ONLY)
+
+o2_add_test_root_macro(macros/readEMCALDCSentries.C
+                                PUBLIC_LINK_LIBRARIES O2::DetectorsDCS O2::CCDB O2::EMCALCalibration
+                                LABELS emcal COMPILE_ONLY)

…lib/include/EMCALCalib/EMCDCSProcessor.h …clude/EMCALCalibration/EMCDCSProcessor.hDetectors/EMCAL/calib/include/EMCALCalib/EMCDCSProcessor.h renamed to Detectors/EMCAL/calibration/include/EMCALCalibration/EMCDCSProcessor.h Detectors/EMCAL/calib/include/EMCALCalib/EMCDCSProcessor.h renamed to Detectors/EMCAL/calibration/include/EMCALCalibration/EMCDCSProcessor.h

@@ -16,7 +16,7 @@
 #include "CCDB/CcdbApi.h"
 #include "DetectorsDCS/DataPointIdentifier.h"
 #include "EMCALCalib/ElmbData.h"
-#include "EMCALCalib/EMCDCSProcessor.h"
+#include "EMCALCalibration/EMCDCSProcessor.h"
 
 //#include <string>
 //#include <unordered_map>

…/calib/macros/makeEMCALCCDBEntryForDCS.C …ration/macros/makeEMCALCCDBEntryForDCS.CDetectors/EMCAL/calib/macros/makeEMCALCCDBEntryForDCS.C renamed to Detectors/EMCAL/calibration/macros/makeEMCALCCDBEntryForDCS.C Detectors/EMCAL/calib/macros/makeEMCALCCDBEntryForDCS.C renamed to Detectors/EMCAL/calibration/macros/makeEMCALCCDBEntryForDCS.C

@@ -25,5 +25,6 @@
 
 #pragma link C++ class o2::emcal::EMCALCalibParams + ;
 #pragma link C++ class o2::conf::ConfigurableParamHelper < o2::emcal::EMCALCalibParams> + ;
+#pragma link C++ class o2::emcal::EMCDCSProcessor + ;
 
 #endif

…EMCAL/calib/macros/readEMCALDCSentries.C …calibration/macros/readEMCALDCSentries.CDetectors/EMCAL/calib/macros/readEMCALDCSentries.C renamed to Detectors/EMCAL/calibration/macros/readEMCALDCSentries.C Detectors/EMCAL/calib/macros/readEMCALDCSentries.C renamed to Detectors/EMCAL/calibration/macros/readEMCALDCSentries.C

@@ -30,7 +30,7 @@
 
 #include <map>
 #include <iterator>
-#include "EMCALCalib/EMCDCSProcessor.h"
+#include "EMCALCalibration/EMCDCSProcessor.h"
 
 using namespace o2::dcs;
 using namespace o2::emcal;
@@ -109,7 +109,7 @@ int EMCDCSProcessor::processDP(const DPCOM& dp)
   if ((type == DPVAL_INT) || (type == DPVAL_UINT)) // FEE config params and STU_TRU error counters
   {
     auto& dpval_prev = mapFEEcfg[dpid];
-    if (dpval_prev.size() == 0 || val.get_epoch_time() != dpval_prev.back().get_epoch_time()) //compate the time stamps
+    if (dpval_prev.size() == 0 || val.get_epoch_time() != dpval_prev.back().get_epoch_time()) // compate the time stamps
     {
       dpval_prev.push_back(val); // do we need to archive them all?????
       mUpdateFEEcfg = true;
@@ -120,7 +120,7 @@ int EMCDCSProcessor::processDP(const DPCOM& dp)
   } else if (type == DPVAL_DOUBLE) { // ELMB data
     FillElmbDP(dp);
   }
-  //printPDCOM(dp);
+  // printPDCOM(dp);
 
   return 0;
 }
@@ -134,7 +134,7 @@ void EMCDCSProcessor::FillElmbDP(const DPCOM& dpcom)
   std::string alias(dpid.get_alias());
 
   auto& dpval = dpcom.data;
-  auto val = o2::dcs::getValue<double>(dpcom); //dpval.payload_pt1;
+  auto val = o2::dcs::getValue<double>(dpcom); // dpval.payload_pt1;
 
   std::size_t index;
   int iPT = -1;

Detectors/EMCAL/calibration/src/EMCALCalibrationLinkDef.h

@@ -39,7 +39,7 @@ o2_add_executable(emc-dcs-workflow
                   COMPONENT_NAME calibration
                   SOURCES src/emc-dcs-data-workflow.cxx
                   PUBLIC_LINK_LIBRARIES O2::Framework
-                                       O2::EMCALCalib
+                                       O2::EMCALCalibration
                                        O2::EMCALWorkflow
                                        O2::DetectorsDCS)
 

…tors/EMCAL/calib/src/EMCDCSProcessor.cxx …MCAL/calibration/src/EMCDCSProcessor.cxxDetectors/EMCAL/calib/src/EMCDCSProcessor.cxx renamed to Detectors/EMCAL/calibration/src/EMCDCSProcessor.cxx Detectors/EMCAL/calib/src/EMCDCSProcessor.cxx renamed to Detectors/EMCAL/calibration/src/EMCDCSProcessor.cxx

@@ -23,7 +23,7 @@
 #include "DetectorsDCS/DataPointCompositeObject.h"
 #include "DetectorsDCS/DeliveryType.h"
 #include "DetectorsDCS/AliasExpander.h"
-#include "EMCALCalib/EMCDCSProcessor.h"
+#include "EMCALCalibration/EMCDCSProcessor.h"
 #include "DetectorsCalibration/Utils.h"
 #include "CCDB/CcdbApi.h"
 #include "CCDB/BasicCCDBManager.h"