From 027c874271d80e3cf11a423febad3c6fd334ef07 Mon Sep 17 00:00:00 2001
From: Roy Stegeman <roystegeman@live.nl>
Date: Mon, 4 Nov 2024 13:28:22 +0000
Subject: [PATCH] add mapping from old point prescriptions as comment

---
 .../scalevariations/pointprescriptions.yaml   | 20 +++++++++++++------
 .../scalevariationtheoryids.yaml              |  6 +++---
 2 files changed, 17 insertions(+), 9 deletions(-)

diff --git a/validphys2/src/validphys/scalevariations/pointprescriptions.yaml b/validphys2/src/validphys/scalevariations/pointprescriptions.yaml
index d7581200a8..cb870895f8 100644
--- a/validphys2/src/validphys/scalevariations/pointprescriptions.yaml
+++ b/validphys2/src/validphys/scalevariations/pointprescriptions.yaml
@@ -9,16 +9,24 @@
 '7 point': ['(1, 1)', '(2, 1)', '(0.5, 1)', '(1, 2)', '(1, 0.5)', '(2, 2)', '(0.5, 0.5)']
 '9 point': ['(1, 1)', '(2, 1)', '(0.5, 1)', '(1, 2)', '(1, 0.5)', '(2, 2)', '(0.5, 0.5)', '(2, 0.5)', '(0.5, 2)']
 # N3LO IHOU Anomalous dimension
-'n3lo ad ihou': ['(0, 0, 0, 0)','(1, 0, 0, 0)','(2, 0, 0, 0)','(3, 0, 0, 0)','(4, 0, 0, 0)','(5, 0, 0, 0)','(6, 0, 0, 0)','(7, 0, 0, 0)','(8, 0, 0, 0)','(9, 0, 0, 0)','(10, 0, 0, 0)','(11, 0, 0, 0)','(12, 0, 0, 0)','(13, 0, 0, 0)','(14, 0, 0, 0)','(15, 0, 0, 0)','(16, 0, 0, 0)','(17, 0, 0, 0)','(18, 0, 0, 0)','(19, 0, 0, 0)','(0, 1, 0, 0)','(0, 2, 0, 0)','(0, 3, 0, 0)','(0, 4, 0, 0)','(0, 5, 0, 0)','(0, 6, 0, 0)','(0, 7, 0, 0)','(0, 8, 0, 0)','(0, 9, 0, 0)','(0, 10, 0, 0)','(0, 11, 0, 0)','(0, 12, 0, 0)','(0, 13, 0, 0)','(0, 14, 0, 0)','(0, 15, 0, 0)','(0, 16, 0, 0)','(0, 17, 0, 0)','(0, 18, 0, 0)','(0, 19, 0, 0)','(0, 20, 0, 0)','(0, 21, 0, 0)','(0, 0, 1, 0)','(0, 0, 2, 0)','(0, 0, 3, 0)','(0, 0, 4, 0)','(0, 0, 5, 0)','(0, 0, 6, 0)','(0, 0, 7, 0)','(0, 0, 8, 0)','(0, 0, 9, 0)','(0, 0, 10, 0)','(0, 0, 11, 0)','(0, 0, 12, 0)','(0, 0, 13, 0)','(0, 0, 14, 0)','(0, 0, 15, 0)','(0, 0, 0, 1)','(0, 0, 0, 2)','(0, 0, 0, 3)','(0, 0, 0, 4)','(0, 0, 0, 5)','(0, 0, 0, 6)']
+'n3lo ad ihou': ['central','(1, 0, 0, 0)','(2, 0, 0, 0)','(3, 0, 0, 0)','(4, 0, 0, 0)','(5, 0, 0, 0)','(6, 0, 0, 0)','(7, 0, 0, 0)','(8, 0, 0, 0)','(9, 0, 0, 0)','(10, 0, 0, 0)','(11, 0, 0, 0)','(12, 0, 0, 0)','(13, 0, 0, 0)','(14, 0, 0, 0)','(15, 0, 0, 0)','(16, 0, 0, 0)','(17, 0, 0, 0)','(18, 0, 0, 0)','(19, 0, 0, 0)','(0, 1, 0, 0)','(0, 2, 0, 0)','(0, 3, 0, 0)','(0, 4, 0, 0)','(0, 5, 0, 0)','(0, 6, 0, 0)','(0, 7, 0, 0)','(0, 8, 0, 0)','(0, 9, 0, 0)','(0, 10, 0, 0)','(0, 11, 0, 0)','(0, 12, 0, 0)','(0, 13, 0, 0)','(0, 14, 0, 0)','(0, 15, 0, 0)','(0, 16, 0, 0)','(0, 17, 0, 0)','(0, 18, 0, 0)','(0, 19, 0, 0)','(0, 20, 0, 0)','(0, 21, 0, 0)','(0, 0, 1, 0)','(0, 0, 2, 0)','(0, 0, 3, 0)','(0, 0, 4, 0)','(0, 0, 5, 0)','(0, 0, 6, 0)','(0, 0, 7, 0)','(0, 0, 8, 0)','(0, 0, 9, 0)','(0, 0, 10, 0)','(0, 0, 11, 0)','(0, 0, 12, 0)','(0, 0, 13, 0)','(0, 0, 14, 0)','(0, 0, 15, 0)','(0, 0, 0, 1)','(0, 0, 0, 2)','(0, 0, 0, 3)','(0, 0, 0, 4)','(0, 0, 0, 5)','(0, 0, 0, 6)']
 # N3LO IHOU DIS massive coefficient functions
