Skip to content

Commit 6030614

Browse files
rahulverma012rahulverma012
authored
Merge branch 'AliceO2Group:master' into hParticleCorrelation
2 parents 375121b + bab3448 commit 6030614

146 files changed

Lines changed: 829 additions & 453 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.

‎PWGCF/Femto/FemtoNuclei/TableProducer/HadNucleiFemto.cxx‎

Lines changed: 156 additions & 7 deletions
Large diffs are not rendered by default.

‎PWGCF/Femto/FemtoNuclei/Tasks/piDeFemtoSystematics.cxx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -202,7 +202,7 @@ struct PiDeFemtoSystematics {
202202
ConfigurableAxis centralityAxis{"centralityAxis", {100, 0., 100.}, "centrality axis"};
203203

204204
using MixingBinning = ColumnBinningPolicy<aod::collision::PosZ, aod::cent::CentFT0C>;
205-
MixingBinning mixingBinning{{mixingVertexAxis, mixingCentralityAxis}, true};
205+
MixingBinning mixingBinning{{mixingVertexAxis, mixingCentralityAxis}};
206206
SliceCache cache;
207207
SameKindPair<CollisionsFull, TrackCandidates, MixingBinning> mixedEventPairs{
208208
mixingBinning, eventCuts.numberOfMixedEvents, -1, &cache};

‎PWGCF/Femto/Tasks/femtoPairD0D0.cxx‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -149,9 +149,9 @@ struct FemtoPairD0D0 {
149149

150150
// setup columnpolicy for binning
151151
// default values are used during instantiation, so we need to explicity update them here
152-
mixBinsVtxMult = {{confMixing.vtxBins.value, confMixing.multBins.value}, true};
153-
mixBinsVtxCent = {{confMixing.vtxBins.value, confMixing.centBins.value}, true};
154-
mixBinsVtxMultCent = {{confMixing.vtxBins.value, confMixing.multBins.value, confMixing.centBins.value}, true};
152+
mixBinsVtxMult = {{confMixing.vtxBins.value, confMixing.multBins.value}};
153+
mixBinsVtxCent = {{confMixing.vtxBins.value, confMixing.centBins.value}};
154+
mixBinsVtxMultCent = {{confMixing.vtxBins.value, confMixing.multBins.value, confMixing.centBins.value}};
155155

156156
// setup histograms
157157
std::map<colhistmanager::ColHist, std::vector<o2::framework::AxisSpec>> colHistSpec;

‎PWGCF/Femto/Tasks/femtoPairMcParticleMcParticle.cxx‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -109,9 +109,9 @@ struct FemtoPairMcParticleMcParticle {
109109
{
110110
// setup columnpolicy for binning
111111
// default values are used during instantiation, so we need to explicity update them here
112-
mixBinsVtxMult = {{confMixing.vtxBins.value, confMixing.multBins.value}, true};
113-
mixBinsVtxCent = {{confMixing.vtxBins.value, confMixing.centBins.value}, true};
114-
mixBinsVtxMultCent = {{confMixing.vtxBins.value, confMixing.multBins.value, confMixing.centBins.value}, true};
112+
mixBinsVtxMult = {{confMixing.vtxBins.value, confMixing.multBins.value}};
113+
mixBinsVtxCent = {{confMixing.vtxBins.value, confMixing.centBins.value}};
114+
mixBinsVtxMultCent = {{confMixing.vtxBins.value, confMixing.multBins.value, confMixing.centBins.value}};
115115

116116
// setup histogram specs
117117
std::map<colhistmanager::ColHist, std::vector<o2::framework::AxisSpec>> colHistSpec;

‎PWGCF/Femto/Tasks/femtoPairTrackCascade.cxx‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -179,9 +179,9 @@ struct FemtoPairTrackCascade {
179179

180180
// setup columnpolicy for binning
181181
// default values are used during instantiation, so we need to explicity update them here
182-
mixBinsVtxMult = {{confMixing.vtxBins.value, confMixing.multBins.value}, true};
183-
mixBinsVtxCent = {{confMixing.vtxBins.value, confMixing.centBins.value}, true};
184-
mixBinsVtxMultCent = {{confMixing.vtxBins.value, confMixing.multBins.value, confMixing.centBins.value}, true};
182+
mixBinsVtxMult = {{confMixing.vtxBins.value, confMixing.multBins.value}};
183+
mixBinsVtxCent = {{confMixing.vtxBins.value, confMixing.centBins.value}};
184+
mixBinsVtxMultCent = {{confMixing.vtxBins.value, confMixing.multBins.value, confMixing.centBins.value}};
185185

186186
std::map<colhistmanager::ColHist, std::vector<o2::framework::AxisSpec>> colHistSpec;
187187
std::map<trackhistmanager::TrackHist, std::vector<o2::framework::AxisSpec>> trackHistSpec;

‎PWGCF/Femto/Tasks/femtoPairTrackCharmHadron.cxx‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -180,9 +180,9 @@ struct FemtoPairTrackCharmHadron {
180180

181181
// setup columnpolicy for binning
182182
// default values are used during instantiation, so we need to explicity update them here
183-
mixBinsVtxMult = {{confMixing.vtxBins.value, confMixing.multBins.value}, true};
184-
mixBinsVtxCent = {{confMixing.vtxBins.value, confMixing.centBins.value}, true};
185-
mixBinsVtxMultCent = {{confMixing.vtxBins.value, confMixing.multBins.value, confMixing.centBins.value}, true};
183+
mixBinsVtxMult = {{confMixing.vtxBins.value, confMixing.multBins.value}};
184+
mixBinsVtxCent = {{confMixing.vtxBins.value, confMixing.centBins.value}};
185+
mixBinsVtxMultCent = {{confMixing.vtxBins.value, confMixing.multBins.value, confMixing.centBins.value}};
186186

187187
std::map<colhistmanager::ColHist, std::vector<o2::framework::AxisSpec>> colHistSpec;
188188
std::map<trackhistmanager::TrackHist, std::vector<o2::framework::AxisSpec>> trackHistSpec;

‎PWGCF/Femto/Tasks/femtoPairTrackKink.cxx‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -169,9 +169,9 @@ struct FemtoPairTrackKink {
169169

170170
// setup columnpolicy for binning
171171
// default values are used during instantiation, so we need to explicity update them here
172-
mixBinsVtxMult = {{confMixing.vtxBins.value, confMixing.multBins.value}, true};
173-
mixBinsVtxCent = {{confMixing.vtxBins.value, confMixing.centBins.value}, true};
174-
mixBinsVtxMultCent = {{confMixing.vtxBins.value, confMixing.multBins.value, confMixing.centBins.value}, true};
172+
mixBinsVtxMult = {{confMixing.vtxBins.value, confMixing.multBins.value}};
173+
mixBinsVtxCent = {{confMixing.vtxBins.value, confMixing.centBins.value}};
174+
mixBinsVtxMultCent = {{confMixing.vtxBins.value, confMixing.multBins.value, confMixing.centBins.value}};
175175

176176
std::map<colhistmanager::ColHist, std::vector<o2::framework::AxisSpec>> colHistSpec;
177177
std::map<trackhistmanager::TrackHist, std::vector<o2::framework::AxisSpec>> trackHistSpec;

‎PWGCF/Femto/Tasks/femtoPairTrackTrack.cxx‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -140,10 +140,10 @@ struct FemtoPairTrackTrack {
140140

141141
// setup columnpolicy for binning
142142
// default values are used during instantiation, so we need to explicity update them here
143-
mixBinsVtxMult = {{confMixing.vtxBins.value, confMixing.multBins.value}, true};
144-
mixBinsVtxCent = {{confMixing.vtxBins.value, confMixing.centBins.value}, true};
145-
mixBinsVtxMultCent = {{confMixing.vtxBins.value, confMixing.multBins.value, confMixing.centBins.value}, true};
146-
mixBinsVtxCentEventPlaneAngle = {{confMixing.vtxBins.value, confMixing.centBins.value, confMixing.eventPlaneAngle.value}, true};
143+
mixBinsVtxMult = {{confMixing.vtxBins.value, confMixing.multBins.value}};
144+
mixBinsVtxCent = {{confMixing.vtxBins.value, confMixing.centBins.value}};
145+
mixBinsVtxMultCent = {{confMixing.vtxBins.value, confMixing.multBins.value, confMixing.centBins.value}};
146+
mixBinsVtxCentEventPlaneAngle = {{confMixing.vtxBins.value, confMixing.centBins.value, confMixing.eventPlaneAngle.value}};
147147

148148
// setup histogram specs
149149
std::map<colhistmanager::ColHist, std::vector<o2::framework::AxisSpec>> colHistSpec;

‎PWGCF/Femto/Tasks/femtoPairTrackTwoTrackResonance.cxx‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -159,9 +159,9 @@ struct FemtoPairTrackTwoTrackResonance {
159159

160160
// setup columnpolicy for binning
161161
// default values are used during instantiation, so we need to explicity update them here
162-
mixBinsVtxMult = {{confMixing.vtxBins.value, confMixing.multBins.value}, true};
163-
mixBinsVtxCent = {{confMixing.vtxBins.value, confMixing.centBins.value}, true};
164-
mixBinsVtxMultCent = {{confMixing.vtxBins.value, confMixing.multBins.value, confMixing.centBins.value}, true};
162+
mixBinsVtxMult = {{confMixing.vtxBins.value, confMixing.multBins.value}};
163+
mixBinsVtxCent = {{confMixing.vtxBins.value, confMixing.centBins.value}};
164+
mixBinsVtxMultCent = {{confMixing.vtxBins.value, confMixing.multBins.value, confMixing.centBins.value}};
165165

166166
// setup histograms
167167
auto colHistSpec = colhistmanager::makeColHistSpecMap(confCollisionBinning);

‎PWGCF/Femto/Tasks/femtoPairTrackV0.cxx‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -171,9 +171,9 @@ struct FemtoPairTrackV0 {
171171

172172
// setup columnpolicy for binning
173173
// default values are used during instantiation, so we need to explicity update them here
174-
mixBinsVtxMult = {{confMixing.vtxBins.value, confMixing.multBins.value}, true};
175-
mixBinsVtxCent = {{confMixing.vtxBins.value, confMixing.centBins.value}, true};
176-
mixBinsVtxMultCent = {{confMixing.vtxBins.value, confMixing.multBins.value, confMixing.centBins.value}, true};
174+
mixBinsVtxMult = {{confMixing.vtxBins.value, confMixing.multBins.value}};
175+
mixBinsVtxCent = {{confMixing.vtxBins.value, confMixing.centBins.value}};
176+
mixBinsVtxMultCent = {{confMixing.vtxBins.value, confMixing.multBins.value, confMixing.centBins.value}};
177177

178178
std::map<colhistmanager::ColHist, std::vector<o2::framework::AxisSpec>> colHistSpec;
179179
std::map<trackhistmanager::TrackHist, std::vector<o2::framework::AxisSpec>> trackHistSpec;

0 commit comments

Comments
 (0)