Add GEMs to FastSim

Configuration/PyReleaseValidation/python/relval_steps.py

@@ -1492,7 +1492,7 @@ def genS(fragment,howMuch):
                            '--fast':'',
                            '--conditions'  :'auto:phase1_2017_realistic',
                            '--beamspot'    : 'Realistic25ns13TeVEarly2017Collision',
-                           '--era'         :'Run2_2017_FastSim',
+                           '--era'         :'Run2_2017',
                            '--eventcontent':'FEVTDEBUGHLT,DQM',
                            '--datatier':'GEN-SIM-DIGI-RECO,DQMIO',
                            '--relval':'27000,3000'},
@@ -1508,7 +1508,7 @@ def genS(fragment,howMuch):
                            '--fast':'',
                            '--conditions'  :'auto:phase1_2018_realistic',
                            '--beamspot'    :'Realistic25ns13TeVEarly2018Collision',
-                           '--era'         :'Run2_2018_FastSim',
+                           '--era'         :'Run2_2018',
                            '--eventcontent':'FEVTDEBUGHLT,DQM',
                            '--datatier':'GEN-SIM-DIGI-RECO,DQMIO',
                            '--relval':'27000,3000'},
@@ -1658,7 +1658,7 @@ def genS(fragment,howMuch):
          "--eventcontent":"PREMIX",
          "--datatier":"PREMIX",
          "--procModifiers":"premix_stage1",
-         "--era":"Run2_2017_FastSim",
+         "--era":"Run2_2017",
          },
         PUFSAVE50,Kby(100,500)])
 
@@ -1708,7 +1708,7 @@ def genS(fragment,howMuch):
          "--eventcontent":"PREMIX",
          "--datatier":"PREMIX",
          "--procModifiers":"premix_stage1",
-         "--era":"Run2_2018_FastSim",
+         "--era":"Run2_2018",
          },
         PUFSAVE50UP18,Kby(100,500)])
 
@@ -4610,9 +4610,9 @@ def gen2024HiMix(fragment,howMuch):
                         '--filetype':'DQM',
                         '--scenario':'pp'}
 steps['HARVESTUP15FS_trackingOnly']=merge([{'-s': 'HARVESTING:@trackingOnlyValidation+@trackingOnlyDQM'}, steps['HARVESTUP15FS']])
-steps['HARVESTUP17FS']=merge([{'--conditions':'auto:phase1_2017_realistic','--era' : 'Run2_2017_FastSim'},steps['HARVESTUP15FS']])
+steps['HARVESTUP17FS']=merge([{'--conditions':'auto:phase1_2017_realistic','--era' : 'Run2_2017'},steps['HARVESTUP15FS']])
 steps['HARVESTUP17FS_trackingOnly']=merge([{'-s': 'HARVESTING:@trackingOnlyValidation+@trackingOnlyDQM'}, steps['HARVESTUP17FS']])
-steps['HARVESTUP18FS']=merge([{'--conditions':'auto:phase1_2018_realistic','--era' : 'Run2_2018_FastSim'},steps['HARVESTUP15FS']])
+steps['HARVESTUP18FS']=merge([{'--conditions':'auto:phase1_2018_realistic','--era' : 'Run2_2018'},steps['HARVESTUP15FS']])
 steps['HARVESTUP18FS_trackingOnly']=merge([{'-s': 'HARVESTING:@trackingOnlyValidation+@trackingOnlyDQM'}, steps['HARVESTUP18FS']])
 
 steps['ALCASPLIT']={'-s':'ALCAOUTPUT:@allForPrompt',
@@ -4779,12 +4779,12 @@ def gen2024HiMix(fragment,howMuch):
                                          '--eventcontent':'MINIAOD',},stepMiniAODMC])
 
 #MiniAOD 2017
