From d0e5241c9d8c3ce1222f68d9e49de54648fd49f6 Mon Sep 17 00:00:00 2001 From: Chiara Zampolli Date: Tue, 5 Oct 2021 16:06:22 +0200 Subject: [PATCH 1/4] ITSTPC tracking QC some fixes Improvements clang-format ITSTPC tracking QC some fixes Improvements clang-format --- Modules/GLO/CMakeLists.txt | 8 +- Modules/GLO/include/GLO/LinkDef.h | 2 + Modules/REC/ITSTPCmatchedTracks.json | 74 +++++++++++++ Modules/REC/include/REC/ITSTPCMatchingTask.h | 55 ++++++++++ Modules/REC/src/ITSTPCMatchingTask.cxx | 109 +++++++++++++++++++ 5 files changed, 246 insertions(+), 2 deletions(-) create mode 100644 Modules/REC/ITSTPCmatchedTracks.json create mode 100644 Modules/REC/include/REC/ITSTPCMatchingTask.h create mode 100644 Modules/REC/src/ITSTPCMatchingTask.cxx diff --git a/Modules/GLO/CMakeLists.txt b/Modules/GLO/CMakeLists.txt index 4b7f3df6e2..bad2b6d34c 100644 --- a/Modules/GLO/CMakeLists.txt +++ b/Modules/GLO/CMakeLists.txt @@ -2,7 +2,7 @@ add_library(O2QcGLO) -target_sources(O2QcGLO PRIVATE src/VertexingQcTask.cxx ) +target_sources(O2QcGLO PRIVATE src/VertexingQcTask.cxx src/ITSTPCMatchingTask.cxx) target_include_directories( O2QcGLO @@ -13,7 +13,10 @@ target_include_directories( target_link_libraries(O2QcGLO PUBLIC O2QualityControl - O2::Steer) + O2::Steer + O2::DataFormatsGlobalTracking + O2::DataFormatsITS + O2::GlobalTracking) install(TARGETS O2QcGLO LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} @@ -23,6 +26,7 @@ install(TARGETS O2QcGLO add_root_dictionary(O2QcGLO HEADERS include/GLO/VertexingQcTask.h + include/GLO/ITSTPCMatchingTask.h LINKDEF include/GLO/LinkDef.h BASENAME O2QcGLO) diff --git a/Modules/GLO/include/GLO/LinkDef.h b/Modules/GLO/include/GLO/LinkDef.h index c3a4b7b0e2..def093620a 100644 --- a/Modules/GLO/include/GLO/LinkDef.h +++ b/Modules/GLO/include/GLO/LinkDef.h @@ -4,4 +4,6 @@ #pragma link off all functions; #pragma link C++ class o2::quality_control_modules::glo::VertexingQcTask + ; +#pragma link C++ class o2::quality_control_modules::glo::ITSTPCMatchingTask + ; + #endif diff --git a/Modules/REC/ITSTPCmatchedTracks.json b/Modules/REC/ITSTPCmatchedTracks.json new file mode 100644 index 0000000000..56cbfb325d --- /dev/null +++ b/Modules/REC/ITSTPCmatchedTracks.json @@ -0,0 +1,74 @@ +{ + "qc" : { + "config" : { + "database" : { + "implementation" : "CCDB", + "host" : "ccdb-test.cern.ch:8080", + "username" : "not_applicable", + "password" : "not_applicable", + "name" : "not_applicable" + }, + "Activity" : { + "number" : "42", + "type" : "2" + }, + "monitoring" : { + "url" : "infologger:///debug?qc" + }, + "consul" : { + "url" : "" + }, + "conditionDB" : { + "url" : "ccdb-test.cern.ch:8080" + }, + "infologger" : { "" : "Configuration of the Infologger (optional).", + "filterDiscardDebug" : "false", + "" : "Set to true to discard debug and trace messages (default: false)", + "filterDiscardLevel" : "21", + "" : "Message at this level or above are discarded (default: 21 - Trace)" } + }, + "tasks" : { + "MatchedTracksITSTPC" : { + "active" : "true", + "className" : "o2::quality_control_modules::rec::ITSTPCMatchingTask", + "moduleName" : "QcREC", + "detectorName" : "REC", + "cycleDurationSeconds" : "10", + "maxNumberCycles" : "-1", + "dataSource" : { + "type" : "direct", + "query_comment" : "checking every matched track", + "query" : "trackITSTPC:GLO/TPCITS/0;trackITSTPCABREFS:GLO/TPCITSAB_REFS/0;trackITSTPCABCLID:GLO/TPCITSAB_CLID/0;trackTPC:TPC/TRACKS;trackTPCClRefs:TPC/CLUSREFS" + }, + "taskParameters" : { + "GID" : "ITS-TPC,ITS", + "verbose" : "false", + "minPtCut" : "0.1f", + "etaCut" : "1.4f", + "minNTPCClustersCut" : "40", + "minDCACut" : "100.f", + "minDCACutY" : "10.f" + }, + "location" : "remote", + "saveObjectsToFile" : "ITSTPCmatched.root", + "" : "For debugging, path to the file where to save. If empty or missing it won't save." + } + }, + "checks" : { + "QcCheck" : { + "active" : "false", + "className" : "o2::quality_control_modules::skeleton::SkeletonCheck", + "moduleName" : "QcSkeleton", + "policy" : "OnAny", + "detectorName" : "TOF", + "dataSource" : [ { + "type" : "Task", + "name" : "QcTask", + "MOs" : ["example"] + } ] + } + } + }, + "dataSamplingPolicies" : [ + ] +} diff --git a/Modules/REC/include/REC/ITSTPCMatchingTask.h b/Modules/REC/include/REC/ITSTPCMatchingTask.h new file mode 100644 index 0000000000..2a1def6047 --- /dev/null +++ b/Modules/REC/include/REC/ITSTPCMatchingTask.h @@ -0,0 +1,55 @@ +// Copyright 2019-2020 CERN and copyright holders of ALICE O2. +// See https://alice-o2.web.cern.ch/copyright for details of the copyright holders. +// All rights not expressly granted are reserved. +// +// This software is distributed under the terms of the GNU General Public +// License v3 (GPL Version 3), copied verbatim in the file "COPYING". +// +// In applying this license CERN does not waive the privileges and immunities +// granted to it by virtue of its status as an Intergovernmental Organization +// or submit itself to any jurisdiction. + +/// +/// \file ITSTPCMatchingTask.h +/// \author My Name +/// + +#ifndef QC_MODULE_REC_RECITSTPCMATCHINGTASK_H +#define QC_MODULE_REC_RECITSTPCMATCHINGTASK_H + +#include "QualityControl/TaskInterface.h" +#include "GlobalTracking/MatchITSTPCQC.h" + +class TH1F; + +using namespace o2::quality_control::core; + +namespace o2::quality_control_modules::rec +{ + +/// \brief Example Quality Control DPL Task +/// \author My Name +class ITSTPCMatchingTask final : public TaskInterface +{ + public: + /// \brief Constructor + ITSTPCMatchingTask() = default; + /// Destructor + ~ITSTPCMatchingTask() override; + + // Definition of the methods for the template method pattern + void initialize(o2::framework::InitContext& ctx) override; + void startOfActivity(Activity& activity) override; + void startOfCycle() override; + void monitorData(o2::framework::ProcessingContext& ctx) override; + void endOfCycle() override; + void endOfActivity(Activity& activity) override; + void reset() override; + + private: + o2::globaltracking::MatchITSTPCQC mMatchITSTPCQC; +}; + +} // namespace o2::quality_control_modules::rec + +#endif // QC_MODULE_REC_RECITSTPCMATCHINGTASK_H diff --git a/Modules/REC/src/ITSTPCMatchingTask.cxx b/Modules/REC/src/ITSTPCMatchingTask.cxx new file mode 100644 index 0000000000..a74b002b34 --- /dev/null +++ b/Modules/REC/src/ITSTPCMatchingTask.cxx @@ -0,0 +1,109 @@ +// Copyright 2019-2020 CERN and copyright holders of ALICE O2. +// See https://alice-o2.web.cern.ch/copyright for details of the copyright holders. +// All rights not expressly granted are reserved. +// +// This software is distributed under the terms of the GNU General Public +// License v3 (GPL Version 3), copied verbatim in the file "COPYING". +// +// In applying this license CERN does not waive the privileges and immunities +// granted to it by virtue of its status as an Intergovernmental Organization +// or submit itself to any jurisdiction. + +/// +/// \file ITSTPCMatchingTask.cxx +/// \author My Name +/// + +#include +#include + +#include "QualityControl/QcInfoLogger.h" +#include "REC/ITSTPCMatchingTask.h" +#include +#include + +namespace o2::quality_control_modules::rec +{ + +ITSTPCMatchingTask::~ITSTPCMatchingTask() +{ + // mMatchITSTPCQC.deleteHistograms(); +} + +void ITSTPCMatchingTask::initialize(o2::framework::InitContext& /*ctx*/) +{ + ILOG(Info, Support) << "initialize ITSTPCMatchingTask" << ENDM; // QcInfoLogger is used. FairMQ logs will go to there as well. + + if (auto param = mCustomParameters.find("isMC"); param != mCustomParameters.end()) { + ILOG(Info, Devel) << "Custom parameter - isMC (= use of MC info): " << param->second << ENDM; + if (param->second == "true" || param->second == "True" || param->second == "TRUE") { + mMatchITSTPCQC.setUseMC(true); + } + } + if (auto param = mCustomParameters.find("minPtCut"); param != mCustomParameters.end()) { + ILOG(Info, Devel) << "Custom parameter - minPtCut (for track selection): " << param->second << ENDM; + mMatchITSTPCQC.setPtCut(atof(param->second.c_str())); + } + if (auto param = mCustomParameters.find("EtaCut"); param != mCustomParameters.end()) { + ILOG(Info, Devel) << "Custom parameter - EtaCut (for track selection): " << param->second << ENDM; + mMatchITSTPCQC.setEtaCut(atof(param->second.c_str())); + } + if (auto param = mCustomParameters.find("minNTPCClustersCut"); param != mCustomParameters.end()) { + ILOG(Info, Devel) << "Custom parameter - minNTPCClustersCut (for track selection): " << param->second << ENDM; + mMatchITSTPCQC.setMinNTPCClustersCut(atoi(param->second.c_str())); + } + if (auto param = mCustomParameters.find("minDCACut"); param != mCustomParameters.end()) { + ILOG(Info, Devel) << "Custom parameter - minDCACut (for track selection): " << param->second << ENDM; + mMatchITSTPCQC.setMinDCAtoBeamPipeDistanceCut(atof(param->second.c_str())); + } + if (auto param = mCustomParameters.find("minDCACutY"); param != mCustomParameters.end()) { + ILOG(Info, Devel) << "Custom parameter - minDCACutY (for track selection): " << param->second << ENDM; + mMatchITSTPCQC.setMinDCAtoBeamPipeYCut(atof(param->second.c_str())); + } + + mMatchITSTPCQC.init(); + getObjectsManager()->startPublishing(mMatchITSTPCQC.getHistoPtTPC()); + getObjectsManager()->startPublishing(mMatchITSTPCQC.getHistoFractionITSTPCmatch()); + getObjectsManager()->startPublishing(mMatchITSTPCQC.getHistoPt()); + getObjectsManager()->startPublishing(mMatchITSTPCQC.getHistoEta()); + getObjectsManager()->startPublishing(mMatchITSTPCQC.getHistoChi2Matching()); + getObjectsManager()->startPublishing(mMatchITSTPCQC.getHistoChi2Refit()); + getObjectsManager()->startPublishing(mMatchITSTPCQC.getHistoTimeResVsPt()); +} + +void ITSTPCMatchingTask::startOfActivity(Activity& activity) +{ + ILOG(Info, Support) << "startOfActivity " << activity.mId << ENDM; + mMatchITSTPCQC.reset(); +} + +void ITSTPCMatchingTask::startOfCycle() +{ + ILOG(Info, Support) << "startOfCycle" << ENDM; +} + +void ITSTPCMatchingTask::monitorData(o2::framework::ProcessingContext& ctx) +{ + mMatchITSTPCQC.run(ctx); +} + +void ITSTPCMatchingTask::endOfCycle() +{ + ILOG(Info, Support) << "endOfCycle" << ENDM; + mMatchITSTPCQC.finalize(); +} + +void ITSTPCMatchingTask::endOfActivity(Activity& /*activity*/) +{ + ILOG(Info, Support) << "endOfActivity" << ENDM; +} + +void ITSTPCMatchingTask::reset() +{ + // clean all the monitor objects here + + ILOG(Info, Support) << "Resetting the histograms" << ENDM; + mMatchITSTPCQC.reset(); +} + +} // namespace o2::quality_control_modules::rec From 5b6cdc084aaab4cf69aefbd0634e7032b72e9d13 Mon Sep 17 00:00:00 2001 From: Chiara Zampolli Date: Fri, 8 Oct 2021 00:35:37 +0200 Subject: [PATCH 2/4] Pass GRP and geom file names --- Modules/REC/ITSTPCmatchedTracks.json | 4 +++- Modules/REC/src/ITSTPCMatchingTask.cxx | 8 ++++++++ 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/Modules/REC/ITSTPCmatchedTracks.json b/Modules/REC/ITSTPCmatchedTracks.json index 56cbfb325d..d947682ef5 100644 --- a/Modules/REC/ITSTPCmatchedTracks.json +++ b/Modules/REC/ITSTPCmatchedTracks.json @@ -47,7 +47,9 @@ "etaCut" : "1.4f", "minNTPCClustersCut" : "40", "minDCACut" : "100.f", - "minDCACutY" : "10.f" + "minDCACutY" : "10.f", + "grpFileName" : "o2sim_grp.root", + "geomFileName" : "o2sim_geometry.root" }, "location" : "remote", "saveObjectsToFile" : "ITSTPCmatched.root", diff --git a/Modules/REC/src/ITSTPCMatchingTask.cxx b/Modules/REC/src/ITSTPCMatchingTask.cxx index a74b002b34..0361441b4b 100644 --- a/Modules/REC/src/ITSTPCMatchingTask.cxx +++ b/Modules/REC/src/ITSTPCMatchingTask.cxx @@ -60,6 +60,14 @@ void ITSTPCMatchingTask::initialize(o2::framework::InitContext& /*ctx*/) ILOG(Info, Devel) << "Custom parameter - minDCACutY (for track selection): " << param->second << ENDM; mMatchITSTPCQC.setMinDCAtoBeamPipeYCut(atof(param->second.c_str())); } + if (auto param = mCustomParameters.find("grpFileName"); param != mCustomParameters.end()) { + ILOG(Info, Devel) << "Custom parameter - GRP filename: " << param->second << ENDM; + mMatchITSTPCQC.setGRPFileName(param->second); + } + if (auto param = mCustomParameters.find("geomFileName"); param != mCustomParameters.end()) { + ILOG(Info, Devel) << "Custom parameter - geometry filename: " << param->second << ENDM; + mMatchITSTPCQC.setGeomFileName(param->second); + } mMatchITSTPCQC.init(); getObjectsManager()->startPublishing(mMatchITSTPCQC.getHistoPtTPC()); From ddd529468d4d75d8fbd8a19b69ce1540edee265a Mon Sep 17 00:00:00 2001 From: Chiara Zampolli Date: Mon, 11 Oct 2021 17:43:37 +0200 Subject: [PATCH 3/4] Adding json to store objects in QCG from DPL And using a dataSamplingPolicy for QC standard processing. --- Modules/REC/ITSTPCmatchedTracks.json | 26 ++++++++--- Modules/REC/ITSTPCmatchedTracks_external.json | 43 +++++++++++++++++++ 2 files changed, 63 insertions(+), 6 deletions(-) create mode 100644 Modules/REC/ITSTPCmatchedTracks_external.json diff --git a/Modules/REC/ITSTPCmatchedTracks.json b/Modules/REC/ITSTPCmatchedTracks.json index d947682ef5..5e3e205436 100644 --- a/Modules/REC/ITSTPCmatchedTracks.json +++ b/Modules/REC/ITSTPCmatchedTracks.json @@ -33,12 +33,11 @@ "className" : "o2::quality_control_modules::rec::ITSTPCMatchingTask", "moduleName" : "QcREC", "detectorName" : "REC", - "cycleDurationSeconds" : "10", + "cycleDurationSeconds" : "3600", "maxNumberCycles" : "-1", "dataSource" : { - "type" : "direct", - "query_comment" : "checking every matched track", - "query" : "trackITSTPC:GLO/TPCITS/0;trackITSTPCABREFS:GLO/TPCITSAB_REFS/0;trackITSTPCABCLID:GLO/TPCITSAB_CLID/0;trackTPC:TPC/TRACKS;trackTPCClRefs:TPC/CLUSREFS" + "type" : "dataSamplingPolicy", + "name" : "ITSTPCmatchingSampling" }, "taskParameters" : { "GID" : "ITS-TPC,ITS", @@ -71,6 +70,21 @@ } } }, - "dataSamplingPolicies" : [ - ] + "dataSamplingPolicies" : [ + { + "id" : "ITSTPCmatchingSampling", + "active" : "true", + "machines": [], + "query_comment" : "checking every matched track", + "query" : "trackITSTPC:GLO/TPCITS/0;trackITSTPCABREFS:GLO/TPCITSAB_REFS/0;trackITSTPCABCLID:GLO/TPCITSAB_CLID/0;trackTPC:TPC/TRACKS;trackTPCClRefs:TPC/CLUSREFS", + "samplingConditions": [ + { + "condition": "random", + "fraction": "0.1", + "seed": "1234" + } + ], + "blocking": "false" + } + ] } diff --git a/Modules/REC/ITSTPCmatchedTracks_external.json b/Modules/REC/ITSTPCmatchedTracks_external.json new file mode 100644 index 0000000000..04f1019ca9 --- /dev/null +++ b/Modules/REC/ITSTPCmatchedTracks_external.json @@ -0,0 +1,43 @@ +{ + "qc" : { + "config" : { + "database" : { + "implementation" : "CCDB", + "host" : "ccdb-test.cern.ch:8080", + "username" : "not_applicable", + "password" : "not_applicable", + "name" : "not_applicable" + }, + "Activity" : { + "number" : "42", + "type" : "2" + }, + "monitoring" : { + "url" : "infologger:///debug?qc" + }, + "consul" : { + "url" : "" + }, + "conditionDB" : { + "url" : "ccdb-test.cern.ch:8080" + }, + "infologger" : { "" : "Configuration of the Infologger (optional).", + "filterDiscardDebug" : "false", + "" : "Set to true to discard debug and trace messages (default: false)", + "filterDiscardLevel" : "21", + "" : "Message at this level or above are discarded (default: 21 - Trace)" } + }, + "tasks" : { + }, + "externalTasks" : { + "MatchedTracksITSTPC": { + "active": "true", + "query": "ITSTPCMatchingQC1D:GLO/ITSTPCMATCHQC_1D/0;ITSTPCMatchingQC2D:GLO/ITSTPCMATCHQC_2D/0", "": "Use the task name as binding (encouraged)" + } + }, + "checks" : { + } + }, + "dataSamplingPolicies" : [ + ] +} From 4e84abed459bc46110cb76af4beea83611968d78 Mon Sep 17 00:00:00 2001 From: Chiara Zampolli Date: Tue, 12 Oct 2021 16:28:26 +0200 Subject: [PATCH 4/4] Moving to GLO module clang-format --- Modules/{REC => GLO}/ITSTPCmatchedTracks.json | 48 +++++++++---------- .../ITSTPCmatchedTracks_external.json | 19 ++++---- .../include/GLO}/ITSTPCMatchingTask.h | 10 ++-- .../{REC => GLO}/src/ITSTPCMatchingTask.cxx | 6 +-- 4 files changed, 41 insertions(+), 42 deletions(-) rename Modules/{REC => GLO}/ITSTPCmatchedTracks.json (67%) rename Modules/{REC => GLO}/ITSTPCmatchedTracks_external.json (75%) rename Modules/{REC/include/REC => GLO/include/GLO}/ITSTPCMatchingTask.h (86%) rename Modules/{REC => GLO}/src/ITSTPCMatchingTask.cxx (97%) diff --git a/Modules/REC/ITSTPCmatchedTracks.json b/Modules/GLO/ITSTPCmatchedTracks.json similarity index 67% rename from Modules/REC/ITSTPCmatchedTracks.json rename to Modules/GLO/ITSTPCmatchedTracks.json index 5e3e205436..1680ddd6f5 100644 --- a/Modules/REC/ITSTPCmatchedTracks.json +++ b/Modules/GLO/ITSTPCmatchedTracks.json @@ -30,14 +30,14 @@ "tasks" : { "MatchedTracksITSTPC" : { "active" : "true", - "className" : "o2::quality_control_modules::rec::ITSTPCMatchingTask", - "moduleName" : "QcREC", - "detectorName" : "REC", + "className" : "o2::quality_control_modules::glo::ITSTPCMatchingTask", + "moduleName" : "QcGLO", + "detectorName" : "GLO", "cycleDurationSeconds" : "3600", "maxNumberCycles" : "-1", "dataSource" : { - "type" : "dataSamplingPolicy", - "name" : "ITSTPCmatchingSampling" + "type" : "dataSamplingPolicy", + "name" : "ITSTPCmatchingSampling" }, "taskParameters" : { "GID" : "ITS-TPC,ITS", @@ -47,8 +47,8 @@ "minNTPCClustersCut" : "40", "minDCACut" : "100.f", "minDCACutY" : "10.f", - "grpFileName" : "o2sim_grp.root", - "geomFileName" : "o2sim_geometry.root" + "grpFileName" : "o2sim_grp.root", + "geomFileName" : "o2sim_geometry.root" }, "location" : "remote", "saveObjectsToFile" : "ITSTPCmatched.root", @@ -70,21 +70,21 @@ } } }, - "dataSamplingPolicies" : [ - { - "id" : "ITSTPCmatchingSampling", - "active" : "true", - "machines": [], - "query_comment" : "checking every matched track", - "query" : "trackITSTPC:GLO/TPCITS/0;trackITSTPCABREFS:GLO/TPCITSAB_REFS/0;trackITSTPCABCLID:GLO/TPCITSAB_CLID/0;trackTPC:TPC/TRACKS;trackTPCClRefs:TPC/CLUSREFS", - "samplingConditions": [ - { - "condition": "random", - "fraction": "0.1", - "seed": "1234" - } - ], - "blocking": "false" - } - ] + "dataSamplingPolicies" : [ + { + "id" : "ITSTPCmatchingSampling", + "active" : "true", + "machines" : [], + "query_comment" : "checking every matched track", + "query" : "trackITSTPC:GLO/TPCITS/0;trackITSTPCABREFS:GLO/TPCITSAB_REFS/0;trackITSTPCABCLID:GLO/TPCITSAB_CLID/0;trackTPC:TPC/TRACKS;trackTPCClRefs:TPC/CLUSREFS", + "samplingConditions" : [ + { + "condition" : "random", + "fraction" : "0.1", + "seed" : "1234" + } + ], + "blocking" : "false" + } + ] } diff --git a/Modules/REC/ITSTPCmatchedTracks_external.json b/Modules/GLO/ITSTPCmatchedTracks_external.json similarity index 75% rename from Modules/REC/ITSTPCmatchedTracks_external.json rename to Modules/GLO/ITSTPCmatchedTracks_external.json index 04f1019ca9..65524cf81b 100644 --- a/Modules/REC/ITSTPCmatchedTracks_external.json +++ b/Modules/GLO/ITSTPCmatchedTracks_external.json @@ -27,17 +27,16 @@ "filterDiscardLevel" : "21", "" : "Message at this level or above are discarded (default: 21 - Trace)" } }, - "tasks" : { - }, + "tasks" : {}, "externalTasks" : { - "MatchedTracksITSTPC": { - "active": "true", - "query": "ITSTPCMatchingQC1D:GLO/ITSTPCMATCHQC_1D/0;ITSTPCMatchingQC2D:GLO/ITSTPCMATCHQC_2D/0", "": "Use the task name as binding (encouraged)" - } + "MatchedTracksITSTPC" : { + "active" : "true", + "query" : "ITSTPCMatchingQC1D:GLO/ITSTPCMATCHQC_1D/0;ITSTPCMatchingQC2D:GLO/ITSTPCMATCHQC_2D/0", + "" : "Use the task name as binding (encouraged)" + } }, - "checks" : { - } + "checks" : {} }, - "dataSamplingPolicies" : [ - ] + "dataSamplingPolicies" : [ + ] } diff --git a/Modules/REC/include/REC/ITSTPCMatchingTask.h b/Modules/GLO/include/GLO/ITSTPCMatchingTask.h similarity index 86% rename from Modules/REC/include/REC/ITSTPCMatchingTask.h rename to Modules/GLO/include/GLO/ITSTPCMatchingTask.h index 2a1def6047..d45b0e832c 100644 --- a/Modules/REC/include/REC/ITSTPCMatchingTask.h +++ b/Modules/GLO/include/GLO/ITSTPCMatchingTask.h @@ -14,8 +14,8 @@ /// \author My Name /// -#ifndef QC_MODULE_REC_RECITSTPCMATCHINGTASK_H -#define QC_MODULE_REC_RECITSTPCMATCHINGTASK_H +#ifndef QC_MODULE_GLO_ITSTPCMATCHINGTASK_H +#define QC_MODULE_GLO_ITSTPCMATCHINGTASK_H #include "QualityControl/TaskInterface.h" #include "GlobalTracking/MatchITSTPCQC.h" @@ -24,7 +24,7 @@ class TH1F; using namespace o2::quality_control::core; -namespace o2::quality_control_modules::rec +namespace o2::quality_control_modules::glo { /// \brief Example Quality Control DPL Task @@ -50,6 +50,6 @@ class ITSTPCMatchingTask final : public TaskInterface o2::globaltracking::MatchITSTPCQC mMatchITSTPCQC; }; -} // namespace o2::quality_control_modules::rec +} // namespace o2::quality_control_modules::glo -#endif // QC_MODULE_REC_RECITSTPCMATCHINGTASK_H +#endif // QC_MODULE_GLO_ITSTPCMATCHINGTASK_H diff --git a/Modules/REC/src/ITSTPCMatchingTask.cxx b/Modules/GLO/src/ITSTPCMatchingTask.cxx similarity index 97% rename from Modules/REC/src/ITSTPCMatchingTask.cxx rename to Modules/GLO/src/ITSTPCMatchingTask.cxx index 0361441b4b..6956c7f843 100644 --- a/Modules/REC/src/ITSTPCMatchingTask.cxx +++ b/Modules/GLO/src/ITSTPCMatchingTask.cxx @@ -18,11 +18,11 @@ #include #include "QualityControl/QcInfoLogger.h" -#include "REC/ITSTPCMatchingTask.h" +#include "GLO/ITSTPCMatchingTask.h" #include #include -namespace o2::quality_control_modules::rec +namespace o2::quality_control_modules::glo { ITSTPCMatchingTask::~ITSTPCMatchingTask() @@ -114,4 +114,4 @@ void ITSTPCMatchingTask::reset() mMatchITSTPCQC.reset(); } -} // namespace o2::quality_control_modules::rec +} // namespace o2::quality_control_modules::glo