Skip to content

Commit 6e4572b

Browse files
mfasDashahor02
mfasDa
authored and
shahor02
committed
[EMCAL-556] Move EMCAL DCS processor to library EMCALCalibration
1 parent 3f2302d commit 6e4572b

10 files changed

Lines changed: 21 additions & 21 deletions

File tree

‎Detectors/EMCAL/calib/CMakeLists.txt‎

Lines changed: 1 addition & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,7 @@ o2_add_library(EMCALCalib
2323
src/FeeDCS.cxx
2424
src/CalibDB.cxx
2525
src/ElmbMeasurement.cxx
26-
src/EMCDCSProcessor.cxx
27-
PUBLIC_LINK_LIBRARIES O2::CCDB O2::DetectorsDCS O2::EMCALBase)
26+
PUBLIC_LINK_LIBRARIES O2::CCDB O2::EMCALBase)
2827

2928
o2_target_root_dictionary(EMCALCalib
3029
HEADERS include/EMCALCalib/BadChannelMap.h
@@ -41,7 +40,6 @@ o2_target_root_dictionary(EMCALCalib
4140
include/EMCALCalib/CalibDB.h
4241
include/EMCALCalib/ElmbData.h
4342
include/EMCALCalib/ElmbMeasurement.h
44-
include/EMCALCalib/EMCDCSProcessor.h
4543
LINKDEF src/EMCALCalibLinkDef.h)
4644

4745
o2_add_test(BadChannelMap
@@ -165,14 +163,5 @@ o2_add_test_root_macro(macros/TriggerDCS_CalibDBTest.C
165163
PUBLIC_LINK_LIBRARIES O2::EMCALCalib
166164
LABELS emcal COMPILE_ONLY)
167165

168-
o2_add_test_root_macro(macros/makeEMCALCCDBEntryForDCS.C
169-
PUBLIC_LINK_LIBRARIES O2::DetectorsDCS O2::CCDB
170-
LABELS emcal COMPILE_ONLY)
171-
172-
o2_add_test_root_macro(macros/readEMCALDCSentries.C
173-
PUBLIC_LINK_LIBRARIES O2::DetectorsDCS O2::CCDB O2::EMCALCalib
174-
LABELS emcal COMPILE_ONLY)
175-
176-
177166
o2_data_file(COPY files DESTINATION Detectors/EMC)
178167

‎Detectors/EMCAL/calib/src/EMCALCalibLinkDef.h‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,5 @@
2929
#pragma link C++ class o2::emcal::FeeDCS + ;
3030
#pragma link C++ class o2::emcal::ElmbData + ;
3131
#pragma link C++ class o2::emcal::ElmbMeasurement + ;
32-
#pragma link C++ class o2::emcal::EMCDCSProcessor + ;
3332

3433
#endif

‎Detectors/EMCAL/calibration/CMakeLists.txt‎

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,10 +15,12 @@ o2_add_library(EMCALCalibration
1515
src/EMCALTimeCalibData.cxx
1616
src/EMCALCalibExtractor.cxx
1717
src/EMCALCalibParams.cxx
18+
src/EMCDCSProcessor.cxx
1819
PUBLIC_LINK_LIBRARIES O2::CCDB O2::EMCALBase
1920
O2::EMCALCalib
2021
O2::CommonUtils
2122
O2::DetectorsCalibration
23+
O2::DetectorsDCS
2224
O2::DataFormatsEMCAL
2325
O2::Framework
2426
O2::Algorithm
@@ -31,6 +33,7 @@ o2_target_root_dictionary(EMCALCalibration
3133
include/EMCALCalibration/EMCALChannelData.h
3234
include/EMCALCalibration/EMCALTimeCalibData.h
3335
include/EMCALCalibration/EMCALCalibParams.h
36+
include/EMCALCalibration/EMCDCSProcessor.h
3437
LINKDEF src/EMCALCalibrationLinkDef.h)
3538

3639
o2_add_executable(emcal-channel-calib-workflow
@@ -51,4 +54,12 @@ o2_add_executable(run-calib-offline
5154
if (OpenMP_CXX_FOUND)
5255
target_compile_definitions(${targetName} PRIVATE WITH_OPENMP)
5356
target_link_libraries(${targetName} PRIVATE OpenMP::OpenMP_CXX)
54-
endif()
57+
endif()
58+
59+
o2_add_test_root_macro(macros/makeEMCALCCDBEntryForDCS.C
60+
PUBLIC_LINK_LIBRARIES O2::DetectorsDCS O2::CCDB
61+
LABELS emcal COMPILE_ONLY)
62+
63+
o2_add_test_root_macro(macros/readEMCALDCSentries.C
64+
PUBLIC_LINK_LIBRARIES O2::DetectorsDCS O2::CCDB O2::EMCALCalibration
65+
LABELS emcal COMPILE_ONLY)

Detectors/EMCAL/calib/include/EMCALCalib/EMCDCSProcessor.h renamed to Detectors/EMCAL/calibration/include/EMCALCalibration/EMCDCSProcessor.h

File renamed without changes.

Detectors/EMCAL/calib/macros/makeEMCALCCDBEntryForDCS.C renamed to Detectors/EMCAL/calibration/macros/makeEMCALCCDBEntryForDCS.C

File renamed without changes.

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
#include "CCDB/CcdbApi.h"
1717
#include "DetectorsDCS/DataPointIdentifier.h"
1818
#include "EMCALCalib/ElmbData.h"
19-
#include "EMCALCalib/EMCDCSProcessor.h"
19+
#include "EMCALCalibration/EMCDCSProcessor.h"
2020

2121
//#include <string>
2222
//#include <unordered_map>

‎Detectors/EMCAL/calibration/src/EMCALCalibrationLinkDef.h‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,5 +25,6 @@
2525

2626
#pragma link C++ class o2::emcal::EMCALCalibParams + ;
2727
#pragma link C++ class o2::conf::ConfigurableParamHelper < o2::emcal::EMCALCalibParams> + ;
28+
#pragma link C++ class o2::emcal::EMCDCSProcessor + ;
2829

2930
#endif

Detectors/EMCAL/calib/src/EMCDCSProcessor.cxx renamed to Detectors/EMCAL/calibration/src/EMCDCSProcessor.cxx

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030

3131
#include <map>
3232
#include <iterator>
33-
#include "EMCALCalib/EMCDCSProcessor.h"
33+
#include "EMCALCalibration/EMCDCSProcessor.h"
3434

3535
using namespace o2::dcs;
3636
using namespace o2::emcal;
@@ -109,7 +109,7 @@ int EMCDCSProcessor::processDP(const DPCOM& dp)
109109
if ((type == DPVAL_INT) || (type == DPVAL_UINT)) // FEE config params and STU_TRU error counters
110110
{
111111
auto& dpval_prev = mapFEEcfg[dpid];
112-
if (dpval_prev.size() == 0 || val.get_epoch_time() != dpval_prev.back().get_epoch_time()) //compate the time stamps
112+
if (dpval_prev.size() == 0 || val.get_epoch_time() != dpval_prev.back().get_epoch_time()) // compate the time stamps
113113
{
114114
dpval_prev.push_back(val); // do we need to archive them all?????
115115
mUpdateFEEcfg = true;
@@ -120,7 +120,7 @@ int EMCDCSProcessor::processDP(const DPCOM& dp)
120120
} else if (type == DPVAL_DOUBLE) { // ELMB data
121121
FillElmbDP(dp);
122122
}
123-
//printPDCOM(dp);
123+
// printPDCOM(dp);
124124

125125
return 0;
126126
}
@@ -134,7 +134,7 @@ void EMCDCSProcessor::FillElmbDP(const DPCOM& dpcom)
134134
std::string alias(dpid.get_alias());
135135

136136
auto& dpval = dpcom.data;
137-
auto val = o2::dcs::getValue<double>(dpcom); //dpval.payload_pt1;
137+
auto val = o2::dcs::getValue<double>(dpcom); // dpval.payload_pt1;
138138

139139
std::size_t index;
140140
int iPT = -1;

‎Detectors/EMCAL/workflow/CMakeLists.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ o2_add_executable(emc-dcs-workflow
3939
COMPONENT_NAME calibration
4040
SOURCES src/emc-dcs-data-workflow.cxx
4141
PUBLIC_LINK_LIBRARIES O2::Framework
42-
O2::EMCALCalib
42+
O2::EMCALCalibration
4343
O2::EMCALWorkflow
4444
O2::DetectorsDCS)
4545

‎Detectors/EMCAL/workflow/include/EMCALWorkflow/EMCALDCSDataProcessorSpec.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
#include "DetectorsDCS/DataPointCompositeObject.h"
2424
#include "DetectorsDCS/DeliveryType.h"
2525
#include "DetectorsDCS/AliasExpander.h"
26-
#include "EMCALCalib/EMCDCSProcessor.h"
26+
#include "EMCALCalibration/EMCDCSProcessor.h"
2727
#include "DetectorsCalibration/Utils.h"
2828
#include "CCDB/CcdbApi.h"
2929
#include "CCDB/BasicCCDBManager.h"

0 commit comments

Comments
 (0)