Skip to content

Commit fcf8dd7

Browse files
abylinkinabylinkin
authored
Merge pull request #47 from alibuild/alibot-cleanup-5932
Please consider the following formatting changes to #5932
2 parents bc64f8e + 8e6af4a commit fcf8dd7

6 files changed

Lines changed: 67 additions & 62 deletions

File tree

‎PWGUD/Tasks/sgD0Analyzer.cxx‎

Lines changed: 51 additions & 49 deletions
Original file line numberDiff line numberDiff line change
@@ -39,15 +39,15 @@ struct SGD0Analyzer {
3939
Configurable<float> FDDA_cut{"FDDA", 10000., "FDDA threshold"};
4040
Configurable<float> FDDC_cut{"FDDC", 10000., "FDDC threshold"};
4141
Configurable<float> ZDC_cut{"ZDC", 10., "ZDC threshold"};
42-
//Track Selections
42+
// Track Selections
4343
Configurable<float> PV_cut{"PV_cut", 0.0, "Use Only PV tracks"};
4444
Configurable<float> dcaZ_cut{"dcaZ_cut", 2.0, "dcaZ cut"};
4545
Configurable<float> dcaXY_cut{"dcaXY_cut", 2.0, "dcaXY cut (0 for Pt-function)"};
4646
Configurable<float> tpcChi2_cut{"tpcChi2_cut", 4, "Max tpcChi2NCl"};
4747
Configurable<float> tpcNClsFindable_cut{"tpcNClsFindable_cut", 70, "Min tpcNClsFindable"};
4848
Configurable<float> itsChi2_cut{"itsChi2_cut", 36, "Max itsChi2NCl"};
4949
Configurable<float> eta_cut{"eta_cut", 0.9, "Track Pseudorapidity"};
50-
//D0 Specific Cuts
50+
// D0 Specific Cuts
5151
Configurable<float> Ntr_min{"Ntr_min", 2., "Minimum Number of Tracks"};
5252
Configurable<float> Ntr_max{"Ntr_max", 50., "Maximum Number of Tracks"};
5353
HistogramRegistry registry{
@@ -80,9 +80,9 @@ struct SGD0Analyzer {
8080
{"ss_KPi_pT_2", "K#pi pT (GeV/c); Entries", {HistType::kTH1F, {{5000, 0, 10}}}},
8181
{"ss_KPi_eTa_2", "K#pi eTa (GeV/c); Entries", {HistType::kTH1F, {{100, -1., 1.}}}},
8282
{"ss_KPi_invm_2", "K#pi Mass (GeV/c^2); Entries", {HistType::kTH1F, {{5000, 0, 10}}}},
83-
{"os_Ntr_KPi_invm_0", "N tracks vs K#pi Mass", {HistType::kTH2F, {{48, 1.5, 49.5},{750, .7, 2.2}}}},
84-
{"os_Ntr_KPi_invm_1", "N tracks vs K#pi Mass", {HistType::kTH2F, {{48, 1.5, 49.5},{750, .7, 2.2}}}},
85-
{"os_Ntr_KPi_invm_2", "N tracks vs K#pi Mass", {HistType::kTH2F, {{48, 1.5, 49.5},{750, .7, 2.2}}}},
83+
{"os_Ntr_KPi_invm_0", "N tracks vs K#pi Mass", {HistType::kTH2F, {{48, 1.5, 49.5}, {750, .7, 2.2}}}},
84+
{"os_Ntr_KPi_invm_1", "N tracks vs K#pi Mass", {HistType::kTH2F, {{48, 1.5, 49.5}, {750, .7, 2.2}}}},
85+
{"os_Ntr_KPi_invm_2", "N tracks vs K#pi Mass", {HistType::kTH2F, {{48, 1.5, 49.5}, {750, .7, 2.2}}}},
8686
{"D0_FT0A", "FIT Amplitude", {HistType::kTH1F, {{500, 0, 1000}}}},
8787
{"D0_FT0C", "FIT Amplitude", {HistType::kTH1F, {{500, 0, 1000}}}},
8888
{"D0_FV0A", "FIT Amplitude", {HistType::kTH1F, {{500, 0, 1000}}}},
@@ -95,8 +95,7 @@ struct SGD0Analyzer {
9595
{"D0_Ntr_2", "Tracks", {HistType::kTH1F, {{100, 0.5, 100.5}}}},
9696
{"D0_NtrPV_0", "Tracks", {HistType::kTH1F, {{50, 0.5, 50.5}}}},
9797
{"D0_NtrPV_1", "Tracks", {HistType::kTH1F, {{50, 0.5, 50.5}}}},
98-
{"D0_NtrPV_2", "Tracks", {HistType::kTH1F, {{50, 0.5, 50.5}}}}
99-
}};
98+
{"D0_NtrPV_2", "Tracks", {HistType::kTH1F, {{50, 0.5, 50.5}}}}}};
10099
using udtracks = soa::Join<aod::UDTracks, aod::UDTracksExtra, aod::UDTracksPID>;
101100
using udtracksfull = soa::Join<aod::UDTracks, aod::UDTracksPID, aod::UDTracksExtra, aod::UDTracksFlags, aod::UDTracksDCA>;
102101
using UDCollisionsFull = soa::Join<aod::UDCollisions, aod::SGCollisions, aod::UDCollisionsSels, aod::UDZdcsReduced>; //
@@ -121,15 +120,18 @@ struct SGD0Analyzer {
121120
registry.fill(HIST("GapSide"), gapSide);
122121
registry.fill(HIST("TrueGapSide"), truegapSide);
123122
gapSide = truegapSide;
124-
int pvtracks=0;
123+
int pvtracks = 0;
125124
for (auto& t0 : tracks) {
126-
if (trackselector(t0, parameters) && t0.isPVContributor())pvtracks++;
125+
if (trackselector(t0, parameters) && t0.isPVContributor())
126+
pvtracks++;
127127
}
128128
// Look for D0 and D0bar
129-
if (tracks.size() < Ntr_min || tracks.size() > Ntr_max) return;
129+
if (tracks.size() < Ntr_min || tracks.size() > Ntr_max)
130+
return;
130131
for (auto& [t0, t1] : combinations(tracks, tracks)) {
131132
// PID cut - t0=K, t1=pi
132-
if (!trackselector(t0, parameters)||!trackselector(t1,parameters))continue;
133+
if (!trackselector(t0, parameters) || !trackselector(t1, parameters))
134+
continue;
133135
if (std::abs(t0.tpcNSigmaKa()) < 3 && std::abs(t1.tpcNSigmaPi()) < 3 && std::abs(t0.tofNSigmaKa()) < 3 && std::abs(t1.tofNSigmaPi()) < 3) {
134136
// Apply pion hypothesis and create pairs
135137
v0.SetXYZM(t0.px(), t0.py(), t0.pz(), o2::constants::physics::MassKaonCharged);
@@ -145,37 +147,37 @@ struct SGD0Analyzer {
145147
registry.fill(HIST("os_KPi_eTa_0"), v01.Eta());
146148
registry.fill(HIST("os_KPi_invm_0"), v01.M());
147149
registry.fill(HIST("os_Ntr_KPi_invm_0"), tracks.size(), v01.M());
148-
if (v01.M() > 1.8 && v01.M() < 1.9){
149-
registry.fill(HIST("D0_Ntr_0"), tracks.size());
150-
registry.fill(HIST("D0_NtrPV_0"), pvtracks);
151-
}
150+
if (v01.M() > 1.8 && v01.M() < 1.9) {
151+
registry.fill(HIST("D0_Ntr_0"), tracks.size());
152+
registry.fill(HIST("D0_NtrPV_0"), pvtracks);
153+
}
152154
}
153155
if (gapSide == 1) {
154156
registry.fill(HIST("os_KPi_pT_1"), v01.Pt());
155157
registry.fill(HIST("os_KPi_eTa_1"), v01.Eta());
156158
registry.fill(HIST("os_KPi_invm_1"), v01.M());
157159
registry.fill(HIST("os_Ntr_KPi_invm_1"), tracks.size(), v01.M());
158-
if (v01.M() > 1.8 && v01.M() < 1.9){
159-
registry.fill(HIST("D0_Ntr_1"), tracks.size());
160-
registry.fill(HIST("D0_NtrPV_1"), pvtracks);
161-
}
160+
if (v01.M() > 1.8 && v01.M() < 1.9) {
161+
registry.fill(HIST("D0_Ntr_1"), tracks.size());
162+
registry.fill(HIST("D0_NtrPV_1"), pvtracks);
163+
}
162164
}
163165
if (gapSide == 2) {
164166
registry.fill(HIST("os_KPi_pT_2"), v01.Pt());
165167
registry.fill(HIST("os_KPi_eTa_2"), v01.Eta());
166168
registry.fill(HIST("os_KPi_invm_2"), v01.M());
167169
registry.fill(HIST("os_Ntr_KPi_invm_2"), tracks.size(), v01.M());
168-
if (v01.M() > 1.8 && v01.M() < 1.9){
169-
registry.fill(HIST("D0_Ntr_2"), tracks.size());
170-
registry.fill(HIST("D0_NtrPV_2"), pvtracks);
171-
registry.fill(HIST("D0_FT0A"), collision.totalFT0AmplitudeA());
172-
registry.fill(HIST("D0_FT0C"), collision.totalFT0AmplitudeC());
173-
registry.fill(HIST("D0_FV0A"), collision.totalFV0AmplitudeA());
174-
registry.fill(HIST("D0_FDDA"), collision.totalFDDAmplitudeA());
175-
registry.fill(HIST("D0_FDDC"), collision.totalFDDAmplitudeC());
176-
registry.fill(HIST("D0_ZNA"), collision.energyCommonZNA());
177-
registry.fill(HIST("D0_ZNC"), collision.energyCommonZNC());
178-
}
170+
if (v01.M() > 1.8 && v01.M() < 1.9) {
171+
registry.fill(HIST("D0_Ntr_2"), tracks.size());
172+
registry.fill(HIST("D0_NtrPV_2"), pvtracks);
173+
registry.fill(HIST("D0_FT0A"), collision.totalFT0AmplitudeA());
174+
registry.fill(HIST("D0_FT0C"), collision.totalFT0AmplitudeC());
175+
registry.fill(HIST("D0_FV0A"), collision.totalFV0AmplitudeA());
176+
registry.fill(HIST("D0_FDDA"), collision.totalFDDAmplitudeA());
177+
registry.fill(HIST("D0_FDDC"), collision.totalFDDAmplitudeC());
178+
registry.fill(HIST("D0_ZNA"), collision.energyCommonZNA());
179+
registry.fill(HIST("D0_ZNC"), collision.energyCommonZNC());
180+
}
179181
}
180182
} else if (t0.sign() == t1.sign()) {
181183
registry.fill(HIST("ss_KPi_pT"), v01.Pt());
@@ -212,37 +214,37 @@ struct SGD0Analyzer {
212214
registry.fill(HIST("os_KPi_eTa_0"), v01.Eta());
213215
registry.fill(HIST("os_KPi_invm_0"), v01.M());
214216
registry.fill(HIST("os_Ntr_KPi_invm_0"), tracks.size(), v01.M());
215-
if (v01.M() > 1.8 && v01.M() < 1.9){
216-
registry.fill(HIST("D0_Ntr_0"), tracks.size());
217-
registry.fill(HIST("D0_NtrPV_0"), pvtracks);
218-
}
217+
if (v01.M() > 1.8 && v01.M() < 1.9) {
218+
registry.fill(HIST("D0_Ntr_0"), tracks.size());
219+
registry.fill(HIST("D0_NtrPV_0"), pvtracks);
220+
}
219221
}
220222
if (gapSide == 1) {
221223
registry.fill(HIST("os_KPi_pT_1"), v01.Pt());
222224
registry.fill(HIST("os_KPi_eTa_1"), v01.Eta());
223225
registry.fill(HIST("os_KPi_invm_1"), v01.M());
224226
registry.fill(HIST("os_Ntr_KPi_invm_1"), tracks.size(), v01.M());
225-
if (v01.M() > 1.8 && v01.M() < 1.9){
226-
registry.fill(HIST("D0_Ntr_1"), tracks.size());
227-
registry.fill(HIST("D0_NtrPV_1"), pvtracks);
228-
}
227+
if (v01.M() > 1.8 && v01.M() < 1.9) {
228+
registry.fill(HIST("D0_Ntr_1"), tracks.size());
229+
registry.fill(HIST("D0_NtrPV_1"), pvtracks);
230+
}
229231
}
230232
if (gapSide == 2) {
231233
registry.fill(HIST("os_KPi_pT_2"), v01.Pt());
232234
registry.fill(HIST("os_KPi_eTa_2"), v01.Eta());
233235
registry.fill(HIST("os_KPi_invm_2"), v01.M());
234236
registry.fill(HIST("os_Ntr_KPi_invm_2"), tracks.size(), v01.M());
235-
if (v01.M() > 1.8 && v01.M() < 1.9){
236-
registry.fill(HIST("D0_Ntr_2"), tracks.size());
237-
registry.fill(HIST("D0_NtrPV_2"), pvtracks);
238-
registry.fill(HIST("D0_FT0A"), collision.totalFT0AmplitudeA());
239-
registry.fill(HIST("D0_FT0C"), collision.totalFT0AmplitudeC());
240-
registry.fill(HIST("D0_FV0A"), collision.totalFV0AmplitudeA());
241-
registry.fill(HIST("D0_FDDA"), collision.totalFDDAmplitudeA());
242-
registry.fill(HIST("D0_FDDC"), collision.totalFDDAmplitudeC());
243-
registry.fill(HIST("D0_ZNA"), collision.energyCommonZNA());
244-
registry.fill(HIST("D0_ZNC"), collision.energyCommonZNC());
245-
}
237+
if (v01.M() > 1.8 && v01.M() < 1.9) {
238+
registry.fill(HIST("D0_Ntr_2"), tracks.size());
239+
registry.fill(HIST("D0_NtrPV_2"), pvtracks);
240+
registry.fill(HIST("D0_FT0A"), collision.totalFT0AmplitudeA());
241+
registry.fill(HIST("D0_FT0C"), collision.totalFT0AmplitudeC());
242+
registry.fill(HIST("D0_FV0A"), collision.totalFV0AmplitudeA());
243+
registry.fill(HIST("D0_FDDA"), collision.totalFDDAmplitudeA());
244+
registry.fill(HIST("D0_FDDC"), collision.totalFDDAmplitudeC());
245+
registry.fill(HIST("D0_ZNA"), collision.energyCommonZNA());
246+
registry.fill(HIST("D0_ZNC"), collision.energyCommonZNC());
247+
}
246248
}
247249
} else if (t0.sign() == t1.sign()) {
248250
registry.fill(HIST("ss_KPi_pT"), v01.Pt());

‎PWGUD/Tasks/sgFITAnalyzer.cxx‎

Lines changed: 10 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ struct SGFITAnalyzer { // UDTutorial01
4949
Configurable<float> FT0C_cut{"FT0C", 50., "FT0C threshold"};
5050
Configurable<float> FDDA_cut{"FDDA", 10000., "FDDA threshold"};
5151
Configurable<float> FDDC_cut{"FDDC", 10000., "FDDC threshold"};
52-
//Track Selections
52+
// Track Selections
5353
Configurable<float> PV_cut{"PV_cut", 1.0, "Use Only PV tracks"};
5454
Configurable<float> dcaZ_cut{"dcaZ_cut", 2.0, "dcaZ cut"};
5555
Configurable<float> dcaXY_cut{"dcaXY_cut", 0.0, "dcaXY cut (0 for Pt-function)"};
@@ -326,7 +326,7 @@ struct SGFITAnalyzer { // UDTutorial01
326326
using UDCollisionsFull = soa::Join<aod::UDCollisions, aod::SGCollisions, aod::UDCollisionsSels, aod::UDZdcsReduced>; // UDCollisions
327327
// using UDCollisionsFull = soa::Join<aod::UDCollisions, aod::SGCollisions>; // UDCollisions
328328
using UDCollisionFull = UDCollisionsFull::iterator;
329-
//using UDTracksFull = soa::Join<aod::UDTracks, aod::UDTracksPID, aod::UDTracksExtra, aod::UDTracksFlags>;
329+
// using UDTracksFull = soa::Join<aod::UDTracks, aod::UDTracksPID, aod::UDTracksExtra, aod::UDTracksFlags>;
330330
using UDTracksFull = soa::Join<aod::UDTracks, aod::UDTracksPID, aod::UDTracksExtra, aod::UDTracksFlags, aod::UDTracksDCA>;
331331
// using UDTracksFull = soa::Join<aod::UDTracks, aod::UDTracksExtra, aod::UDTracksFlags>;
332332

@@ -346,8 +346,8 @@ struct SGFITAnalyzer { // UDTutorial01
346346
// select PV contributors
347347
Partition<UDTracksFull> PVContributors = aod::udtrack::isPVContributor == true;
348348
PVContributors.bindTable(dgtracks);
349-
// if (PVContributors.size() > 50)
350-
// return;
349+
// if (PVContributors.size() > 50)
350+
// return;
351351
registry.get<TH1>(HIST("collisions/multiplicityPVC"))->Fill(PVContributors.size(), 1.);
352352
bool tof = false;
353353
// relative BC number
@@ -375,19 +375,22 @@ struct SGFITAnalyzer { // UDTutorial01
375375
if (trackselector(t, parameters)) {
376376
sign += t.sign();
377377
goodTracks.push_back(a);
378-
if (std::abs(t.tpcNSigmaMu()) < 3) muonTracks.push_back(b);
378+
if (std::abs(t.tpcNSigmaMu()) < 3)
379+
muonTracks.push_back(b);
379380
}
380381
}
381382
if (goodTracks.size() == 2) {
382383
for (auto pion : goodTracks) {
383384
rho += pion;
384385
}
385-
if (sign == 0 && TMath::Abs(rho.Rapidity()) < .9 && rho.M() > .5 && rho.M() < 1.2 && rho.Pt() < 0.1) coh_rho0 = true;
386+
if (sign == 0 && TMath::Abs(rho.Rapidity()) < .9 && rho.M() > .5 && rho.M() < 1.2 && rho.Pt() < 0.1)
387+
coh_rho0 = true;
386388
if (muonTracks.size() == 2) {
387389
for (auto muon : muonTracks) {
388390
jpsi += muon;
389391
}
390-
if (sign == 0 && TMath::Abs(jpsi.Rapidity()) < .9 && jpsi.M() > 2.8 && jpsi.M() < 3.35 && jpsi.Pt() < 0.1) coh_jpsi = true;
392+
if (sign == 0 && TMath::Abs(jpsi.Rapidity()) < .9 && jpsi.M() > 2.8 && jpsi.M() < 3.35 && jpsi.Pt() < 0.1)
393+
coh_jpsi = true;
391394
}
392395
}
393396
int pva = 0;

‎PWGUD/Tasks/sgFourPiAnalyzer.cxx‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,14 +39,14 @@ using namespace o2::framework::expressions;
3939
#define mproton 0.9383
4040
struct SGFourPiAnalyzer {
4141
SGSelector sgSelector;
42-
//Adjusted Gap thresholds
42+
// Adjusted Gap thresholds
4343
Configurable<float> FV0_cut{"FV0", 50., "FV0A threshold"};
4444
Configurable<float> FT0A_cut{"FT0A", 150., "FT0A threshold"};
4545
Configurable<float> FT0C_cut{"FT0C", 50., "FT0C threshold"};
4646
Configurable<float> FDDA_cut{"FDDA", 10000., "FDDA threshold"};
4747
Configurable<float> FDDC_cut{"FDDC", 10000., "FDDC threshold"};
4848
Configurable<float> ZDC_cut{"ZDC", 10., "ZDC threshold"};
49-
//Track Selections
49+
// Track Selections
5050
Configurable<float> PV_cut{"PV_cut", 1.0, "Use Only PV tracks"};
5151
Configurable<float> dcaZ_cut{"dcaZ_cut", 2.0, "dcaZ cut"};
5252
Configurable<float> dcaXY_cut{"dcaXY_cut", 0.0, "dcaXY cut (0 for Pt-function)"};

‎PWGUD/Tasks/sgSixPiAnalyzer.cxx‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,14 +39,14 @@ using namespace o2::framework::expressions;
3939
#define mproton 0.9383
4040
struct SGSixPiAnalyzer {
4141
SGSelector sgSelector;
42-
//Adjusted Gap thresholds
42+
// Adjusted Gap thresholds
4343
Configurable<float> FV0_cut{"FV0", 50., "FV0A threshold"};
4444
Configurable<float> FT0A_cut{"FT0A", 150., "FT0A threshold"};
4545
Configurable<float> FT0C_cut{"FT0C", 50., "FT0C threshold"};
4646
Configurable<float> FDDA_cut{"FDDA", 10000., "FDDA threshold"};
4747
Configurable<float> FDDC_cut{"FDDC", 10000., "FDDC threshold"};
4848
Configurable<float> ZDC_cut{"ZDC", 10., "ZDC threshold"};
49-
//Track Selections
49+
// Track Selections
5050
Configurable<float> PV_cut{"PV_cut", 1.0, "Use Only PV tracks"};
5151
Configurable<float> dcaZ_cut{"dcaZ_cut", 2.0, "dcaZ cut"};
5252
Configurable<float> dcaXY_cut{"dcaXY_cut", 0.0, "dcaXY cut (0 for Pt-function)"};

‎PWGUD/Tasks/sgSpectraAnalyzer.cxx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ struct SGSpectraAnalyzer {
4141
Configurable<float> FDDC_cut{"FDDC", 10000., "FDDC threshold"};
4242
Configurable<float> ZDC_cut{"ZDC", 10., "ZDC threshold"};
4343
Configurable<bool> use_tof{"Use_TOF", true, "TOF PID"};
44-
//Track Selections
44+
// Track Selections
4545
Configurable<float> PV_cut{"PV_cut", 1.0, "Use Only PV tracks"};
4646
Configurable<float> dcaZ_cut{"dcaZ_cut", 2.0, "dcaZ cut"};
4747
Configurable<float> dcaXY_cut{"dcaXY_cut", 0.0, "dcaXY cut (0 for Pt-function)"};

‎PWGUD/Tasks/sgTwoPiAnalyzer.cxx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ struct SGTwoPiAnalyzer {
4545
Configurable<float> FDDA_cut{"FDDA", 10000., "FDDA threshold"};
4646
Configurable<float> FDDC_cut{"FDDC", 10000., "FDDC threshold"};
4747
Configurable<float> ZDC_cut{"ZDC", 10., "ZDC threshold"};
48-
//Track Selections
48+
// Track Selections
4949
Configurable<float> PV_cut{"PV_cut", 1.0, "Use Only PV tracks"};
5050
Configurable<float> dcaZ_cut{"dcaZ_cut", 2.0, "dcaZ cut"};
5151
Configurable<float> dcaXY_cut{"dcaXY_cut", 0.0, "dcaXY cut (0 for Pt-function)"};

0 commit comments

Comments
 (0)