Skip to content

Commit f49a882

Browse files
MattOckletonMattOckleton
committed
Merge remote-tracking branch 'refs/remotes/upstream/master'
2 parents 036a8a6 + aba5f30 commit f49a882

67 files changed

Lines changed: 2054 additions & 2852 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/EbyEFluctuations/Tasks/partNumFluc.cxx‎

Lines changed: 365 additions & 319 deletions
Large diffs are not rendered by default.

‎PWGCF/MultiparticleCorrelations/Tasks/multiharmonicCorrelations.cxx‎

Lines changed: 13 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -419,7 +419,6 @@ struct MultiharmonicCorrelations { // this name is used in lower-case format to
419419
return;
420420
}
421421
// Print current run number:
422-
// LOGF(info, "Run number: %d", collision.bc().runNumber());
423422
int currentRun = collision.bc().runNumber();
424423
auto it = phih.histMap.find(currentRun);
425424
auto histweight = wh.weightsmap.find(currentRun);
@@ -532,10 +531,16 @@ struct MultiharmonicCorrelations { // this name is used in lower-case format to
532531
it->second->Fill(phi);
533532
}
534533

535-
if (cfUseWeights && histweight != wh.weightsmap.end())
536-
weight = histweight->second->GetBinContent(histweight->second->FindBin(phi));
537-
else
534+
if (cfUseWeights) {
535+
if (histweight != wh.weightsmap.end() && histweight->second) {
536+
weight = histweight->second->GetBinContent(histweight->second->FindBin(phi));
537+
} else {
538+
LOG(warning) << "No weights found for run " << currentRun << ", using weight=1";
539+
weight = 1;
540+
}
541+
} else {
538542
weight = 1;
543+
}
539544

