Skip to content

Commit af98f0c

Browse files
vkuceravkucera
authored
[Common] Fix compilation errors in macros (#15630)
1 parent 2f9bba4 commit af98f0c

File tree

3 files changed

+21
-20
lines changed

3 files changed

+21
-20
lines changed

‎Common/CCDB/macros/ctpRateF.C‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ void ctpRateFetcher::getCTPconfig(o2::ccdb::BasicCCDBManager* ccdb, uint64_t tim
5252
if (runNumber == mRunNumber && mConfig != nullptr) {
5353
return;
5454
}
55-
std::map<string, string> metadata;
55+
std::map<std::string, std::string> metadata;
5656
metadata["runNumber"] = std::to_string(runNumber);
5757
mConfig = ccdb->getSpecific<o2::ctp::CTPConfiguration>("CTP/Config/Config", timeStamp, metadata);
5858
if (mConfig == nullptr) {
@@ -64,7 +64,7 @@ void ctpRateFetcher::getLHCIFdata(o2::ccdb::BasicCCDBManager* ccdb, uint64_t tim
6464
if (runNumber == mRunNumber && mLHCIFdata != nullptr) {
6565
return;
6666
}
67-
std::map<string, string> metadata;
67+
std::map<std::string, std::string> metadata;
6868
mLHCIFdata = ccdb->getSpecific<o2::parameters::GRPLHCIFData>("GLO/Config/GRPLHCIF", timeStamp, metadata);
6969
if (mLHCIFdata == nullptr) {
7070
LOG(fatal) << "GRPLHCIFData not in database, timestamp:" << timeStamp;
@@ -75,7 +75,7 @@ void ctpRateFetcher::getCTPscalers(o2::ccdb::BasicCCDBManager* ccdb, uint64_t ti
7575
if (runNumber == mRunNumber && mScalers != nullptr) {
7676
return;
7777
}
78-
std::map<string, string> metadata;
78+
std::map<std::string, std::string> metadata;
7979
metadata["runNumber"] = std::to_string(runNumber);
8080
mScalers = ccdb->getSpecific<o2::ctp::CTPRunScalers>("CTP/Calib/Scalers", timeStamp, metadata);
8181
if (mScalers == nullptr) {

‎Common/CCDB/macros/upload_event_selection_params.C‎

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -84,14 +84,14 @@ void upload_event_selection_params()
8484
n++;
8585
period[n] = "lhc15f_isolated_bunches";
8686
par[n] = new EventSelectionParams(0);
87-
par[n]->DisableOutOfBunchPileupCuts();
87+
par[n]->disableOutOfBunchPileupCuts();
8888
runFirst[n] = 225000;
8989
runLast[n] = 225719;
9090

9191
n++;
9292
period[n] = "lhc15f_isolated_bunches2";
9393
par[n] = new EventSelectionParams(0);
94-
par[n]->DisableOutOfBunchPileupCuts();
94+
par[n]->disableOutOfBunchPileupCuts();
9595
runFirst[n] = 226062;
9696
runLast[n] = 226500;
9797

@@ -100,12 +100,12 @@ void upload_event_selection_params()
100100
par[n] = new EventSelectionParams(0);
101101
runFirst[n] = 225753;
102102
runLast[n] = 225768;
103-
par[n]->SetOnVsOfParams(-372.579114, 9.415265, -6.65857, 0.546801);
103+
par[n]->setOnVsOfParams(-372.579114, 9.415265, -6.65857, 0.546801);
104104

105105
n++;
106106
period[n] = "lhc15f_50ns_trains2_missing_V0C3";
107107
par[n] = new EventSelectionParams(0);
108-
par[n]->SetOnVsOfParams(-372.579114, 9.415265, -6.65857, 0.546801);
108+
par[n]->setOnVsOfParams(-372.579114, 9.415265, -6.65857, 0.546801);
109109
par[n]->fV0CasymA = 0;
110110
par[n]->fV0CasymB = 0;
111111
runFirst[n] = 226530;
@@ -114,42 +114,42 @@ void upload_event_selection_params()
114114
n++;
115115
period[n] = "lhc15h";
116116
par[n] = new EventSelectionParams(0);
117-
par[n]->SetOnVsOfParams(-245.12, 6.86754, -6.65857, 0.546801);
117+
par[n]->setOnVsOfParams(-245.12, 6.86754, -6.65857, 0.546801);
118118
runFirst[n] = 232914;
119119
runLast[n] = 233859;
120120

121121
n++;
122122
period[n] = "lhc15h_isolated_bunches";
123123
par[n] = new EventSelectionParams(0);
124-
par[n]->DisableOutOfBunchPileupCuts();
124+
par[n]->disableOutOfBunchPileupCuts();
125125
runFirst[n] = 233912;
126126
runLast[n] = 234050;
127127

128128
n++;
129129
period[n] = "lhc15i";
130130
par[n] = new EventSelectionParams(0);
131-
par[n]->SetOnVsOfParams(-223.155660, 7.117266, -6.218793, 0.543201);
131+
par[n]->setOnVsOfParams(-223.155660, 7.117266, -6.218793, 0.543201);
132132
runFirst[n] = 235196;
133133
runLast[n] = 236866;
134134

135135
n++;
136136
period[n] = "lhc15j";
137137
par[n] = new EventSelectionParams(0);
138-
par[n]->SetOnVsOfParams(-222.631866, 7.431432, -6.610850, 0.587165);
138+
par[n]->setOnVsOfParams(-222.631866, 7.431432, -6.610850, 0.587165);
139139
runFirst[n] = 236892;
140140
runLast[n] = 238621;
141141

142142
n++;
143143
period[n] = "lhc15l";
144144
par[n] = new EventSelectionParams(0);
145-
par[n]->SetOnVsOfParams(-198.639921, 7.454714, -5.018572, 0.585245);
145+
par[n]->setOnVsOfParams(-198.639921, 7.454714, -5.018572, 0.585245);
146146
runFirst[n] = 239188;
147147
runLast[n] = 241544;
148148

149149
n++;
150150
period[n] = "lhc15n";
151151
par[n] = new EventSelectionParams(0);
152-
par[n]->SetOnVsOfParams(-336.279729, 10.694535, -4.144493, 0.851104);
152+
par[n]->setOnVsOfParams(-336.279729, 10.694535, -4.144493, 0.851104);
153153
runFirst[n] = 244340;
154154
runLast[n] = 244628;
155155

@@ -176,7 +176,7 @@ void upload_event_selection_params()
176176
n++;
177177
period[n] = "lhc16do";
178178
par[n] = new EventSelectionParams(0);
179-
par[n]->SetOnVsOfParams(-65.42, 7.43, -5.62, 0.85);
179+
par[n]->setOnVsOfParams(-65.42, 7.43, -5.62, 0.85);
180180
runFirst[n] = 252235;
181181
runLast[n] = 264035;
182182

@@ -201,7 +201,7 @@ void upload_event_selection_params()
201201
n++;
202202
period[n] = "pp2017";
203203
par[n] = new EventSelectionParams(0);
204-
par[n]->SetOnVsOfParams(-70, 5.2, -3.0, 0.76);
204+
par[n]->setOnVsOfParams(-70, 5.2, -3.0, 0.76);
205205
runFirst[n] = 270531;
206206
runLast[n] = 280140;
207207

@@ -214,21 +214,21 @@ void upload_event_selection_params()
214214
n++;
215215
period[n] = "pp2017pqr";
216216
par[n] = new EventSelectionParams(0);
217-
par[n]->SetOnVsOfParams(-70, 5.2, -3.0, 0.76);
217+
par[n]->setOnVsOfParams(-70, 5.2, -3.0, 0.76);
218218
runFirst[n] = 282008;
219219
runLast[n] = 282704;
220220

221221
n++;
222222
period[n] = "lhc18b_isolated_bunches";
223223
par[n] = new EventSelectionParams(0);
224-
par[n]->DisableOutOfBunchPileupCuts();
224+
par[n]->disableOutOfBunchPileupCuts();
225225
runFirst[n] = 284706;
226226
runLast[n] = 285015;
227227

228228
n++;
229229
period[n] = "lhc18b_trains";
230230
par[n] = new EventSelectionParams(0);
231-
par[n]->SetOnVsOfParams(-65., 4.3, -5.62, 0.85);
231+
par[n]->setOnVsOfParams(-65., 4.3, -5.62, 0.85);
232232
runFirst[n] = 285064;
233233
runLast[n] = 285203;
234234

‎Common/Core/macros/testMetadataHelper.C‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -120,8 +120,9 @@ std::map<std::string, bool> buildMapForCommitHash(const std::string& hash)
120120
return results;
121121
}
122122

123-
void populateCCDBWithCommitAvailability(std::map<string, bool> hasHashMap,
124-
const std::string commitHash const std::string ccdbUrl = "http://ccdb-test.cern.ch:8080/")
123+
void populateCCDBWithCommitAvailability(std::map<std::string, bool> hasHashMap,
124+
const std::string commitHash,
125+
const std::string ccdbUrl = "http://ccdb-test.cern.ch:8080/")
125126
{
126127
// First, init the CCDB manager to test if the ccdb is already populated
127128
o2::ccdb::CcdbApi api;

0 commit comments

Comments
 (0)