Renew FASTSIM HLT removal

cms-sw · Jan 27, 2017 · a6ba252 · a6ba252
1 parent 3318f06
commit a6ba252
Show file tree

Hide file tree

Showing 6 changed files with 11 additions and 604 deletions.
diff --git a/Configuration/Applications/python/ConfigBuilder.py b/Configuration/Applications/python/ConfigBuilder.py
@@ -1544,10 +1544,7 @@ def prepare_HLT(self, sequence = None):
 		self.loadAndRemember('HLTrigger/Configuration/HLT_%s_cff'       % sequence)
 
         if self._options.isMC:
-		if self._options.fast:
-			self._options.customisation_file.append("HLTrigger/Configuration/customizeHLTforMC.customizeHLTforFastSim")
-		else:
-			self._options.customisation_file.append("HLTrigger/Configuration/customizeHLTforMC.customizeHLTforFullSim")
+		self._options.customisation_file.append("HLTrigger/Configuration/customizeHLTforMC.customizeHLTforMC")
 
 	if self._options.name != 'HLT':
 		self.additionalCommands.append('from HLTrigger.Configuration.CustomConfigs import ProcessName')

diff --git a/Configuration/Applications/python/cmsDriverOptions.py b/Configuration/Applications/python/cmsDriverOptions.py
@@ -263,6 +263,8 @@ def OptionsFromItems(items):
     # options incompatible with fastsim
     if options.fast and not options.scenario == "pp":
         raise Exception("ERROR: the --option fast is only compatible with the default scenario (--scenario=pp)")
+    if options.fast and 'HLT' in options.trimmedStep:
+        raise Exception("ERROR: the --option fast is incompatible with HLT (HLT is no longer available in FastSim)")
 
     return options