Skip to content

Commit 1d4cd05

Browse files
authored
TRD further code cleanup (#2070)
* TRD code cleanup * Update TRDQC.json for local tests * Reduce warnings from getFromConfig utility
1 parent 22c151d commit 1d4cd05

20 files changed

Lines changed: 31 additions & 1277 deletions

Modules/Common/include/Common/Utils.h

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,8 +37,7 @@ T getFromConfig(const quality_control::core::CustomParameters& params, const std
3737
const auto itParam = params.find(name.data());
3838

3939
if (itParam == last) {
40-
LOGP(warning, "missing parameter {}", name.data());
41-
LOGP(warning, "Please add '{}': '<value>' to the 'taskParameters'. Using default value {}.", name.data(), retVal);
40+
LOGP(warning, "Missing parameter. Please add '{}': '<value>' to the 'taskParameters'. Using default value {}.", name.data(), retVal);
4241
} else {
4342
const auto& param = itParam->second;
4443
if constexpr (std::is_same<int, T>::value) {

Modules/TRD/CMakeLists.txt

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22

33
add_library(O2QcTRD)
44

5-
target_sources(O2QcTRD PRIVATE src/TrackletCountCheck.cxx src/TRDReductor.cxx src/PulsePositionCheck.cxx src/TrackingTask.cxx src/PulseHeightTrackMatch.cxx src/TrackletsCheck.cxx src/TrackletsTask.cxx src/PulseHeightCheck.cxx src/PulseHeight.cxx src/RawData.cxx src/DigitsTask.cxx
6-
src/DigitsCheck.cxx src/TRDTrending.cxx src/TrendingTaskConfigTRD.cxx src/PulseHeightPostProcessing.cxx)
5+
target_sources(O2QcTRD PRIVATE src/TrackletCountCheck.cxx src/PulsePositionCheck.cxx src/TrackingTask.cxx src/PulseHeightTrackMatch.cxx src/TrackletsCheck.cxx src/TrackletsTask.cxx src/PulseHeightCheck.cxx src/RawData.cxx src/DigitsTask.cxx
6+
src/TRDTrending.cxx src/TrendingTaskConfigTRD.cxx src/PulseHeightPostProcessing.cxx)
77

88
target_include_directories(
99
O2QcTRD
@@ -21,18 +21,15 @@ install(TARGETS O2QcTRD
2121
add_root_dictionary(O2QcTRD
2222
HEADERS
2323
include/TRD/TrackletCountCheck.h
24-
include/TRD/TRDReductor.h
2524
include/TRD/PulsePositionCheck.h
2625
include/TRD/TrackingTask.h
2726
include/TRD/PulseHeightTrackMatch.h
2827
include/TRD/TrackletsCheck.h
2928
include/TRD/TrackletsTask.h
3029
include/TRD/PulseHeightCheck.h
31-
include/TRD/PulseHeight.h
3230
include/TRD/RawData.h
3331
include/TRD/PulseHeightPostProcessing.h
3432
include/TRD/DigitsTask.h
35-
include/TRD/DigitsCheck.h
3633
include/TRD/TRDTrending.h
3734
include/TRD/TrendingTaskConfigTRD.h
3835
LINKDEF include/TRD/LinkDef.h)
@@ -70,5 +67,5 @@ install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/include/TRD
7067

7168
# ---- Install config files ----
7269

73-
install(FILES DigitsTask.json
70+
install(FILES TRDQC.json
7471
DESTINATION etc)

Modules/TRD/DigitsTask.json

Lines changed: 0 additions & 75 deletions
This file was deleted.

Modules/TRD/PulsePositionCheck.json

Lines changed: 0 additions & 159 deletions
This file was deleted.

Modules/TRD/RawData.json

Lines changed: 0 additions & 66 deletions
This file was deleted.

0 commit comments

Comments
 (0)