Skip to content

Commit bef7300

Browse files
authored
[Common,PWGCF,PWGDQ,PWGEM,PWGLF,PWGUD,DPG,Trigger] [Cleanup] Add fully qualified names for std::string and std::map (#12378)
1 parent b6c4006 commit bef7300

File tree

15 files changed

+17
-17
lines changed

15 files changed

+17
-17
lines changed

Common/CCDB/ctpRateFetcher.cxx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -109,7 +109,7 @@ void ctpRateFetcher::setupRun(int runNumber, o2::ccdb::BasicCCDBManager* ccdb, u
109109
delete mScalers;
110110
delete mLHCIFdata;
111111
}
112-
std::map<string, string> metadata;
112+
std::map<std::string, std::string> metadata;
113113
mLHCIFdata = ccdb->getSpecific<parameters::GRPLHCIFData>("GLO/Config/GRPLHCIF", timeStamp, metadata);
114114
if (mLHCIFdata == nullptr) {
115115
LOG(fatal) << "GRPLHCIFData not in database, timestamp:" << timeStamp;

Common/TableProducer/eventSelection.cxx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1286,7 +1286,7 @@ struct LumiTask {
12861286
LOGP(warn, "Cross section for z={} + z={} @ {} GeV is not defined", beamZ1, beamZ2, sqrts);
12871287
}
12881288
// getting CTP config to extract lumi class indices (used for rate fetching and pileup correction)
1289-
std::map<string, string> metadata;
1289+
std::map<std::string, std::string> metadata;
12901290
metadata["runNumber"] = std::to_string(run);
12911291
auto config = ccdb->getSpecific<o2::ctp::CTPConfiguration>("CTP/Config/Config", ts, metadata);
12921292
auto classes = config->getCTPClasses();

Common/TableProducer/qVectorsTable.cxx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -154,7 +154,7 @@ struct qVectorsTable {
154154
Produces<aod::QvectorBTotVecs> qVectorBTotVec;
155155
/////////////////////////////////////////////////////////////////
156156

157-
std::unordered_map<string, bool> useDetector = {
157+
std::unordered_map<std::string, bool> useDetector = {
158158
{"QvectorBTots", cfgUseBTot},
159159
{"QvectorBNegs", cfgUseBNeg},
160160
{"QvectorBPoss", cfgUseBPos},

Common/Tools/PID/handleParamTPCResponse.cxx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ bool initOptionsAndParse(bpo::options_description& options, int argc, char* argv
4848
"paramMultNormalization", bpo::value<float>()->default_value(11000.), "Multiplicity Normalization")(
4949
"paramnClNormalization", bpo::value<float>()->default_value(152.), "Maximum nClusters for normalisation (159 for run 2, 152 for run 3)")(
5050
"useDefaultParam", bpo::value<bool>()->default_value(true), "Use default sigma parametrisation")(
51-
"mode", bpo::value<string>()->default_value(""), "Running mode ('read' from file, 'write' to file, 'pull' from CCDB, 'push' to CCDB)")(
51+
"mode", bpo::value<std::string>()->default_value(""), "Running mode ('read' from file, 'write' to file, 'pull' from CCDB, 'push' to CCDB)")(
5252
"help,h", "Produce help message.");
5353
setStandardOpt(options);
5454
try {

DPG/Tasks/AOTEvent/detectorOccupancyQa.cxx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -736,7 +736,7 @@ struct DetectorOccupancyQaTask {
736736
int nCollInTimeWindowSelIfTOF = 0;
737737
double multFT0CmainCollision = 0.f;
738738
double multFT0CInTimeWindow = 0.f;
739-
map<int64_t, int32_t> mUniqueBC;
739+
std::map<int64_t, int32_t> mUniqueBC;
740740

741741
bool sel = col.selection_bit(kIsTriggerTVX);
742742

EventFiltering/PWGCF/CFFilterQA.cxx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1033,7 +1033,7 @@ struct CFFilterQA {
10331033

10341034
std::vector<double> setValuesBB(aod::BCsWithTimestamps::iterator const& bunchCrossing, const std::string ccdbPath)
10351035
{
1036-
map<string, string> metadata;
1036+
std::map<std::string, std::string> metadata;
10371037
auto h = ccdbApi.retrieveFromTFileAny<TH1F>(ccdbPath, metadata, bunchCrossing.timestamp());
10381038
// auto h = ccdb->getForTimeStamp<TH1F>(ccdbPath, bunchCrossing.timestamp()); //check if possible to use this without getting fatal
10391039
if (!h) {
@@ -1055,7 +1055,7 @@ struct CFFilterQA {
10551055

10561056
std::vector<double> setValuesAvg(aod::BCsWithTimestamps::iterator const& bunchCrossing, const std::string ccdbPath)
10571057
{
1058-
map<string, string> metadata;
1058+
std::map<std::string, std::string> metadata;
10591059
auto h = ccdbApi.retrieveFromTFileAny<TH1F>(ccdbPath, metadata, bunchCrossing.timestamp());
10601060
// auto h = ccdb->getForTimeStamp<TH1F>(ccdbPath, bunchCrossing.timestamp()); //check if possible to use this without getting fatal
10611061
if (!h) {

EventFiltering/PWGLF/filterf1proton.cxx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -436,7 +436,7 @@ struct filterf1proton {
436436

437437
std::vector<double> setValuesBB(o2::ccdb::CcdbApi& ccdbApi, aod::BCsWithTimestamps::iterator const& bunchCrossing, const std::string ccdbPath)
438438
{
439-
map<string, string> metadata;
439+
std::map<std::string, std::string> metadata;
440440
auto h = ccdbApi.retrieveFromTFileAny<TH1F>(ccdbPath, metadata, bunchCrossing.timestamp());
441441
// auto h = ccdb->getForTimeStamp<TH1F>(ccdbPath, bunchCrossing.timestamp()); // check if possible to use this without getting fatal
442442
if (!h) {

PWGDQ/TableProducer/tableMakerMC_withAssoc.cxx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1112,7 +1112,7 @@ struct TableMakerMC {
11121112
VarManager::SetupMuonMagField();
11131113
}
11141114
}
1115-
std::map<string, string> metadataRCT, header;
1115+
std::map<std::string, std::string> metadataRCT, header;
11161116
header = fCCDBApi.retrieveHeaders(Form("RCT/Info/RunInformation/%i", bcs.begin().runNumber()), metadataRCT, -1);
11171117
uint64_t sor = std::atol(header["SOR"].c_str());
11181118
uint64_t eor = std::atol(header["EOR"].c_str());

PWGDQ/TableProducer/tableMaker_withAssoc.cxx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1320,7 +1320,7 @@ struct TableMaker {
13201320
VarManager::SetupMuonMagField();
13211321
}
13221322
}
1323-
std::map<string, string> metadataRCT, header;
1323+
std::map<std::string, std::string> metadataRCT, header;
13241324
header = fCCDBApi.retrieveHeaders(Form("RCT/Info/RunInformation/%i", bcs.begin().runNumber()), metadataRCT, -1);
13251325
uint64_t sor = std::atol(header["SOR"].c_str());
13261326
uint64_t eor = std::atol(header["EOR"].c_str());

PWGDQ/Tasks/tableReader_withAssoc.cxx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -360,7 +360,7 @@ struct AnalysisEventSelection {
360360
void runEventSelection(TEvents const& events)
361361
{
362362
if (events.size() > 0 && events.begin().runNumber() != fCurrentRun) {
363-
std::map<string, string> metadataRCT, header;
363+
std::map<std::string, std::string> metadataRCT, header;
364364
header = fCCDBApi.retrieveHeaders(Form("RCT/Info/RunInformation/%i", events.begin().runNumber()), metadataRCT, -1);
365365
uint64_t sor = std::atol(header["SOR"].c_str());
366366
uint64_t eor = std::atol(header["EOR"].c_str());
@@ -657,7 +657,7 @@ struct AnalysisTrackSelection {
657657
LOGF(fatal, "GRP object is not available in CCDB at timestamp=%llu", events.begin().timestamp());
658658
}
659659

660-
std::map<string, string> metadataRCT, header;
660+
std::map<std::string, std::string> metadataRCT, header;
661661
header = fCCDBApi.retrieveHeaders(Form("RCT/Info/RunInformation/%i", events.begin().runNumber()), metadataRCT, -1);
662662
uint64_t sor = std::atol(header["SOR"].c_str());
663663
uint64_t eor = std::atol(header["EOR"].c_str());

0 commit comments

Comments
 (0)