-'n3lo dis ihou': ['(0, 0, 0, 0)','(-1, -1)','(1, 1)']
+'n3lo dis ihou': ['central','(-1, -1)','(1, 1)']
 # N3LO 3 point scale variations for datasets with no N3LO corrections
-'n3lo 3pt missing': ['(0, 0, 0, 0)','(1, 0.5 missing)', '(1, 2 missing)']
+'n3lo 3pt missing': ['central','(1, 0.5 missing)', '(1, 2 missing)']
 # N3LO 3 point scale variations for hadronic datasets
-'n3lo 3pt hadronic': ['(0, 0, 0, 0)','(1, 0.5 hadronic)', '(1, 2 hadronic)']
+'n3lo 3pt hadronic': ['central','(1, 0.5 hadronic)', '(1, 2 hadronic)']
 # N3LO 7 point scale variations
-'n3lo 7 point': ['(0, 0, 0, 0)', '(2, 1)', '(0.5, 1)', '(1, 2)', '(1, 0.5)', '(2, 2)', '(0.5, 0.5)']
+'n3lo 7 point': ['central', '(2, 1)', '(0.5, 1)', '(1, 2)', '(1, 0.5)', '(2, 2)', '(0.5, 0.5)']
 # N3LO FHMV splittings
-'n3lo fhmv': ['(0, 0, 0, 0, 0, 0, 0)','(1, 0, 0, 0, 0, 0, 0)','(2, 0, 0, 0, 0, 0, 0)','(0, 1, 0, 0, 0, 0, 0)','(0, 2, 0, 0, 0, 0, 0)', '(0, 0, 1, 0, 0, 0, 0)','(0, 0, 2, 0, 0, 0, 0)','(0, 0, 0, 1, 0, 0, 0)','(0, 0, 0, 2, 0, 0, 0)','(0, 0, 0, 0, 1, 0, 0)','(0, 0, 0, 0, 2, 0, 0)','(0, 0, 0, 0, 0, 1, 0)','(0, 0, 0, 0, 0, 2, 0)','(0, 0, 0, 0, 0, 0, 1)','(0, 0, 0, 0, 0, 0, 2)']
+'n3lo fhmv ihou': ['central','(1, 0, 0, 0, 0, 0, 0)','(2, 0, 0, 0, 0, 0, 0)','(0, 1, 0, 0, 0, 0, 0)','(0, 2, 0, 0, 0, 0, 0)', '(0, 0, 1, 0, 0, 0, 0)','(0, 0, 2, 0, 0, 0, 0)','(0, 0, 0, 1, 0, 0, 0)','(0, 0, 0, 2, 0, 0, 0)','(0, 0, 0, 0, 1, 0, 0)','(0, 0, 0, 0, 2, 0, 0)','(0, 0, 0, 0, 0, 1, 0)','(0, 0, 0, 0, 0, 2, 0)','(0, 0, 0, 0, 0, 0, 1)','(0, 0, 0, 0, 0, 0, 2)']
 # Polarized missing: 3 point renormalization scales for JETS and DIJETS
 '3pt missing': ['(1, 1)', '(1, 0.5 missing)', '(1, 2 missing)']
+
+# n3lo ad covmat            -> n3lo ad ihou
+# n3lo ihou                 -> n3lo ad ihou + n3lo dis ihou
+# n3lo full thcovmat        -> n3lo ad ihou + n3lo dis ihou + n3lo 7 point
+# n3lo 3pt missing          -> n3lo ad ihou + n3lo dis ihou + n3lo 3pt missing
+# n3lo 3pt hadronic         -> n3lo ad ihou + n3lo dis ihou + n3lo 3pt hadronic
+# n3lo fhmv full thcovmat   -> n3lo fhmv ihou + n3lo dis ihou + n3lo 7 point
+# n3lo fhmv 3pt hadronic    -> n3lo fhmv ihou + n3lo 3pt hadronic + n3lo 3pt hadronic fhmv + n3lo dis ihou fhmv
diff --git a/validphys2/src/validphys/scalevariations/scalevariationtheoryids.yaml b/validphys2/src/validphys/scalevariations/scalevariationtheoryids.yaml
index 7f430ee2d8..8eb100d577 100644
--- a/validphys2/src/validphys/scalevariations/scalevariationtheoryids.yaml
+++ b/validphys2/src/validphys/scalevariations/scalevariationtheoryids.yaml
@@ -61,7 +61,7 @@ scale_variations_for:
   # N3LO: MHOU + IHOU
   - theoryid: 722
     variations:
-      (0, 0, 0, 0): 722 # central th
+      central: 722 # central th
       (1, 0, 0, 0): 723 # anomalous dimensions variations
       (2, 0, 0, 0): 724
       (3, 0, 0, 0): 725
@@ -141,7 +141,7 @@ scale_variations_for:
 
   - theoryid: 824 # N3LO+QED
     variations:
-      (0, 0, 0, 0): 722 # central th
+      central: 722 # central th
       (1, 0, 0, 0): 723 # anomalous dimensions variations
       (2, 0, 0, 0): 724
       (3, 0, 0, 0): 725
@@ -222,7 +222,7 @@ scale_variations_for:
   # N3LO: MHOU + IHOU
   - theoryid: 1000
     variations:
-      (0, 0, 0, 0, 0, 0, 0): 1000 # central th
+      central: 1000 # central th
       (1, 0, 0, 0, 0, 0, 0): 1001 # anomalous dimensions variations
       (2, 0, 0, 0, 0, 0, 0): 1002
       (0, 1, 0, 0, 0, 0, 0): 1003