diff --git a/2jet.fnl2452btest.run b/2jet.fnl2452btest.run
deleted file mode 100644
index d20730f9c75c1fc8ce8b54faec07d46dbfa76be7..0000000000000000000000000000000000000000
--- a/2jet.fnl2452btest.run
+++ /dev/null
@@ -1,105 +0,0 @@
-NNLOJET_RUNCARD
-@FULLCHANNEL@-ATLAS7-ak06 ! Job name id, must be <= 64 characters
-2jet ! Process name
-@EVENTS@ ! Number of events
-@ITERATIONS@ ! Number of iterations
-@SEED@ ! Seed number
-@WARMUP@ ! Warmup: 0/.false, 1/.true., 2/continue
-@PRODUCTION@ ! Production
-NNPDF31_nnlo_as_0118 ! PDF set
-0 ! PDF MEMBER
-antikt ! Jet algorithm, accepts 'kt', 'cam' or 'antikt'
-0.6d0 ! Rcut
-.false. ! exclusive
-0 ! Heavy particle decay type
-.1e-7 ! Technical cutoff y0
-.false. ! angular averaging of the phase space, default to true
-2 ! Virtual Integration method, use 2 if you're not sure
-@REGION@ ! RR a/b region flag. Accepts 'a','b' or 'all'.
-0 ! set to zero for MC, 2 for point test
-.false. ! print max weight flag
-.true. ! momentum mapping and PDF storage flag
-.true. ! colour sampling flag
-.false. ! explicit pole check flag, stops integration when set to true
-
-PHYSICAL_PARAMETERS
-7000d0 ! roots
-125d0 ! Mass of the Higgs Boson
-0.004029643852d0 ! Width of the Higgs Boson
-91.1876d0 ! Mass of the Z Boson
-2.4952d0 ! Width of the Z Boson
-80.398d0 ! Mass of the W Boson
-2.1054d0 ! Width of the W Boson
-173.2d0 ! Mass of the Top Quark
-1.41d0 ! Width of the Top Quark
-4.18d0 ! Mass of the Bottom Quark
-0d0 ! Width of the Bottom Quark
-1.275d0 ! Mass of the Charm Quark
-0d0 ! Width of the Charm Quark
-1.777d0 ! Mass of the Tau lepton
-0d0 ! Width of the Tau lepton
-
-@UNIT_PHASE@
-
-SELECTORS
- select ptj1 min = 100.0
- select ptj2 min = 50.0
- select abs_yj1 max = 3.0
- select abs_yj2 max = 3.0
- select m12 min = 260.0 max = 5040.0
- select ystar max = 3.0
- select njets min = 2
-END_SELECTORS
-
-HISTOGRAMS
-
- m12 > fnl2452btest_ys0_m12 [260.0,310.0,370.0,440.0,510.0,590.0,670.0,760.0,850.0,950.0,1060.0,1180.0,1310.0,1450.0,1600.0,1760.0,1940.0,2120.0,2330.0,2550.0,2780.0,4270.0] grid=fnl2452btest_ys0_m12.fast
- HISTOGRAM_SELECTORS
- select ystar min=0.0 max=0.5
- END_HISTOGRAM_SELECTORS
-
- m12 > fnl2452btest_ys1_m12 [310.0,370.0,440.0,510.0,590.0,670.0,760.0,850.0,950.0,1060.0,1180.0,1310.0,1450.0,1600.0,1760.0,1940.0,2120.0,2330.0,2550.0,2780.0,3040.0,4270.0] grid=fnl2452btest_ys1_m12.fast
- HISTOGRAM_SELECTORS
- select ystar min=0.5 max=1.0
- END_HISTOGRAM_SELECTORS
-
- m12 > fnl2452btest_ys2_m12 [510.0,590.0,670.0,760.0,850.0,950.0,1060.0,1180.0,1310.0,1450.0,1600.0,1760.0,1940.0,2120.0,2330.0,2550.0,2780.0,3040.0,3310.0,4640.0] grid=fnl2452btest_ys2_m12.fast
- HISTOGRAM_SELECTORS
- select ystar min=1.0 max=1.5
- END_HISTOGRAM_SELECTORS
-
- m12 > fnl2452btest_ys3_m12 [760.0,850.0,950.0,1060.0,1180.0,1310.0,1450.0,1600.0,1760.0,1940.0,2120.0,2330.0,2550.0,2780.0,3040.0,3310.0,3610.0,4640.0] grid=fnl2452btest_ys3_m12.fast
- HISTOGRAM_SELECTORS
- select ystar min=1.5 max=2.0
- END_HISTOGRAM_SELECTORS
-
- m12 > fnl2452btest_ys4_m12 [1310.0,1450.0,1600.0,1760.0,2120.0,2550.0,3040.0,3610.0,5040.0] grid=fnl2452btest_ys4_m12.fast
- HISTOGRAM_SELECTORS
- select ystar min=2.0 max=2.5
- END_HISTOGRAM_SELECTORS
-
- m12 > fnl2452btest_ys5_m12 [2120.0,2550.0,3040.0,3930.0,5040.0] grid=fnl2452btest_ys5_m12.fast
- HISTOGRAM_SELECTORS
- select ystar min=2.5 max=3.0
- END_HISTOGRAM_SELECTORS
-
-END_HISTOGRAMS
-
-SCALES
- muf = m12 mur = m12
- muf = 90.0171313005 mur = 90.0171313005
- muf = 54.5981500331 mur = 54.5981500331
- muf = 148.4131591026 mur = 148.4131591026
- muf = 54.5981500331 mur = 90.0171313005
- muf = 90.0171313005 mur = 54.5981500331
- muf = 148.4131591026 mur = 90.0171313005
-END_SCALES
-
-REWEIGHT m12**4
-
-CHANNELS
- @CHANNEL@
-END_CHANNELS
-
-SETUP
-END_SETUP
diff --git a/analysis/tasks/FastWarm.py b/analysis/tasks/FastWarm.py
index e9d63cb06b58f51ddd8be9c515e2f5e5acd5501c..64c5f6fa37e9cf777e709aa2833b88d11434f3eb 100644
--- a/analysis/tasks/FastWarm.py
+++ b/analysis/tasks/FastWarm.py
@@ -34,9 +34,12 @@ class FastWarm(Task, TarballExtractionMixin, HTCondorWorkflow, law.LocalWorkflow
cls=luigi.Parameter,
choices=("LO", "R", "V", "RRa", "RRb", "RV", "VV")
)
+ starting_seeds = SpaceSeparatedListParameter(cls=luigi.IntParameter)
fastwarm_events = SpaceSeparatedListParameter(cls=luigi.IntParameter)
fastwarm_jobs = SpaceSeparatedListParameter(cls=luigi.IntParameter)
- starting_seeds = SpaceSeparatedListParameter(cls=luigi.IntParameter)
+
+ NNLOJET_RUNMODE = 'production'
+ NNLOJET_UNITPHASE = 'UNIT_PHASE'
def create_branch_map(self):
"""Branch data dicts. Each branch should correspond to exactly one output."""
@@ -142,12 +145,11 @@ class FastWarm(Task, TarballExtractionMixin, HTCondorWorkflow, law.LocalWorkflow
runcard = createRuncard(
open(self.base_runcard, 'r').read(), {
'channel': self.branch_data['channel'],
- 'events': self.branch_data['events'],
'seed': self.branch_data['seed'],
'iterations': '1',
- 'warmup': '0',
- 'production': '.true.',
- 'unit_phase': 'UNIT_PHASE'
+ 'events': self.branch_data['events'],
+ 'runmode': self.NNLOJET_RUNMODE,
+ 'unit_phase': self.NNLOJET_UNITPHASE
}
)
f.write(runcard)