Skip to content

Do not have local ccdb URL parameters in configKeyValues initialized from NameConf #7814

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
davidrohr merged 1 commit into from
Dec 5, 2021
Merged

Do not have local ccdb URL parameters in configKeyValues initialized from NameConf #7814

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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: 0 additions & 1 deletion Common/SimConfig/include/SimConfig/DigiParams.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,6 @@ namespace conf
// Global parameters for digitization
struct DigiParams : public o2::conf::ConfigurableParamHelper<DigiParams> {

std::string ccdb = o2::base::NameConf::getCCDBServer();
std::string digitizationgeometry = ""; // with with geometry file to digitize -> leave empty as this needs to be filled by the digitizer workflow
std::string grpfile = ""; // which GRP file to use --> leave empty as this needs to be filled by the digitizer workflow
bool mctruth = true; // whether to create labels
Expand Down
2 changes: 0 additions & 2 deletions Detectors/CPV/base/include/CPVBase/CPVSimParams.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,6 @@ namespace cpv
// (mostly used in GEANT stepping and Digitizer)
struct CPVSimParams : public o2::conf::ConfigurableParamHelper<CPVSimParams> {

std::string mCCDBPath = o2::base::NameConf::getCCDBServer(); ///< use "localtest" to avoid connecting ccdb server, otherwise use ccdb-test.cern.ch

//Parameters used in conversion of deposited energy to APD response
int mnCellX = 128;
int mnCellZ = 60;
Expand Down
5 changes: 2 additions & 3 deletions Detectors/CPV/simulation/src/Digitizer.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,15 +28,14 @@ using namespace o2::cpv;
//_______________________________________________________________________
void Digitizer::init()
{
LOG(info) << "CPVDigitizer::init() : CCDB Url = " << o2::cpv::CPVSimParams::Instance().mCCDBPath.data();
if (o2::cpv::CPVSimParams::Instance().mCCDBPath.compare("localtest") == 0) {
LOG(info) << "CPVDigitizer::init() : CCDB Url = " << o2::base::NameConf::getCCDBServer();
if (o2::base::NameConf::getCCDBServer().compare("localtest") == 0) {
mCalibParams = new CalibParams(1); // test default calibration
mPedestals = new Pedestals(1); // test default pedestals
mBadMap = new BadChannelMap(1); // test default bad channels
LOG(info) << "[CPVDigitizer] No reading calibration from ccdb requested, set default";
} else {
auto& ccdbMgr = o2::ccdb::BasicCCDBManager::instance();
ccdbMgr.setURL(o2::cpv::CPVSimParams::Instance().mCCDBPath.data());
bool isCcdbReachable = ccdbMgr.isHostReachable(); //if host is not reachable we can use only dummy calibration
if (!isCcdbReachable) {
LOG(fatal) << "[CPVDigitizer] CCDB Host is not reachable!!!";
Expand Down
8 changes: 1 addition & 7 deletions Detectors/ZDC/simulation/src/digi2raw.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,13 +87,7 @@ int main(int argc, char** argv)
}
o2::conf::ConfigurableParam::updateFromString(vm["configKeyValues"].as<std::string>());

std::string ccdb_url = o2::base::NameConf::getCCDBServer();
auto& dopt = o2::conf::DigiParams::Instance();
std::string ccdbHost = dopt.ccdb;
if (ccdb_url.length() > 0) {
ccdbHost = ccdb_url;
LOG(info) << "CCDB url set to " << ccdb_url;
}
std::string ccdbHost = o2::base::NameConf::getCCDBServer();
LOG(info) << "CCDB url " << ccdbHost;
digi2raw(vm["input-file"].as<std::string>(),
vm["output-dir"].as<std::string>(),
Expand Down
2 changes: 1 addition & 1 deletion Steer/DigitizerWorkflow/src/ZDCDigitizerSpec.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ class ZDCDPLDigitizerTask : public o2::base::BaseDPLDigitizer

auto& dopt = o2::conf::DigiParams::Instance();

mDigitizer.setCCDBServer(dopt.ccdb);
mDigitizer.setCCDBServer(o2::base::NameConf::getCCDBServer());
auto enableHitInfo = ic.options().get<bool>("enable-hit-info");
mDigitizer.setMaskTriggerBits(!enableHitInfo);
mDigitizer.setSkipMCLabels(not mUseMC);
Expand Down