From 83cce8566f3d90bfaecbeaf77146c53cf6765634 Mon Sep 17 00:00:00 2001
From: Klaus Rabbertz <klaus.rabbertz@cern.ch>
Date: Sat, 30 Sep 2023 14:27:25 +0200
Subject: [PATCH] Comment out run card replacements not yet necessary; edit
intro text of str file
---
analysis/util.py | 10 +++----
steeringfiles/2jetfc.fnl2412eff-fc-v2.str | 32 ++++++-----------------
2 files changed, 13 insertions(+), 29 deletions(-)
diff --git a/analysis/util.py b/analysis/util.py
index 599a8b9..70e9cfd 100644
--- a/analysis/util.py
+++ b/analysis/util.py
@@ -53,11 +53,11 @@ def createRuncard(baseRuncard, params):
'@UNIT_PHASE@' : params['unit_phase'],
'@CHANNEL@' : params['channel'],
'@SEED@' : params['seed'],
- '@CACHE_KINEMATICS@' : params['cache_kinematics'],
- '@RESET_VEGAS_GRID@' : params['reset_vegas_grid'],
- '@LIPS_REDUCE@' : params['lips_reduce'],
- '@ANGULAR_AVERAGE@' : params['angular_average'],
- '@MULTI_CHANNEL@' : params['multi_channel'],
+ # '@CACHE_KINEMATICS@' : params['cache_kinematics'],
+ # '@RESET_VEGAS_GRID@' : params['reset_vegas_grid'],
+ # '@LIPS_REDUCE@' : params['lips_reduce'],
+ # '@ANGULAR_AVERAGE@' : params['angular_average'],
+ # '@MULTI_CHANNEL@' : params['multi_channel'],
'@EVENTS@' : params['events'],
'@ITERATIONS@' : params['iterations']
}
diff --git a/steeringfiles/2jetfc.fnl2412eff-fc-v2.str b/steeringfiles/2jetfc.fnl2412eff-fc-v2.str
index 504d66c..5529d9f 100644
--- a/steeringfiles/2jetfc.fnl2412eff-fc-v2.str
+++ b/steeringfiles/2jetfc.fnl2412eff-fc-v2.str
@@ -54,6 +54,11 @@
# 4. In principal, parameters can also be set on the command line, but
# this has not been tested yet.
#
+##### TODO: The special scale-factor settings are not necessary anymore with the modules2 interface
+##### TODO: The method how to set two different scales in flex-scale grids needs to be tested
+#
+##### BEGIN OF DESCRIPTION NEEDING UPDATE
+#
# Special remarks on scale settings:
# ----------------------------------
# Lacking sufficient scale choice information from NNLOJET the following
@@ -74,18 +79,6 @@
# then one central scale, e.g. ptmax=ptj1, must be defined for both
# muf and mur, and the InclusiveJets flag must be set in the fastNLO
# steering file.
-# In that case the following definitions hold depending on the
-# nnlo-bridge code version:
-#
-# BRIDGE 0.0.40:
-# (requires additional fixed-scale combinations of
-# muf = 2.718281828459045 mur = 2.718281828459045
-# muf = 4.481689070338065 mur = 4.481689070338065
-# muf = 4.481689070338065 mur = 2.718281828459045
-# muf = 2.718281828459045 mur = 4.481689070338065
-# muf = 12.18249396070347 mur = 2.718281828459045
-# muf = 2.718281828459045 mur = 12.18249396070347
-# in the SCALES section of the NNLOJET run card.)
#
# DIS pp
# - the 1st scale set for muf&mur defines scale1 scale2
@@ -94,16 +87,6 @@
# SYMMETRIC central scale choice must be used when evaluating a
# fastNLO grid with fnlo-tk-cppread, either scale1 or scale2.
#
-# BRIDGE 0.0.46:
-# (requires additional fixed-scale combinations of
-# 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
-# in the SCALES section of the NNLOJET run card.)
-#
# DIS(?) pp
# - the 1st scale set for muf&mur defines scale1 scale2=mu/obs(!)
# - the stored observable defines scale2 scale1
@@ -111,6 +94,8 @@
# SYMMETRIC central scale choice must be used when evaluating a
# fastNLO grid with fnlo-tk-cppread, i.e. for pp scale1*scale2.
#
+##### END OF DESCRIPTION NEEDING UPDATE
+#
# ==================================================================== #
# ==================================================================== #
@@ -146,7 +131,6 @@ DimensionLabels { # Labels (symbol and unit) for
# (Write each line of description in quotation marks)
# -------------------------------------------------------------------- #
ScenarioName fnl2412eff-fc-v2 # (def.=NNLOJET process name) No white space allowed here!
- # Here: Either one description for all
ScenarioDescription { # Replace generic one-line text by desired (multi-line) description
"d2sigma-dijet_dm12_dym_[pb_GeV]"
"CMS_Collaboration"
@@ -212,7 +196,7 @@ GlobalVerbosity INFO # (def.=WARNING) Global output
# Possible values are: DEBUG, MANUAL, INFO, WARNING, ERROR, SILENT
FlexibleScaleTable true # (def.=false) Create table fully flexible in mu_f (larger size), true, or
# table with fixed number of mu_f scale factors
-CacheType 20 # For now switch off caching feature
+CacheType 20 # Default caching settings
CacheMax 30
CacheCompare 10
--
GitLab