From 3113c27139cfe85a62702a18686523954915b5e7 Mon Sep 17 00:00:00 2001 From: Matti Kortelainen Date: Fri, 4 Mar 2016 16:20:51 +0100 Subject: [PATCH] Remove 2017 fake conditions These are not needed anymore, and the BeamSpot override becomes (is) wrong with a non-Gaussian BeamSpot in GlobalTag. --- .../Configuration/python/phase1TkCustoms.py | 15 ------- .../fakeConditions_Phase1_R30F12_HCal_cff.py | 40 ------------------ .../fakeConditions_Phase1_R34F16_HCal_cff.py | 40 ------------------ .../python/fakeConditions_Phase1_cff.py | 42 ------------------- 4 files changed, 137 deletions(-) delete mode 100644 SLHCUpgradeSimulations/Geometry/python/fakeConditions_Phase1_R30F12_HCal_cff.py delete mode 100644 SLHCUpgradeSimulations/Geometry/python/fakeConditions_Phase1_R34F16_HCal_cff.py delete mode 100644 SLHCUpgradeSimulations/Geometry/python/fakeConditions_Phase1_cff.py diff --git a/SLHCUpgradeSimulations/Configuration/python/phase1TkCustoms.py b/SLHCUpgradeSimulations/Configuration/python/phase1TkCustoms.py index 2b7930a6e49a8..a9a5517e6668f 100644 --- a/SLHCUpgradeSimulations/Configuration/python/phase1TkCustoms.py +++ b/SLHCUpgradeSimulations/Configuration/python/phase1TkCustoms.py @@ -53,7 +53,6 @@ def customise(process): process=customise_harvesting(process) if hasattr(process,'validation_step'): process=customise_Validation(process) - process=customise_condOverRides(process) return process @@ -313,20 +312,6 @@ def customise_harvesting(process): process.dqmHarvesting.remove(process.sipixelCertification) return (process) -def customise_condOverRides(process): -# process.trackerTopologyConstants.pxb_layerStartBit = cms.uint32(20) -# process.trackerTopologyConstants.pxb_ladderStartBit = cms.uint32(12) -# process.trackerTopologyConstants.pxb_moduleStartBit = cms.uint32(2) -# process.trackerTopologyConstants.pxb_layerMask = cms.uint32(15) -# process.trackerTopologyConstants.pxb_ladderMask = cms.uint32(255) -# process.trackerTopologyConstants.pxb_moduleMask = cms.uint32(1023) -# process.trackerTopologyConstants.pxf_diskStartBit = cms.uint32(18) -# process.trackerTopologyConstants.pxf_bladeStartBit = cms.uint32(12) -# process.trackerTopologyConstants.pxf_panelStartBit = cms.uint32(10) -# process.trackerTopologyConstants.pxf_moduleMask = cms.uint32(255) - process.load('SLHCUpgradeSimulations.Geometry.fakeConditions_Phase1_cff') - return process - def add_detailed_pixel_dqm(process): #enable modOn process.SiPixelRawDataErrorSource.modOn = cms.untracked.bool(True) diff --git a/SLHCUpgradeSimulations/Geometry/python/fakeConditions_Phase1_R30F12_HCal_cff.py b/SLHCUpgradeSimulations/Geometry/python/fakeConditions_Phase1_R30F12_HCal_cff.py deleted file mode 100644 index 44950b01c7950..0000000000000 --- a/SLHCUpgradeSimulations/Geometry/python/fakeConditions_Phase1_R30F12_HCal_cff.py +++ /dev/null @@ -1,40 +0,0 @@ -import FWCore.ParameterSet.Config as cms - -# Start by reading in all the fake conditions that are common to all Phase1 trackers -# Then do the 1 or two that are specific the R34F16 -from SLHCUpgradeSimulations.Geometry.fakeConditions_Phase1_cff import * -siPixelFakeLorentzAngleESSource = cms.ESSource("SiPixelFakeLorentzAngleESSource", - file = cms.FileInPath('SLHCUpgradeSimulations/Geometry/data/PhaseI/PixelSkimmedGeometry_phase1.txt') - ) -es_prefer_fake_lorentz = cms.ESPrefer("SiPixelFakeLorentzAngleESSource","siPixelFakeLorentzAngleESSource") - -# HCal -from Configuration.StandardSequences.FrontierConditions_GlobalTag_cff import * -from Configuration.StandardSequences.SimIdeal_cff import * -from Configuration.StandardSequences.Generator_cff import * -# use hardcoded values -es_hardcode.toGet.extend(['Gains', 'Pedestals', 'PedestalWidths', 'QIEData', - 'ElectronicsMap','ChannelQuality','RespCorrs', - 'ZSThresholds', - 'LutMetadata', - 'L1TriggerObjects','TimeCorrs','PFCorrs','LUTCorrs', - 'RecoParams']) -es_hardcode.H2Mode = cms.untracked.bool(False) -es_hardcode.SLHCMode = cms.untracked.bool(True) -es_prefer_hcalHardcode = cms.ESPrefer("HcalHardcodeCalibrations", "es_hardcode") - -# Keep more stuff -#myOutputCommands.extend([ -# 'keep *_hcalDigis_*_*', 'keep *_simHcalUnsuppressedDigis_*_*', -# 'keep *_towerMakerWithHO_*_*' -# ]) - -# turn on test numbering -g4SimHits.Physics.type = 'SimG4Core/Physics/QGSP_BERT_EMV' -g4SimHits.HCalSD.TestNumberingScheme = True - -# turn on SLHC topology -#HcalTopologyIdealEP.SLHCMode = cms.untracked.bool(True) -- In the Geometry file - -#pgen.remove(genJetMET) - diff --git a/SLHCUpgradeSimulations/Geometry/python/fakeConditions_Phase1_R34F16_HCal_cff.py b/SLHCUpgradeSimulations/Geometry/python/fakeConditions_Phase1_R34F16_HCal_cff.py deleted file mode 100644 index 7706932a0704b..0000000000000 --- a/SLHCUpgradeSimulations/Geometry/python/fakeConditions_Phase1_R34F16_HCal_cff.py +++ /dev/null @@ -1,40 +0,0 @@ -import FWCore.ParameterSet.Config as cms - -# Start by reading in all the fake conditions that are common to all Phase1 trackers -# Then do the 1 or two that are specific the R34F16 -from SLHCUpgradeSimulations.Geometry.fakeConditions_Phase1_cff import * -siPixelFakeLorentzAngleESSource = cms.ESSource("SiPixelFakeLorentzAngleESSource", - file = cms.FileInPath('SLHCUpgradeSimulations/Geometry/data/PhaseI/R34F16/PixelSkimmedGeometry_phase1.txt') - ) -es_prefer_fake_lorentz = cms.ESPrefer("SiPixelFakeLorentzAngleESSource","siPixelFakeLorentzAngleESSource") - -# HCal -from Configuration.StandardSequences.FrontierConditions_GlobalTag_cff import * -from Configuration.StandardSequences.SimIdeal_cff import * -from Configuration.StandardSequences.Generator_cff import * -# use hardcoded values -es_hardcode.toGet.extend(['Gains', 'Pedestals', 'PedestalWidths', 'QIEData', - 'ElectronicsMap','ChannelQuality','RespCorrs', - 'ZSThresholds', - 'LutMetadata', - 'L1TriggerObjects','TimeCorrs','PFCorrs','LUTCorrs', - 'RecoParams']) -es_hardcode.H2Mode = cms.untracked.bool(False) -es_hardcode.SLHCMode = cms.untracked.bool(True) -es_prefer_hcalHardcode = cms.ESPrefer("HcalHardcodeCalibrations", "es_hardcode") - -# Keep more stuff -#myOutputCommands.extend([ -# 'keep *_hcalDigis_*_*', 'keep *_simHcalUnsuppressedDigis_*_*', -# 'keep *_towerMakerWithHO_*_*' -# ]) - -# turn on test numbering -g4SimHits.Physics.type = 'SimG4Core/Physics/QGSP_BERT_EMV' -g4SimHits.HCalSD.TestNumberingScheme = True - -# turn on SLHC topology -#HcalTopologyIdealEP.SLHCMode = cms.untracked.bool(True) -- In the Geometry file - -#pgen.remove(genJetMET) - diff --git a/SLHCUpgradeSimulations/Geometry/python/fakeConditions_Phase1_cff.py b/SLHCUpgradeSimulations/Geometry/python/fakeConditions_Phase1_cff.py deleted file mode 100644 index eac2d7242c34a..0000000000000 --- a/SLHCUpgradeSimulations/Geometry/python/fakeConditions_Phase1_cff.py +++ /dev/null @@ -1,42 +0,0 @@ -import FWCore.ParameterSet.Config as cms - -# I do not know why this is here, comment-out d.k. 2/16 -#siPixelFakeGainOfflineESSource = cms.ESSource("SiPixelFakeGainOfflineESSource", -# file = cms.FileInPath('SLHCUpgradeSimulations/Geometry/data/PhaseI/Empt#yPixelSkimmedGeometry_phase1.txt') -# ) -#es_prefer_fake_gain = cms.ESPrefer("SiPixelFakeGainOfflineESSource","siPixelFakeGainOfflineESSource") - -# from Geometry.TrackerGeometryBuilder.trackerGeometry_cfi import * Double check this later -# TrackerDigiGeometryESModule.applyAlignment = False - - -from SimGeneral.TrackingAnalysis.trackingParticles_cfi import * -mergedtruth.volumeRadius = cms.double(100.0) -mergedtruth.volumeZ = cms.double(900.0) -mergedtruth.discardOutVolume = cms.bool(True) - -#from Geometry.TrackerNumberingBuilder.pixelSLHCGeometryConstants_cfi import * -from Geometry.TrackerGeometryBuilder.idealForDigiTrackerGeometry_cff import * - -# this assumes that the beamspot is gaussian -# remove this when the right global tag is used! -from RecoVertex.BeamSpotProducer.BeamSpotFakeParameters_cfi import * -BeamSpotFakeConditions.X0 = cms.double(0.0) -BeamSpotFakeConditions.Y0 = cms.double(0.0) -BeamSpotFakeConditions.Z0 = cms.double(0.0) -BeamSpotFakeConditions.dxdz = cms.double(0.0) -BeamSpotFakeConditions.dydz = cms.double(0.0) -BeamSpotFakeConditions.sigmaZ = cms.double(5.3) -BeamSpotFakeConditions.widthX = cms.double(0.0015) -BeamSpotFakeConditions.widthY = cms.double(0.0015) -BeamSpotFakeConditions.emittanceX = cms.double(0.) -BeamSpotFakeConditions.emittanceY = cms.double(0.) -BeamSpotFakeConditions.betaStar = cms.double(0.) -BeamSpotFakeConditions.errorX0 = cms.double(0.00002) -BeamSpotFakeConditions.errorY0 = cms.double(0.00002) -BeamSpotFakeConditions.errorZ0 = cms.double(0.04000) -BeamSpotFakeConditions.errordxdz = cms.double(0.0) -BeamSpotFakeConditions.errordydz = cms.double(0.0) -BeamSpotFakeConditions.errorSigmaZ = cms.double(0.03000) -BeamSpotFakeConditions.errorWidth = cms.double(0.00003) -es_prefer_beamspot = cms.ESPrefer("BeamSpotFakeConditions","")