Skip to content

Commit d55ce86

Browse files
YazhenLinYazhenLin
authored
Merge branch 'AliceO2Group:master' into master
2 parents 45b2cbe + 9ceb227 commit d55ce86

File tree

69 files changed

+4387
-2713
lines changed

Some content is hidden

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

69 files changed

+4387
-2713
lines changed

‎CODEOWNERS‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -50,9 +50,9 @@
5050
/PWGCF/Tutorial @alibuild @ariedel-cern @victor-gonzalez @otonvd @shouqiye
5151

5252
/PWGDQ @alibuild @iarsene @mcoquet642 @lucamicheletti93 @XiaozhiBai
53-
/PWGEM @alibuild @feisenhu @dsekihat @ivorobye @jokonig
54-
/PWGEM/Dilepton @alibuild @mikesas @rbailhac @dsekihat @ivorobye @feisenhu @hscheid @jokonig
55-
/PWGEM/PhotonMeson @alibuild @mikesas @rbailhac @m-c-danisch @novitzky @mhemmer-cern @dsekihat @jokonig
53+
/PWGEM @alibuild @feisenhu @dsekihat @jokonig @hscheid
54+
/PWGEM/Dilepton @alibuild @mikesas @rbailhac @dsekihat @feisenhu @hscheid @jokonig
55+
/PWGEM/PhotonMeson @alibuild @mhemmer-cern @dsekihat @jokonig @hscheid @amaringarcia
5656
/PWGHF @alibuild @vkucera @fcolamar @fgrosa @fcatalan92 @mfaggin @mmazzilli @deepathoms @NicoleBastid @hahassan7 @jpxrk @apalasciano @zhangbiao-phy @gluparel @stefanopolitano @xinyepeng @singhra1994
5757
# PWG-LF
5858
/PWGLF @alibuild @omvazque @skundu692 @mpuccio

‎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;

‎Common/DataModel/Multiplicity.h‎

Lines changed: 22 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -26,20 +26,19 @@ namespace o2::aod
2626
{
2727
namespace mult
2828
{
29-
DECLARE_SOA_COLUMN(MultFV0A, multFV0A, float); //!
30-
DECLARE_SOA_COLUMN(MultFV0AOuter, multFV0AOuter, float); //!
31-
DECLARE_SOA_COLUMN(MultFV0C, multFV0C, float); //!
32-
DECLARE_SOA_COLUMN(MultFT0A, multFT0A, float); //!
33-
DECLARE_SOA_COLUMN(MultFT0C, multFT0C, float); //!
34-
DECLARE_SOA_COLUMN(MultFDDA, multFDDA, float); //!
35-
DECLARE_SOA_COLUMN(MultFDDC, multFDDC, float); //!
36-
DECLARE_SOA_COLUMN(MultZNA, multZNA, float); //!
37-
DECLARE_SOA_COLUMN(MultZNC, multZNC, float); //!
38-
DECLARE_SOA_COLUMN(MultZEM1, multZEM1, float); //!
39-
DECLARE_SOA_COLUMN(MultZEM2, multZEM2, float); //!
40-
DECLARE_SOA_COLUMN(MultZPA, multZPA, float); //!
41-
DECLARE_SOA_COLUMN(MultZPC, multZPC, float); //!
42-
DECLARE_SOA_DYNAMIC_COLUMN(MultFV0M, multFV0M, //!
29+
DECLARE_SOA_COLUMN(MultFV0A, multFV0A, float); //!
30+
DECLARE_SOA_COLUMN(MultFV0C, multFV0C, float); //!
31+
DECLARE_SOA_COLUMN(MultFT0A, multFT0A, float); //!
32+
DECLARE_SOA_COLUMN(MultFT0C, multFT0C, float); //!
33+
DECLARE_SOA_COLUMN(MultFDDA, multFDDA, float); //!
34+
DECLARE_SOA_COLUMN(MultFDDC, multFDDC, float); //!
35+
DECLARE_SOA_COLUMN(MultZNA, multZNA, float); //!
36+
DECLARE_SOA_COLUMN(MultZNC, multZNC, float); //!
37+
DECLARE_SOA_COLUMN(MultZEM1, multZEM1, float); //!
38+
DECLARE_SOA_COLUMN(MultZEM2, multZEM2, float); //!
39+
DECLARE_SOA_COLUMN(MultZPA, multZPA, float); //!
40+
DECLARE_SOA_COLUMN(MultZPC, multZPC, float); //!
41+
DECLARE_SOA_DYNAMIC_COLUMN(MultFV0M, multFV0M, //!
4342
[](float multFV0A, float multFV0C) -> float { return multFV0A + multFV0C; });
4443
DECLARE_SOA_DYNAMIC_COLUMN(MultFT0M, multFT0M, //!
4544
[](float multFT0A, float multFT0C) -> float { return multFT0A + multFT0C; });
@@ -100,6 +99,10 @@ DECLARE_SOA_COLUMN(TimeToPrevious, timeToPrevious, float); //!
10099
DECLARE_SOA_COLUMN(TimeToNext, timeToNext, float); //!
101100
DECLARE_SOA_COLUMN(TimeToNeNext, timeToNeNext, float); //!
102101

102+
// Extra information from FIT detectors
103+
DECLARE_SOA_COLUMN(MultFV0AOuter, multFV0AOuter, float); //! FV0 without innermost ring
104+
DECLARE_SOA_COLUMN(FT0TriggerMask, ft0TriggerMask, uint8_t); //!
105+
103106
} // namespace mult
104107
DECLARE_SOA_TABLE(FV0Mults, "AOD", "FV0MULT", //! Multiplicity with the FV0 detector
105108
mult::MultFV0A, mult::MultFV0C,
@@ -126,6 +129,11 @@ DECLARE_SOA_TABLE(PVMults, "AOD", "PVMULT", //! Multiplicity from the PV contrib
126129
mult::IsInelGt1<mult::MultNTracksPVeta1>);
127130
DECLARE_SOA_TABLE(MFTMults, "AOD", "MFTMULT", //! Multiplicity with MFT
128131
mult::MFTNalltracks, mult::MFTNtracks);
132+
133+
DECLARE_SOA_TABLE(FITExtraMults, "AOD", "FITEXTRAMULT", //! Extra information from FIT detectors
134+
mult::MultFV0AOuter,
135+
mult::FT0TriggerMask);
136+
129137
using BarrelMults = soa::Join<TrackletMults, TPCMults, PVMults>;
130138
using Mults = soa::Join<BarrelMults, FV0Mults, FT0Mults, FDDMults, ZDCMults>;
131139
using MultsRun3 = soa::Join<TPCMults, PVMults, FV0Mults, FT0Mults, FDDMults, ZDCMults>;

0 commit comments

Comments
 (0)