Bugfixes and clean-up after HI mixing updates

Alignment/OfflineValidation/plugins/PrimaryVertexValidation.h

@@ -25,10 +25,6 @@
 #include "DataFormats/TrackReco/interface/TrackFwd.h"
 #include "DataFormats/TrackingRecHit/interface/TrackingRecHit.h"
 #include "DataFormats/DetId/interface/DetId.h"
-#include "DataFormats/SiStripDetId/interface/TIBDetId.h"
-#include "DataFormats/SiStripDetId/interface/TIDDetId.h"
-#include "DataFormats/SiStripDetId/interface/TOBDetId.h"
-#include "DataFormats/SiStripDetId/interface/TECDetId.h"
 #include "DataFormats/SiStripDetId/interface/StripSubdetector.h"
 #include "DataFormats/SiPixelDetId/interface/PixelSubdetector.h"
 #include "DataFormats/TrackerRecHit2D/interface/SiStripRecHit2DCollection.h"

Configuration/Applications/python/ConfigBuilder.py

@@ -28,7 +28,6 @@ class Options:
 defaultOptions.scenarioOptions=['pp','cosmics','nocoll','HeavyIons']
 defaultOptions.harvesting= 'AtRunEnd'
 defaultOptions.gflash = False
-defaultOptions.himix = False
 defaultOptions.number = -1
 defaultOptions.number_out = None
 defaultOptions.arguments = ""
@@ -429,10 +428,6 @@ def filesFromOption(self):
         if 'GEN' in self.stepMap.keys() or 'LHE' in self.stepMap or (not self._options.filein and hasattr(self._options, "evt_type")):
             if self.process.source is None:
                 self.process.source=cms.Source("EmptySource")
-            # if option himix is active, drop possibly duplicate DIGI-RAW info:
-            if self._options.himix==True:
-                self.process.source.inputCommands = cms.untracked.vstring('drop *','keep *_generator_*_*','keep *_g4SimHits_*_*')
-                self.process.source.dropDescendantsOfDroppedBranches=cms.untracked.bool(False)
 
 	# modify source in case of run-dependent MC
 	self.runsAndWeights=None
@@ -637,9 +632,22 @@ def addStandardSequences(self):
         # load the pile up file
 	if self._options.pileup:
 		pileupSpec=self._options.pileup.split(',')[0]
+
+		# FastSim: GEN-mixing or DIGI-RECO mixing?
+		GEN_mixing = False
+		if self._options.fast and pileupSpec.find("GEN_") == 0:
+                        GEN_mixing = True
+                        pileupSpec = pileupSpec[4:]
+
+		# Does the requested pile-up scenario exist?
 		from Configuration.StandardSequences.Mixing import Mixing,defineMixing
 		if not pileupSpec in Mixing and '.' not in pileupSpec and 'file:' not in pileupSpec:
-			raise Exception(pileupSpec+' is not a know mixing scenario:\n available are: '+'\n'.join(Mixing.keys()))
+			message = pileupSpec+' is not a know mixing scenario:\n available are: '+'\n'.join(Mixing.keys())
+			if self._options.fast:
+				message += "\n-"*20+"\n additional options for FastSim (gen-mixing):\n" + "-"*20 + "\n" + '\n'.join(["GEN_" + x for x in Mixing.keys()]) + "\n"
+			raise Exception(message)
+
+		# Put mixing parameters in a dictionary
 		if '.' in pileupSpec:
 			mixingDict={'file':pileupSpec}
 		elif pileupSpec.startswith('file:'):
@@ -649,15 +657,22 @@ def addStandardSequences(self):
 			mixingDict=copy.copy(Mixing[pileupSpec])
 		if len(self._options.pileup.split(','))>1:
 			mixingDict.update(eval(self._options.pileup[self._options.pileup.find(',')+1:]))
+
+		# Load the pu cfg file corresponding to the requested pu scenario
 		if 'file:' in pileupSpec:
 			#the file is local
 			self.process.load(mixingDict['file'])
 			print "inlining mixing module configuration"
 			self._options.inlineObjets+=',mix'
 		else:
 			self.loadAndRemember(mixingDict['file'])
