Implement separation of first nnlojet combine task and 2nd reweight/recombine step

analysis/tasks/Absolute.py

@@ -8,6 +8,7 @@ from law.util import interruptable_popen
 from subprocess import PIPE
 
 from FnloCppreadFinal import FnloCppreadFinal
+from Recombine import Recombine
 
 from analysis.framework import Task
 
@@ -41,7 +42,8 @@ class Absolute(Task, law.LocalWorkflow):
 
   def workflow_requires(self):
     return {
-      'fnlocppread': FnloCppreadFinal()
+      'fnlocppread': FnloCppreadFinal(),
+      'recombine': Recombine()
     }
 
   def output(self):

analysis/tasks/Combine.py

@@ -45,6 +45,9 @@ class Combine(Task):
       if (code != 0):
         raise Exception('[Combine] ERROR! nnlojet-combine returned error {} and non-zero exit status {}'.format(error, code))
 
+      os.chdir(prevdir)
+      self.output().dump(job_out, formatter="text")
+
     except:
       os.chdir(prevdir)
       raise

analysis/tasks/KfacComparison.py

@@ -7,6 +7,7 @@ from law import util
 from subprocess import PIPE
 
 from FnloCppreadFinal import FnloCppreadFinal
+from Recombine import Recombine
 
 from analysis.framework import Task
 

analysis/tasks/MergedGridClosure.py

@@ -8,6 +8,7 @@ from law.util import interruptable_popen
 from subprocess import PIPE
 
 from FnloCppreadFinal import FnloCppreadFinal
+from Recombine import Recombine
 
 from analysis.framework import Task
 
@@ -41,7 +42,8 @@ class MergedGridClosure(Task, law.LocalWorkflow):
 
   def workflow_requires(self):
     return {
-      'fnlocppread': FnloCppreadFinal(self)
+      'fnlocppread': FnloCppreadFinal(self),
+      'recombine': Recombine()
     }
 
   def output(self):

combine-Real.ini

+[Paths]
+raw_dir = .
+out_dir = Combined
+
+
+[Observables]
+ALL
+
+#> rebin an observable
+# observable > observable_rebin : [x0, x1, x2, ... xN]
+
+
+[Parts]
+#LO
+#V
+R
+RRa
+RRb
+RV
+#VV
+
+
+
+[Final]
+#LO        = LO
+R         = R
+#V         = V
+RRa       = RRa
+RRb       = RRb
+RV        = RV
+#VV        = VV
+NLO       = LO + R + V
+NNLO      = LO + R + V + RRa + RRb + RV + VV
+NLO_only  = R + V
+NNLO_only = RRa + RRb + RV + VV
+
+
+[Options]
+#> search the directory structure recursive for data files
+# recursive = True
+
+#> output weight tables: for APPLfast
+weights = True
+
+#> restrict merge to only certain columns: e.g. drop channel breakdown for performance
+# columns = ['tot_scale01', 'tot_scale02', 'tot_scale03', 'tot_scale04', 'tot_scale05', 'tot_scale06', 'tot_scale07']