Skip to content

Commit cf26a9c

Browse files
shahor02davidrohr
shahor02
authored and
davidrohr
committed
Set CCDB server defaults via NameConf::getCCDBServer()
1 parent c5abdb0 commit cf26a9c

52 files changed

Lines changed: 92 additions & 77 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎Common/SimConfig/include/SimConfig/DigiParams.h‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616

1717
#include "CommonUtils/ConfigurableParam.h"
1818
#include "CommonUtils/ConfigurableParamHelper.h"
19+
#include "DetectorsCommonDataFormats/NameConf.h"
1920
#include <string>
2021

2122
namespace o2
@@ -26,7 +27,7 @@ namespace conf
2627
// Global parameters for digitization
2728
struct DigiParams : public o2::conf::ConfigurableParamHelper<DigiParams> {
2829

29-
std::string ccdb = "http://ccdb-test.cern.ch:8080"; // URL for CCDB acces
30+
std::string ccdb = o2::base::NameConf::getCCDBServer();
3031
std::string digitizationgeometry = ""; // with with geometry file to digitize -> leave empty as this needs to be filled by the digitizer workflow
3132
std::string grpfile = ""; // which GRP file to use --> leave empty as this needs to be filled by the digitizer workflow
3233
bool mctruth = true; // whether to create labels

‎DataFormats/Detectors/FIT/FDD/include/DataFormatsFDD/LookUpTable.h‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@
2727
#include <iomanip> // std::setfill, std::setw - for stream formating
2828
#include <Framework/Logger.h>
2929
#include "FDDBase/Constants.h"
30+
#include "DetectorsCommonDataFormats/NameConf.h"
3031

3132
namespace o2
3233
{
@@ -214,9 +215,8 @@ class SingleLUT : public LUT
214215

215216
public:
216217
static constexpr char sDetectorName[] = "FDD";
217-
static constexpr char sDefaultCCDBpath[] = "http://ccdb-test.cern.ch:8080/";
218218
static constexpr char sDefaultLUTpath[] = "FDD/LookUpTable";
219-
inline static std::string sCurrentCCDBpath = sDefaultCCDBpath;
219+
inline static std::string sCurrentCCDBpath = o2::base::NameConf::getCCDBServer();
220220
inline static std::string sCurrentLUTpath = sDefaultLUTpath;
221221
//Before instance() call, setup url and path
222222
static void setCCDBurl(const std::string& url) { sCurrentCCDBpath = url; }

‎DataFormats/Detectors/FIT/FT0/include/DataFormatsFT0/LookUpTable.h‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@
2323
#include "CCDB/BasicCCDBManager.h"
2424
#include "FT0Base/Constants.h"
2525
#include "DataFormatsFIT/LookUpTable.h"
26+
#include "DetectorsCommonDataFormats/NameConf.h"
2627
#include <Rtypes.h>
2728
#include <cassert>
2829
#include <exception>
@@ -214,7 +215,7 @@ class LookUpTable
214215

215216
std::vector<o2::ft0::Topo> lut_data;
216217
auto& mgr = o2::ccdb::BasicCCDBManager::instance();
217-
mgr.setURL("http://ccdb-test.cern.ch:8080");
218+
mgr.setURL(o2::base::NameConf::getCCDBServer());
218219
auto hvch = mgr.get<std::vector<o2::ft0::HVchannel>>("FT0/LookUpTable");
219220
size_t max = 0;
220221
for (auto const& chan : *hvch) {
@@ -371,9 +372,8 @@ class SingleLUT : public LUT
371372

372373
public:
373374
static constexpr char sDetectorName[] = "FT0";
374-
static constexpr char sDefaultCCDBpath[] = "http://ccdb-test.cern.ch:8080/";
375375
static constexpr char sDefaultLUTpath[] = "FT0/LookUpTableNew";
376-
inline static std::string sCurrentCCDBpath = sDefaultCCDBpath;
376+
inline static std::string sCurrentCCDBpath = o2::base::NameConf::getCCDBServer();
377377
inline static std::string sCurrentLUTpath = sDefaultLUTpath;
378378
//Before instance() call, setup url and path
379379
static void setCCDBurl(const std::string& url) { sCurrentCCDBpath = url; }

‎DataFormats/Detectors/FIT/FV0/include/DataFormatsFV0/LookUpTable.h‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@
2727
#include <iomanip> // std::setfill, std::setw - for stream formating
2828
#include <Framework/Logger.h>
2929
#include "FV0Base/Constants.h"
30+
#include "DetectorsCommonDataFormats/NameConf.h"
3031

3132
namespace o2
3233
{
@@ -210,9 +211,8 @@ class SingleLUT : public LUT
210211

211212
public:
212213
static constexpr char sDetectorName[] = "FV0";
213-
static constexpr char sDefaultCCDBpath[] = "http://ccdb-test.cern.ch:8080/";
214214
static constexpr char sDefaultLUTpath[] = "FV0/LookUpTable";
215-
inline static std::string sCurrentCCDBpath = sDefaultCCDBpath;
215+
inline static std::string sCurrentCCDBpath = o2::base::NameConf::getCCDBServer();
216216
inline static std::string sCurrentLUTpath = sDefaultLUTpath;
217217
//Before instance() call, setup url and path
218218
static void setCCDBurl(const std::string& url) { sCurrentCCDBpath = url; }

‎Detectors/AOD/src/AODProducerWorkflowSpec.cxx‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@
2121
#include "DataFormatsMCH/TrackMCH.h"
2222
#include "DataFormatsMFT/TrackMFT.h"
2323
#include "DataFormatsTPC/TrackTPC.h"
24+
#include "DetectorsCommonDataFormats/NameConf.h"
2425
#include "DetectorsBase/GeometryManager.h"
2526
#include "CCDB/BasicCCDBManager.h"
2627
#include "CommonConstants/PhysicsConstants.h"
@@ -137,10 +138,9 @@ uint64_t AODProducerWorkflowDPL::getTFNumber(const o2::InteractionRecord& tfStar
137138
o2::ccdb::CcdbApi ccdb_api;
138139
const std::string rct_path = "RCT/RunInformation/";
139140
const std::string start_orbit_path = "Trigger/StartOrbit";
140-
const std::string url = "http://ccdb-test.cern.ch:8080";
141141

142-
mgr.setURL(url);
143-
ccdb_api.init(url);
142+
mgr.setURL(o2::base::NameConf::getCCDBServer());
143+
ccdb_api.init(o2::base::NameConf::getCCDBServer());
144144

145145
std::map<int, int>* mapStartOrbit = mgr.get<std::map<int, int>>(start_orbit_path);
146146
int64_t ts = 0;

‎Detectors/Base/include/DetectorsBase/Aligner.h‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,6 @@ namespace base
2828
class Aligner : public o2::conf::ConfigurableParamHelper<Aligner>
2929
{
3030
public:
31-
const std::string& getCCDB() const { return mCCDB; }
3231
const std::string& getDetectors() const { return mDetectors; }
3332
long getTimeStamp() const;
3433
o2::detectors::DetID::mask_t getDetectorsMask() const;
@@ -37,7 +36,6 @@ class Aligner : public o2::conf::ConfigurableParamHelper<Aligner>
3736
void applyAlignment(long timestamp = 0, o2::detectors::DetID::mask_t addMask = o2::detectors::DetID::FullMask) const;
3837

3938
private:
40-
std::string mCCDB = "http://ccdb-test.cern.ch:8080"; // URL for CCDB acces
4139
std::string mDetectors = "all"; // comma-separated list of modules to align, "all" or "none"
4240
long mTimeStamp = 0; // assigned TimeStamp or now() if 0
4341

‎Detectors/Base/src/Aligner.cxx‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ void Aligner::applyAlignment(long timestamp, DetID::mask_t addMask) const
4444
if (timestamp == 0) {
4545
timestamp = getTimeStamp();
4646
}
47-
ccdbmgr.setURL(getCCDB());
47+
ccdbmgr.setURL(o2::base::NameConf::getCCDBServer());
4848
ccdbmgr.setTimestamp(timestamp);
4949
DetID::mask_t done, skipped;
5050
DetID::mask_t detGeoMask(gGeoManager->GetUniqueID());
@@ -55,7 +55,7 @@ void Aligner::applyAlignment(long timestamp, DetID::mask_t addMask) const
5555
std::string path = o2::base::NameConf::getAlignmentPath({id});
5656
auto algV = ccdbmgr.get<std::vector<o2::detectors::AlignParam>>(path);
5757
if (!algV) {
58-
throw std::runtime_error(fmt::format("Failed to fetch alignment from {}:{}", getCCDB(), path));
58+
throw std::runtime_error(fmt::format("Failed to fetch alignment from {}:{}", o2::base::NameConf::getCCDBServer(), path));
5959
}
6060
if (!algV->empty()) {
6161
done.set(id);
@@ -64,7 +64,7 @@ void Aligner::applyAlignment(long timestamp, DetID::mask_t addMask) const
6464
skipped.set(id);
6565
}
6666
}
67-
std::string log = fmt::format("Alignment from {} for timestamp {}: ", getCCDB(), timestamp);
67+
std::string log = fmt::format("Alignment from {} for timestamp {}: ", o2::base::NameConf::getCCDBServer(), timestamp);
6868
if (done.any()) {
6969
log += fmt::format("applied to [{}]", DetID::getNames(done));
7070
}

‎Detectors/CPV/base/include/CPVBase/CPVSimParams.h‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@
1414

1515
#include "CommonUtils/ConfigurableParam.h"
1616
#include "CommonUtils/ConfigurableParamHelper.h"
17+
#include "DetectorsCommonDataFormats/NameConf.h"
1718

1819
namespace o2
1920
{
@@ -23,7 +24,7 @@ namespace cpv
2324
// (mostly used in GEANT stepping and Digitizer)
2425
struct CPVSimParams : public o2::conf::ConfigurableParamHelper<CPVSimParams> {
2526

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

2829
//Parameters used in conversion of deposited energy to APD response
2930
int mnCellX = 128;

‎Detectors/CPV/simulation/include/CPVSimulation/RawWriter.h‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@
2929
#include "DataFormatsCPV/CalibParams.h"
3030
#include "DataFormatsCPV/Pedestals.h"
3131
#include "DataFormatsCPV/BadChannelMap.h"
32+
#include "DetectorsCommonDataFormats/NameConf.h"
3233

3334
namespace o2
3435
{
@@ -95,7 +96,7 @@ class RawWriter
9596
std::vector<padCharge> mPadCharge[kNcc][kNDilogic][kNGasiplex]; ///< list of signals per event
9697
FileFor_t mFileFor = FileFor_t::kFullDet; ///< Granularity of the output files
9798
std::string mOutputLocation = "./"; ///< Rawfile name
98-
std::string mCcdbUrl = "http://ccdb-test.cern.ch:8080"; ///< CCDB Url
99+
std::string mCcdbUrl = o2::base::NameConf::getCCDBServer(); ///< CCDB Url
99100
CalibParams* mCalibParams = nullptr; ///< CPV calibration
100101
Pedestals* mPedestals = nullptr; ///< CPV pedestals
101102
BadChannelMap* mBadMap = nullptr; ///< CPV bad channel map

‎Detectors/CPV/simulation/src/RawCreator.cxx‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,6 @@ int main(int argc, const char** argv)
5151
add_option("file-for,f", bpo::value<std::string>()->default_value("all"), "single file per: all,cru,link");
5252
add_option("output-dir,o", bpo::value<std::string>()->default_value("./"), "output directory for raw data");
5353
add_option("debug,d", bpo::value<uint32_t>()->default_value(0), "Select debug output level [0 = no debug output]");
54-
add_option("ccdb-url,c", bpo::value<std::string>()->default_value("http://ccdb-test.cern.ch:8080"), "CCDB Url ['localtest' for local testing]");
5554
add_option("hbfutils-config,u", bpo::value<std::string>()->default_value(std::string(o2::base::NameConf::DIGITIZATIONCONFIGFILE)), "config file for HBFUtils (or none)");
5655
add_option("configKeyValues", bpo::value<std::string>()->default_value(""), "comma-separated configKeyValues");
5756

@@ -83,8 +82,6 @@ int main(int argc, const char** argv)
8382
outputdir = vm["output-dir"].as<std::string>(),
8483
filefor = vm["file-for"].as<std::string>();
8584

86-
auto ccdbUrl = vm["ccdb-url"].as<std::string>();
87-
8885
// if needed, create output directory
8986
if (!std::filesystem::exists(outputdir)) {
9087
if (!std::filesystem::create_directories(outputdir)) {
@@ -112,7 +109,7 @@ int main(int argc, const char** argv)
112109
o2::cpv::RawWriter rawwriter;
113110
rawwriter.setOutputLocation(outputdir.data());
114111
rawwriter.setFileFor(granularity);
115-
rawwriter.setCcdbUrl(ccdbUrl.data());
112+
rawwriter.setCcdbUrl(o2::base::NameConf::getCCDBServer().c_str());
116113
rawwriter.init();
117114
rawwriter.getWriter().setContinuousReadout(grp->isDetContinuousReadOut(o2::detectors::DetID::CPV)); // must be set explicitly
118115

0 commit comments

Comments
 (0)