flavor bugfix

Author: theoheimel

madgraph/iolibs/template_files/mg7/madevent.py

@@ -381,7 +381,7 @@ def train_madnis(self) -> None:
             self.madnis_upper_box = ms.PrettyBox(
                 "MadNIS training", 2, [18, 0], self.madnis_lower_box.line_count
             )
-            self.madnis_upper_box.set_column(0, ["Subprocess:", "Run time:"])
+            self.madnis_upper_box.set_column(0, ["Subprocesses:", "Run time:"])
             self.madnis_upper_box.print_first()
             self.madnis_lower_box.print_first()
         else:
@@ -480,7 +480,7 @@ def update_madnis_status_multi(
             subproc_str = f"{subproc_count} / {subproc_count}"
         batch_str = f"{batch + 1} / {batch_target}"
         self.madnis_upper_box.set_column(1, [
-            f"{subproc_str:<15} {progress_bar}",
+            f"{subproc_str:<15} {progress_bar_all}",
             time_str,
         ])
         self.madnis_lower_box.set_row(subproc_id + 1, [

madspace/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "scikit_build_core.build"
 
 [project]
 name = "madspace"
-version = "0.1.1"
+version = "0.1.2"
 description="Fast and flexible phase space mappings"
 readme = "README.md"
 authors = [

madspace/src/phasespace/scale.cpp

@@ -25,14 +25,15 @@ EnergyScale::EnergyScale(
 
 ValueVec
 EnergyScale::build_function_impl(FunctionBuilder& fb, const ValueVec& args) const {
+    auto momenta = args.at(0);
     if (_ren_scale_fixed && _fact_scale_fixed) {
+        auto batch_size = fb.batch_size({momenta});
         return {
-            _ren_scale * _ren_scale,
-            _fact_scale1 * _fact_scale1,
-            _fact_scale2 * _fact_scale2
+            fb.full({_ren_scale * _ren_scale, batch_size}),
+            fb.full({_fact_scale1 * _fact_scale1, batch_size}),
+            fb.full({_fact_scale2 * _fact_scale2, batch_size}),
         };
     }
-    auto momenta = args.at(0);
     Value scale;
     switch (_dynamical_scale_type) {
     case transverse_energy:
@@ -50,9 +51,10 @@ EnergyScale::build_function_impl(FunctionBuilder& fb, const ValueVec& args) cons
     default:
         throw std::runtime_error("invalid dynamical scale type");
     }
+    auto batch_size = fb.batch_size({momenta});
     return {
-        _ren_scale_fixed ? Value(_ren_scale * _ren_scale) : scale,
-        _fact_scale_fixed ? Value(_fact_scale1 * _fact_scale1) : scale,
-        _fact_scale_fixed ? Value(_fact_scale2 * _fact_scale2) : scale
+        _ren_scale_fixed ? fb.full({_ren_scale * _ren_scale, batch_size}) : scale,
+        _fact_scale_fixed ? fb.full({_fact_scale1 * _fact_scale1, batch_size}) : scale,
+        _fact_scale_fixed ? fb.full({_fact_scale2 * _fact_scale2, batch_size}) : scale
     };
 }