Merge branch 'master' into n3lo_dis_fit

NNPDF · Jul 10, 2023 · 7fe2d70 · 7fe2d70
2 parents fde6be0 + 4847c56
commit 7fe2d70
Show file tree

Hide file tree

Showing 4 changed files with 56 additions and 1 deletion.
diff --git a/nnpdfcpp/data/theory.db b/nnpdfcpp/data/theory.db
diff --git a/validphys2/src/validphys/eff_exponents.py b/validphys2/src/validphys/eff_exponents.py
@@ -599,5 +599,8 @@ def iterated_runcard_yaml(fit, update_runcard_description_yaml):
         closuretest_data = filtermap["closuretest"]
         if "filterseed" in closuretest_data:
             closuretest_data["filterseed"] = random.randrange(0, maxint)
+
+    if "fiatlux" in filtermap:
+        filtermap['fiatlux']['luxset'] = fit.name
 
     return yaml.dump(filtermap, Dumper=yaml.RoundTripDumper)
diff --git a/validphys2/src/validphys/scalevariations/scalevariationtheoryids.yaml b/validphys2/src/validphys/scalevariations/scalevariationtheoryids.yaml
@@ -24,6 +24,32 @@ scale_variations_for:
       (2, 1): 408
       (2, 2): 409
 
+#alpha=0.117
+  - theoryid: 528
+    variations:
+      (0.5, 0.5): 401
+      (0.5, 1): 402
+      (0.5, 2): 403
+      (1, 0.5): 404
+      (1, 1): 405
+      (1, 2): 406
+      (2, 0.5): 407
+      (2, 1): 408
+      (2, 2): 409
+
+#alpha=0.119
+  - theoryid: 529
+    variations:
+      (0.5, 0.5): 401
+      (0.5, 1): 402
+      (0.5, 2): 403
+      (1, 0.5): 404
+      (1, 1): 405
+      (1, 2): 406
+      (2, 0.5): 407
+      (2, 1): 408
+      (2, 2): 409
+
   - theoryid: 414
     variations:
       (0.5, 0.5): 410
@@ -48,6 +74,32 @@ scale_variations_for:
       (2, 1): 427
       (2, 2): 428
 
+#alpha=0.117
+  - theoryid: 530
+    variations:
+      (0.5, 0.5): 420
+      (0.5, 1): 421
+      (0.5, 2): 422
+      (1, 0.5): 423
+      (1, 1): 424
+      (1, 2): 425
+      (2, 0.5): 426
+      (2, 1): 427
+      (2, 2): 428
+
+#alpha=0.119
+  - theoryid: 531
+    variations:
+      (0.5, 0.5): 420
+      (0.5, 1): 421
+      (0.5, 2): 422
+      (1, 0.5): 423
+      (1, 1): 424
+      (1, 2): 425
+      (2, 0.5): 426
+      (2, 1): 427
+      (2, 2): 428
+
   - theoryid: 434
     variations:
       (0.5, 0.5): 430

diff --git a/validphys2/src/validphys/theorycovariance/output.py b/validphys2/src/validphys/theorycovariance/output.py
@@ -128,7 +128,7 @@ def plot_covmat_heatmap(covmat, title):
     return fig
 
 
-_procorder = ("DIS NC", "DIS CC", "DY NC", "DY CC", "JETS", "TOP", "SINGLETOP", "PHOTON", "DIJET")
+_procorder = ("DIS NC", "DIS CC", "TOP", "DY NC", "DY CC", "SINGLETOP", "JETS", "PHOTON", "DIJET")
 
 _dsorder = (
     "BCDMSP",