-
Notifications
You must be signed in to change notification settings - Fork 448
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
Add functionality to set the coordinates of PV. #13922
Draft
makor
wants to merge
1
commit into
AliceO2Group:dev
Choose a base branch
from
makor:dev
base: dev
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
+13
−1
Draft
Changes from all commits
Commits
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 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 | ||||||||
---|---|---|---|---|---|---|---|---|---|---|
|
@@ -81,6 +81,14 @@ class Tracks | |||||||||
mUseCutMaxAbsDCArOnHistos = useCutMaxAbsDCArOnHistos; | ||||||||||
} | ||||||||||
|
||||||||||
// Set PV position | ||||||||||
void setPVposition(const o2::math_utils::Point3D<float> meanVtxPoint3D) | ||||||||||
{ | ||||||||||
mXpositionOfPV = meanVtxPoint3D.X(); | ||||||||||
mYpositionOfPV = meanVtxPoint3D.Y(); | ||||||||||
mZpositionOfPV = meanVtxPoint3D.Z(); | ||||||||||
} | ||||||||||
|
||||||||||
/// get ratios of 1D histograms | ||||||||||
std::unordered_map<std::string, std::unique_ptr<TH1>>& getMapHist() { return mMapHist; } | ||||||||||
const std::unordered_map<std::string, std::unique_ptr<TH1>>& getMapHist() const { return mMapHist; } | ||||||||||
|
@@ -94,6 +102,9 @@ class Tracks | |||||||||
bool mTurnOffHistosForAsync = false; // Decide whether to turn off some histograms for async to reduce memory | ||||||||||
float mCutMaxAbsDCAr = 1.f; // maximum DCAr | ||||||||||
bool mUseCutMaxAbsDCArOnHistos = false; // Decide whether to use the cut on maximum DCAr for the histograms | ||||||||||
float mXpositionOfPV = 0.f; // x-position of the PV | ||||||||||
float mYpositionOfPV = 0.f; // y-position of the PV | ||||||||||
float mZpositionOfPV = 0.f; // z-position of the PV | ||||||||||
Comment on lines
+105
to
+107
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.
Suggested change
|
||||||||||
|
||||||||||
std::unordered_map<std::string, std::unique_ptr<TH1>> mMapHist; | ||||||||||
std::vector<TH1F> mHist1D{}; ///< Initialize vector of 1D histograms | ||||||||||
|
This file contains 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 | ||||||||||||||
---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|
|
@@ -180,7 +180,8 @@ bool Tracks::processTrack(const o2::tpc::TrackTPC& track) | |||||||||||||||
if (propagator->getMatLUT() && propagator->hasMagFieldSet()) { | ||||||||||||||||
// ---| fill DCA histos |--- | ||||||||||||||||
o2::gpu::gpustd::array<float, 2> dca; | ||||||||||||||||
const o2::math_utils::Point3D<float> refPoint{0, 0, 0}; | ||||||||||||||||
const o2::math_utils::Point3D<float> refPoint{mXpositionOfPV, mYpositionOfPV, mZpositionOfPV}; // inlcude option to fetch this information form the CCDB instead of assuming collision at nominal interaction point | ||||||||||||||||
// LOGP(error, "DeBugOutput: mXpositionOfPV({%.2f}), mYpositionOfPV({%.2f}), mZpositionOfPV({%i})", mXpositionOfPV, mYpositionOfPV, mZpositionOfPV); | ||||||||||||||||
o2::track::TrackPar propTrack(track); | ||||||||||||||||
if (propagator->propagateToDCABxByBz(refPoint, propTrack, 2.f, o2::base::Propagator::MatCorrType::USEMatCorrLUT, &dca)) { | ||||||||||||||||
Comment on lines
+183
to
186
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.
Suggested change
|
||||||||||||||||
const auto phi = o2::math_utils::to02PiGen(track.getPhi()); | ||||||||||||||||
|
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.