Change names of command-line options for run-dependent MC with integer IOV weights

Author: christopheralanwest

Configuration/Applications/python/ConfigBuilder.py

@@ -82,8 +82,8 @@ class Options:
 defaultOptions.fast=False
 defaultOptions.runsAndWeightsForMC = None
 defaultOptions.runsScenarioForMC = None
-defaultOptions.runsAndWeightsForMCInteger = None
-defaultOptions.runsScenarioForMCInteger = None
+defaultOptions.runsAndWeightsForMCIntegerWeights = None
+defaultOptions.runsScenarioForMCIntegerWeights = None
 defaultOptions.runUnscheduled = False
 defaultOptions.timeoutOutput = False
 defaultOptions.nThreads = '1'
@@ -500,18 +500,18 @@ def filesFromOption(self):
 
         # modify source in case of run-dependent MC (Run-3 method)
         self.runsAndWeightsInt=None
-        if self._options.runsAndWeightsForMCInteger or self._options.runsScenarioForMCInteger:
+        if self._options.runsAndWeightsForMCIntegerWeights or self._options.runsScenarioForMCIntegerWeights:
             if not self._options.isMC :
-                raise Exception("options --runsAndWeightsForMCInteger and --runsScenarioForMCInteger are only valid for MC")
-            if self._options.runsAndWeightsForMCInteger:
-                self.runsAndWeightsInt = eval(self._options.runsAndWeightsForMCInteger)
+                raise Exception("options --runsAndWeightsForMCIntegerWeights and --runsScenarioForMCIntegerWeights are only valid for MC")
+            if self._options.runsAndWeightsForMCIntegerWeights:
+                self.runsAndWeightsInt = eval(self._options.runsAndWeightsForMCIntegerWeights)
             else:
                 from Configuration.StandardSequences.RunsAndWeights import RunsAndWeights
-                if isinstance(RunsAndWeights[self._options.runsScenarioForMCInteger], str):
-                    __import__(RunsAndWeights[self._options.runsScenarioForMCInteger])
-                    self.runsAndWeightsInt = sys.modules[RunsAndWeights[self._options.runsScenarioForMCInteger]].runProbabilityDistribution
+                if isinstance(RunsAndWeights[self._options.runsScenarioForMCIntegerWeights], str):
+                    __import__(RunsAndWeights[self._options.runsScenarioForMCIntegerWeights])
+                    self.runsAndWeightsInt = sys.modules[RunsAndWeights[self._options.runsScenarioForMCIntegerWeights]].runProbabilityDistribution
                 else:
-                    self.runsAndWeightsInt = RunsAndWeights[self._options.runsScenarioForMCInteger]
+                    self.runsAndWeightsInt = RunsAndWeights[self._options.runsScenarioForMCIntegerWeights]
 
         if self.runsAndWeightsInt:
             if not self._options.relval:

Configuration/Applications/python/Options.py

@@ -89,7 +89,7 @@
                   default=False)
 
 parser.add_option("--runsAndWeightsForMC",
-                  help="Assign run numbers to MC source according to relatieve weights. [(run1,weight1),...,(runN,weightN)])",
+                  help="Assign run numbers to MC source according to relative weights. [(run1,weight1),...,(runN,weightN)])",
                   default=None,
                   dest="runsAndWeightsForMC")
 
@@ -98,15 +98,15 @@
                   default=None,
                   dest="runsScenarioForMC")
 
-parser.add_option("--runsAndWeightsForMCInteger",
+parser.add_option("--runsAndWeightsForMCIntegerWeights",
                   help="Assign run numbers to MC source according to relative weights where weighting is determined by the number of times the run number appears. [(run1,run2,...,runN)])",
                   default=None,
-                  dest="runsAndWeightsForMCInteger")
+                  dest="runsAndWeightsForMCIntegerWeights")
 
-parser.add_option("--runsScenarioForMCInteger",
-                  help="Load a scenario to set run numbers in MC.)",
+parser.add_option("--runsScenarioForMCIntegerWeights",
+                  help="Load a scenario to set run numbers in MC with integer IOV weights.)",
                   default=None,
-                  dest="runsScenarioForMCInteger")
+                  dest="runsScenarioForMCIntegerWeights")
 
 parser.add_option("--runUnscheduled",
                   help="Automatically convert configuration to run unscheduled the EDProducers/EDFilters that were scheduled",

Configuration/PyReleaseValidation/python/relval_steps.py

@@ -1808,7 +1808,7 @@ def lhegensim2018ml(fragment,howMuch):
     '--procModifiers':'premix_stage2,runDependent'
 }
 
-steps['DIGIPRMXUP18_PU25_RD']=merge([{'--conditions':'auto:phase1_2018_realistic_rd', '--relval': str(kevents_rd*1000) + ',' + str(events_per_job_rd), '--runsScenarioForMCInteger': 'Run2018_Equal_Lumi_Integer_Weights'}, digiPremixRD2018, digiPremixUp2018Defaults25ns])
+steps['DIGIPRMXUP18_PU25_RD']=merge([{'--conditions':'auto:phase1_2018_realistic_rd', '--relval': str(kevents_rd*1000) + ',' + str(events_per_job_rd), '--runsScenarioForMCIntegerWeights': 'Run2018_Equal_Lumi_Integer_Weights'}, digiPremixRD2018, digiPremixUp2018Defaults25ns])
 
 # configuration to simulate cross run number boundary in IB, given 5 events per lumi
 steps['DIGIPRMXUP18_PU25_RD_IB']=merge([{'--conditions':'auto:phase1_2018_realistic_rd', '--customise_commands':"\"process.source.setRunNumberForEachLumi = cms.untracked.vuint32(315257,316083) \"", '--procModifiers':'premix_stage2,runDependent'}, digiPremixRD2018, digiPremixUp2018Defaults25ns])