-			#if self._options.fast:
-			#	self._options.customisation_file.append("FastSimulation/Configuration/MixingModule_Full2Fast.setVertexGeneratorPileUpProducer")
+
+		# FastSim: transform cfg of MixingModule from FullSim to FastSim 
+		if self._options.fast:
+			if GEN_mixing:
+				self._options.customisation_file.append("FastSimulation/Configuration/MixingModule_Full2Fast.prepareGenMixing")
+			else:   
+				self._options.customisation_file.append("FastSimulation/Configuration/MixingModule_Full2Fast.prepareDigiRecoMixing")
 
 		mixingDict.pop('file')
 		if not "DATAMIX" in self.stepMap.keys(): # when DATAMIX is present, pileup_input refers to pre-mixed GEN-RAW
@@ -666,16 +681,12 @@ def addStandardSequences(self):
 					mixingDict['F']=filesFromDASQuery('file dataset = %s'%(self._options.pileup_input[4:],))[0]
 				else:
 					mixingDict['F']=self._options.pileup_input.split(',')
-			specialization=defineMixing(mixingDict,self._options.fast)
+			specialization=defineMixing(mixingDict)
 			for command in specialization:
 				self.executeAndRemember(command)
 			if len(mixingDict)!=0:
 				raise Exception('unused mixing specification: '+mixingDict.keys().__str__())
 
-			if self._options.fast and not 'SIM' in self.stepMap and not 'FASTSIM' in self.stepMap:
-				self.executeAndRemember('process.mix.playback= True')
-
-
         # load the geometry file
         try:
 		if len(self.stepMap):
@@ -985,18 +996,10 @@ def define_Configs(self):
             self.RECODefaultSeq='reconstructionCosmics'
             self.DQMDefaultSeq='DQMOfflineCosmics'
 
-        if self._options.himix:
-                print "From the presence of the himix option, we have determined that this is heavy ions and will use '--scenario HeavyIons'."
-                self._options.scenario='HeavyIons'
-
         if self._options.scenario=='HeavyIons':
 	    if not self._options.beamspot:
 		    self._options.beamspot=VtxSmearedHIDefaultKey
             self.HLTDefaultSeq = 'HIon'
-            if not self._options.himix:
-                    self.GENDefaultSeq='pgen_hi'
-            else:
-                    self.GENDefaultSeq='pgen_himix'
             self.VALIDATIONDefaultCFF="Configuration/StandardSequences/ValidationHeavyIons_cff"
             self.VALIDATIONDefaultSeq=''
             self.EVTCONTDefaultCFF="Configuration/EventContent/EventContentHeavyIons_cff"
@@ -1085,21 +1088,16 @@ def inGeometryKeys(opt):
 
         # Mixing
 	if self._options.pileup=='default':
-		from Configuration.StandardSequences.Mixing import MixingDefaultKey,MixingFSDefaultKey
+		from Configuration.StandardSequences.Mixing import MixingDefaultKey
+		self._options.pileup=MixingDefaultKey
+		# temporary, until digi-reco mixing becomes standard in RelVals
 		if self._options.fast:
-			self._options.pileup=MixingFSDefaultKey
-		else:
-			self._options.pileup=MixingDefaultKey
-
+			self._options.pileup="GEN_" + MixingDefaultKey
+
+
 	#not driven by a default cff anymore
 	if self._options.isData:
 		self._options.pileup=None
-        if self._options.isMC==True and self._options.himix==False:
-                if self._options.fast:
-			self._options.pileup='FS_'+self._options.pileup
-        elif self._options.isMC==True and self._options.himix==True:
-		self._options.pileup='HiMix'
-
 
 	if self._options.slhc:
 		self.GeometryCFF='SLHCUpgradeSimulations.Geometry.%s_cmsSimIdealGeometryXML_cff'%(self._options.slhc,)
@@ -1339,8 +1337,8 @@ def prepare_GEN(self, sequence = None):
 				elif isinstance(theObject, cms.Sequence) or isinstance(theObject, cmstypes.ESProducer):
 					self._options.inlineObjets+=','+name
 