540545
// ... and corresponding MC truth simulated:
541546
// See https://github.com/AliceO2Group/O2Physics/blob/master/Tutorials/src/mcHistograms.cxx
@@ -573,9 +578,9 @@ struct MultiharmonicCorrelations { // this name is used in lower-case format to
573578
float wFour = Four(0, 0, 0, 0).Re();
574579
float four32 = Four(3, 2, -3, -2).Re() / wFour;
575580
float four42 = Four(4, 2, -4, -2).Re() / wFour;
576-
float v22 = Two(2, -2) / wTwo;
577-
float v32 = Two(3, -3) / wTwo;
578-
float v42 = Two(4, -4) / wTwo;
581+
float v22 = Two(2, -2).Re() / wTwo;
582+
float v32 = Two(3, -3).Re() / wTwo;
583+
float v42 = Two(4, -4).Re() / wTwo;
579584
if (std::isnan(v22) || std::isnan(v32) || std::isnan(v42) || std::isnan(four32) || std::isnan(four42)) {
580585
LOGF(info, "\033[1;31m%s std::isnan(v22) || std::isnan(v32) || std::isnan(v42) || std::isnan(four32) || std::isnan(four42)\033[0m", __FUNCTION__);
581586
LOGF(error, "v22 = %f\nv32 = %f\nv42 = %f\nfour32=%f\nv42 = %f\n", v22, v32, v42, four32, four42);
@@ -802,6 +807,7 @@ struct MultiharmonicCorrelations { // this name is used in lower-case format to
802807
LOG(fatal) << "Failed to load weights for run " << run;
803808
return;
804809
}
810+
histweights->SetName(Form("histWithEfficiencyCorrections_%d", run));
805811
wh.fWeightsHistList->Add(histweights);
806812
wh.weightsmap[run] = histweights;
807813
}

‎PWGDQ/Core/AnalysisCompositeCut.cxx‎

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -17,13 +17,11 @@
1717

1818
#include <vector>
1919

20-
ClassImp(AnalysisCompositeCut)
21-
22-
//____________________________________________________________________________
23-
AnalysisCompositeCut::AnalysisCompositeCut(bool useAND) : AnalysisCut(),
24-
fOptionUseAND(useAND),
25-
fCutList(),
26-
fCompositeCutList()
20+
//____________________________________________________________________________
21+
AnalysisCompositeCut::AnalysisCompositeCut(bool useAND) : AnalysisCut(),
22+
fOptionUseAND(useAND),
23+
fCutList(),
24+
fCompositeCutList()
2725
{
2826
//
2927
// default constructor

‎PWGDQ/Core/AnalysisCompositeCut.h‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -36,8 +36,8 @@ class AnalysisCompositeCut : public AnalysisCut
3636

3737
void AddCut(AnalysisCut* cut)
3838
{
39-
if (cut->IsA() == AnalysisCompositeCut::Class()) {
40-
fCompositeCutList.push_back(*(AnalysisCompositeCut*)cut);
39+
if (auto* composite = dynamic_cast<AnalysisCompositeCut*>(cut)) {
40+
fCompositeCutList.push_back(*composite);
4141
} else {
4242
fCutList.push_back(*cut);
4343
}
@@ -52,8 +52,6 @@ class AnalysisCompositeCut : public AnalysisCut
5252
bool fOptionUseAND; // true (default): apply AND on all cuts; false: use OR
5353
std::vector<AnalysisCut> fCutList; // list of cuts
5454
std::vector<AnalysisCompositeCut> fCompositeCutList; // list of composite cuts
55-
56-
ClassDef(AnalysisCompositeCut, 2);
5755
};
5856

5957
#endif // PWGDQ_CORE_ANALYSISCOMPOSITECUT_H_

‎PWGDQ/Core/AnalysisCut.cxx‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,6 @@
2121
using std::cout;
2222
using std::endl;
2323

24-
ClassImp(AnalysisCut);
25-
2624
std::vector<int> AnalysisCut::fgUsedVars = {};
2725

2826
//____________________________________________________________________________

‎PWGDQ/Core/AnalysisCut.h‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -72,8 +72,6 @@ class AnalysisCut : public TNamed
7272

7373
protected:
7474
std::vector<CutContainer> fCuts;
75-
76-
ClassDef(AnalysisCut, 2);
7775
};
7876

7977
//____________________________________________________________________________

‎PWGDQ/Core/CMakeLists.txt‎

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -22,17 +22,3 @@ o2physics_add_library(PWGDQCore
2222
MCProng.cxx
2323
MCSignal.cxx
2424
PUBLIC_LINK_LIBRARIES O2::Framework O2::DCAFitter O2::GlobalTracking O2Physics::AnalysisCore KFParticle::KFParticle O2Physics::MLCore)
25-
26-
o2physics_target_root_dictionary(PWGDQCore
27-
HEADERS AnalysisCut.h
28-
AnalysisCompositeCut.h
29-
VarManager.h
30-
HistogramManager.h
31-
CutsLibrary.h
32-
MixingHandler.h
33-
MixingLibrary.h
34-
HistogramsLibrary.h
35-
MCProng.h
36-
MCSignal.h
37-
MCSignalLibrary.h
38-
LINKDEF PWGDQCoreLinkDef.h)

‎PWGDQ/Core/CutsLibrary.cxx‎

Lines changed: 75 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1593,6 +1593,34 @@ AnalysisCompositeCut* o2::aod::dqcuts::GetCompositeCut(const char* cutName)
15931593
cut->AddCut(GetAnalysisCut("electronPID1shiftDown"));
15941594
return cut;
15951595
}
1596+
// -------------------------------------------------------------------------------------------------
1597+
//
1598+
// Q vector contributor cut
1599+
//
1600+
if (!nameStr.compare("selTPCCentral")) {
1601+
AnalysisCut* kineCut = new AnalysisCut("kineCut", "kine cut");
1602+
kineCut->AddCut(VarManager::kEta, -0.8, 0.8);
1603+
kineCut->AddCut(VarManager::kPt, 0.15, 5);
1604+
1605+
AnalysisCut* qualityCuts = new AnalysisCut("qualityCuts", "quality cuts");
1606+
qualityCuts->AddCut(VarManager::kTPCchi2, 0., 4.);
1607+
qualityCuts->AddCut(VarManager::kTPCnCRoverFindCls, 0.8, 1.);
1608+
qualityCuts->AddCut(VarManager::kIsITSibAny, 0.5, 1.5);
1609+
qualityCuts->AddCut(VarManager::kITSchi2, 0., 36.);
1610+
1611+
AnalysisCut* dcaCuts = new AnalysisCut("dcaCuts", "DCA cuts");
1612+
std::shared_ptr<TF1> f1dcaxyHigh = std::make_shared<TF1>("f1dcaxy", "[0]+[1]/pow(x,[2])", 0., 10.);
1613+
f1dcaxyHigh->SetParameters(0.0105, 0.035, 1.1);
1614+
std::shared_ptr<TF1> f1dcaxyLow = std::make_shared<TF1>("f1dcaxy_low", "[0]+[1]/pow(x,[2])", 0., 10.);
1615+
f1dcaxyLow->SetParameters(-0.0105, -0.035, 1.1);
1616+
dcaCuts->AddCut(VarManager::kTrackDCAxy, f1dcaxyLow, f1dcaxyHigh);
1617+
dcaCuts->AddCut(VarManager::kTrackDCAz, -2., 2.);
1618+
1619+
cut->AddCut(kineCut);
1620+
cut->AddCut(qualityCuts);
1621+
cut->AddCut(dcaCuts);
1622+
}
1623+
15961624
// -------------------------------------------------------------------------------------------------
15971625
//
15981626
// LMee cuts
@@ -3001,6 +3029,17 @@ AnalysisCompositeCut* o2::aod::dqcuts::GetCompositeCut(const char* cutName)
30013029
return cut;
30023030
}
30033031

