Skip to content

convolute_eko: x2_grid was determined though not needed #167

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

Merged
cschwan merged 2 commits into from
Aug 25, 2022
Merged

convolute_eko: x2_grid was determined though not needed #167

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
022e732
Protext x1/x2_grid determination
felixhekhorn Aug 18, 2022
dc33d2b
Remove type annotations
cschwan Aug 25, 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
56 changes: 32 additions & 24 deletions pineappl/src/grid.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1535,30 +1535,38 @@ impl Grid {
.find(|subgrid| !subgrid.is_empty())
.unwrap_or_else(|| unreachable!());
// source x1/x2 grid might differ and be differently sorted than the operator
let x1_grid: Vec<_> = first_non_zero_grid
.x1_grid()
.iter()
.map(|x| {
eko_info
.grid_axes
.x_grid
.iter()
.position(|xi| approx_eq!(f64, *xi, *x, ulps = 64))
.unwrap_or_else(|| unreachable!())
})
.collect();
let x2_grid: Vec<_> = first_non_zero_grid
.x2_grid()
.iter()
.map(|x| {
eko_info
.grid_axes
.x_grid
.iter()
.position(|xi| approx_eq!(f64, *xi, *x, ulps = 64))
.unwrap_or_else(|| unreachable!())
})
.collect();
let x1_grid = if has_pdf1 {
first_non_zero_grid
.x1_grid()
.iter()
.map(|x| {
eko_info
.grid_axes
.x_grid
.iter()
.position(|xi| approx_eq!(f64, *xi, *x, ulps = 64))
.unwrap_or_else(|| unreachable!())
})
.collect()
} else {
Vec::new()
};
let x2_grid = if has_pdf2 {
first_non_zero_grid
.x2_grid()
.iter()
.map(|x| {
eko_info
.grid_axes
.x_grid
.iter()
.position(|xi| approx_eq!(f64, *xi, *x, ulps = 64))
.unwrap_or_else(|| unreachable!())
})
.collect()
} else {
Vec::new()
};

// iterate over all bins, which are mapped one-to-one from the target to the source grid
for bin in 0..self.bin_info().bins() {
Expand Down