Skip to content

Commit 581a455

Browse files
sashingosashingo
authored
Merge branch 'AliceO2Group:master' into master
2 parents 5813d26 + 5f59d93 commit 581a455

File tree

106 files changed

+5871
-2364
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

106 files changed

+5871
-2364
lines changed

‎Common/TableProducer/eventSelection.cxx‎

Lines changed: 178 additions & 119 deletions
Large diffs are not rendered by default.

‎Common/TableProducer/trackPropagation.cxx‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -123,9 +123,6 @@ struct TrackPropagation {
123123
trackTunerObj.getDcaGraphs();
124124
trackTunedTracks->SetTitle(outputStringParams.c_str());
125125
trackTunedTracks->GetXaxis()->SetBinLabel(1, "all tracks");
126-
trackTunedTracks->GetXaxis()->SetBinLabel(2, "tracks tuned (no negative detXY)");
127-
trackTunedTracks->GetXaxis()->SetBinLabel(3, "untouched tracks due to negative detXY");
128-
trackTunedTracks->GetXaxis()->SetBinLabel(4, "original detXY<0");
129126
}
130127
}
131128

‎EventFiltering/macros/checkBCrangesSkimming.C‎

Lines changed: 433 additions & 338 deletions
Large diffs are not rendered by default.

‎PWGCF/EbyEFluctuations/Tasks/FactorialMomentsTask.cxx‎

