Skip to content

Commit eff7fba

Browse files
glegrasglegras
committed
clang format
1 parent b473808 commit eff7fba

2 files changed

Lines changed: 34 additions & 39 deletions

File tree

‎PWGDQ/Core/CutsLibrary.cxx‎

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1488,36 +1488,36 @@ AnalysisCompositeCut* o2::aod::dqcuts::GetCompositeCut(const char* cutName)
14881488
return cut;
14891489
}
14901490
}
1491-
1491+
14921492
if (!nameStr.compare("electronPrimaryTag0")) {
14931493
// with tight 3 sigma DCA cut for selecting primary electrons
14941494
cut->AddCut(GetAnalysisCut("electronPID_TPCnsigma_loose")); // 3 sigma inclusion, 3sigma rejection
14951495
cut->AddCut(GetAnalysisCut("electronPrimary_dca3sigma"));
14961496
cut->AddCut(GetAnalysisCut("jpsiStandardKine"));
14971497
return cut;
14981498
}
1499-
1499+
15001500
if (!nameStr.compare("electronPrimaryTag1")) {
15011501
// with 7 sigma DCA cut for selecting primary electrons
15021502
cut->AddCut(GetAnalysisCut("electronPID_TPCnsigma_loose")); // 3 sigma inclusion, 3sigma rejection
15031503
cut->AddCut(GetAnalysisCut("electronPrimary_dca7sigma"));
15041504
cut->AddCut(GetAnalysisCut("jpsiStandardKine"));
15051505
return cut;
15061506
}
1507-
1507+
15081508
if (!nameStr.compare("electronPrimaryProbe_TPC")) {
15091509
cut->AddCut(GetAnalysisCut("electronStandardQualityTPCOnly"));
15101510
cut->AddCut(GetAnalysisCut("lmeeStandardKine"));
15111511
return cut;
15121512
}
1513-
1513+
15141514
if (!nameStr.compare("electronPrimaryProbe_ITS")) {
15151515
cut->AddCut(GetAnalysisCut("electronStandardQualitybAnyITSOnly"));
15161516
cut->AddCut(GetAnalysisCut("standardPrimaryTrackDCA"));
15171517
cut->AddCut(GetAnalysisCut("lmeeStandardKine"));
15181518
return cut;
15191519
}
1520-
1520+
15211521
if (!nameStr.compare("electronPrimaryProbe_ITSTPC")) {
15221522
cut->AddCut(GetAnalysisCut("electronStandardQualityTPCOnly"));
15231523
cut->AddCut(GetAnalysisCut("electronStandardQualitybAnyITSOnly"));
@@ -5095,36 +5095,36 @@ AnalysisCut* o2::aod::dqcuts::GetAnalysisCut(const char* cutName)
50955095
cut->AddCut(VarManager::kTrackDCAz, -1.0, 1.0);
50965096
return cut;
50975097
}
5098-
5098+
50995099
TF1* fDCAxyresLow = new TF1("fDCAxyresLow", "[0] + [1] * pow(x, -[2])", 0.1, 1000.);
51005100
TF1* fDCAzresLow = new TF1("fDCAzresLow", "[0] + [1] * pow(x, -[2])", 0.1, 1000.);
51015101
TF1* fDCAxyresUp = new TF1("fDCAxyresUp", "[0] + [1] * pow(x, -[2])", 0.1, 1000.);
51025102
TF1* fDCAzresUp = new TF1("fDCAzresUp", "[0] + [1] * pow(x, -[2])", 0.1, 1000.);
5103-
5103+
51045104
if (!nameStr.compare("electronPrimary_dca3sigma")) {
51055105
// DCAxy and DCAz 3 sigma cut. DCA resolution vs pt extracted from fits of Users/m/mfaggin/test/inputsTrackTuner/pp2024/pass1_minBias/vsPhi (used for the track tuner)
51065106
// we add in addition a term for the misalignment of the mean of the distribution, which seems to be at most 20 mum for DCAxy and 10 mum for DCAz
51075107
fDCAxyresLow->SetParameters(-3 * 8.7e-4 - 20e-4, -3 * 25.4e-4, 0.79); // res is 8.7 + 25.4/pt^0.79 mum
5108-
fDCAzresLow->SetParameters(-3 * 9.4e-4 - 10e-4, -3 * 26.5e-4, 0.79); // res is 9.4 + 26.5/pt^0.79 mum
5109-
fDCAxyresUp->SetParameters(3 * 8.7e-4 + 20e-4, 3 * 25.4e-4, 0.79); // res is 8.7 + 25.4/pt^0.79 mum
5110-
fDCAzresUp->SetParameters(3 * 9.4e-4 + 10e-4, 3 * 26.5e-4, 0.79); // res is 9.4 + 26.5/pt^0.79 mum
5111-
cut->AddCut(VarManager::kTrackDCAxy, fDCAxyresLow, fDCAxyresUp, false, VarManager::kPt, 0.2, 1000.);
5112-
cut->AddCut(VarManager::kTrackDCAz, fDCAzresLow, fDCAzresUp, false, VarManager::kPt, 0.2, 1000.);
5108+
fDCAzresLow->SetParameters(-3 * 9.4e-4 - 10e-4, -3 * 26.5e-4, 0.79); // res is 9.4 + 26.5/pt^0.79 mum
5109+
fDCAxyresUp->SetParameters(3 * 8.7e-4 + 20e-4, 3 * 25.4e-4, 0.79); // res is 8.7 + 25.4/pt^0.79 mum
5110+
fDCAzresUp->SetParameters(3 * 9.4e-4 + 10e-4, 3 * 26.5e-4, 0.79); // res is 9.4 + 26.5/pt^0.79 mum
5111+
cut->AddCut(VarManager::kTrackDCAxy, fDCAxyresLow, fDCAxyresUp, false, VarManager::kPt, 0.2, 1000.);
5112+
cut->AddCut(VarManager::kTrackDCAz, fDCAzresLow, fDCAzresUp, false, VarManager::kPt, 0.2, 1000.);
51135113
cut->AddCut(VarManager::kIsITSibFirst, 0.5, 1.5);
51145114
cut->AddCut(VarManager::kITSchi2, 0.0, 5.0);
51155115
cut->AddCut(VarManager::kTPCchi2, 0.0, 4.0);
51165116
cut->AddCut(VarManager::kTPCncls, 100, 161.);
51175117
return cut;
51185118
}
5119-
5119+
51205120
if (!nameStr.compare("electronPrimary_dca7sigma")) {
51215121
// DCAxy and DCAz 7 sigma cut
51225122
fDCAxyresLow->SetParameters(-7 * 8.7e-4 - 20e-4, -7 * 25.4e-4, 0.79);
51235123
fDCAzresLow->SetParameters(-7 * 9.4e-4 - 10e-4, -7 * 26.5e-4, 0.79);
51245124
fDCAxyresUp->SetParameters(7 * 8.7e-4 + 20e-4, 7 * 25.4e-4, 0.79);
51255125
fDCAzresUp->SetParameters(7 * 9.4e-4 + 10e-4, 7 * 26.5e-4, 0.79);
5126-
cut->AddCut(VarManager::kTrackDCAxy, fDCAxyresLow, fDCAxyresUp, false, VarManager::kPt, 0.2, 1000.);
5127-
cut->AddCut(VarManager::kTrackDCAz, fDCAzresLow, fDCAzresUp, false, VarManager::kPt, 0.2, 1000.);
5126+
cut->AddCut(VarManager::kTrackDCAxy, fDCAxyresLow, fDCAxyresUp, false, VarManager::kPt, 0.2, 1000.);
5127+
cut->AddCut(VarManager::kTrackDCAz, fDCAzresLow, fDCAzresUp, false, VarManager::kPt, 0.2, 1000.);
51285128
cut->AddCut(VarManager::kIsITSibFirst, 0.5, 1.5);
51295129
cut->AddCut(VarManager::kITSchi2, 0.0, 5.0);
51305130
cut->AddCut(VarManager::kTPCchi2, 0.0, 4.0);

‎PWGDQ/Tasks/DalitzSelection.cxx‎

Lines changed: 19 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -87,14 +87,14 @@ struct dalitzPairing {
8787
Configurable<float> fConfigTPCNSigLow{"cfgTPCNSigElLow", -3.f, "Low TPCNSigEl cut for Dalitz tracks in the barrel"};
8888
Configurable<float> fConfigTPCNSigHigh{"cfgTPCNSigElHigh", 3.f, "High TPCNsigEl cut for Dalitz tracks in the barrel"};
8989
} fConfigCuts;
90-
90+
9191
// histograms
9292
struct : ConfigurableGroup {
9393
Configurable<std::string> fConfigAddTrackHistogram{"cfgAddTrackHistogram", "", "Comma separated list of histograms"};
9494
Configurable<std::string> fConfigAddPairHistogram{"cfgAddPairHistogram", "", "Comma separated list of histograms"};
9595
Configurable<std::string> fConfigAddJSONHistograms{"cfgAddJSONHistograms", "", "Histograms in JSON format for tracks"};
9696
} fConfigHistograms;
97-
97+
9898
// additional options
9999
struct : ConfigurableGroup {
100100
Configurable<bool> fConfigEnableLikeSign{"cfgEnableLikeSign", false, "Whether or not also add like-sign pairs (for studying combinatorial background which might contain misID or non-primary electrons)"};
@@ -118,24 +118,24 @@ struct dalitzPairing {
118118
OutputObj<THashList> fOutputList{"output"}; //! the histogram manager output list
119119
OutputObj<TList> fStatsList{"Statistics"}; //! skimming statistics
120120

121-
std::map<int, uint8_t> fTrackmap; // whether it is selected with symmetric or tag cut
122-
std::map<int, uint8_t> fTrackmapProbe; // whether it is selected with probe cut
123-
std::map<int, uint8_t> fDalitzmap; // whether it is selected as dalitz decay daughter with symmetric or tag cut
124-
std::map<int, uint8_t> fDalitzmapProbe; // whether it is selected as dalitz decay daughter with probe cut
121+
std::map<int, uint8_t> fTrackmap; // whether it is selected with symmetric or tag cut
122+
std::map<int, uint8_t> fTrackmapProbe; // whether it is selected with probe cut
123+
std::map<int, uint8_t> fDalitzmap; // whether it is selected as dalitz decay daughter with symmetric or tag cut
124+
std::map<int, uint8_t> fDalitzmapProbe; // whether it is selected as dalitz decay daughter with probe cut
125125

126126
AnalysisCompositeCut* fEventCut;
127127
std::vector<AnalysisCompositeCut> fTrackCuts;
128128
std::vector<AnalysisCompositeCut> fTrackCutsProbe;
129129
std::vector<AnalysisCompositeCut> fPairCuts;
130-
130+
131131
bool fIsTagAndProbe; // whether we are doing tag and probe, or just symmetric cuts
132132

133133
HistogramManager* fHistMan;
134134

135135
void init(o2::framework::InitContext&)
136136
{
137137
fIsTagAndProbe = false;
138-
138+
139139
// Event cuts
140140
fEventCut = new AnalysisCompositeCut(true);
141141
TString eventCutStr = fConfigCuts.fConfigEventCuts.value;
@@ -158,7 +158,7 @@ struct dalitzPairing {
158158
fTrackCuts.push_back(reinterpret_cast<AnalysisCompositeCut*>(t));
159159
}
160160
}
161-
161+
162162
// Probe cuts
163163
TString cutNamesProbeStr = fConfigCuts.fConfigDalitzTrackCutsProbe.value;
164164
TString addTrackCutsProbeStr = fConfigCuts.fConfigTrackCutsProbeJSON.value;
@@ -228,8 +228,7 @@ struct dalitzPairing {
228228
if (fConfigOptions.fConfigEnableLikeSign) {
229229
histClasses += Form("Pair_LS_%s_%s_%s;", (*trackCut).GetName(), fTrackCutsProbe.at(iCut).GetName(), (*pairCut).GetName());
230230
}
231-
}
232-
else {
231+
} else {
233232
histClasses += Form("TrackBarrel_%s_%s;", (*trackCut).GetName(), (*pairCut).GetName());
234233
histClasses += Form("Pair_%s_%s;", (*trackCut).GetName(), (*pairCut).GetName());
235234
if (fConfigOptions.fConfigEnableLikeSign) {
@@ -261,7 +260,7 @@ struct dalitzPairing {
261260
dqhistograms::DefineHistograms(fHistMan, objArray->At(iclass)->GetName(), "pair", histPairName);
262261
}
263262
}
264-
263+
265264
// Additional histogram via the JSON configurable
266265
TString addHistsStr = fConfigHistograms.fConfigAddJSONHistograms.value;
267266
if (addHistsStr != "") {
@@ -278,10 +277,9 @@ struct dalitzPairing {
278277
int icut = 1;
279278
for (auto pairCut = fPairCuts.begin(); pairCut != fPairCuts.end(); pairCut++, trackCut++, icut++) {
280279
if (fIsTagAndProbe) {
281-
histTracks->GetXaxis()->SetBinLabel(2*icut, Form("%s_%s_%s tag", (*trackCut).GetName(), fTrackCutsProbe.at(icut-1).GetName(), (*pairCut).GetName()));
282-
histTracks->GetXaxis()->SetBinLabel(2*icut + 1, Form("%s_%s_%s probe", (*trackCut).GetName(), fTrackCutsProbe.at(icut-1).GetName(), (*pairCut).GetName()));
283-
}
284-
else {
280+
histTracks->GetXaxis()->SetBinLabel(2 * icut, Form("%s_%s_%s tag", (*trackCut).GetName(), fTrackCutsProbe.at(icut - 1).GetName(), (*pairCut).GetName()));
281+
histTracks->GetXaxis()->SetBinLabel(2 * icut + 1, Form("%s_%s_%s probe", (*trackCut).GetName(), fTrackCutsProbe.at(icut - 1).GetName(), (*pairCut).GetName()));
282+
} else {
285283
histTracks->GetXaxis()->SetBinLabel(icut + 1, Form("%s_%s", (*trackCut).GetName(), (*pairCut).GetName()));
286284
}
287285
}
@@ -312,7 +310,7 @@ struct dalitzPairing {
312310
if ((*cut).IsSelected(VarManager::fgValues)) {
313311
filterMapProbe |= (uint8_t(1) << i);
314312
}
315-
}
313+
}
316314
}
317315
if (filterMap) {
318316
fTrackmap[track.globalIndex()] = filterMap;
@@ -360,15 +358,13 @@ struct dalitzPairing {
360358
if (fConfigOptions.fQA) {
361359
fHistMan->FillHistClass(Form("Pair_%s_%s_%s", (*trackCut).GetName(), fTrackCutsProbe.at(icut).GetName(), (*pairCut).GetName()), VarManager::fgValues);
362360
}
363-
}
364-
else {
361+
} else {
365362
fDalitzmap[track2.globalIndex()] |= (uint8_t(1) << icut);
366363
if (fConfigOptions.fQA) {
367364
fHistMan->FillHistClass(Form("Pair_%s_%s", (*trackCut).GetName(), (*pairCut).GetName()), VarManager::fgValues);
368365
}
369366
}
370-
}
371-
else {
367+
} else {
372368
if (fConfigOptions.fQA) {
373369
fHistMan->FillHistClass(fIsTagAndProbe ? Form("PairLS_%s_%s_%s", (*trackCut).GetName(), fTrackCutsProbe.at(icut).GetName(), (*pairCut).GetName()) : Form("PairLS_%s_%s", (*trackCut).GetName(), (*pairCut).GetName()), VarManager::fgValues);
374370
}
@@ -377,7 +373,6 @@ struct dalitzPairing {
377373
} // end cut loop
378374
} // end of tracksP,N loop
379375

380-
381376
// Fill Hists
382377
if (fConfigOptions.fQA) {
383378
for (auto& track : tracks1) {
@@ -392,11 +387,11 @@ struct dalitzPairing {
392387
auto trackCut = fTrackCuts.begin();
393388
for (auto pairCut = fPairCuts.begin(); pairCut != fPairCuts.end(); pairCut++, trackCut++, icut++) {
394389
if (filterMap & (uint8_t(1) << icut)) {
395-
reinterpret_cast<TH1I*>(fStatsList->At(0))->Fill(fIsTagAndProbe ? 2*icut + 1 : icut + 1);
390+
reinterpret_cast<TH1I*>(fStatsList->At(0))->Fill(fIsTagAndProbe ? 2 * icut + 1 : icut + 1);
396391
fHistMan->FillHistClass(fIsTagAndProbe ? Form("TrackBarrelTag_%s_%s_%s", (*trackCut).GetName(), fTrackCutsProbe.at(icut).GetName(), (*pairCut).GetName()) : Form("TrackBarrel_%s_%s", (*trackCut).GetName(), (*pairCut).GetName()), VarManager::fgValues);
397392
}
398393
if (filterMapProbe & (uint8_t(1) << icut)) {
399-
reinterpret_cast<TH1I*>(fStatsList->At(0))->Fill(2*icut + 2);
394+
reinterpret_cast<TH1I*>(fStatsList->At(0))->Fill(2 * icut + 2);
400395
fHistMan->FillHistClass(Form("TrackBarrelProbe_%s_%s_%s", (*trackCut).GetName(), fTrackCutsProbe.at(icut).GetName(), (*pairCut).GetName()), VarManager::fgValues);
401396
}
402397
}

0 commit comments

Comments
 (0)