3032+
if (!nameStr.compare("jpsi_debug_TPCTOF3_rejBadTOF")) {
3033+
cut->AddCut(GetAnalysisCut("jpsiStandardKine5"));
3034+
cut->AddCut(GetAnalysisCut("electronStandardQualityTPCOnly3"));
3035+
cut->AddCut(GetAnalysisCut("SPDfirst"));
3036+
cut->AddCut(GetAnalysisCut("dcaCut1_ionut"));
3037+
cut->AddCut(GetAnalysisCut("pidJpsi_TPCpion0"));
3038+
cut->AddCut(GetAnalysisCut("pidJpsi_beta"));
3039+
cut->AddCut(GetAnalysisCut("pidJpsi_noTOF_prot"));
3040+
return cut;
3041+
}
3042+
30043043
// -------------------------------------------------------------------------------------------------
30053044
// lmee pair cuts
30063045

@@ -4141,6 +4180,15 @@ AnalysisCut* o2::aod::dqcuts::GetAnalysisCut(const char* cutName)
41414180
return cut;
41424181
}
41434182

4183+
if (!nameStr.compare("eventStandardSel8NoPileup")) {
4184+
cut->AddCut(VarManager::kVtxZ, -10.0, 10.0);
4185+
cut->AddCut(VarManager::kIsSel8, 0.5, 1.5);
4186+
cut->AddCut(VarManager::kIsNoSameBunch, 0.5, 1.5);
4187+
cut->AddCut(VarManager::kIsGoodZvtxFT0vsPV, 0.5, 1.5);
4188+
cut->AddCut(VarManager::kNoCollInTimeRangeStandard, 0.5, 1.5);
4189+
return cut;
4190+
}
4191+
41444192
if (!nameStr.compare("eventStandardSel8PbPbQualityCent90")) {
41454193
cut->AddCut(VarManager::kVtxZ, -10.0, 10.0);
41464194
cut->AddCut(VarManager::kIsSel8, 0.5, 1.5);
@@ -4597,6 +4645,12 @@ AnalysisCut* o2::aod::dqcuts::GetAnalysisCut(const char* cutName)
45974645
return cut;
45984646
}
45994647

4648+
if (!nameStr.compare("jpsiStandardKine5")) {
4649+
cut->AddCut(VarManager::kP, 1.0, 1000.0);
4650+
cut->AddCut(VarManager::kEta, -0.9, 0.9);
4651+
return cut;
4652+
}
4653+
46004654
if (!nameStr.compare("jpsiKineSkimmed")) {
46014655
cut->AddCut(VarManager::kPt, 0.7, 1000.0);
46024656
cut->AddCut(VarManager::kEta, -0.9, 0.9);
@@ -5080,6 +5134,12 @@ AnalysisCut* o2::aod::dqcuts::GetAnalysisCut(const char* cutName)
50805134
return cut;
50815135
}
50825136

5137+
if (!nameStr.compare("electronStandardQualityTPCOnly3")) {
5138+
cut->AddCut(VarManager::kTPCchi2, 0.0, 4.0);
5139+
cut->AddCut(VarManager::kTPCncls, 120, 161.);
5140+
return cut;
5141+
}
5142+
50835143
if (!nameStr.compare("NoelectronStandardQualityTPCOnly")) {
50845144
cut->AddCut(VarManager::kTPCchi2, 0.0, 4.0, true, VarManager::kTPCncls, 70, 161.);
50855145
return cut;
@@ -5298,6 +5358,21 @@ AnalysisCut* o2::aod::dqcuts::GetAnalysisCut(const char* cutName)
52985358
return cut;
52995359
}
53005360

5361+
if (!nameStr.compare("pidJpsi_TPCpion0")) {
5362+
cut->AddCut(VarManager::kTPCnSigmaPi, 4.0, 1000.0);
5363+
return cut;
5364+
}
5365+
5366+
if (!nameStr.compare("pidJpsi_noTOF_prot")) {
5367+
cut->AddCut(VarManager::kTPCnSigmaPr, 3.5, 1000.0, false, VarManager::kHasTOF, -0.5, 0.5);
5368+
return cut;
5369+
}
5370+
5371+
if (!nameStr.compare("pidJpsi_beta")) {
5372+
cut->AddCut(VarManager::kTOFbeta, 0.98, 1.02, false, VarManager::kHasTOF, 0.5, 1.5);
5373+
return cut;
5374+
}
5375+
53015376
// Magnus cuts ----------------------------------------------------------
53025377

53035378
if (!nameStr.compare("pidJpsi_magnus_ele1")) {

‎PWGDQ/Core/HistogramManager.cxx‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,8 +43,6 @@ using namespace std;
4343
#include <TProfile2D.h>
4444
#include <TProfile3D.h>
4545

46-
ClassImp(HistogramManager);
47-
4846
//_______________________________________________________________________________
4947
HistogramManager::HistogramManager() : TNamed("", ""),
5048
fMainList(nullptr),

‎PWGDQ/Core/HistogramManager.h‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -115,8 +115,6 @@ class HistogramManager : public TNamed
115115

116116
HistogramManager& operator=(const HistogramManager& c);
117117
HistogramManager(const HistogramManager& c);
118-
119-
ClassDef(HistogramManager, 2)
120118
};
121119

122120
#endif // PWGDQ_CORE_HISTOGRAMMANAGER_H_

0 commit comments

Comments
 (0)