add a careful option

Author: scarlehoff

src/pineko/cli/fonll.py

@@ -79,16 +79,18 @@ def tcards(theoryid):
 def ekos(theoryid, datasets, overwrite):
     """Command to generate numerical FONLL ekos.
 
-    1. Create the 3 operator cards for the different flavor patches.
+    1. Create all the operator cards for the different flavor patches.
     2. Run the 3 ekos for the different flavor patches.
     3. Inherit the ekos.
     """
-    for nf_id in ["00", "04", "05"]:
-        # create opcards
+    # Create all the operator cards as they are required for careful testing
+    for nf_id in range(7):
         theory.TheoryBuilder(
-            f"{theoryid}{nf_id}", datasets, overwrite=overwrite
+            f"{theoryid}0{nf_id}", datasets, overwrite=overwrite
         ).opcards()
 
+    # Most of the time only these 3 patches are necessary
+    for nf_id in ["00", "04", "05"]:
         # run the ekos
         theory.TheoryBuilder(
             f"{theoryid}{nf_id}",
@@ -98,25 +100,29 @@ def ekos(theoryid, datasets, overwrite):
             overwrite=overwrite,
         ).ekos()
 
-    # now inherit ekos
-    # nf=3
-    rich.print(f"[green] Inherit nf=3 ekos from theory {theoryid}00")
-    theory.TheoryBuilder(f"{theoryid}00", datasets, overwrite=overwrite).inherit_ekos(
-        f"{theoryid}01"
-    )
-    # nf=4
-    rich.print(f"[green] Inherit nf=4 ekos from theory {theoryid}04")
-    theory.TheoryBuilder(f"{theoryid}04", datasets, overwrite=overwrite).inherit_ekos(
-        f"{theoryid}02"
-    )
-    theory.TheoryBuilder(f"{theoryid}04", datasets, overwrite=overwrite).inherit_ekos(
-        f"{theoryid}03"
-    )
-    # nf=5
-    rich.print(f"[green] Inherit nf=5 ekos from theory {theoryid}05")
-    theory.TheoryBuilder(f"{theoryid}05", datasets, overwrite=overwrite).inherit_ekos(
-        f"{theoryid}06"
-    )
+    # Now _attempt_ to inherit the ekos
+    # _if_ a discrepancy is found between the eko and the grid, recompute
+
+    inheritance_map = {"00": ["01"], "04": ["02", "03"], "05": ["06"]}
+    for i, (source, targets) in enumerate(inheritance_map.items()):
+        source_tid = f"{theoryid}{source}"
+        rich.print(f"[green] Inherit nf={3+i} ekos from theory {source_tid}")
+        source_theory = theory.TheoryBuilder(source_tid, datasets, overwrite=overwrite)
+        for target in targets:
+            target_tid = f"{theoryid}{target}"
+            try:
+                source_theory.inherit_ekos(target_tid, careful=True)
+            except AssertionError as e:
+                rich.print(
+                    f"[red] Could not inherit from theory {source_tid} to {target_tid}, computing the EKO"
+                )
+                theory.TheoryBuilder(
+                    target_tid,
+                    datasets,
+                    silent=False,
+                    clear_logs=True,
+                    overwrite=overwrite,
+                ).ekos()
 
 
 @fonll_.command()

src/pineko/theory.py

@@ -199,7 +199,7 @@ def inherit_grids(self, target_theory_id):
         other.mkdir(exist_ok=True)
         self.iterate(self.inherit_grid, other=other)
 
-    def inherit_eko(self, name, grid, other):
+    def inherit_eko(self, name, grid, other, careful=False):
         """Inherit a EKO to a new theory.
 
         Parameters
@@ -210,9 +210,17 @@ def inherit_eko(self, name, grid, other):
             path to grid
         other : pathlib.Path
             new folder
+        careful : bool (default: False)
+            check that grid and eko are compatible before forcing the inheritance
         """
         names = get_eko_names(grid, name)
         for name in names:
+            if careful:
+                # Check the operator card of the parent
+                parent_card = self.load_operator_card(name)
+                child_card = self.__class__(other.name, []).load_operator_card(name)
+                assert parent_card == child_card
+
             eko_path = self.ekos_path() / f"{name}.tar"
             new = other / f"{name}.tar"
             if new.exists():
@@ -225,17 +233,19 @@ def inherit_eko(self, name, grid, other):
             if new.exists():
                 rich.print(f"[green]Success:[/] Created link at {new}")
 
-    def inherit_ekos(self, target_theory_id):
+    def inherit_ekos(self, target_theory_id, careful=False):
         """Inherit ekos to a new theory.
 
         Parameters
         ----------
         target_theory_id : int
             target theory id
+        careful : bool (default: False)
+            check that grid and eko are compatible before forcing the inheritanc
         """
         other = self.ekos_path(target_theory_id)
         other.mkdir(exist_ok=True)
-        self.iterate(self.inherit_eko, other=other)
+        self.iterate(self.inherit_eko, other=other, careful=careful)
 
     def iterate(self, f, **kwargs):
         """Iterate grids in datasets.