Lines changed: 22 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -228,44 +228,29 @@ struct FactorialMoments {
228228
fqEvent = {{{{{0, 0, 0, 0, 0, 0}}}}};
229229
binConEvent = {{{0, 0, 0, 0, 0}}};
230230
for (auto const& track : tracks) {
231-
if (includeGlobalTracks && (!track.isGlobalTrack())) {
232-
continue;
233-
}
234-
if (includeTPCTracks && (!track.hasTPC())) {
235-
continue;
236-
}
237-
if (includeITSTracks && (!track.hasITS())) {
238-
continue;
239-
}
240-
histos.fill(HIST("mDCAxyPtbcut"), track.pt(), track.dcaXY());
241-
histos.fill(HIST("mDCAzPtbcut"), track.pt(), track.dcaZ());
242-
if ((track.pt() < confPtMin) || (track.tpcNClsFindable() < confMinTPCCls)) {
243-
continue;
231+
if (track.hasTPC()) {
232+
histos.fill(HIST("mCollID"), track.collisionId());
233+
histos.fill(HIST("mEta"), track.eta());
234+
histos.fill(HIST("mPt"), track.pt());
235+
histos.fill(HIST("mPhi"), track.phi());
236+
histos.fill(HIST("mNFindableClsTPC"), track.tpcNClsFindable());
237+
histos.fill(HIST("mNClsTPC"), track.tpcNClsFound());
238+
histos.fill(HIST("mNClsITS"), track.itsNCls());
239+
histos.fill(HIST("mChi2TPC"), track.tpcChi2NCl());
240+
histos.fill(HIST("mChi2ITS"), track.itsChi2NCl());
241+
histos.fill(HIST("mChi2TRD"), track.trdChi2());
242+
histos.fill(HIST("mDCAxy"), track.dcaXY());
243+
histos.fill(HIST("mDCAx"), track.dcaZ());
244+
histos.fill(HIST("mDCAxyPt"), track.pt(), track.dcaXY());
245+
histos.fill(HIST("mDCAzPt"), track.pt(), track.dcaZ());
246+
histos.fill(HIST("mNSharedClsTPC"), track.tpcNClsShared());
247+
histos.fill(HIST("mCrossedRowsTPC"), track.tpcNClsCrossedRows());
248+
histos.fill(HIST("mNFinClsminusCRows"), track.tpcNClsFindableMinusCrossedRows());
249+
histos.fill(HIST("mNFractionShClsTPC"), track.tpcFractionSharedCls());
250+
histos.fill(HIST("mSharedClsvsPt"), track.pt(), track.tpcNClsShared());
251+
histos.fill(HIST("mSharedClsProbvsPt"), track.pt(), track.tpcFractionSharedCls() / track.tpcNClsCrossedRows());
252+
checkpT(track);
244253
}
245-
if (TMath::Abs(track.dcaXY()) > (0.0105 + 0.0350 / TMath::Power(track.pt(), 1.1))) {
246-
continue;
247-
}
248-
histos.fill(HIST("mCollID"), track.collisionId());
249-
histos.fill(HIST("mEta"), track.eta());
250-
histos.fill(HIST("mPt"), track.pt());
251-
histos.fill(HIST("mPhi"), track.phi());
252-
histos.fill(HIST("mNFindableClsTPC"), track.tpcNClsFindable());
253-
histos.fill(HIST("mNClsTPC"), track.tpcNClsFound());
254-
histos.fill(HIST("mNClsITS"), track.itsNCls());
255-
histos.fill(HIST("mChi2TPC"), track.tpcChi2NCl());
256-
histos.fill(HIST("mChi2ITS"), track.itsChi2NCl());
257-
histos.fill(HIST("mChi2TRD"), track.trdChi2());
258-
histos.fill(HIST("mDCAxy"), track.dcaXY());
259-
histos.fill(HIST("mDCAx"), track.dcaZ());
260-
histos.fill(HIST("mDCAxyPt"), track.pt(), track.dcaXY());
261-
histos.fill(HIST("mDCAzPt"), track.pt(), track.dcaZ());
262-
histos.fill(HIST("mNSharedClsTPC"), track.tpcNClsShared());
263-
histos.fill(HIST("mCrossedRowsTPC"), track.tpcNClsCrossedRows());
264-
histos.fill(HIST("mNFinClsminusCRows"), track.tpcNClsFindableMinusCrossedRows());
265-
histos.fill(HIST("mNFractionShClsTPC"), track.tpcFractionSharedCls());
266-
histos.fill(HIST("mSharedClsvsPt"), track.pt(), track.tpcNClsShared());
267-
histos.fill(HIST("mSharedClsProbvsPt"), track.pt(), track.tpcFractionSharedCls() / track.tpcNClsCrossedRows());
268-
checkpT(track);
269254
}
270255
for (auto iPt = 0; iPt < confNumPt; ++iPt) {
271256
// if (countTracks[iPt] > 0)

‎PWGCF/FemtoUniverse/TableProducer/femtoUniverseProducerTask.cxx‎

Lines changed: 17 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -265,6 +265,8 @@ struct femtoUniverseProducerTask {
265265
Configurable<float> ConfLooseTOFNSigmaValue{"ConfLooseTOFNSigmaValue", 10, "Value for the loose TOF N Sigma for Kaon PID."};
266266
Configurable<float> ConfInvMassLowLimitPhi{"ConfInvMassLowLimitPhi", 1.011, "Lower limit of the Phi invariant mass"}; // change that to do invariant mass cut
267267
Configurable<float> ConfInvMassUpLimitPhi{"ConfInvMassUpLimitPhi", 1.027, "Upper limit of the Phi invariant mass"};
268+
Configurable<float> ConfPtLowLimitPhi{"ConfPtLowLimitPhi", 0.8, "Lower limit of the Phi pT."};
269+
Configurable<float> ConfPtHighLimitPhi{"ConfPtHighLimitPhi", 4.0, "Higher limit of the Phi pT."};
268270
Configurable<float> ConfNsigmaRejectPion{"ConfNsigmaRejectPion", 3.0, "Reject if particle could be a Pion combined nsigma value."};
269271
Configurable<float> ConfNsigmaRejectProton{"ConfNsigmaRejectProton", 3.0, "Reject if particle could be a Proton combined nsigma value."};
270272
} ConfPhiSelection;
@@ -324,31 +326,31 @@ struct femtoUniverseProducerTask {
324326
{
325327

326328
if (mom < 0.3) { // 0.0-0.3
327-
if (TMath::Abs(nsigmaTPCK) < ConfPhiSelection.ConfLooseTPCNSigmaValue) {
329+
if (TMath::Abs(nsigmaTPCK) < ConfPhiSelection.ConfLooseTPCNSigmaValue.value) {
328330
return true;
329331
} else {
330332
return false;
331333
}
332334
} else if (mom < 0.45) { // 0.30 - 0.45
333-
if (TMath::Abs(nsigmaTPCK) < ConfPhiSelection.ConfLooseTPCNSigmaValue) {
335+
if (TMath::Abs(nsigmaTPCK) < ConfPhiSelection.ConfLooseTPCNSigmaValue.value) {
334336
return true;
335337
} else {
336338
return false;
337339
}
338340
} else if (mom < 0.55) { // 0.45-0.55
339-
if (TMath::Abs(nsigmaTPCK) < ConfPhiSelection.ConfLooseTPCNSigmaValue) {
341+
if (TMath::Abs(nsigmaTPCK) < ConfPhiSelection.ConfLooseTPCNSigmaValue.value) {
340342
return true;
341343
} else {
342344
return false;
343345
}
344346
} else if (mom < 1.5) { // 0.55-1.5 (now we use TPC and TOF)
345-
if ((TMath::Abs(nsigmaTOFK) < 3.0) && (TMath::Abs(nsigmaTPCK) < ConfPhiSelection.ConfLooseTPCNSigmaValue)) {
347+
if ((TMath::Abs(nsigmaTOFK) < 3.0) && (TMath::Abs(nsigmaTPCK) < ConfPhiSelection.ConfLooseTPCNSigmaValue.value)) {
346348
return true;
347349
} else {
348350
return false;
349351
}
350352
} else if (mom > 1.5) { // 1.5 -
351-
if ((TMath::Abs(nsigmaTOFK) < 2.0) && (TMath::Abs(nsigmaTPCK) < ConfPhiSelection.ConfLooseTPCNSigmaValue)) {
353+
if ((TMath::Abs(nsigmaTOFK) < 2.0) && (TMath::Abs(nsigmaTPCK) < ConfPhiSelection.ConfLooseTPCNSigmaValue.value)) {
352354
return true;
353355
} else {
354356
return false;
@@ -379,15 +381,15 @@ struct femtoUniverseProducerTask {
379381
return false;
380382
}
381383
} else if (mom < 1.5) { // 0.55-1.5 (now we use TPC and TOF)
382-
if ((TMath::Abs(nsigmaTOFK) < ConfPhiSelection.ConfLooseTOFNSigmaValue) && (TMath::Abs(nsigmaTPCK) < 3.0)) {
384+
if ((TMath::Abs(nsigmaTOFK) < ConfPhiSelection.ConfLooseTOFNSigmaValue.value) && (TMath::Abs(nsigmaTPCK) < 3.0)) {
383385
{
384386
return true;
385387
}
386388
} else {
387389
return false;
388390
}
389391
} else if (mom > 1.5) { // 1.5 -
390-
if ((TMath::Abs(nsigmaTOFK) < ConfPhiSelection.ConfLooseTOFNSigmaValue) && (TMath::Abs(nsigmaTPCK) < 3.0)) {
392+
if ((TMath::Abs(nsigmaTOFK) < ConfPhiSelection.ConfLooseTOFNSigmaValue.value) && (TMath::Abs(nsigmaTPCK) < 3.0)) {
391393
return true;
392394
} else {
393395
return false;
@@ -400,16 +402,16 @@ struct femtoUniverseProducerTask {
400402
bool IsKaonRejected(float mom, float nsigmaTPCPr, float nsigmaTOFPr, float nsigmaTPCPi, float nsigmaTOFPi)
401403
{
402404
if (mom < 0.5) {
403-
if (TMath::Abs(nsigmaTPCPi) < ConfPhiSelection.ConfNsigmaRejectPion) {
405+
if (TMath::Abs(nsigmaTPCPi) < ConfPhiSelection.ConfNsigmaRejectPion.value) {
404406
return true;
405-
} else if (TMath::Abs(nsigmaTPCPr) < ConfPhiSelection.ConfNsigmaRejectProton) {
407+
} else if (TMath::Abs(nsigmaTPCPr) < ConfPhiSelection.ConfNsigmaRejectProton.value) {
406408
return true;
407409
}
408410
}
409411
if (mom > 0.5) {
410-
if (TMath::Hypot(nsigmaTOFPi, nsigmaTPCPi) < ConfPhiSelection.ConfNsigmaRejectPion) {
412+
if (TMath::Hypot(nsigmaTOFPi, nsigmaTPCPi) < ConfPhiSelection.ConfNsigmaRejectPion.value) {
411413
return true;
412-
} else if (TMath::Hypot(nsigmaTOFPr, nsigmaTPCPr) < ConfPhiSelection.ConfNsigmaRejectProton) {
414+
} else if (TMath::Hypot(nsigmaTOFPr, nsigmaTPCPr) < ConfPhiSelection.ConfNsigmaRejectProton.value) {
413415
return true;
414416
} else {
415417
return false;
@@ -1245,15 +1247,15 @@ struct femtoUniverseProducerTask {
12451247
continue;
12461248
}
12471249
// implementing PID cuts for phi children
1248-
if (ConfPhiSelection.ConfLooseTPCNSigma) {
1250+
if (ConfPhiSelection.ConfLooseTPCNSigma.value) {
12491251
if (!(IsKaonNSigmaTPCLoose(p1.pt(), trackCuts.getNsigmaTPC(p1, o2::track::PID::Kaon), trackCuts.getNsigmaTOF(p1, o2::track::PID::Kaon)))) {
12501252
continue;
12511253
}
12521254
if (!(IsKaonNSigmaTPCLoose(p2.pt(), trackCuts.getNsigmaTPC(p2, o2::track::PID::Kaon), trackCuts.getNsigmaTOF(p2, o2::track::PID::Kaon)))) {
12531255
continue;
12541256
}
12551257
}
1256-
if (ConfPhiSelection.ConfLooseTOFNSigma) {
1258+
if (ConfPhiSelection.ConfLooseTOFNSigma.value) {
12571259
if (!(IsKaonNSigmaTOFLoose(p1.pt(), trackCuts.getNsigmaTPC(p1, o2::track::PID::Kaon), trackCuts.getNsigmaTOF(p1, o2::track::PID::Kaon)))) {
12581260
continue;
12591261
}
@@ -1297,7 +1299,7 @@ struct femtoUniverseProducerTask {
12971299
}
12981300

12991301
float phiPt = sumVec.Pt();
1300-
if ((phiPt < 0.14) || (phiPt > 10.0)) {
1302+
if ((phiPt < ConfPhiSelection.ConfPtLowLimitPhi.value) || (phiPt > ConfPhiSelection.ConfPtHighLimitPhi.value)) {
13011303
continue;
13021304
}
13031305

@@ -1309,7 +1311,7 @@ struct femtoUniverseProducerTask {
13091311
}
13101312
float phiM = sumVec.M();
13111313

1312-
if (((phiM < ConfPhiSelection.ConfInvMassLowLimitPhi) || (phiM > ConfPhiSelection.ConfInvMassUpLimitPhi))) {
1314+
if (((phiM < ConfPhiSelection.ConfInvMassLowLimitPhi.value) || (phiM > ConfPhiSelection.ConfInvMassUpLimitPhi.value))) {
13131315
continue;
13141316
}
13151317

0 commit comments

Comments
 (0)