-		if sequence == self.GENDefaultSeq or sequence == 'pgen_genonly' or ( sequence == 'pgen_himix' or sequence == 'pgen_hi'):
-			if 'ProductionFilterSequence' in genModules and ('generator' in genModules or 'hiSignal' in genModules):
+		if sequence == self.GENDefaultSeq or sequence == 'pgen_genonly':
+			if 'ProductionFilterSequence' in genModules and ('generator' in genModules):
 				self.productionFilterSequence = 'ProductionFilterSequence'
 			elif 'generator' in genModules:
 				self.productionFilterSequence = 'generator'
@@ -1357,8 +1355,11 @@ def prepare_GEN(self, sequence = None):
                 except ImportError:
                         raise Exception("VertexSmearing type or beamspot "+self._options.beamspot+" unknown.")
 
-                if self._options.scenario == 'HeavyIons' and self._options.himix:
-                        self.loadAndRemember("SimGeneral/MixingModule/himixGEN_cff")
+                if self._options.scenario == 'HeavyIons': 
+			if self._options.pileup=='HiMixGEN':
+				self.loadAndRemember("Configuration/StandardSequences/GeneratorMix_cff")
+			else:
+				self.loadAndRemember("Configuration/StandardSequences/GeneratorHI_cff")
 
         self.process.generation_step = cms.Path( getattr(self.process,genSeqName) )
         self.schedule.append(self.process.generation_step)
@@ -1385,12 +1386,6 @@ def prepare_SIM(self, sequence = None):
 
 		if self._options.magField=='0T':
 			self.executeAndRemember("process.g4SimHits.UseMagneticField = cms.bool(False)")
-
-		if self._options.himix==True:
-			if self._options.geometry in defaultOptions.geometryExtendedOptions:
-				self.loadAndRemember("SimGeneral/MixingModule/himixSIMExtended_cff")
-			else:
-				self.loadAndRemember("SimGeneral/MixingModule/himixSIMIdeal_cff")
 	else:
 		if self._options.magField=='0T':
 			self.executeAndRemember("process.famosSimHits.UseMagneticField = cms.bool(False)")
@@ -1405,9 +1400,6 @@ def prepare_DIGI(self, sequence = None):
         if self._options.gflash==True:
                 self.loadAndRemember("Configuration/StandardSequences/GFlashDIGI_cff")
 
-        if self._options.himix==True:
-            self.loadAndRemember("SimGeneral/MixingModule/himixDIGI_cff")
-
         if sequence == 'pdigi_valid':
             self.executeAndRemember("process.mix.digitizers = cms.PSet(process.theDigitizersValid)")
 

Configuration/Applications/python/Options.py

@@ -217,12 +217,6 @@
                   default=defaultOptions.gflash,
                   dest="gflash")
 
