|
23 | 23 | #include <QualityControl/ActivityHelpers.h> |
24 | 24 | #include <CCDB/BasicCCDBManager.h> |
25 | 25 | #include <DataFormatsCTP/Configuration.h> |
26 | | -#include "DataFormatsCTP/RunManager.h" |
| 26 | +// #include "DataFormatsCTP/RunManager.h" |
27 | 27 |
|
28 | 28 | #include <TCanvas.h> |
29 | 29 | #include <TH1.h> |
@@ -51,10 +51,22 @@ void CTPTrendingTask::initCTP(Trigger& t) |
51 | 51 | } |
52 | 52 |
|
53 | 53 | /// the reading of the ccdb from trending was already discussed and is related with the fact that CTPconfing may not be ready at the QC starts |
54 | | - o2::ctp::CTPRunManager::setCCDBHost(CCDBHost); |
| 54 | + // o2::ctp::CTPRunManager::setCCDBHost(CCDBHost); |
55 | 55 | bool ok; |
56 | | - o2::ctp::CTPConfiguration CTPconfig = o2::ctp::CTPRunManager::getConfigFromCCDB(t.timestamp, run, ok); |
57 | | - |
| 56 | + // o2::ctp::CTPConfiguration CTPconfig = o2::ctp::CTPRunManager::getConfigFromCCDB(t.timestamp, run, ok); |
| 57 | + auto& mgr = o2::ccdb::BasicCCDBManager::instance(); |
| 58 | + mgr.setURL(CCDBHost); |
| 59 | + map<string, string> metadata; // can be empty |
| 60 | + metadata["runNumber"] = run; |
| 61 | + auto ctpconfigdb = mgr.getSpecific<o2::ctp::CTPConfiguration>(o2::ctp::CCDBPathCTPConfig, t.timestamp, metadata); |
| 62 | + if (ctpconfigdb == nullptr) { |
| 63 | + LOG(info) << "CTP config not in database, timestamp:" << t.timestamp; |
| 64 | + ok = 0; |
| 65 | + } else { |
| 66 | + // ctpconfigdb->printStream(std::cout); |
| 67 | + LOG(info) << "CTP config found. Run:" << run; |
| 68 | + ok = 1; |
| 69 | + } |
58 | 70 | if (!ok) { |
59 | 71 | ILOG(Warning, Support) << "CTP Config not found for run:" << run << " timesamp " << t.timestamp << ENDM; |
60 | 72 | return; |
@@ -123,8 +135,10 @@ void CTPTrendingTask::initCTP(Trigger& t) |
123 | 135 | } |
124 | 136 |
|
125 | 137 | // get the indices of the classes we want to trend |
126 | | - std::vector<ctp::CTPClass> ctpcls = CTPconfig.getCTPClasses(); |
127 | | - std::vector<int> clslist = CTPconfig.getTriggerClassList(); |
| 138 | + // std::vector<ctp::CTPClass> ctpcls = CTPconfig.getCTPClasses(); |
| 139 | + // std::vector<int> clslist = CTPconfig.getTriggerClassList(); |
| 140 | + std::vector<ctp::CTPClass> ctpcls = ctpconfigdb->getCTPClasses(); |
| 141 | + std::vector<int> clslist = ctpconfigdb->getTriggerClassList(); |
128 | 142 | for (size_t i = 0; i < clslist.size(); i++) { |
129 | 143 | for (size_t j = 0; j < mNumberOfClasses; j++) { |
130 | 144 | if (ctpcls[i].name.find(mClassNames[j]) != std::string::npos) { |
|
0 commit comments