Skip to content

Commit a31c111

Browse files
committed
small optimization
1 parent a50b0b1 commit a31c111

File tree

3 files changed

+7
-6
lines changed

3 files changed

+7
-6
lines changed

PWGCF/FemtoDream/Core/femtoDreamContainer.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -245,7 +245,7 @@ class FemtoDreamContainer
245245
framework::AxisSpec mTAxis4D = {mTBins4D, "#it{m}_{T} (GeV/#it{c})"};
246246
framework::AxisSpec multPercentileAxis4D = {multPercentileBins4D, "Centralty(%)"};
247247
framework::AxisSpec qnAxis = {qnBins, "qn"};
248-
framework::AxisSpec pairPhiAxis = {pairPhiBins, "#varphi_{pair} - #Psi_{EP}"};
248+
framework::AxisSpec pairPhiAxis = {pairPhiBins, "#varphi_{pair} - #Psi_{EP} (rad)"};
249249

250250
std::string folderName = static_cast<std::string>(mFolderSuffix[mEventType]) + static_cast<std::string>(o2::aod::femtodreamMCparticle::MCTypeName[o2::aod::femtodreamMCparticle::MCType::kRecon]) + static_cast<std::string>("_3Dqn");
251251

PWGCF/FemtoDream/TableProducer/femtoDreamProducerTask.cxx

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -278,6 +278,7 @@ struct femtoDreamProducerTask {
278278
std::string prefix = std::string("epCal");
279279
Configurable<bool> ConfFillFlowQA{"ConfFillFlowQA", false, "Evt sel: fill flow/event-plane related observables"};
280280
Configurable<bool> ConfQnSeparation{"ConfQnSeparation", false, "Evt sel: do qn separation of events"};
281+
Configurable<int> ConfHarmonicOrder{"ConfHarmonicOrder", 2, "harmonic order for event plane calculation"};
281282
Configurable<std::vector<float>> ConfQnBinSeparator{"ConfQnBinSeparator", std::vector<float>{-999.f, -999.f, -999.f}, "qn bin separator"};
282283
Configurable<bool> ConfDoCumlant{"ConfDoCumlant", false, "do cumulant for flow calculation"};
283284
Configurable<float> ConfCentralityMax{"ConfCentralityMax", 100.f, "Evt sel: Maximum Centrality cut"};
@@ -782,7 +783,7 @@ struct femtoDreamProducerTask {
782783
}
783784

784785
if constexpr (doFlow) {
785-
fillCollisionsFlow(col, tracks, mult, spher, multNtr);
786+
fillCollisionsFlow(col, tracks, mult, spher, multNtr, epCal.ConfHarmonicOrder);
786787
}
787788

788789
std::vector<int> childIDs = {0, 0}; // these IDs are necessary to keep track of the children
@@ -1134,10 +1135,10 @@ struct femtoDreamProducerTask {
11341135
}
11351136

11361137
template <typename CollisionType, typename TrackType>
1137-
void fillCollisionsFlow(CollisionType const& col, TrackType const& tracks, float mult, float spher, float multNtr)
1138+
void fillCollisionsFlow(CollisionType const& col, TrackType const& tracks, float mult, float spher, float multNtr, int EPHarmonic)
11381139
{
11391140
float myqn = colCuts.computeqnVec(col);
1140-
float myEP = TMath::RadToDeg() * colCuts.computeEP(col, 2);
1141+
float myEP = TMath::RadToDeg() * colCuts.computeEP(col, EPHarmonic);
11411142
// psi from rad(0-pi) to deg, in table psi would be in deg,from 0-180
11421143

11431144
if ((myqn >= 0 && myqn < 1e6) || (myEP >= 0 && myEP < 180)) {

PWGCF/FemtoDream/Tasks/femtoDreamPairTaskTrackTrack.cxx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -308,10 +308,10 @@ struct femtoDreamPairTaskTrackTrack {
308308

309309
if (EPCal.do1DFemto) {
310310
sameEventQnCont.init_EP(&Registry,
311-
Binning4D.kstar, Binning4D.mT, Binning4D.multPercentile, EPCal.doQnSeparation ? EPCal.qnBins : EPCal.pairPhiBins, EPCal.doQnSeparation ? "qnBin" : "#phi_{pair}-#Psi_{EP}",
311+
Binning4D.kstar, Binning4D.mT, Binning4D.multPercentile, EPCal.doQnSeparation ? EPCal.qnBins : EPCal.pairPhiBins, EPCal.doQnSeparation ? "qnBin" : "#phi_{pair}-#Psi_{EP} (rad)",
312312
Option.IsMC, Option.HighkstarCut);
313313
mixedEventQnCont.init_EP(&Registry,
314-
Binning4D.kstar, Binning4D.mT, Binning4D.multPercentile, EPCal.doQnSeparation ? EPCal.qnBins : EPCal.pairPhiBins, EPCal.doQnSeparation ? "qnBin" : "#phi_{pair}-#Psi_{EP}",
314+
Binning4D.kstar, Binning4D.mT, Binning4D.multPercentile, EPCal.doQnSeparation ? EPCal.qnBins : EPCal.pairPhiBins, EPCal.doQnSeparation ? "qnBin" : "#phi_{pair}-#Psi_{EP} (rad)",
315315
Option.IsMC, Option.HighkstarCut);
316316
sameEventQnCont.setPDGCodes(Track1.PDGCode, Track2.PDGCode);
317317
mixedEventQnCont.setPDGCodes(Track1.PDGCode, Track2.PDGCode);

0 commit comments

Comments
 (0)