Add sven's patch for digi step.

geonmo · May 4, 2015 · 37becd4 · 37becd4
1 parent 8e93d92
commit 37becd4
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 12 deletions.
diff --git a/SLHCUpgradeSimulations/Configuration/python/fixMissingUpgradeGTPayloads.py b/SLHCUpgradeSimulations/Configuration/python/fixMissingUpgradeGTPayloads.py
@@ -7,11 +7,11 @@ def fixRPCConditions(process):
     process.GlobalTag.toGet.extend( cms.VPSet(
         cms.PSet(record = cms.string("RPCStripNoisesRcd"),
                  tag = cms.string("RPC_testCondition_192Strips_mc"),
-                 connect = cms.untracked.string("frontier://FrontierProd/CMS_COND_31X_RPC")
+                 connect = cms.string("frontier://FrontierProd/CMS_COND_31X_RPC")
                  ),
         cms.PSet(record = cms.string("RPCClusterSizeRcd"),
                  tag = cms.string("RPCClusterSize_PhaseII_mc"),
-                 connect = cms.untracked.string("frontier://FrontierProd/CMS_COND_36X_RPC")
+                 connect = cms.string("frontier://FrontierProd/CMS_COND_36X_RPC")
                  )
         )
     )
@@ -23,14 +23,14 @@ def fixDTAlignmentConditions(process):
     process.GlobalTag.toGet.extend( cms.VPSet(
             cms.PSet(record = cms.string("DTAlignmentErrorExtendedRcd"),
                      tag = cms.string("MuonDTAPEObjectsExtended_v0_mc"),
-                     connect = cms.untracked.string("frontier://FrontierProd/CMS_COND_ALIGN_000")
+                     connect = cms.string("frontier://FrontierProd/CMS_COND_ALIGN_000")
                  )
             )
     ),
     process.GlobalTag.toGet.extend( cms.VPSet(
             cms.PSet(record = cms.string("DTRecoUncertaintiesRcd"),
                      tag = cms.string("DTRecoUncertainties_True_v0"),
-                     connect = cms.untracked.string("frontier://FrontierProd/CMS_COND_DT_000")
+                     connect = cms.string("frontier://FrontierProd/CMS_COND_DT_000")
                  )
             )
     ),
@@ -42,7 +42,7 @@ def fixCSCAlignmentConditions(process):
     process.GlobalTag.toGet.extend( cms.VPSet(
             cms.PSet(record = cms.string("CSCAlignmentErrorExtendedRcd"),
                      tag = cms.string("MuonCSCAPEObjectsExtended_v0_mc"),
-                     connect = cms.untracked.string("frontier://FrontierProd/CMS_COND_ALIGN_000")
+                     connect = cms.string("frontier://FrontierProd/CMS_COND_ALIGN_000")
                  )
             )
     ),

diff --git a/SLHCUpgradeSimulations/Configuration/python/gemCustom.py b/SLHCUpgradeSimulations/Configuration/python/gemCustom.py
@@ -11,12 +11,6 @@ def customise2023(process):
   return process
 
 def customise_digitization(process):
-  from SimMuon.GEMDigitizer.customizeGEMDigi import customize_digi_addGEM_muon_only
-  process = customize_digi_addGEM_muon_only(process)
-  process.simMuonGEMDigis.mixLabel = cms.string("mix")
-  process.simMuonRPCDigis.digiModel = cms.string('RPCSimParam')
-  #process.simMuonME0Digis.mixLabel = cms.string("mix")
-  process.digitisation_step.remove(process.simMuonRPCDigis)
   return process
 
 def customise_Validation(process):

diff --git a/Validation/MuonGEMHits/test/Generate.sh b/Validation/MuonGEMHits/test/Generate.sh
@@ -5,7 +5,7 @@
 
 #!/bin/bash
 
-cmsDriver.py SingleMuPt40Fwd_cfi -s GEN,SIM,DIGI,L1 --conditions auto:run1_mc --datatier GEN-SIM-DIGI --geometry Extended2023 --evt_type Validation/MuonGEMHits/SingleMuPt40Fwd_cfi --eventcontent FEVTDEBUG -n 1000 --no_exec --fileout out_digi.root --customise SLHCUpgradeSimulations/Configuration/gemCustom.customise2023 --python_filename=gen_sim_digi_cfg.py
+cmsDriver.py SingleMuPt40Fwd_cfi -s GEN,SIM,DIGI,L1 --conditions auto:run1_mc --datatier GEN-SIM-DIGI --geometry Extended2023 --evt_type Validation/MuonGEMHits/SingleMuPt40Fwd_cfi --eventcontent FEVTDEBUG -n 1000 --no_exec --fileout out_digi.root --customise SLHCUpgradeSimulations/Configuration/gemCustom.customise2023,SLHCUpgradeSimulations/Configuration/fixMissingUpgradeGTPayloads.fixRPCConditions,SLHCUpgradeSimulations/Configuration/fixMissingUpgradeGTPayloads.fixCSCAlignmentConditions,SimMuon/GEMDigitizer/customizeGEMDigi.customize_digi_addGEM_muon_only --python_filename=gen_sim_digi_cfg.py
 
 cmsDriver.py validation --conditions auto:run1_mc -n 1000 --eventcontent FEVTDEBUGHLT -s VALIDATION:genvalid_all --customise SLHCUpgradeSimulations/Configuration/gemCustom.customise2023 --datatier GEN-SIM-DIGI --geometry Extended2023 --no_exec --filein file:out_digi.root --fileout file:out_valid.root --python_filename=valid_cfg.py