Skip to content
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.

Sign up for GitHub

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

Jump to bottom

feat: minimum and maximum values of deltaRMiddleSPRange in check for radial region of interest of middle SP #1261

Merged
merged 2 commits into from
May 19, 2022
Merged

feat: minimum and maximum values of deltaRMiddleSPRange in check for radial region of interest of middle SP #1261

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c056fb6
split deltaRMiddleSPRange into min and max
LuisFelipeCoelho May 19, 2022
7bc9f03
fix bug
LuisFelipeCoelho May 19, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions Core/include/Acts/Seeding/Seedfinder.ipp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,9 +52,9 @@ void Seedfinder<external_spacepoint_t, platform_t>::createSeedsForGroup(
/// check if spM is outside our radial region of interest
if (m_config.useVariableMiddleSPRange) {
float rMinMiddleSP = std::floor(rRangeSPExtent.min(Acts::binR) / 2) * 2 +
m_config.deltaRMiddleSPRange;
m_config.deltaRMiddleMinSPRange;
float rMaxMiddleSP = std::floor(rRangeSPExtent.max(Acts::binR) / 2) * 2 -
m_config.deltaRMiddleSPRange;
m_config.deltaRMiddleMaxSPRange;
if (rM < rMinMiddleSP || rM > rMaxMiddleSP) {
continue;
}
Expand Down
6 changes: 4 additions & 2 deletions Core/include/Acts/Seeding/SeedfinderConfig.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,8 @@ struct SeedfinderConfig {
// radial range for middle SP
std::vector<std::vector<float>> rRangeMiddleSP;
bool useVariableMiddleSPRange = false;
float deltaRMiddleSPRange = 10. * Acts::UnitConstants::mm;
float deltaRMiddleMinSPRange = 10. * Acts::UnitConstants::mm;
float deltaRMiddleMaxSPRange = 10. * Acts::UnitConstants::mm;

// seed confirmation
bool seedConfirmation = false;
Expand Down Expand Up @@ -188,7 +189,8 @@ struct SeedfinderConfig {
config.deltaRMaxTopSP /= 1_mm;
config.deltaRMinBottomSP /= 1_mm;
config.deltaRMaxBottomSP /= 1_mm;
config.deltaRMiddleSPRange /= 1_mm;
config.deltaRMiddleMinSPRange /= 1_mm;
config.deltaRMiddleMaxSPRange /= 1_mm;
config.impactMax /= 1_mm;
config.maxPtScattering /= 1_MeV; // correct?
config.collisionRegionMin /= 1_mm;
Expand Down
3 changes: 2 additions & 1 deletion Examples/Python/src/TrackFinding.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -113,7 +113,8 @@ void addTrackFinding(Context& ctx) {
ACTS_PYTHON_MEMBER(zBinsCustomLooping);
ACTS_PYTHON_MEMBER(rRangeMiddleSP);
ACTS_PYTHON_MEMBER(useVariableMiddleSPRange);
ACTS_PYTHON_MEMBER(deltaRMiddleSPRange);
ACTS_PYTHON_MEMBER(deltaRMiddleMinSPRange);
ACTS_PYTHON_MEMBER(deltaRMiddleMaxSPRange);
ACTS_PYTHON_MEMBER(seedConfirmation);
ACTS_PYTHON_MEMBER(centralSeedConfirmationRange);
ACTS_PYTHON_MEMBER(forwardSeedConfirmationRange);
Expand Down
3 changes: 2 additions & 1 deletion Examples/Scripts/Python/itk_seeding.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,8 @@ def runITkSeeding(field, csvInputDir, outputDir, s=None):
[40.0, 90.0],
], # if useVariableMiddleSPRange is set to false, the vector rRangeMiddleSP can be used to define a fixed r range for each z bin: {{rMin, rMax}, ...}. If useVariableMiddleSPRange is set to false and the vector is empty, the cuts won't be applied
useVariableMiddleSPRange=True, # if useVariableMiddleSPRange is true, the values in rRangeMiddleSP will be calculated based on r values of the SPs and deltaRMiddleSPRange
deltaRMiddleSPRange=10,
deltaRMiddleMinSPRange=10,
deltaRMiddleMaxSPRange=10,
seedConfirmation=True,
centralSeedConfirmationRange=acts.SeedConfirmationRange(
zMinSeedConf=250 * u.mm,
Expand Down