diff --git a/pineappl_cli/src/convolve.rs b/pineappl_cli/src/convolve.rs index 466e286e..0c88dc85 100644 --- a/pineappl_cli/src/convolve.rs +++ b/pineappl_cli/src/convolve.rs @@ -38,6 +38,15 @@ pub struct Opts { value_parser = helpers::parse_order )] orders: Vec<(u8, u8)>, + /// Set the variation of the renormalization scale. + #[arg(default_value = "1.0", long, num_args = 1)] + xir: f64, + /// Set the variation of the factorization scale. + #[arg(default_value = "1.0", long, num_args = 1)] + xif: f64, + /// Set the variation of the fragmentation scale. + #[arg(default_value = "1.0", long, num_args = 1)] + xia: f64, /// Set the number of fractional digits shown for absolute numbers. #[arg(default_value_t = 7, long, value_name = "ABS")] digits_abs: usize, @@ -52,13 +61,13 @@ impl Subcommand for Opts { let mut conv_funs_0 = helpers::create_conv_funs(&self.conv_funs[0])?; let bins: Vec<_> = self.bins.iter().cloned().flatten().collect(); - let results = helpers::convolve( + let results = helpers::convolve_scales( &grid, &mut conv_funs_0, &self.orders, &bins, &[], - 1, + &[(self.xir, self.xif, self.xia)], if self.integrated { ConvoluteMode::Integrated } else { diff --git a/pineappl_cli/tests/convolve.rs b/pineappl_cli/tests/convolve.rs index 54be75c0..3822634e 100644 --- a/pineappl_cli/tests/convolve.rs +++ b/pineappl_cli/tests/convolve.rs @@ -15,6 +15,9 @@ Options: -b, --bins Selects a subset of bins -i, --integrated Show integrated numbers (without bin widths) instead of differential ones -o, --orders Select orders manually + --xir Set the variation of the renormalization scale [default: 1.0] + --xif Set the variation of the factorization scale [default: 1.0] + --xia Set the variation of the fragmentation scale [default: 1.0] --digits-abs Set the number of fractional digits shown for absolute numbers [default: 7] --digits-rel Set the number of fractional digits shown for relative numbers [default: 2] -h, --help Print help @@ -170,6 +173,19 @@ const WRONG_ORDERS_STR: &str = "error: invalid value 'a2a2as2' for '--orders