Skip to content

Commit 4b25ae7

Browse files
victorvalenciatorresvictorvalenciatorres
authored
[PWGDQ] Update on cumulants (#8712)
1 parent 0d044bc commit 4b25ae7

File tree

3 files changed

+2
-70
lines changed

3 files changed

+2
-70
lines changed

‎PWGDQ/Core/HistogramsLibrary.cxx‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -249,9 +249,6 @@ void o2::aod::dqhistograms::DefineHistograms(HistogramManager* hm, const char* h
249249
hm->AddHistogram(histClass, "Run2_centrFT0C_Corr2REFetagap_ev", "Run2_centrFT0C_Corr2REFetagap_ev, --s--", true, 9, std::array<double, 10>{0.0, 5.0, 10.0, 20.0, 30.0, 40.0, 50.0, 60.0, 70.0, 80.0}.data(), VarManager::kCentFT0C, 250, std::array<double, 2>{-1.0, 1.0}.data(), VarManager::kCORR2REFetagap, 0, nullptr, -1, "", "", "", VarManager::kCORR2REFetagap, VarManager::kM11REFetagap);
250250
hm->AddHistogram(histClass, "Run2_centrFT0C_Corr4REF_ev", "Run2_centrFT0C_Corr4REF_ev, --s--", true, 9, std::array<double, 10>{0.0, 5.0, 10.0, 20.0, 30.0, 40.0, 50.0, 60.0, 70.0, 80.0}.data(), VarManager::kCentFT0C, 250, std::array<double, 2>{-1.0, 1.0}.data(), VarManager::kCORR4REF, 0, nullptr, -1, "", "", "", VarManager::kCORR4REF, VarManager::kM1111REF);
251251
hm->AddHistogram(histClass, "Run2_centrFT0C_Corr2Corr4REF_ev", "Run2_centrFT0C_Corr2Corr4REF_ev, --s--", true, 9, std::array<double, 10>{0.0, 5.0, 10.0, 20.0, 30.0, 40.0, 50.0, 60.0, 70.0, 80.0}.data(), VarManager::kCentFT0C, 250, std::array<double, 2>{-1.0, 1.0}.data(), VarManager::kCORR2CORR4REF, 0, nullptr, -1, "", "", "", VarManager::kCORR2CORR4REF, VarManager::kM11M1111REF);
252-
hm->AddHistogram(histClass, "Corr2REFerrorsetagap", "", 4, std::array<int, 4>{VarManager::kCentFT0C, VarManager::kCORR2REFetagapw, VarManager::kCORR2REFetagapsquaredw, VarManager::kM11REFetagap}.data(), std::array<int, 4>{100, 5000, 5000, 5000}.data(), std::array<double, 4>{0.0, -5000.0, 0.0, 0.0}.data(), std::array<double, 4>{100.0, 5000.0, 100.0, 300000.0}.data(), nullptr, -1, true, true);
253-
hm->AddHistogram(histClass, "Corr2REFerrors", "", 4, std::array<int, 4>{VarManager::kCentFT0C, VarManager::kCORR2REFw, VarManager::kCORR2REFsquaredw, VarManager::kM11REF}.data(), std::array<int, 4>{100, 10000, 10000, 10000}.data(), std::array<double, 4>{0.0, -40000.0, 0.0, 0.0}.data(), std::array<double, 4>{100.0, 40000.0, 100.0, 6000000.0}.data(), nullptr, -1, true, true);
254-
hm->AddHistogram(histClass, "Corr4REFerrors", "", 4, std::array<int, 4>{VarManager::kCentFT0C, VarManager::kCORR4REFw, VarManager::kCORR4REFsquaredw, VarManager::kM1111REF}.data(), std::array<int, 4>{100, 100000, 100000, 100000}.data(), std::array<double, 4>{0.0, -30000000.0, 0.0, 0.0}.data(), std::array<double, 4>{100.0, 90000000.0, 40000.0, 9000000000000.0}.data(), nullptr, -1, true, true);
255252
if (subGroupStr.Contains("cross")) {
256253
hm->AddHistogram(histClass, "Q1ZNACXX_CentFT0C", "", false, 90, 0.0, 90.0, VarManager::kCentFT0C, 4000, -2, 2, VarManager::kQ1ZNACXX);
257254
hm->AddHistogram(histClass, "Q1ZNACYY_CentFT0C", "", false, 90, 0.0, 90.0, VarManager::kCentFT0C, 4000, -2, 2, VarManager::kQ1ZNACYY);

‎PWGDQ/Core/VarManager.cxx‎

Lines changed: 0 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -763,8 +763,6 @@ void VarManager::SetDefaultVarNames()
763763
fgVariableUnits[kM01POI] = "";
764764
fgVariableNames[kM1111REF] = "M_{1111}^{REF} ";
765765
fgVariableUnits[kM1111REF] = "";
766-
fgVariableNames[kM1111REFsmall] = "M_{1111}^{REF}small ";
767-
fgVariableUnits[kM1111REFsmall] = "";
768766
fgVariableNames[kM11M1111REF] = "M_{11}_{REF}M_{1111}_{REF} ";
769767
fgVariableUnits[kM11M1111REF] = "";
770768
fgVariableNames[kCORR2CORR4REF] = "<2><4>";
@@ -773,36 +771,14 @@ void VarManager::SetDefaultVarNames()
773771
fgVariableUnits[kM0111POI] = "";
774772
fgVariableNames[kCORR2REF] = "<2> ";
775773
fgVariableUnits[kCORR2REF] = "";
776-
fgVariableNames[kCORR2REFw] = "<2w> ";
777-
fgVariableUnits[kCORR2REFw] = "";
778-
fgVariableNames[kCORR2REFsquared] = "<M11*2^2> ";
779-
fgVariableUnits[kCORR2REFsquared] = "";
780-
fgVariableNames[kCORR2REFsquaredw] = "<M11*2^2> ";
781-
fgVariableUnits[kCORR2REFsquaredw] = "";
782774
fgVariableNames[kCORR2REFetagap] = "<2-etagap> ";
783775
fgVariableUnits[kCORR2REFetagap] = "";
784-
fgVariableNames[kCORR2REFetagapw] = "<2w-etagap> ";
785-
fgVariableUnits[kCORR2REFetagapw] = "";
786-
fgVariableNames[kCORR2REFetagapsquaredw] = "<M11*2^2-etagap> ";
787-
fgVariableUnits[kCORR2REFetagapsquaredw] = "";
788776
fgVariableNames[kCORR2POI] = "<2'> ";
789777
fgVariableUnits[kCORR2POI] = "";
790-
fgVariableNames[kCORR2POIw] = "<2'w> ";
791-
fgVariableUnits[kCORR2POIw] = "";
792-
fgVariableNames[kCORR2POIsquaredw] = "<M01*2'^2> ";
793-
fgVariableUnits[kCORR2POIsquaredw] = "";
794778
fgVariableNames[kCORR4REF] = "<4> ";
795779
fgVariableUnits[kCORR4REF] = "";
796-
fgVariableNames[kCORR4REFw] = "<4w> ";
797-
fgVariableUnits[kCORR4REFw] = "";
798-
fgVariableNames[kCORR4REFsquaredw] = "<M1111*4^2> ";
799-
fgVariableUnits[kCORR4REFsquaredw] = "";
800780
fgVariableNames[kCORR4POI] = "<4'> ";
801781
fgVariableUnits[kCORR4POI] = "";
802-
fgVariableNames[kCORR4POIw] = "<4'w> ";
803-
fgVariableUnits[kCORR4POIw] = "";
804-
fgVariableNames[kCORR4POIsquaredw] = "<M0111*2'^2> ";
805-
fgVariableUnits[kCORR4POIsquaredw] = "";
806782
fgVariableNames[kM11REFoverMp] = "M_{11}^{REF}/M_{p} ";
807783
fgVariableUnits[kM11REFoverMp] = "";
808784
fgVariableNames[kM01POIoverMp] = "M^{'}_{01}^{POI}/M_{p} ";
@@ -813,16 +789,8 @@ void VarManager::SetDefaultVarNames()
813789
fgVariableUnits[kM0111POIoverMp] = "";
814790
fgVariableNames[kCORR2POIMp] = "<2'> M_{p} ";
815791
fgVariableUnits[kCORR2POIMp] = "";
816-
fgVariableNames[kCORR2POIMpw] = "<2'w> M_{p} ";
817-
fgVariableUnits[kCORR2POIMpw] = "";
818-
fgVariableNames[kCORR2POIsquaredMpw] = "<2'w>^{2} M_{p} ";
819-
fgVariableUnits[kCORR2POIsquaredMpw] = "";
820792
fgVariableNames[kCORR4POIMp] = "<4'> M_{p} ";
821793
fgVariableUnits[kCORR4POIMp] = "";
822-
fgVariableNames[kCORR4POIMpw] = "<4'w> M_{p} ";
823-
fgVariableUnits[kCORR4POIMpw] = "";
824-
fgVariableNames[kCORR4POIsquaredMpw] = "<4'w>^{2} M_{p} ";
825-
fgVariableUnits[kCORR4POIsquaredMpw] = "";
826794
fgVariableNames[kCos2DeltaPhi] = "cos 2(#varphi-#Psi_{2}^{A}) ";
827795
fgVariableUnits[kCos2DeltaPhi] = "";
828796
fgVariableNames[kCos3DeltaPhi] = "cos 3(#varphi-#Psi_{3}^{A}) ";

‎PWGDQ/Core/VarManager.h‎

Lines changed: 2 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -645,36 +645,20 @@ class VarManager : public TObject
645645
kM11REFetagap,
646646
kM01POI,
647647
kM1111REF,
648-
kM1111REFsmall,
649648
kM11M1111REF,
650649
kCORR2CORR4REF,
651650
kM0111POI,
652651
kCORR2REF,
653-
kCORR2REFw,
654-
kCORR2REFsquared,
655-
kCORR2REFsquaredw,
656652
kCORR2REFetagap,
657-
kCORR2REFetagapw,
658-
kCORR2REFetagapsquaredw,
659653
kCORR2POI,
660-
kCORR2POIw,
661-
kCORR2POIsquaredw,
662-
kCORR2POIsquaredMpw,
663654
kCORR4REF,
664-
kCORR4REFw,
665-
kCORR4REFsquaredw,
666655
kCORR4POI,
667-
kCORR4POIw,
668-
kCORR4POIsquaredw,
669-
kCORR4POIsquaredMpw,
670656
kM11REFoverMp,
671657
kM01POIoverMp,
672658
kM1111REFoverMp,
673659
kM0111POIoverMp,
674660
kCORR2POIMp,
675661
kCORR4POIMp,
676-
kCORR2POIMpw,
677-
kCORR4POIMpw,
678662
kR2SP,
679663
kR2EP,
680664
kPsi2A,
@@ -1652,21 +1636,11 @@ void VarManager::FillEvent(T const& event, float* values)
16521636

16531637
if constexpr ((fillMap & ReducedEventRefFlow) > 0) {
16541638
values[kM1111REF] = event.m1111ref();
1655-
values[kM1111REFsmall] = event.m1111ref();
1656-
values[kM11M1111REF] = event.m1111ref();
1657-
values[kCORR2CORR4REF] = event.corr4ref();
16581639
values[kM11REF] = event.m11ref();
1659-
values[kM11REFetagap] = event.m11ref();
1640+
values[kM11M1111REF] = event.m11ref() * event.m1111ref();
16601641
values[kCORR2REF] = event.corr2ref();
1661-
values[kCORR2REFsquared] = event.corr2ref();
1662-
values[kCORR2REFw] = event.corr2ref();
1663-
values[kCORR2REFsquaredw] = event.corr2ref();
1664-
values[kCORR2REFetagap] = event.corr2ref();
1665-
values[kCORR2REFetagapw] = event.corr2ref();
1666-
values[kCORR2REFetagapsquaredw] = event.corr2ref();
16671642
values[kCORR4REF] = event.corr4ref();
1668-
values[kCORR4REFw] = event.corr4ref();
1669-
values[kCORR4REFsquaredw] = event.corr4ref();
1643+
values[kCORR2CORR4REF] = event.corr2ref() * event.corr4ref();
16701644
values[kMultA] = event.multa();
16711645
}
16721646
}
@@ -4026,11 +4000,6 @@ void VarManager::FillQVectorFromGFW(C const& /*collision*/, A const& compA11, A
40264000
values[kM1111REF] = std::isnan(values[kM1111REF]) || std::isinf(values[kM1111REF]) ? 0 : values[kM1111REF];
40274001
values[kM11REF] = std::isnan(values[kCORR2REF]) || std::isinf(values[kCORR2REF]) ? 0 : values[kM11REF];
40284002
values[kM1111REF] = std::isnan(values[kCORR4REF]) || std::isinf(values[kCORR4REF]) ? 0 : values[kM1111REF];
4029-
values[kCORR2REFw] = values[kCORR2REF] * values[kM11REF];
4030-
values[kCORR2REFsquared] = values[kCORR2REF] * values[kCORR2REF];
4031-
values[kCORR2REFsquaredw] = values[kCORR2REF] * values[kCORR2REF] * values[kM11REF];
4032-
values[kCORR4REFw] = values[kCORR4REF] * values[kM1111REF];
4033-
values[kCORR4REFsquaredw] = values[kCORR4REF] * values[kCORR4REF] * values[kM1111REF];
40344003
values[kCORR2CORR4REF] = values[kCORR2REF] * values[kCORR4REF];
40354004
values[kM11M1111REF] = values[kM11REF] * values[kM1111REF];
40364005

@@ -4041,8 +4010,6 @@ void VarManager::FillQVectorFromGFW(C const& /*collision*/, A const& compA11, A
40414010
values[kM11REFetagap] = S11B * S11C;
40424011
values[kCORR2REFetagap] = ((QB * conj(QC)).real()) / values[kM11REFetagap];
40434012
values[kCORR2REFetagap] = std::isnan(values[kCORR2REFetagap]) || std::isinf(values[kCORR2REFetagap]) ? 0 : values[kCORR2REFetagap];
4044-
values[kCORR2REFetagapw] = values[kCORR2REFetagap] * values[kM11REFetagap];
4045-
values[kCORR2REFetagapsquaredw] = values[kCORR2REFetagap] * values[kCORR2REFetagap] * values[kM11REFetagap];
40464013

40474014
// TODO: provide different computations for R
40484015
// Compute the R factor using the 2 sub-events technique for second and third harmonic

0 commit comments

Comments
 (0)