-steps['MINIAODMCUP17FS']   =merge([{'--filein':'file:step1.root','--fast':'','--conditions':'auto:phase1_2017_realistic','--era':'Run2_2017_FastSim'},stepMiniAODMC])
+steps['MINIAODMCUP17FS']   =merge([{'--filein':'file:step1.root','--fast':'','--conditions':'auto:phase1_2017_realistic','--era':'Run2_2017'},stepMiniAODMC])
 
 #MiniAOD 2018
 steps['MINIAODMCUP18']   =merge([{'--conditions':'auto:phase1_2018_realistic','--era':'Run2_2018'},stepMiniAODMC])
 steps['MINIAODMCUP18bParking']   =merge([{'--conditions':'auto:phase1_2018_realistic','--era':'Run2_2018,bParking'},stepMiniAODMC])
-steps['MINIAODMCUP18FS']   =merge([{'--filein':'file:step1.root','--fast':'','--conditions':'auto:phase1_2018_realistic','--era':'Run2_2018_FastSim'},stepMiniAODMC])
+steps['MINIAODMCUP18FS']   =merge([{'--filein':'file:step1.root','--fast':'','--conditions':'auto:phase1_2018_realistic','--era':'Run2_2018'},stepMiniAODMC])
 
 stepNanoAODDefaults = { '-s': 'NANO,DQM:@nanoAODDQM', '-n': 1000 }
 stepNanoAODData = merge([{ '--data':'', '--eventcontent' : 'NANOAOD,DQM' ,'--datatier': 'NANOAOD,DQMIO'    }, stepNanoAODDefaults ])
@@ -4805,8 +4805,8 @@ def gen2024HiMix(fragment,howMuch):
 steps['NANOPRODUP18']=merge([{'--filein':'file:step4.root'},steps['NANOUP18']])
 
 steps['NANOUP15FS'] = merge([{'--filein':'file:step3.root','--fast':''}, steps['NANOUP15']])
-steps['NANOUP17FS'] = merge([{'--filein':'file:step3.root','--fast':'','--era':'Run2_2017_FastSim'}, steps['NANOUP17']])
-steps['NANOUP18FS'] = merge([{'--filein':'file:step3.root','--fast':'','--era':'Run2_2018_FastSim'}, steps['NANOUP18']])
+steps['NANOUP17FS'] = merge([{'--filein':'file:step3.root','--fast':'','--era':'Run2_2017'}, steps['NANOUP17']])
+steps['NANOUP18FS'] = merge([{'--filein':'file:step3.root','--fast':'','--era':'Run2_2018'}, steps['NANOUP18']])
 
 
 steps['HEfail'] = {'--conditions':'auto:phase1_2018_realistic_HEfail',
@@ -5124,7 +5124,7 @@ def gen2024HiMix(fragment,howMuch):
 
     upgradeStepDict['FastSimRun3'][k]={'-s':'SIM,RECOBEFMIX,DIGI:pdigi_valid,L1,DIGI2RAW,L1Reco,RECO,PAT,NANO,VALIDATION:@standardValidation+@miniAODValidation,DQM:@standardDQMFS+@miniAODDQM+@nanoAODDQM',
                                        '--fast':'',
-                                       '--era':'Run3_FastSim',
+                                       '--era':'Run3',
                                        '--beamspot':beamspot,
                                        '--conditions':gt,
                                        '--geometry':geom,

Configuration/PyReleaseValidation/python/upgradeWorkflowComponents.py

@@ -3116,7 +3116,7 @@ def setupPU_(self, step, stepName, stepDict, k, properties):
             if not stepNameS1 in stepDict: stepDict[stepNameS1] = {}
             stepDict[stepNameS1][k] = merge([{
                 '--fast': '',
-                '--era': stepDict[stepName][k]['--era']+'_FastSim',
+                '--era': stepDict[stepName][k]['--era'],
                 '--eventcontent': 'FASTPU',
                 '--processName': 'FASTSIM',
             }, d])
@@ -3183,7 +3183,6 @@ def setup_(self, step, stepName, stepDict, k, properties):
         if 'HARVESTFastRun3' in step:
             stepDict[stepName][k] = merge([{'-s':'HARVESTING:@trackingOnlyValidation+@trackingOnlyDQM',
                                             '--fast':'',
-                                            '--era':'Run3_FastSim',
                                             '--filein':'file:step1_inDQM.root'}, stepDict[step][k]])
         else:
             stepDict[stepName][k] = merge([stepDict[step][k]])
@@ -3208,7 +3207,6 @@ def setup_(self, step, stepName, stepDict, k, properties):
         if 'Gen' in step and 'GenOnly' not in step:
             stepDict[stepName][k] = merge([{'-s':'GEN,SIM,RECOBEFMIX',
                                             '--fast':'',
-                                            '--era':'Run3_FastSim',
                                             '--eventcontent':'FASTPU',
                                             '--datatier':'GEN-SIM-RECO',
                                             '--relval':'27000,3000'}, stepDict[step][k]])
@@ -3503,7 +3501,7 @@ def condition(self, fragment, stepList, key, hasHarvest):
         'Geom' : 'DB:Extended',
         'GT' : 'auto:phase1_2022_realistic',
         'HLTmenu': '@relval2022',
-        'Era' : 'Run3_FastSim',
+        'Era' : 'Run3',
         'BeamSpot': 'DBrealistic',
         'ScenToRun' : ['Gen','FastSimRun3','HARVESTFastRun3'],
     },
@@ -3519,7 +3517,7 @@ def condition(self, fragment, stepList, key, hasHarvest):
         'Geom' : 'DB:Extended',
         'GT' : 'auto:phase1_2023_realistic',
         'HLTmenu': '@relval2023',
-        'Era' : 'Run3_2023_FastSim',
+        'Era' : 'Run3_2023',
         'BeamSpot': 'DBrealistic',
         'ScenToRun' : ['Gen','FastSimRun3','HARVESTFastRun3'],
     },