-expertSettings.add_option("--himix",
-                 help="Run the Heavy Ions signal mixing.",
-                 action="store_true",
-                 default=defaultOptions.himix,
-                 dest="himix")
-
 expertSettings.add_option("--python_filename",
                           help="Change the name of the created config file ",
                           default='',

Configuration/Generator/python/ZEEMM_13TeV_TuneCUETP8M1_cfi.py

@@ -0,0 +1,26 @@
+import FWCore.ParameterSet.Config as cms
+from Configuration.Generator.Pythia8CommonSettings_cfi import *
+from Configuration.Generator.Pythia8CUEP8M1Settings_cfi import *
+source = cms.Source("EmptySource")
+generator = cms.EDFilter("Pythia8GeneratorFilter",
+                         pythiaHepMCVerbosity = cms.untracked.bool(False),
+                         maxEventsToPrint = cms.untracked.int32(0),
+                         pythiaPylistVerbosity = cms.untracked.int32(0),
+                         filterEfficiency = cms.untracked.double(1.0),
+                         comEnergy = cms.double(13000.0),
+                         PythiaParameters = cms.PSet(
+        pythia8CommonSettingsBlock,
+        pythia8CUEP8M1SettingsBlock,
+        processParameters = cms.vstring(
+            'WeakSingleBoson:ffbar2gmZ = on',
+            '23:onMode = off',
+            '23:onIfAny = 11 13',
+            'PhaseSpace:pTHatMin = 40.',
+            ),
+        parameterSets = cms.vstring('pythia8CommonSettings',
+                                    'pythia8CUEP8M1Settings',
+                                    'processParameters',
+                                    )
+        )
+                         )
+

Configuration/Generator/python/ZEEMM_13TeV_cfi.py

@@ -0,0 +1,31 @@
+import FWCore.ParameterSet.Config as cms
+
+from Configuration.Generator.PythiaUEZ2starSettings_cfi import *
+generator = cms.EDFilter("Pythia6GeneratorFilter",
+    pythiaHepMCVerbosity = cms.untracked.bool(False),
+    maxEventsToPrint = cms.untracked.int32(0),
+    pythiaPylistVerbosity = cms.untracked.int32(0),
+    filterEfficiency = cms.untracked.double(1.0),
+    comEnergy = cms.double(13000.0),
+    PythiaParameters = cms.PSet(
+        pythiaUESettingsBlock,
+        processParameters = cms.vstring('MSEL         = 11 ', 
+            'MDME( 174,1) = 0    !Z decay into d dbar', 
+            'MDME( 175,1) = 0    !Z decay into u ubar', 
+            'MDME( 176,1) = 0    !Z decay into s sbar', 
+            'MDME( 177,1) = 0    !Z decay into c cbar', 
+            'MDME( 178,1) = 0    !Z decay into b bbar', 
+            'MDME( 179,1) = 0    !Z decay into t tbar', 
+            'MDME( 182,1) = 1    !Z decay into e- e+', 
+            'MDME( 183,1) = 0    !Z decay into nu_e nu_ebar', 
+            'MDME( 184,1) = 1    !Z decay into mu- mu+', 
+            'MDME( 185,1) = 0    !Z decay into nu_mu nu_mubar', 
+            'MDME( 186,1) = 0    !Z decay into tau- tau+', 
+            'MDME( 187,1) = 0    !Z decay into nu_tau nu_taubar', 
+            'CKIN( 1)     = 40.  !(D=2. GeV)', 
+            'CKIN( 2)     = -1.  !(D=-1. GeV)'),
+        # This is a vector of ParameterSet names to be read, in this order
+        parameterSets = cms.vstring('pythiaUESettings', 
+            'processParameters')
+    )
+)

Configuration/PyReleaseValidation/python/relval_standard.py

@@ -236,6 +236,8 @@
 workflows[140.1] = ['',['QCD_Pt_80_120_13_HI','DIGIHI','RECOHI','HARVESTHI']]
 workflows[140.2] = ['',['PhotonJets_Pt_10_13_HI','DIGIHI','RECOHI','HARVESTHI']]
 workflows[140.3] = ['',['ZMM_13_HI','DIGIHI','RECOHI','HARVESTHI']]
+workflows[140.4] = ['',['ZEEMM_13_HI','DIGIHI','RECOHI','HARVESTHI']]
+
 # legacy: 141 => B0; 143 => B3 ; 144 => B5
 #workflows[142] = ['',['HydjetQ_B8_2760GeV','DIGIHI','RECOHI','HARVESTHI','MINIAODMCUP15HI']]
 

Configuration/PyReleaseValidation/python/relval_steps.py

@@ -475,6 +475,7 @@ def genS(fragment,howMuch):
 steps['WM_13']=gen2015('WM_13TeV_TuneCUETP8M1_cfi',Kby(9,200))
 steps['WpM_13']=gen2015('WpM_13TeV_TuneCUETP8M1_cfi',Kby(9,200))
 steps['ZMM_13']=gen2015('ZMM_13TeV_TuneCUETP8M1_cfi',Kby(18,300))
+steps['ZEEMM_13']=gen2015('ZEEMM_13TeV_TuneCUETP8M1_cfi',Kby(18,300))
 steps['ZpMM_13']=gen2015('ZpMM_13TeV_TuneCUETP8M1_cfi',Kby(9,200))
 
 steps['ZTT']=genS('ZTT_All_hadronic_8TeV_TuneCUETP8M1_cfi',Kby(9,150))
@@ -565,6 +566,7 @@ def genS(fragment,howMuch):
 steps['QCD_Pt_80_120_13_HI']=merge([hiDefaults,steps['QCD_Pt_80_120_13']])
 steps['PhotonJets_Pt_10_13_HI']=merge([hiDefaults,steps['PhotonJets_Pt_10_13']])
 steps['ZMM_13_HI']=merge([hiDefaults,steps['ZMM_13']])
+steps['ZEEMM_13_HI']=merge([hiDefaults,steps['ZEEMM_13']])
 
 
 def changeRefRelease(steps,listOfPairs):
@@ -759,10 +761,10 @@ def genvalid(fragment,d,suffix='all',fi='',dataSet=''):
 
 
 #PU for FastSim
-PUFS={'--pileup':'default'}
-PUFS2={'--pileup':'mix_2012_Startup_inTimeOnly'}
-PUFSAVE10={'--pileup':'E13TeV_AVE_10_inTimeOnly'}
-PUFSAVE20={'--pileup':'E13TeV_AVE_20_inTimeOnly'}
+PUFS={'--pileup':'GEN_2012_Summer_50ns_PoissonOOTPU'}
+PUFS2={'--pileup':'2012_Startup_50ns_PoissonOOTPU'}
+PUFSAVE10={'--pileup':'GEN_AVE_10_BX_25ns'}
+PUFSAVE20={'--pileup':'GEN_AVE_20_BX_25ns'}
 
 #
 steps['TTbarFSPU']=merge([PUFS,Kby(100,500),steps['TTbarFS']] )

Configuration/StandardSequences/python/GeneratorHI_cff.py

@@ -0,0 +1,10 @@
+import FWCore.ParameterSet.Config as cms
+
+# Produce GenParticles of the two HepMCProducts
+from Configuration.StandardSequences.Generator_cff import *
+
+genParticles.doSubEvent = cms.untracked.bool(True)
+
+hiGenJets = cms.Sequence(genParticlesForJets*hiRecoGenJets)
+pgen = cms.Sequence(cms.SequencePlaceholder("randomEngineStateProducer")+VertexSmearing+genParticles+hiGenJets)
+

Configuration/StandardSequences/python/GeneratorMix_cff.py

@@ -0,0 +1,13 @@
+import FWCore.ParameterSet.Config as cms
+
+# Produce GenParticles of the two HepMCProducts
+from Configuration.StandardSequences.Generator_cff import *
+genParticles.mix = cms.string("mix")
+genParticles.doSubEvent = cms.untracked.bool(True)
+genParticles.useCrossingFrame = cms.untracked.bool(True)
+genParticles.saveBarCodes = cms.untracked.bool(True)
+genParticles.abortOnUnknownPDGCode = cms.untracked.bool(False)
+
+hiGenJets = cms.Sequence(genParticlesForJets*hiRecoGenJets)
+pgen = cms.Sequence(cms.SequencePlaceholder("randomEngineStateProducer")+cms.SequencePlaceholder("mix")+VertexSmearing+genParticles+hiGenJets)
+

Configuration/StandardSequences/python/Generator_cff.py

@@ -45,25 +45,18 @@
 #      untracked uint32 VtxSmeared = 98765432
 #   }
 # }
+
+
 VertexSmearing = cms.Sequence(cms.SequencePlaceholder("VtxSmeared"))
 GeneInfo = cms.Sequence(genParticles)
 genJetMET = cms.Sequence(genJetParticles*recoGenJets+genMETParticles*recoGenMET)
+
 pgen = cms.Sequence(cms.SequencePlaceholder("randomEngineStateProducer")+VertexSmearing+GeneInfo+genJetMET)
 
 # sequence for bare generator result only, without vertex smearing and analysis objects added
 
 pgen_genonly = cms.Sequence(cms.SequencePlaceholder("randomEngineStateProducer"))
 
-#
-# this sequence is intended for HI runs/studies;
-#
-
-hiGenJets = cms.Sequence(hiGenParticlesForJets*hiRecoGenJets)
-from PhysicsTools.HepMCCandAlgos.HiGenParticles_cfi import *
-
-pgen_hi = cms.Sequence(cms.SequencePlaceholder("randomEngineStateProducer")+VertexSmearing+hiGenParticles+hiGenJets)
-pgen_himix = cms.Sequence(cms.SequencePlaceholder("randomEngineStateProducer")+cms.SequencePlaceholder("mix")+VertexSmearing+hiGenParticles+hiGenJets)
-
 fixGenInfo = cms.Sequence(GeneInfo * genJetMET)