Merge pull request #10036 from boudoul/fixgeomphase1

update tracker configurations (phase1)
cms-sw · Jul 7, 2015 · bffb041 · bffb041
2 parents f97713c + fc08576
commit bffb041
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/SLHCUpgradeSimulations/Configuration/python/phase1TkCustoms.py b/SLHCUpgradeSimulations/Configuration/python/phase1TkCustoms.py
@@ -75,7 +75,8 @@ def customise_Digi(process):
     process.mix.digitizers.pixel.thePixelChipEfficiency_FPix1 = cms.double(0.999)
     process.mix.digitizers.pixel.thePixelChipEfficiency_FPix2 = cms.double(0.999)
     process.mix.digitizers.pixel.thePixelChipEfficiency_FPix3 = cms.double(0.999)
-    process.mix.digitizers.pixel.AddPixelInefficiency = cms.bool(True)
+# something broken in the configs above - turn off for now
+    process.mix.digitizers.pixel.AddPixelInefficiency = cms.bool(False)
 
     process=customise_pixelMixing_PU(process)
     return process

diff --git a/SLHCUpgradeSimulations/Geometry/python/fakeConditions_Phase1_cff.py b/SLHCUpgradeSimulations/Geometry/python/fakeConditions_Phase1_cff.py
@@ -15,7 +15,7 @@
 mergedtruth.discardOutVolume = cms.bool(True)
 
 #from Geometry.TrackerNumberingBuilder.pixelSLHCGeometryConstants_cfi import *
-from Geometry.TrackerGeometryBuilder.idealForDigiTrackerSLHCGeometry_cff import *
+from Geometry.TrackerGeometryBuilder.idealForDigiTrackerGeometry_cff import *
 
 # this assumes that the beamspot is gaussian
 # remove this when the right global tag is used!