@@ -3574,7 +3572,7 @@ def condition(self, fragment, stepList, key, hasHarvest):
         'Geom' : 'DB:Extended',
         'GT' : 'auto:phase1_2024_realistic',
         'HLTmenu': '@relval2024',
-        'Era' : 'Run3_2024_FastSim',
+        'Era' : 'Run3_2024',
         'BeamSpot': 'DBrealistic',
         'ScenToRun' : ['Gen','FastSimRun3','HARVESTFastRun3'],
     },
@@ -3614,7 +3612,7 @@ def condition(self, fragment, stepList, key, hasHarvest):
         'Geom' : 'DB:Extended',
         'GT' : 'auto:phase1_2025_realistic',
         'HLTmenu': '@relval2025',
-        'Era' : 'Run3_2025_FastSim',
+        'Era' : 'Run3_2025',
         'BeamSpot': 'DBrealistic',
         'ScenToRun' : ['Gen','FastSimRun3','HARVESTFastRun3'],
     },
@@ -3655,7 +3653,7 @@ def condition(self, fragment, stepList, key, hasHarvest):
         'Geom' : 'DB:Extended',
         'GT' : 'auto:phase1_2026_realistic',
         'HLTmenu': '@relval2026',
-        'Era' : 'Run3_2026_FastSim',
+        'Era' : 'Run3_2026',
         'BeamSpot': 'DBrealistic',
         'ScenToRun' : ['Gen','FastSimRun3','HARVESTFastRun3'],
     }

Configuration/PyReleaseValidation/scripts/README.md

@@ -319,10 +319,10 @@ MC workflows for pp collisions:
 | **Run3** 	|  	|  	|  	|  	|  	
 | |  	|  	|  	|  	|  	
 | 11634.0 	| TTbar_14TeV 	| phase1_2022_realistic 	| Run3 	|  	|  	
-| 13234.0 	| RelValTTbar_14TeV 	| phase1_2022_realistic 	| Run3_FastSim 	| *FastSim*  |  	
+| 13234.0 	| RelValTTbar_14TeV 	| phase1_2022_realistic 	| Run3 	| *FastSim*  |  	
 | 12434.0 	| RelValTTbar_14TeV 	| phase1_2023_realistic 	| Run3_2023 	|  	|  	
