From 40948d27da4a6bd0758ac918adf084e2ffc3963e Mon Sep 17 00:00:00 2001
From: Klaus Rabbertz <klaus.rabbertz@cern.ch>
Date: Wed, 22 Nov 2023 10:02:13 +0100
Subject: [PATCH] Update luigi template

---
 luigi.cfg.template | 95 +++++++++++++++++++++++++++++++++-------------
 1 file changed, 68 insertions(+), 27 deletions(-)

diff --git a/luigi.cfg.template b/luigi.cfg.template
index 4e26ec3..c876103 100644
--- a/luigi.cfg.template
+++ b/luigi.cfg.template
@@ -29,6 +29,7 @@ rivetid = CMS_2013_I1208923
 process = 2jetfc
 jobnameext = CMS7-ak07
 cutoff = y1.00E-08
+multi_channel = .false. .false. .false. 5 5 5 5
 
 # NNLOJET channels
 # Complete LIST to be used in production; serves to create dictionary with settings per channel; settings must have same lengths!
@@ -41,6 +42,8 @@ channels = LO R V RRa RRb RV VV
 
 # Grid merging setup as defined in combine.ini; check compatibility
 final_tables = {
+    "LO": ["LO"],
+# Use the following lines when NLO is ready to be merged in as well (don't forget to add/remove a comma above)
     "NLO": ["LO", "R", "V"],
     "NLO_only": ["R", "V"],
 # Use the following lines when NNLO is ready to be merged in as well (don't forget to add/remove a comma above)
@@ -66,7 +69,7 @@ htcondor_user_proxy = /home/rabbertz/.globus/x509_proxy
 # Time in seconds
 htcondor_walltime = 84000
 htcondor_request_cpus = 1
-htcondor_use_cpus = 1
+htcondor_use_cpus = 1 1 1 1 1 1 1
 # For all cores in total
 htcondor_request_memory = 4096
 htcondor_universe = docker
@@ -85,10 +88,10 @@ only_missing = True
 
 # Do not resubmit automatically (default is 5); important for debugging!
 #retries = 3
-retries = 0
+retries = 2
 
 # Bootstrap file to be sourced at beginning of htcondor jobs
-bootstrap_file = bootstrap_NNLOJET_modules2_rev6591_bridge-0.0.46-WiP_202307.sh
+bootstrap_file = bootstrap_NNLOJET_modules2_rev6591_bridge-1.0.0_202309.sh
 
 # Local directories, defaults are 'grids', 'plots', 'tags', 'warmups'
 # - unpacking and merging of grids in local directories $merge_dir/$name/[$channel|Combined]
@@ -113,7 +116,7 @@ scaleindex = 0
 # Central plus scale variations, cf. NNLOJET run file & nnlobridge setup
 # None: --> 1; fixed-scale: --> 7; flex-scale low pT: --> -6; flex-scale high pT: --> -12
 # Either one number for all or one per observable
-scalecombs = 1 1 1 1 1
+scalecombs = 7 7 7 7 7
 ascode = LHAPDF
 norm = no
 
@@ -131,22 +134,25 @@ steer_dir = steeringfiles
 # produced @ grid storage under Warmup
 
 # Override some defaults for this task
-# bootstrap_file =
 # htcondor config
 # If BWFORCLUSTER is too full
 #htcondor_requirements = (TARGET.ProvidesCPU==true)
 #htcondor_requirements = (TARGET.CloudSite=="blade")
-htcondor_request_cpus = 1
-htcondor_use_cpus = 1
+#htcondor_request_cpus = 1
+#htcondor_use_cpus = 1 1 1 1 1 1 1
 #htcondor_requirements = (TARGET.CloudSite=="topas")
 #htcondor_request_cpus = 42
-#htcondor_use_cpus = 28
+#htcondor_use_cpus = 28 28 28 28 28 28 28
 htcondor_requirements = (TARGET.CloudSite=="BWFORCLUSTER")
 #htcondor_request_cpus = 20
-#htcondor_use_cpus = 20
+#htcondor_use_cpus = 20 20 20 20 20 20 20
 # for all cores in total
 #htcondor_request_memory = 8000
 
+# Set multicore usage per channel
+htcondor_request_cpus = 4
+htcondor_use_cpus = 4 4 4 4 4 4 4
+
 # Uncomment the following line to have only channels changing with jet size R to complement other analysis
 #channels = R RRa RRb RV
 # NNLOJET event count and integration steps for every channel
@@ -195,17 +201,16 @@ htcondor_walltime = 3600
 # produced @ grid storage under Rewarmup
 
 # Override some defaults for this task
-# bootstrap_file =
 # htcondor config
 #htcondor_requirements = (TARGET.CloudSite=="blade")
 htcondor_request_cpus = 1
-htcondor_use_cpus = 1
+htcondor_use_cpus = 1 1 1 1 1 1 1
 #htcondor_requirements = (TARGET.CloudSite=="topas")
 #htcondor_request_cpus = 42
-#htcondor_use_cpus = 28
+#htcondor_use_cpus = 28 28 28 28 28 28 28
 htcondor_requirements = (TARGET.CloudSite=="BWFORCLUSTER")
 #htcondor_request_cpus = 20
-#htcondor_use_cpus = 20
+#htcondor_use_cpus = 20 20 20 20 20 20 20
 # for all cores in total
 htcondor_request_memory = 8000
 
@@ -301,12 +306,19 @@ acceptance = 0.95
 #htcondor_requirements = (TARGET.Cloudsite=="blade")
 #htcondor_requirements = (TARGET.CloudSite=="topas")
 # If ETP blades are too slow
-htcondor_requirements = (TARGET.CloudSite=="BWFORCLUSTER")
+#htcondor_requirements = (TARGET.CloudSite=="BWFORCLUSTER")
 # Everything fast
+htcondor_requirements = ((TARGET.CloudSite=="BWFORCLUSTER")||(TARGET.CloudSite=="topas"))
 #htcondor_requirements = ((TARGET.CloudSite=="BWFORCLUSTER")||(TARGET.CloudSite=="schnepf")||(TARGET.CloudSite=="topas"))
 #htcondor_request_memory = 7500
 htcondor_request_memory = 4000
 
+# Set multicore usage per channel
+#htcondor_request_cpus = 1
+#htcondor_use_cpus = 1 1 1 1 1 1 1
+htcondor_request_cpus = 4
+htcondor_use_cpus = 4 4 4 4 4 4 4
+
 # Uncomment the following line to have only channels changing with jet size R to complement other analysis
 #channels = R RRa RRb RV
 #fastprod_subdirs = LO R . . . . .
@@ -340,7 +352,8 @@ htcondor_walltime = 1800
 # Uncomment the following line to have only channels changing with jet size R to complement other analysis
 #channels = R RRa RRb RV
 
-# Up to NLO only
+# Up to LO/NLO only
+#channels = LO
 #channels = LO R V
 
 # accept as complete at 95%
@@ -361,6 +374,10 @@ force = True
 # Uncomment the following line to have only channels changing with jet size R to complement other analysis
 #channels = R RRa RRb RV
 
+# Up to LO/NLO only
+#channels = LO
+#channels = LO R V
+
 # Accept as complete at 95%
 acceptance = 0.95
 
@@ -376,9 +393,13 @@ force = True
 
 # Always needs all channels up to some order LO, NLO, or NNLO
 channels = LO R V RRa RRb RV VV
+#channels = LO R V
+#channels = LO
 
 # Path to combine.ini config; check compatibility to desired order
 combine_ini = combine.ini
+#combine_ini = combine-LO.ini
+#combine_ini = combine-NLO.ini
 # Update of only part of the contributions
 #combine_ini = combine-Real.ini
 #combine_ini = combine-RRaRV.ini
@@ -392,9 +413,13 @@ cores = 20
 
 # Needs all input channels up to some order plus combined channels as defined in combine_ini
 channels = LO R V RRa RRb RV VV NLO NLO_only NNLO NNLO_only
+#channels = LO R V
+#channels = LO
 
 # Path to combine.ini config; check compatibility to desired order
 combine_ini = combine.ini
+#combine_ini = combine-LO.ini
+#combine_ini = combine-NLO.ini
 # Update of only part of the contributions
 #combine_ini = combine-Real.ini
 #combine_ini = combine-RRaRV.ini
@@ -405,15 +430,13 @@ cores = 20
 [MergeFastProd]
 # produced @ local storage under $merge_dir/$name/Combined/Final
 
-htcondor_requirements = (TARGET.ProvidesEkpResources==true)
-
 # Always needs all channels up to some order LO, NLO, or NNLO
-channels = LO R V RRa RRb RV VV
+#channels = LO R V RRa RRb RV VV
 
-# Up to LO only
+# Up to LO/NLO only
 #channels = LO
-# Up to NLO only
 #channels = LO R V
+
 # NNLOJET weight file to use for merging (LO, NLO, or NNLO)
 weightorder = NNLO
 
@@ -427,6 +450,15 @@ workflow = local
 # produced @ local storage under $merge_dir/$name/Combined/Final
 
 # Channels are set via final_tables dictionary
+final_tables = {
+    "LO": ["LO"],
+# Use the following lines when NLO is ready to be merged in as well (don't forget to add/remove a comma above)
+    "NLO": ["LO", "R", "V"],
+    "NLO_only": ["R", "V"],
+# Use the following lines when NNLO is ready to be merged in as well (don't forget to add/remove a comma above)
+    "NNLO_only": ["RRa", "RRb", "RV", "VV"],
+    "NNLO": ["LO", "R", "V", "RRa", "RRb", "RV", "VV"]
+  }
 
 [AddStatunc]
 # produced @ local storage under $merge_dir/$name/Combined/Final
@@ -435,6 +467,8 @@ workflow = local
 
 # Should be added for each order
 orders = [ "LO", "NLO", "NNLO" ]
+#orders = [ "LO", "NLO" ]
+#orders = [ "LO" ]
 
 # Rivet_Id must have been defined in default section.
 # Make sure SteerModify.str contains a scenario description with RIVET_ID=
@@ -446,6 +480,8 @@ histoids = ["d02-x01-y01", "d02-x01-y02", "d02-x01-y03", "d02-x01-y04", "d02-x01
 
 # Needs all input channels up to some order plus combined channels as defined in combine_ini
 channels = LO R V RRa RRb RV VV NLO NLO_only NNLO NNLO_only
+#channels = LO R V NLO NLO_only
+#channels = LO
 
 #######################
 # New plotting setup! #
@@ -458,7 +494,8 @@ channels = LO R V RRa RRb RV VV NLO NLO_only NNLO NNLO_only
 # Uncomment the following line to have only channels changing with jet size R to complement other analysis
 #channels = R RRa RRb RV
 
-# Up to NLO only
+# Up to LO/NLO only
+#channels = LO
 #channels = LO R V
 
 # Uncomment the following line to have this task ignore the level
@@ -474,7 +511,8 @@ force = True
 # Uncomment the following line to have only channels changing with jet size R to complement other analysis
 #channels = R RRa RRb RV
 
-# Up to NLO only
+# Up to LO/NLO only
+#channels = LO
 #channels = LO R V
 
 # Uncomment the following line to have this task ignore the level
@@ -490,7 +528,8 @@ force = True
 # Uncomment the following line to have only channels changing with jet size R to complement other analysis
 #channels = R RRa RRb RV
 
-# Up to NLO only
+# Up to LO/NLO only
+#channels = LO
 #channels = LO R V
 # Needs correct fastNLO 'scalecombs' parameter to be set, see above
 
@@ -507,7 +546,8 @@ force = True
 # Needs all input channels up to some order plus combined channels as defined in combine_ini
 channels = LO R V RRa RRb RV VV NLO NLO_only NNLO NNLO_only
 
-# Up to NLO only
+# Up to LO/NLO only
+#channels = LO
 #channels = LO R V
 
 # Only subset available
@@ -528,9 +568,8 @@ orders = [ "NNLO" ]
 
 # Needs all input channels up to some order plus combined channels as defined in combine_ini
 channels = LO R V RRa RRb RV VV NLO NLO_only NNLO NNLO_only
-
-# Up to NLO only
-#channels = LO R V
+#channels = LO R V NLO NLO_only
+#channels = LO
 
 # Only subset available
 #channels = NNLO
@@ -573,6 +612,8 @@ scaleindex = 0
 
 # Show comparison to all orders
 orders = [ "LO", "NLO", "NNLO" ]
+#orders = [ "LO", "NLO" ]
+#orders = [ "LO" ]
 
 # Needs correct fastNLO 'scalename' parameter to be set
 scalenames = [ "kScale1" ]
-- 
GitLab