Skip to content

ctpdev: orbitreset and orbitsox via zmq II #14147

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
shahor02 merged 7 commits into from
Apr 10, 2025
Merged

ctpdev: orbitreset and orbitsox via zmq II #14147

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
0a85418
dev: finishing orbitsox and orbitreset via zmq
lietava Apr 5, 2025
0ab975b
clang
lietava Apr 5, 2025
904dd80
fix
lietava Apr 5, 2025
fa79907
fix
lietava Apr 7, 2025
deb25ab
dev: removed infologger and using LOG(important)
lietava Apr 10, 2025
8f4a862
clang
lietava Apr 10, 2025
de9609d
fix
lietava Apr 10, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions Detectors/CTP/workflowScalers/include/CTPWorkflowScalers/RunManager.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@
#include "DataFormatsCTP/Configuration.h"
#include "BookkeepingApi/BkpClientFactory.h"
#include "BookkeepingApi/BkpClient.h"

using namespace o2::bkp::api;
namespace o2
{
Expand Down
39 changes: 37 additions & 2 deletions Detectors/CTP/workflowScalers/src/RunManager.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@
#include <regex>
#include "CommonUtils/StringUtils.h"
#include <fairlogger/Logger.h>

using namespace o2::ctp;
///
/// Active run to keep cfg and saclers of active runs
Expand Down Expand Up @@ -232,10 +233,44 @@ int CTPRunManager::processMessage(std::string& topic, const std::string& message
return 0;
}
if (topic.find("soxorbit") != std::string::npos) {
return 0;
std::vector<std::string> tokens = o2::utils::Str::tokenize(message, ' ');
int ret = 0;
if (tokens.size() == 3) {
long timestamp = std::stol(tokens[0]);
uint32_t runnumber = std::stoul(tokens[1]);
uint32_t orbit = std::stoul(tokens[2]);
ret = saveSoxOrbit(runnumber, orbit, timestamp);
std::string logmessage;
if (ret) {
logmessage = "Failed to update CCDB with SOX orbit.";
} else {
logmessage = "CCDB updated with SOX orbit.";
}
LOG(important) << logmessage << " run:" << runnumber << " sox orbit:" << orbit << " ts:" << timestamp;
} else {
LOG(error) << "Topic soxorbit dize !=3: " << message << " token size:" << tokens.size();
ret = 1;
}
return ret;
}
if (topic.find("orbitreset") != std::string::npos) {
return 0;
std::vector<std::string> tokens = o2::utils::Str::tokenize(message, ' ');
int ret = 0;
if (tokens.size() == 1) {
long timestamp = std::stol(tokens[0]);
ret = saveOrbitReset(timestamp);
std::string logmessage;
if (ret) {
logmessage = "Failed to update CCDB with orbitreset. ";
} else {
logmessage = "CCDB updated with orbitreset. ";
}
LOG(important) << logmessage << timestamp;
} else {
LOG(error) << "Topic orbit reset != 2: " << message << " token size:" << tokens.size();
ret = 1;
}
return ret;
}
static int nerror = 0;
if (topic.find("sox") != std::string::npos) {
Expand Down
5 changes: 3 additions & 2 deletions Detectors/CTP/workflowScalers/src/ctpCCDBManager.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -122,7 +122,7 @@ int ctpCCDBManager::saveSoxOrbit(uint32_t runNumber, uint32_t soxOrbit, long tim
vect.push_back(timestamp);
vect.push_back((uint64_t)runNumber);
vect.push_back((uint64_t)soxOrbit);
long tmin = timestamp;
long tmin = timestamp / 1000;
long tmax = tmin + 381928219;
o2::ccdb::CcdbApi api;
map<string, string> metadata; // can be empty
Expand All @@ -149,9 +149,10 @@ int ctpCCDBManager::saveOrbitReset(long timeStamp)
if (timeStamp == 0) {
auto now = std::chrono::system_clock::now();
timeStamp = std::chrono::duration_cast<std::chrono::microseconds>(now.time_since_epoch()).count();
LOG(warn) << "Received timestamp = 0 , using current time:" << timeStamp;
}
vect.push_back(timeStamp);
long tmin = timeStamp;
long tmin = timeStamp / 1000;
long tmax = tmin + 381928219;
o2::ccdb::CcdbApi api;
map<string, string> metadata; // can be empty
Expand Down