diff --git a/CHANGELOG.md b/CHANGELOG.md index d033a75b5..823d98174 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -15,6 +15,11 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ### Changed +- changed the official name of the CLI subcommand `convolute` to `convolve`, + because the latter is the proper verb of 'convolution'. The old name + `convolute` is now an alias of `convolve`, which means both can be used. The + methods `Grid::convolute*` are left unchanged and will be renamed in later + version - changed switch `--silence-lhapdf` to `--lhapdf-banner` and suppress LHAPDF's banners by default, unless `--lhapdf-banner` is given - `Grid::evolve` has now been marked deprecated diff --git a/pineappl_cli/src/analyze.rs b/pineappl_cli/src/analyze.rs index 18f9a7301..84479b86d 100644 --- a/pineappl_cli/src/analyze.rs +++ b/pineappl_cli/src/analyze.rs @@ -80,12 +80,12 @@ impl Subcommand for CkfOpts { }; let limit = grid.lumi().len().min(self.limit); - let limits = helpers::convolute_limits(&grid, &[], ConvoluteMode::Normal); + let limits = helpers::convolve_limits(&grid, &[], ConvoluteMode::Normal); let results: Vec<_> = (0..grid.lumi().len()) .map(|lumi| { let mut lumi_mask = vec![false; grid.lumi().len()]; lumi_mask[lumi] = true; - helpers::convolute( + helpers::convolve( &grid, &mut pdf, &[self.order], @@ -101,7 +101,7 @@ impl Subcommand for CkfOpts { .map(|lumi| { let mut lumi_mask = vec![false; grid.lumi().len()]; lumi_mask[lumi] = true; - helpers::convolute( + helpers::convolve( &grid, &mut pdf, &orders_den, diff --git a/pineappl_cli/src/channels.rs b/pineappl_cli/src/channels.rs index 1f415e5ad..b3859dd1a 100644 --- a/pineappl_cli/src/channels.rs +++ b/pineappl_cli/src/channels.rs @@ -74,7 +74,7 @@ impl Subcommand for Opts { } else { limit.min(lumis.len()) }; - let limits = helpers::convolute_limits( + let limits = helpers::convolve_limits( &grid, &[], if self.integrated { @@ -87,7 +87,7 @@ impl Subcommand for Opts { .map(|lumi| { let mut lumi_mask = vec![false; grid.lumi().len()]; lumi_mask[lumi] = true; - helpers::convolute( + helpers::convolve( &grid, &mut pdf, &self.orders, diff --git a/pineappl_cli/src/convolute.rs b/pineappl_cli/src/convolve.rs similarity index 96% rename from pineappl_cli/src/convolute.rs rename to pineappl_cli/src/convolve.rs index 4e26f9666..71f0225ec 100644 --- a/pineappl_cli/src/convolute.rs +++ b/pineappl_cli/src/convolve.rs @@ -9,6 +9,7 @@ use std::process::ExitCode; /// Convolutes a PineAPPL grid with a PDF set. #[derive(Parser)] +#[command(alias = "convolute")] pub struct Opts { /// Path of the input grid. #[arg(value_hint = ValueHint::FilePath)] @@ -51,7 +52,7 @@ impl Subcommand for Opts { let mut pdf = helpers::create_pdf(&self.pdfsets[0])?; let bins: Vec<_> = self.bins.iter().cloned().flatten().collect(); - let results = helpers::convolute( + let results = helpers::convolve( &grid, &mut pdf, &self.orders, @@ -65,7 +66,7 @@ impl Subcommand for Opts { }, cfg, ); - let limits = helpers::convolute_limits( + let limits = helpers::convolve_limits( &grid, &bins, if self.integrated { @@ -80,7 +81,7 @@ impl Subcommand for Opts { .iter() .flat_map(|pdfset| { let mut pdf = helpers::create_pdf(pdfset).unwrap(); - helpers::convolute( + helpers::convolve( &grid, &mut pdf, &self.orders, diff --git a/pineappl_cli/src/diff.rs b/pineappl_cli/src/diff.rs index 35a9d545b..04303748c 100644 --- a/pineappl_cli/src/diff.rs +++ b/pineappl_cli/src/diff.rs @@ -137,7 +137,7 @@ impl Subcommand for Opts { title.add_cell(cell); } - let limits1 = helpers::convolute_limits(&grid1, &[], ConvoluteMode::Normal); + let limits1 = helpers::convolve_limits(&grid1, &[], ConvoluteMode::Normal); if self.ignore_orders { let mut cell = cell!(c->"diff"); @@ -146,7 +146,7 @@ impl Subcommand for Opts { table.set_titles(title); - let results1 = helpers::convolute( + let results1 = helpers::convolve( &grid1, &mut pdf, &orders1, @@ -156,7 +156,7 @@ impl Subcommand for Opts { ConvoluteMode::Normal, cfg, ); - let results2 = helpers::convolute( + let results2 = helpers::convolve( &grid2, &mut pdf, &orders2, @@ -202,7 +202,7 @@ impl Subcommand for Opts { let order_results1: Vec> = orders .iter() .map(|&order| { - helpers::convolute( + helpers::convolve( &grid1, &mut pdf, &[order], @@ -217,7 +217,7 @@ impl Subcommand for Opts { let order_results2: Vec> = orders .iter() .map(|&order| { - helpers::convolute( + helpers::convolve( &grid2, &mut pdf, &[order], diff --git a/pineappl_cli/src/evolve.rs b/pineappl_cli/src/evolve.rs index 568e78501..e8726b886 100644 --- a/pineappl_cli/src/evolve.rs +++ b/pineappl_cli/src/evolve.rs @@ -543,7 +543,7 @@ impl Subcommand for Opts { let grid = helpers::read_grid(&self.input)?; let mut pdf = helpers::create_pdf(&self.pdfset)?; - let results = helpers::convolute_scales( + let results = helpers::convolve_scales( &grid, &mut pdf, &self.orders, @@ -563,7 +563,7 @@ impl Subcommand for Opts { self.xif, self.use_old_evolve, )?; - let evolved_results = helpers::convolute_scales( + let evolved_results = helpers::convolve_scales( fk_table.grid(), &mut pdf, &[], diff --git a/pineappl_cli/src/export.rs b/pineappl_cli/src/export.rs index a67c8a920..a8cc3f0c0 100644 --- a/pineappl_cli/src/export.rs +++ b/pineappl_cli/src/export.rs @@ -155,7 +155,7 @@ impl Subcommand for Opts { println!("file was converted, but we cannot check the conversion for this type"); } else { let mut pdf = helpers::create_pdf(&self.pdfset)?; - let reference_results = helpers::convolute( + let reference_results = helpers::convolve( &grid, &mut pdf, &orders, diff --git a/pineappl_cli/src/helpers.rs b/pineappl_cli/src/helpers.rs index c9b814ad3..335c3db30 100644 --- a/pineappl_cli/src/helpers.rs +++ b/pineappl_cli/src/helpers.rs @@ -125,7 +125,7 @@ pub enum ConvoluteMode { Normal, } -pub fn convolute_scales( +pub fn convolve_scales( grid: &Grid, lhapdf: &mut Pdf, orders: &[(u32, u32)], @@ -210,7 +210,7 @@ pub fn convolute_scales( } } -pub fn convolute( +pub fn convolve( grid: &Grid, lhapdf: &mut Pdf, orders: &[(u32, u32)], @@ -220,7 +220,7 @@ pub fn convolute( mode: ConvoluteMode, cfg: &GlobalConfiguration, ) -> Vec { - convolute_scales( + convolve_scales( grid, lhapdf, orders, @@ -232,7 +232,7 @@ pub fn convolute( ) } -pub fn convolute_limits(grid: &Grid, bins: &[usize], mode: ConvoluteMode) -> Vec> { +pub fn convolve_limits(grid: &Grid, bins: &[usize], mode: ConvoluteMode) -> Vec> { let limits: Vec<_> = grid .bin_info() .limits() @@ -247,7 +247,7 @@ pub fn convolute_limits(grid: &Grid, bins: &[usize], mode: ConvoluteMode) -> Vec } } -pub fn convolute_subgrid( +pub fn convolve_subgrid( grid: &Grid, lhapdf: &mut Pdf, order: usize, diff --git a/pineappl_cli/src/import.rs b/pineappl_cli/src/import.rs index 530d39f86..f546588ac 100644 --- a/pineappl_cli/src/import.rs +++ b/pineappl_cli/src/import.rs @@ -275,7 +275,7 @@ impl Subcommand for Opts { println!("file was converted, but we cannot check the conversion for this type"); } else { let mut pdf = helpers::create_pdf(&self.pdfset)?; - let results = helpers::convolute( + let results = helpers::convolve( &grid, &mut pdf, &[], diff --git a/pineappl_cli/src/lib.rs b/pineappl_cli/src/lib.rs index 87c3ecffb..d02e045b9 100644 --- a/pineappl_cli/src/lib.rs +++ b/pineappl_cli/src/lib.rs @@ -5,7 +5,7 @@ mod analyze; mod channels; -mod convolute; +mod convolve; mod diff; mod evolve; mod export; @@ -50,7 +50,7 @@ pub trait Subcommand { pub enum SubcommandEnum { Analyze(analyze::Opts), Channels(channels::Opts), - Convolute(convolute::Opts), + Convolve(convolve::Opts), Diff(diff::Opts), Evolve(evolve::Opts), Export(export::Opts), diff --git a/pineappl_cli/src/orders.rs b/pineappl_cli/src/orders.rs index e5af3212d..77919d234 100644 --- a/pineappl_cli/src/orders.rs +++ b/pineappl_cli/src/orders.rs @@ -52,7 +52,7 @@ impl Subcommand for Opts { orders.sort(); let orders = orders; - let limits = helpers::convolute_limits( + let limits = helpers::convolve_limits( &grid, &[], if self.integrated { @@ -64,7 +64,7 @@ impl Subcommand for Opts { let results: Vec> = orders .iter() .map(|order| { - helpers::convolute( + helpers::convolve( &grid, &mut pdf, &[(order.alphas, order.alpha)], diff --git a/pineappl_cli/src/plot.rs b/pineappl_cli/src/plot.rs index a1a203bed..2af5fcc6b 100644 --- a/pineappl_cli/src/plot.rs +++ b/pineappl_cli/src/plot.rs @@ -218,7 +218,7 @@ impl Subcommand for Opts { let bins: Vec<_> = (slice.0..slice.1).collect(); let results = - helpers::convolute(&grid, &mut pdf, &[], &bins, &[], self.scales, mode, cfg); + helpers::convolve(&grid, &mut pdf, &[], &bins, &[], self.scales, mode, cfg); let qcd_results = { let mut orders = grid.orders().to_vec(); @@ -235,7 +235,7 @@ impl Subcommand for Opts { }) .collect(); - helpers::convolute( + helpers::convolve( &grid, &mut pdf, &qcd_orders, @@ -247,7 +247,7 @@ impl Subcommand for Opts { ) }; - let bin_limits: Vec<_> = helpers::convolute_limits(&grid, &bins, mode) + let bin_limits: Vec<_> = helpers::convolve_limits(&grid, &bins, mode) .into_iter() .map(|limits| limits.last().copied().unwrap()) .collect(); @@ -270,7 +270,7 @@ impl Subcommand for Opts { let mut pdf = helpers::create_pdf(pdfset).unwrap(); let results = - helpers::convolute(&grid, &mut pdf, &[], &bins, &[], 1, mode, cfg); + helpers::convolve(&grid, &mut pdf, &[], &bins, &[], 1, mode, cfg); Ok(vec![results; 3]) } else { @@ -280,7 +280,7 @@ impl Subcommand for Opts { .mk_pdfs()? .into_par_iter() .flat_map(|mut pdf| { - helpers::convolute( + helpers::convolve( &grid, &mut pdf, &[], @@ -379,7 +379,7 @@ impl Subcommand for Opts { grid.has_pdf1(), grid.has_pdf2(), ), - helpers::convolute( + helpers::convolve( &grid, &mut pdf, &[], @@ -523,7 +523,7 @@ impl Subcommand for Opts { let values1: Vec<_> = pdfset1 .par_iter_mut() .map(|pdf| { - let values = helpers::convolute( + let values = helpers::convolve( &grid, pdf, &[], @@ -540,7 +540,7 @@ impl Subcommand for Opts { let values2: Vec<_> = pdfset2 .par_iter_mut() .map(|pdf| { - let values = helpers::convolute( + let values = helpers::convolve( &grid, pdf, &[], @@ -576,9 +576,9 @@ impl Subcommand for Opts { unc1.hypot(unc2) }; - let res1 = helpers::convolute_subgrid(&grid, &mut pdfset1[0], order, bin, lumi, cfg) + let res1 = helpers::convolve_subgrid(&grid, &mut pdfset1[0], order, bin, lumi, cfg) .sum_axis(Axis(0)); - let res2 = helpers::convolute_subgrid(&grid, &mut pdfset2[0], order, bin, lumi, cfg) + let res2 = helpers::convolve_subgrid(&grid, &mut pdfset2[0], order, bin, lumi, cfg) .sum_axis(Axis(0)); let subgrid = grid.subgrid(order, bin, lumi); diff --git a/pineappl_cli/src/pull.rs b/pineappl_cli/src/pull.rs index e57a61530..25043c327 100644 --- a/pineappl_cli/src/pull.rs +++ b/pineappl_cli/src/pull.rs @@ -62,11 +62,11 @@ impl Subcommand for Opts { .unwrap(); let limit = grid.lumi().len().min(self.limit); - let bin_limits = helpers::convolute_limits(&grid, &[], ConvoluteMode::Normal); + let bin_limits = helpers::convolve_limits(&grid, &[], ConvoluteMode::Normal); let results1: Vec<_> = pdfset1 .par_iter_mut() .flat_map(|pdf| { - helpers::convolute( + helpers::convolve( &grid, pdf, &self.orders, @@ -81,7 +81,7 @@ impl Subcommand for Opts { let results2: Vec<_> = pdfset2 .par_iter_mut() .flat_map(|pdf| { - helpers::convolute( + helpers::convolve( &grid, pdf, &self.orders, @@ -147,7 +147,7 @@ impl Subcommand for Opts { .map(|lumi| { let mut lumi_mask = vec![false; grid.lumi().len()]; lumi_mask[lumi] = true; - match helpers::convolute( + match helpers::convolve( &grid, &mut pdfset[member], &self.orders, @@ -172,7 +172,7 @@ impl Subcommand for Opts { .map(|lumi| { let mut lumi_mask = vec![false; grid.lumi().len()]; lumi_mask[lumi] = true; - match helpers::convolute( + match helpers::convolve( &grid, pdf, &self.orders, diff --git a/pineappl_cli/src/uncert.rs b/pineappl_cli/src/uncert.rs index 515f87e89..aefe6f867 100644 --- a/pineappl_cli/src/uncert.rs +++ b/pineappl_cli/src/uncert.rs @@ -100,7 +100,7 @@ impl Subcommand for Opts { let grid = helpers::read_grid(&self.input)?; let (set, _) = helpers::create_pdfset(&self.pdfset)?; - let limits = helpers::convolute_limits( + let limits = helpers::convolve_limits( &grid, &[], if self.integrated { @@ -119,7 +119,7 @@ impl Subcommand for Opts { set.mk_pdfs()? .into_par_iter() .flat_map(|mut pdf| { - helpers::convolute( + helpers::convolve( &grid, &mut pdf, &self.orders, @@ -148,7 +148,7 @@ impl Subcommand for Opts { .map(|&x| usize::from(x)) .max() .unwrap_or(1); - let scale_results = helpers::convolute( + let scale_results = helpers::convolve( &grid, &mut helpers::create_pdf(&self.pdfset)?, &self.orders, diff --git a/pineappl_cli/tests/convolute.rs b/pineappl_cli/tests/convolve.rs similarity index 96% rename from pineappl_cli/tests/convolute.rs rename to pineappl_cli/tests/convolve.rs index 36265c0f2..9eb93292b 100644 --- a/pineappl_cli/tests/convolute.rs +++ b/pineappl_cli/tests/convolve.rs @@ -2,7 +2,7 @@ use assert_cmd::Command; const HELP_STR: &str = "Convolutes a PineAPPL grid with a PDF set -Usage: pineappl convolute [OPTIONS] ... +Usage: pineappl convolve [OPTIONS] ... Arguments: Path of the input grid @@ -168,7 +168,7 @@ For more information, try '--help'. fn help() { Command::cargo_bin("pineappl") .unwrap() - .args(["convolute", "--help"]) + .args(["convolve", "--help"]) .assert() .success() .stdout(HELP_STR); @@ -179,7 +179,7 @@ fn default() { Command::cargo_bin("pineappl") .unwrap() .args([ - "convolute", + "convolve", "../test-data/LHCB_WP_7TEV.pineappl.lz4", "NNPDF31_nlo_as_0118_luxqed", ]) @@ -194,7 +194,7 @@ fn force_positive() { .unwrap() .args([ "--force-positive", - "convolute", + "convolve", "../test-data/LHCB_WP_7TEV.pineappl.lz4", "NNPDF31_nlo_as_0118_luxqed", ]) @@ -208,7 +208,7 @@ fn default_multiple_pdfs() { Command::cargo_bin("pineappl") .unwrap() .args([ - "convolute", + "convolve", "../test-data/LHCB_WP_7TEV.pineappl.lz4", "NNPDF31_nlo_as_0118_luxqed", "324900=NNPDF31_nlo_as_0118_luxqed", @@ -223,7 +223,7 @@ fn multiple_pdfs_with_new_construction() { Command::cargo_bin("pineappl") .unwrap() .args([ - "convolute", + "convolve", "../test-data/LHCB_WP_7TEV.pineappl.lz4", "NNPDF31_nlo_as_0118_luxqed/0", "NNPDF31_nlo_as_0118_luxqed/1", @@ -238,7 +238,7 @@ fn multiple_pdfs_with_relabeling() { Command::cargo_bin("pineappl") .unwrap() .args([ - "convolute", + "convolve", "../test-data/LHCB_WP_7TEV.pineappl.lz4", "NNPDF31_nlo_as_0118_luxqed", "NNPDF31_nlo_as_0118_luxqed/1=other mc=1.4", @@ -253,7 +253,7 @@ fn two_pdfs_with_order_subset() { Command::cargo_bin("pineappl") .unwrap() .args([ - "convolute", + "convolve", "--orders=a2", "../test-data/LHCB_WP_7TEV.pineappl.lz4", "NNPDF31_nlo_as_0118_luxqed/0", @@ -269,7 +269,7 @@ fn three_pdfs() { Command::cargo_bin("pineappl") .unwrap() .args([ - "convolute", + "convolve", "../test-data/LHCB_WP_7TEV.pineappl.lz4", "NNPDF31_nlo_as_0118_luxqed/0", "NNPDF31_nlo_as_0118_luxqed/1", @@ -285,7 +285,7 @@ fn bins_13567() { Command::cargo_bin("pineappl") .unwrap() .args([ - "convolute", + "convolve", "--bins=1,3,5-7", "../test-data/LHCB_WP_7TEV.pineappl.lz4", "NNPDF31_nlo_as_0118_luxqed", @@ -300,7 +300,7 @@ fn integrated() { Command::cargo_bin("pineappl") .unwrap() .args([ - "convolute", + "convolve", "--integrated", "../test-data/LHCB_WP_7TEV.pineappl.lz4", "NNPDF31_nlo_as_0118_luxqed", @@ -315,7 +315,7 @@ fn integrated_multiple_pdfs() { Command::cargo_bin("pineappl") .unwrap() .args([ - "convolute", + "convolve", "--integrated", "../test-data/LHCB_WP_7TEV.pineappl.lz4", "NNPDF31_nlo_as_0118_luxqed", @@ -331,7 +331,7 @@ fn orders_a2_a3() { Command::cargo_bin("pineappl") .unwrap() .args([ - "convolute", + "convolve", "--orders=a2,a3", "../test-data/LHCB_WP_7TEV.pineappl.lz4", "NNPDF31_nlo_as_0118_luxqed", @@ -346,7 +346,7 @@ fn wrong_orders() { Command::cargo_bin("pineappl") .unwrap() .args([ - "convolute", + "convolve", "--orders=a2a2as2", "../test-data/LHCB_WP_7TEV.pineappl.lz4", "NNPDF31_nlo_as_0118_luxqed", diff --git a/pineappl_cli/tests/evolve.rs b/pineappl_cli/tests/evolve.rs index 710365d16..5173c15b5 100644 --- a/pineappl_cli/tests/evolve.rs +++ b/pineappl_cli/tests/evolve.rs @@ -217,7 +217,7 @@ fn lhcb_wp_7tev() { Command::cargo_bin("pineappl") .unwrap() .args([ - "convolute", + "convolve", optimized.path().to_str().unwrap(), "NNPDF40_nlo_as_01180", ]) diff --git a/pineappl_cli/tests/import.rs b/pineappl_cli/tests/import.rs index a016c0d2a..c5736f9e2 100644 --- a/pineappl_cli/tests/import.rs +++ b/pineappl_cli/tests/import.rs @@ -680,7 +680,7 @@ fn import_dis_fktable() { Command::cargo_bin("pineappl") .unwrap() .args([ - "convolute", + "convolve", output.path().to_str().unwrap(), "NNPDF31_nlo_as_0118_luxqed", ]) @@ -858,7 +858,7 @@ fn import_hadronic_fktable() { Command::cargo_bin("pineappl") .unwrap() .args([ - "convolute", + "convolve", output.path().to_str().unwrap(), "NNPDF31_nlo_as_0118_luxqed", ]) diff --git a/pineappl_cli/tests/main.rs b/pineappl_cli/tests/main.rs index 0577a05ce..00d428172 100644 --- a/pineappl_cli/tests/main.rs +++ b/pineappl_cli/tests/main.rs @@ -5,22 +5,22 @@ const HELP_STR: &str = "Read, write, and query PineAPPL grids Usage: pineappl [OPTIONS] Commands: - analyze Perform various analyses with grids - channels Shows the contribution for each partonic channel - convolute Convolutes a PineAPPL grid with a PDF set - diff Compares the numerical content of two grids with each other - evolve Evolve a grid with an evolution kernel operator to an FK table - export Converts PineAPPL grids to APPLgrid files - help Display a manpage for selected subcommands - import Converts APPLgrid/fastNLO/FastKernel files to PineAPPL grids - merge Merges one or more PineAPPL grids together - orders Shows the predictions for all bin for each order separately - plot Creates a matplotlib script plotting the contents of the grid - pull Calculates the pull between two different PDF sets - read Read out information of a grid - subgrids Print information about the internal subgrid types - uncert Calculates scale and PDF uncertainties - write Write a grid modified by various operations + analyze Perform various analyses with grids + channels Shows the contribution for each partonic channel + convolve Convolutes a PineAPPL grid with a PDF set + diff Compares the numerical content of two grids with each other + evolve Evolve a grid with an evolution kernel operator to an FK table + export Converts PineAPPL grids to APPLgrid files + help Display a manpage for selected subcommands + import Converts APPLgrid/fastNLO/FastKernel files to PineAPPL grids + merge Merges one or more PineAPPL grids together + orders Shows the predictions for all bin for each order separately + plot Creates a matplotlib script plotting the contents of the grid + pull Calculates the pull between two different PDF sets + read Read out information of a grid + subgrids Print information about the internal subgrid types + uncert Calculates scale and PDF uncertainties + write Write a grid modified by various operations Options: --lhapdf-banner Allow LHAPDF to print banners diff --git a/pineappl_cli/tests/merge.rs b/pineappl_cli/tests/merge.rs index 134d7aff9..0741ae2d8 100644 --- a/pineappl_cli/tests/merge.rs +++ b/pineappl_cli/tests/merge.rs @@ -55,7 +55,7 @@ fn default() { Command::cargo_bin("pineappl") .unwrap() .args([ - "convolute", + "convolve", output.path().to_str().unwrap(), "NNPDF40_nnlo_as_01180", ]) diff --git a/pineappl_cli/tests/write.rs b/pineappl_cli/tests/write.rs index 429bed77a..03058a51e 100644 --- a/pineappl_cli/tests/write.rs +++ b/pineappl_cli/tests/write.rs @@ -256,7 +256,7 @@ fn cc1() { Command::cargo_bin("pineappl") .unwrap() .args([ - "convolute", + "convolve", output.path().to_str().unwrap(), "NNPDF31_nlo_as_0118_luxqed", ]) @@ -284,7 +284,7 @@ fn cc2() { Command::cargo_bin("pineappl") .unwrap() .args([ - "convolute", + "convolve", output.path().to_str().unwrap(), "NNPDF31_nlo_as_0118_luxqed", ]) @@ -312,7 +312,7 @@ fn delete_bins_02_57() { Command::cargo_bin("pineappl") .unwrap() .args([ - "convolute", + "convolve", output.path().to_str().unwrap(), "NNPDF31_nlo_as_0118_luxqed", ]) @@ -340,7 +340,7 @@ fn delete_bins_25() { Command::cargo_bin("pineappl") .unwrap() .args([ - "convolute", + "convolve", output.path().to_str().unwrap(), "NNPDF31_nlo_as_0118_luxqed", ]) @@ -425,7 +425,7 @@ fn merge_bins() { Command::cargo_bin("pineappl") .unwrap() .args([ - "convolute", + "convolve", output.path().to_str().unwrap(), "NNPDF31_nlo_as_0118_luxqed", ]) @@ -473,7 +473,7 @@ fn remap() { Command::cargo_bin("pineappl") .unwrap() .args([ - "convolute", + "convolve", output.path().to_str().unwrap(), "NNPDF31_nlo_as_0118_luxqed", ]) @@ -535,7 +535,7 @@ fn scale_by_bin() { Command::cargo_bin("pineappl") .unwrap() .args([ - "convolute", + "convolve", output.path().to_str().unwrap(), "NNPDF31_nlo_as_0118_luxqed", ]) @@ -564,7 +564,7 @@ fn scale_by_order() { Command::cargo_bin("pineappl") .unwrap() .args([ - "convolute", + "convolve", output.path().to_str().unwrap(), "NNPDF31_nlo_as_0118_luxqed", ]) @@ -592,7 +592,7 @@ fn split_lumi() { Command::cargo_bin("pineappl") .unwrap() .args([ - "convolute", + "convolve", output.path().to_str().unwrap(), "NNPDF31_nlo_as_0118_luxqed", ]) @@ -684,7 +684,7 @@ fn multiple_arguments() { Command::cargo_bin("pineappl") .unwrap() .args([ - "convolute", + "convolve", output.path().to_str().unwrap(), "NNPDF40_nnlo_as_01180", ]) @@ -727,7 +727,7 @@ fn rewrite_channels() { Command::cargo_bin("pineappl") .unwrap() .args([ - "convolute", + "convolve", output.path().to_str().unwrap(), "NNPDF31_nlo_as_0118_luxqed", ])