-| 14034.0 	| RelValTTbar_14TeV 	| phase1_2023_realistic 	| Run3_2023_FastSim 	|  	*FastSim* |  	
-| 14234.0 	| RelValTTbar_14TeV 	| phase1_2023_realistic 	| Run3_2023_FastSim 	| *FastSim*  Run3_Flat55To75_PoissonOOTPU 	|  	
+| 14034.0 	| RelValTTbar_14TeV 	| phase1_2023_realistic 	| Run3_2023 	|  	*FastSim* |  	
+| 14234.0 	| RelValTTbar_14TeV 	| phase1_2023_realistic 	| Run3_2023 	| *FastSim*  Run3_Flat55To75_PoissonOOTPU 	|  	
 | 12834.0 	| RelValTTbar_14TeV 	| phase1_2024_realistic 	| Run3_2024 	|  	| 
 | 12846.0 	| RelValZEE_14 	| phase1_2023_realistic 	| Run3_2024 	|  	|  	
 | 13034.0 	| RelValTTbar_14TeV 	| phase1_2024_realistic 	| Run3_2024 	|  Run3_Flat55To75_PoissonOOTPU 	|  	

Configuration/StandardSequences/python/Digi_cff.py

@@ -74,10 +74,18 @@ def _fastSimDigis(process):
 # no need for the aliases for premixing stage1
 modifyDigi_fastSimDigis = (fastSim & ~premix_stage1).makeProcessModifier(_fastSimDigis)
 
+from Configuration.Eras.Modifier_run2_GEM_2017_cff import run2_GEM_2017
+from Configuration.Eras.Modifier_run3_GEM_cff import run3_GEM
+def _fastSimDigisGEM(process):
+    from FastSimulation.Configuration.DigiAliases_cff import loadDigiAliasesGEM
+    loadDigiAliasesGEM(process)
+modifyDigi_fastSimDigisGEM = (fastSim & (run2_GEM_2017 | run3_GEM) & ~premix_stage1).makeProcessModifier(_fastSimDigisGEM)
+
 from Configuration.Eras.Modifier_phase2_hgcal_cff import phase2_hgcal
 def _fastSimDigisHGCal(process):
     from FastSimulation.Configuration.DigiAliases_cff import loadDigiAliasesHGCal
-modifyDigi_fastSimDigisHGCal = (fastSim & phase2_hgcal).makeProcessModifier(_fastSimDigisHGCal)
+    loadDigiAliasesHGCal(process)
+modifyDigi_fastSimDigisHGCal = (fastSim & phase2_hgcal & ~premix_stage1).makeProcessModifier(_fastSimDigisHGCal)
 
 #phase 2 common mods
 def _modifyEnableHcalHardcode( theProcess ):

FastSimulation/Configuration/python/DigiAliases_cff.py

@@ -125,6 +125,15 @@ def loadDigiAliases(process, premix=False):
                 )
           )
 
+def loadDigiAliasesGEM(process):
+    process.muonGEMDigis = cms.EDAlias(
+        simMuonGEMDigis = cms.VPSet(
+                cms.PSet(
+                    type = cms.string("GEMDetIdGEMDigiMuonDigiCollection")
+                    ),
+                )
+          )
+
 def loadDigiAliasesHGCal(process):
     process.hgcalDigis = cms.EDAlias(
         mix = cms.VPSet(

FastSimulation/MuonSimHitProducer/plugins/BuildFile.xml

@@ -8,6 +8,7 @@
 <use name="Geometry/CSCGeometry"/>
 <use name="Geometry/DTGeometry"/>
 <use name="Geometry/RPCGeometry"/>
+<use name="Geometry/GEMGeometry"/>
 <use name="Geometry/Records"/>
 <use name="MagneticField/Records"/>
 <use name="RecoMuon/MeasurementDet"/>