From c588302ad7f144cd82de9bf236dd3646c7404b23 Mon Sep 17 00:00:00 2001 From: Sunanda Date: Mon, 14 Nov 2022 01:31:16 +0100 Subject: [PATCH] Take care of some remaining obsolete python scripts in Geometry/HGCalCommonData --- .../plugins/HGCalParametersESModule.cc | 6 +- .../hgcalEENumberingInitialization_cfi.py | 5 -- .../hgcalEEParametersInitialization_cfi.py | 18 ----- .../python/testGeometryExtended_cff.py | 7 -- .../CheckOverlap/test/python/runHGC_cfg.py | 73 ------------------- 5 files changed, 3 insertions(+), 106 deletions(-) delete mode 100644 Geometry/HGCalCommonData/python/hgcalEENumberingInitialization_cfi.py delete mode 100644 Geometry/HGCalCommonData/python/hgcalEEParametersInitialization_cfi.py delete mode 100644 Geometry/HGCalCommonData/python/testGeometryExtended_cff.py delete mode 100644 Validation/CheckOverlap/test/python/runHGC_cfg.py diff --git a/Geometry/HGCalCommonData/plugins/HGCalParametersESModule.cc b/Geometry/HGCalCommonData/plugins/HGCalParametersESModule.cc index fded90c0a74e6..302ac404171d8 100644 --- a/Geometry/HGCalCommonData/plugins/HGCalParametersESModule.cc +++ b/Geometry/HGCalCommonData/plugins/HGCalParametersESModule.cc @@ -51,10 +51,10 @@ HGCalParametersESModule::HGCalParametersESModule(const edm::ParameterSet& iC) { void HGCalParametersESModule::fillDescriptions(edm::ConfigurationDescriptions& descriptions) { edm::ParameterSetDescription desc; - desc.add("name", "HGCalEESensitive"); - desc.add("name2", "HGCalEE"); + desc.add("name", "HGCalEELayer"); + desc.add("name2", "HGCalEESensitive"); desc.add("nameW", "HGCalEEWafer"); - desc.add("nameC", "HGCalEECell"); + desc.add("nameC", "HGCalEESensitive"); desc.add("nameT", "HGCal"); desc.add("nameX", "HGCalEESensitive"); desc.add("fromDD4hep", false); diff --git a/Geometry/HGCalCommonData/python/hgcalEENumberingInitialization_cfi.py b/Geometry/HGCalCommonData/python/hgcalEENumberingInitialization_cfi.py deleted file mode 100644 index e7563503f47be..0000000000000 --- a/Geometry/HGCalCommonData/python/hgcalEENumberingInitialization_cfi.py +++ /dev/null @@ -1,5 +0,0 @@ -import FWCore.ParameterSet.Config as cms - -hgcalEENumberingInitialize = cms.ESProducer("HGCalNumberingInitialization", - Name = cms.untracked.string("HGCalEESensitive") -) diff --git a/Geometry/HGCalCommonData/python/hgcalEEParametersInitialization_cfi.py b/Geometry/HGCalCommonData/python/hgcalEEParametersInitialization_cfi.py deleted file mode 100644 index 1a8bbb721cbdb..0000000000000 --- a/Geometry/HGCalCommonData/python/hgcalEEParametersInitialization_cfi.py +++ /dev/null @@ -1,18 +0,0 @@ -import FWCore.ParameterSet.Config as cms - -hgcalEEParametersInitialize = cms.ESProducer('HGCalParametersESModule', - name = cms.string('HGCalEELayer'), - name2 = cms.string('HGCalEESensitive'), - nameW = cms.string('HGCalEEWafer'), - nameC = cms.string('HGCalEESensitive'), - nameT = cms.string('HGCal'), - nameX = cms.string('HGCalEESensitive'), - fromDD4hep = cms.bool(False), - appendToDataLabel = cms.string('') -) - -from Configuration.ProcessModifiers.dd4hep_cff import dd4hep - -dd4hep.toModify(hgcalEEParametersInitialize, - fromDD4hep = True -) diff --git a/Geometry/HGCalCommonData/python/testGeometryExtended_cff.py b/Geometry/HGCalCommonData/python/testGeometryExtended_cff.py deleted file mode 100644 index f3283d4b7a3dd..0000000000000 --- a/Geometry/HGCalCommonData/python/testGeometryExtended_cff.py +++ /dev/null @@ -1,7 +0,0 @@ -import FWCore.ParameterSet.Config as cms - -from Geometry.CMSCommonData.cmsExtendedGeometry2026D41XML_cfi import * -from Geometry.TrackerNumberingBuilder.trackerNumberingGeometry_cfi import * -from Geometry.HcalCommonData.hcalDDConstants_cff import * -from Geometry.HGCalCommonData.hgcalParametersInitialization_cfi import * -from Geometry.HGCalCommonData.hgcalNumberingInitialization_cfi import * diff --git a/Validation/CheckOverlap/test/python/runHGC_cfg.py b/Validation/CheckOverlap/test/python/runHGC_cfg.py deleted file mode 100644 index e8efd2595e45b..0000000000000 --- a/Validation/CheckOverlap/test/python/runHGC_cfg.py +++ /dev/null @@ -1,73 +0,0 @@ -import FWCore.ParameterSet.Config as cms - -process = cms.Process("PROD") -process.load("SimGeneral.HepPDTESSource.pdt_cfi") - -#process.load("Geometry.CMSCommonData.cmsExtendedGeometry2023HGCalMuonXML_cfi") -process.load("Geometry.HGCalCommonData.testHGCXML_cfi") - -process.load("Geometry.TrackerNumberingBuilder.trackerNumberingGeometry_cfi") -process.load("Geometry.MuonNumbering.muonNumberingInitialization_cfi") -process.load("Geometry.HGCalCommonData.hgcalNumberingInitialization_cfi") - -process.load("SimG4Core.Application.g4SimHits_cfi") - -process.MessageLogger = cms.Service("MessageLogger", - cerr = cms.untracked.PSet( - enable = cms.untracked.bool(False) - ), - cout = cms.untracked.PSet( - G4cerr = cms.untracked.PSet( - limit = cms.untracked.int32(-1) - ), - G4cout = cms.untracked.PSet( - limit = cms.untracked.int32(-1) - ), - HGCalGeom = cms.untracked.PSet( - limit = cms.untracked.int32(-1) - ), - default = cms.untracked.PSet( - limit = cms.untracked.int32(0) - ), - enable = cms.untracked.bool(True), - threshold = cms.untracked.string('DEBUG') - ), - debugModules = cms.untracked.vstring('*') -) - -process.load("IOMC.RandomEngine.IOMC_cff") -process.RandomNumberGeneratorService.generator.initialSeed = 456789 -process.RandomNumberGeneratorService.g4SimHits.initialSeed = 9876 -process.RandomNumberGeneratorService.VtxSmeared.initialSeed = 123456789 - -process.source = cms.Source("EmptySource") - -process.generator = cms.EDProducer("FlatRandomEGunProducer", - PGunParameters = cms.PSet( - PartID = cms.vint32(14), - MinEta = cms.double(-3.5), - MaxEta = cms.double(3.5), - MinPhi = cms.double(-3.14159265359), - MaxPhi = cms.double(3.14159265359), - MinE = cms.double(9.99), - MaxE = cms.double(10.01) - ), - AddAntiParticle = cms.bool(False), - Verbosity = cms.untracked.int32(0), - firstRun = cms.untracked.uint32(1) -) - -process.maxEvents = cms.untracked.PSet( - input = cms.untracked.int32(1) -) - -process.p1 = cms.Path(process.generator*process.g4SimHits) -process.g4SimHits.UseMagneticField = False -process.g4SimHits.Physics.type = 'SimG4Core/Physics/DummyPhysics' -process.g4SimHits.Physics.DummyEMPhysics = True -process.g4SimHits.Watchers = cms.VPSet(cms.PSet( - type = cms.string('CheckOverlap'), - Resolution = cms.untracked.int32(1000), - NodeNames = cms.untracked.vstring('HGCal') -)) -