-
Notifications
You must be signed in to change notification settings - Fork 622
[PWGLF] Modification in event selection cuts #11791
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Closed
Closed
Changes from all commits
Commits
Show all changes
5 commits
Select commit
Hold shift + click to select a range
7903cd7
Modification in event selection cuts
tutripat 25d01ff
Please consider the following formatting changes
alibuild 3e4c987
Merge pull request #6 from alibuild/alibot-cleanup-11791
tutripat 23fa08e
Merge branch 'AliceO2Group:master' into master
tutripat a466a7f
Merge branch 'AliceO2Group:master' into master
tutripat File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -19,7 +19,7 @@ | |
| #include <cmath> | ||
| #include <cstdint> | ||
| #include <cstdlib> | ||
| #include <iostream> | ||
| #include <unordered_set> | ||
| #include <vector> | ||
|
|
||
|
|
@@ -51,7 +51,7 @@ | |
| AxisSpec PtAxis = {1001, -0.005, 10.005}; | ||
| AxisSpec DeltaZAxis = {61, -6.1, 6.1}; | ||
| AxisSpec ZAxis = {301, -30.1, 30.1}; | ||
| AxisSpec PhiAxis = {629, 0, 2 * M_PI, "Rad", "phi axis"}; | ||
| // AxisSpec EtaAxis = {18, -4.6, -1.}; | ||
| AxisSpec DCAxyAxis = {100, -1, 10}; | ||
| AxisSpec CentAxis = {{0, 10, 20, 30, 40, 50, 60, 70, 80, 100}}; | ||
|
|
@@ -82,6 +82,7 @@ | |
| "eta range for INEL>0 sample definition"}; | ||
|
|
||
| Configurable<bool> useEvSel{"useEvSel", true, "use event selection"}; | ||
| Configurable<bool> disableITSROFCut{"disableITSROFCut", false, "Disable ITS ROC cut for event selection"}; | ||
| ConfigurableAxis multBinning{"multBinning", {701, -0.5, 700.5}, ""}; | ||
| ConfigurableAxis EtaAxis = {"etaBinning", {18, -4.6, -1.}, ""}; | ||
|
|
||
|
|
@@ -145,15 +146,15 @@ | |
| auto hstat = registry.get<TH1>(HIST("EventSelection")); | ||
| auto* x = hstat->GetXaxis(); | ||
| x->SetBinLabel(1, "All"); | ||
| x->SetBinLabel(2, "Selected"); | ||
| x->SetBinLabel(3, "Selected Vz Cut"); | ||
| x->SetBinLabel(4, "Sel8+Vz+INEL>0"); | ||
| x->SetBinLabel(5, "Sel INEL,INEL_fwd>0"); | ||
| x->SetBinLabel(6, "Rejected"); | ||
| x->SetBinLabel(7, "Good BCs"); | ||
| x->SetBinLabel(8, "BCs with collisions"); | ||
| x->SetBinLabel(9, "BCs with pile-up/splitting"); | ||
| x->SetBinLabel(10, "midtracks>0"); | ||
| x->SetBinLabel(2, "Vz"); | ||
| x->SetBinLabel(3, "Vz+ITSRof"); | ||
| x->SetBinLabel(4, "Vz+Selected"); | ||
| x->SetBinLabel(5, "Sel8+Vz+INEL>0"); | ||
| x->SetBinLabel(6, "Sel INEL,INEL_fwd>0"); | ||
| x->SetBinLabel(7, "Rejected"); | ||
| x->SetBinLabel(8, "Good BCs"); | ||
| x->SetBinLabel(9, "BCs with collisions"); | ||
| x->SetBinLabel(10, "BCs with pile-up/splitting"); | ||
| x->SetBinLabel(11, "percollisionSample>0"); | ||
| x->SetBinLabel(12, "midtracks+percollisionSample>0"); | ||
| registry.add({"EventsNtrkZvtx", | ||
|
|
@@ -450,7 +451,7 @@ | |
| if (!useEvSel || | ||
| (useEvSel && ((bc.selection_bit(aod::evsel::kIsBBT0A) && | ||
| bc.selection_bit(aod::evsel::kIsBBT0C)) != 0))) { | ||
| registry.fill(HIST("EventSelection"), 7); // added 5->12 | ||
| registry.fill(HIST("EventSelection"), 8); // added 5->12 | ||
| cols.clear(); | ||
| for (auto& collision : collisions) { | ||
| if (collision.has_foundBC()) { | ||
|
|
@@ -463,9 +464,9 @@ | |
| } | ||
| LOGP(debug, "BC {} has {} collisions", bc.globalBC(), cols.size()); | ||
| if (!cols.empty()) { | ||
| registry.fill(HIST("EventSelection"), 8); // added 6->13 | ||
| registry.fill(HIST("EventSelection"), 9); // added 6->13 | ||
| if (cols.size() > 1) { | ||
| registry.fill(HIST("EventSelection"), 9); // added 7->14 | ||
| registry.fill(HIST("EventSelection"), 10); // added 7->14 | ||
| } | ||
| } | ||
| } | ||
|
|
@@ -529,10 +530,10 @@ | |
|
|
||
| if (usePhiCut) { | ||
| if ((phi < cfgPhiCut) || | ||
| ((phi > M_PI - cfgPhiCut) && (phi < M_PI + cfgPhiCut)) || | ||
| (phi > 2. * M_PI - cfgPhiCut) || | ||
| ((phi > ((M_PI / 2. - 0.1) * M_PI) - cfgPhiCut) && | ||
| (phi < ((M_PI / 2. - 0.1) * M_PI) + cfgPhiCut))) | ||
| continue; | ||
| } | ||
|
|
||
|
|
@@ -569,25 +570,28 @@ | |
| registry.fill(HIST("EventsNtrkZvtx"), Ntrk, z); | ||
| if ((z >= cfgVzCut1) && (z <= cfgVzCut2)) { | ||
| registry.fill(HIST("Tracks/2Danalysis/EventsNtrkZvtx_all"), Ntrk, z); | ||
| registry.fill(HIST("EventSelection"), 2.); | ||
| for (auto& retrack : retracks) { | ||
| auto track = retrack.mfttrack(); | ||
| if ((cfgnEta1 < track.eta()) && (track.eta() < cfgnEta2) && track.nClusters() >= cfgnCluster && retrack.ambDegree() > 0) { | ||
| registry.fill(HIST("Tracks/2Danalysis/EtaZvtx"), track.eta(), z); | ||
| } | ||
| } | ||
| if (!useEvSel || (useEvSel && collision.sel8())) { | ||
| registry.fill(HIST("EventSelection"), 2.); | ||
| if (!disableITSROFCut && !collision.selection_bit(aod::evsel::kNoITSROFrameBorder)) { | ||
| return; | ||
| } | ||
| registry.fill(HIST("EventSelection"), 3.); | ||
| if (!useEvSel || (useEvSel && collision.selection_bit(aod::evsel::kIsTriggerTVX) && collision.selection_bit(aod::evsel::kNoTimeFrameBorder))) { | ||
| registry.fill(HIST("EventSelection"), 4.); | ||
| registry.fill(HIST("Tracks/2Danalysis/EventsNtrkZvtx_sel8"), Ntrk, z); | ||
| registry.fill(HIST("EventSelection"), 3.); | ||
| std::unordered_set<int> uniqueEvents; | ||
| std::unordered_set<int> uniqueEventsAmb; | ||
| std::unordered_set<int> uniqueCollisions; | ||
| std::unordered_set<int> uniqueCollisionsAmb; | ||
| std::unordered_set<int> eventsInelMFT; | ||
| std::unordered_set<int> eventsInel; | ||
| if (midtracks.size() > 0) { | ||
| registry.fill(HIST("EventSelection"), 4.); | ||
| registry.fill(HIST("EventSelection"), 10.); | ||
| registry.fill(HIST("EventSelection"), 5.); | ||
| registry.fill(HIST("EventsNtrkZvtx_gt0"), Ntrk, z); | ||
| registry.fill(HIST("Tracks/2Danalysis/EventsNtrkZvtx_sel8_inelgt0"), Ntrk, z); | ||
| eventsInel.insert(collision.globalIndex()); | ||
|
|
@@ -609,7 +613,7 @@ | |
| } | ||
| } | ||
| if (retracks.size() > 0) { | ||
| registry.fill(HIST("EventSelection"), 5.); | ||
| registry.fill(HIST("EventSelection"), 6.); | ||
| if (midtracks.size() > 0) { | ||
| registry.fill(HIST("Tracks/2Danalysis/EventsNtrkZvtx_sel8_inelfwdgt0"), Ntrk, z); | ||
| } | ||
|
|
@@ -736,7 +740,7 @@ | |
| registry.fill(HIST("hNumCollisions_Inel"), 1, eventsInel.size()); | ||
| } | ||
| } else { | ||
| registry.fill(HIST("EventSelection"), 6); | ||
| registry.fill(HIST("EventSelection"), 7); | ||
| } | ||
| } | ||
| PROCESS_SWITCH(PseudorapidityDensityMFT, processMultReassoc, | ||
|
|
@@ -766,10 +770,10 @@ | |
|
|
||
| if (usePhiCut) { | ||
| if ((phi < cfgPhiCut) || | ||
| ((phi > M_PI - cfgPhiCut) && (phi < M_PI + cfgPhiCut)) || | ||
| (phi > 2. * M_PI - cfgPhiCut) || | ||
| ((phi > ((M_PI / 2. - 0.1) * M_PI) - cfgPhiCut) && | ||
| (phi < ((M_PI / 2. - 0.1) * M_PI) + cfgPhiCut))) | ||
| continue; | ||
| } | ||
|
|
||
|
|
@@ -851,7 +855,10 @@ | |
| collisions.size()); | ||
| for (auto& collision : collisions) { | ||
| registry.fill(HIST("EventEfficiency"), 3.); | ||
| if (!useEvSel || (useEvSel && collision.sel8())) { | ||
| if (!disableITSROFCut && !collision.selection_bit(aod::evsel::kNoITSROFrameBorder)) { | ||
| return; | ||
| } | ||
| if (!useEvSel || (useEvSel && collision.selection_bit(aod::evsel::kIsTriggerTVX) && collision.selection_bit(aod::evsel::kNoTimeFrameBorder))) { | ||
|
Collaborator
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Please also separate out |
||
| atLeastOne = true; | ||
| auto perCollisionSample = sample->sliceByCached( | ||
| o2::aod::fwdtrack::collisionId, collision.globalIndex(), cache); | ||
|
|
||
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Please also separate out
kNoTimeFrameBordercut like you did forkNoITSROFrameBorder