From 837712174642fa0f1af6acf9cc4d1efcf43f5f4f Mon Sep 17 00:00:00 2001 From: Sunanda Date: Tue, 22 Sep 2015 19:05:28 +0200 Subject: [PATCH 1/4] Make the topology tester up-to-date with the geometry changes for HCAL --- Geometry/CaloTopology/test/BuildFile.xml | 13 +- ...HcalTopology.cpp => HcalTopologyTester.cc} | 60 ++++- .../test/testCaloTowerTopology.cpp | 40 --- .../CaloTopology/test/testHcalTopology_cfg.py | 51 ++++ .../test/testHcalTopology_cfg_dump.py | 237 ++++++++++++++++++ 5 files changed, 349 insertions(+), 52 deletions(-) rename Geometry/CaloTopology/test/{testHcalTopology.cpp => HcalTopologyTester.cc} (51%) delete mode 100644 Geometry/CaloTopology/test/testCaloTowerTopology.cpp create mode 100644 Geometry/CaloTopology/test/testHcalTopology_cfg.py create mode 100644 Geometry/CaloTopology/test/testHcalTopology_cfg_dump.py diff --git a/Geometry/CaloTopology/test/BuildFile.xml b/Geometry/CaloTopology/test/BuildFile.xml index e777e770913c2..b0a7e0044ab7b 100644 --- a/Geometry/CaloTopology/test/BuildFile.xml +++ b/Geometry/CaloTopology/test/BuildFile.xml @@ -1,7 +1,10 @@ - +1;2401;0c - - - - + + + + + + + diff --git a/Geometry/CaloTopology/test/testHcalTopology.cpp b/Geometry/CaloTopology/test/HcalTopologyTester.cc similarity index 51% rename from Geometry/CaloTopology/test/testHcalTopology.cpp rename to Geometry/CaloTopology/test/HcalTopologyTester.cc index 82b5e24326678..d00c941d95056 100644 --- a/Geometry/CaloTopology/test/testHcalTopology.cpp +++ b/Geometry/CaloTopology/test/HcalTopologyTester.cc @@ -2,18 +2,61 @@ #include #include +#include "FWCore/ParameterSet/interface/ParameterSet.h" +#include "FWCore/Framework/interface/Frameworkfwd.h" +#include "FWCore/Framework/interface/EDAnalyzer.h" + +#include "FWCore/Framework/interface/Event.h" +#include "FWCore/Framework/interface/EventSetup.h" +#include "FWCore/Framework/interface/ESTransientHandle.h" +#include "FWCore/Framework/interface/ESHandle.h" +#include "FWCore/Framework/interface/MakerMacros.h" + +#include "DetectorDescription/Core/interface/DDCompactView.h" +#include "Geometry/Records/interface/IdealGeometryRecord.h" +#include "Geometry/Records/interface/HcalRecNumberingRecord.h" +#include "Geometry/HcalCommonData/interface/HcalDDDRecConstants.h" #include "Geometry/CaloTopology/interface/HcalTopology.h" #include "DataFormats/HcalDetId/interface/HcalDetId.h" #include "DataFormats/HcalDetId/interface/HcalSubdetector.h" +#include "CoralBase/Exception.h" + +class HcalTopologyTester : public edm::EDAnalyzer { +public: + explicit HcalTopologyTester(const edm::ParameterSet& ); + ~HcalTopologyTester(); + + + virtual void analyze(const edm::Event&, const edm::EventSetup& ); + void doTest(const HcalTopology& topology); + +private: + // ----------member data --------------------------- +}; + +HcalTopologyTester::HcalTopologyTester(const edm::ParameterSet& ) {} -int main(int /*argc*/, char** /*argv*/) { - // FIXME: for SLHC - HcalTopologyMode::Mode mode = HcalTopologyMode::LHC; - int maxDepthHB = 2; - int maxDepthHE = 3; +HcalTopologyTester::~HcalTopologyTester() {} + +void HcalTopologyTester::analyze(const edm::Event& , + const edm::EventSetup& iSetup ) { + + + edm::ESTransientHandle pDD; + iSetup.get().get( pDD ); + std::cout << "Gets Compact View\n"; + edm::ESHandle pHSNDC; + iSetup.get().get( pHSNDC ); + std::cout << "Gets RecNumbering Record\n"; + edm::ESHandle topo; + iSetup.get().get(topo); + if (topo.isValid()) doTest(*topo); + else std::cout << "Cannot get a valid HcalTopology Object\n"; +} + +void HcalTopologyTester::doTest(const HcalTopology& topology) { - HcalTopology topology(mode, maxDepthHB, maxDepthHE); for (int idet=0; idet<4; idet++) { HcalSubdetector subdet = HcalBarrel; if (idet == 1) subdet = HcalOuter; @@ -55,5 +98,8 @@ int main(int /*argc*/, char** /*argv*/) { } } } - return 0; + } + +//define this as a plug-in +DEFINE_FWK_MODULE(HcalTopologyTester); diff --git a/Geometry/CaloTopology/test/testCaloTowerTopology.cpp b/Geometry/CaloTopology/test/testCaloTowerTopology.cpp deleted file mode 100644 index e85956f6a30bf..0000000000000 --- a/Geometry/CaloTopology/test/testCaloTowerTopology.cpp +++ /dev/null @@ -1,40 +0,0 @@ -#include -#include -#include - -#include "Geometry/CaloTopology/interface/CaloTowerTopology.h" -#include "DataFormats/CaloTowers/interface/CaloTowerDetId.h" - -int main(int /*argc*/, char** /*argv*/) { - - CaloTowerTopology topology; - for (int ieta=-41; ieta<=41; ieta++) { - for (int iphi=1; iphi<=72; iphi++) { - if (CaloTowerDetId::validDetId(ieta,iphi)) { - const CaloTowerDetId id(ieta,iphi); - std::vector idE = topology.east(id); - std::vector idW = topology.west(id); - std::vector idN = topology.north(id); - std::vector idS = topology.south(id); - std::cout << "Neighbours for : Tower " << id << std::endl; - std::cout << " " << idE.size() << " sets along East:"; - for (unsigned int i=0; i Date: Tue, 22 Sep 2015 19:08:53 +0200 Subject: [PATCH 2/4] Correct typing error --- Geometry/CaloTopology/test/BuildFile.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Geometry/CaloTopology/test/BuildFile.xml b/Geometry/CaloTopology/test/BuildFile.xml index b0a7e0044ab7b..8e1219596093c 100644 --- a/Geometry/CaloTopology/test/BuildFile.xml +++ b/Geometry/CaloTopology/test/BuildFile.xml @@ -1,4 +1,4 @@ -1;2401;0c + From 729e8bd7ffa94416f3b5ed4a43b91ca4bdf60406 Mon Sep 17 00:00:00 2001 From: Sunanda Date: Fri, 25 Sep 2015 12:45:52 +0200 Subject: [PATCH 3/4] Remove the dump cfg file --- .../test/testHcalTopology_cfg_dump.py | 237 ------------------ 1 file changed, 237 deletions(-) delete mode 100644 Geometry/CaloTopology/test/testHcalTopology_cfg_dump.py diff --git a/Geometry/CaloTopology/test/testHcalTopology_cfg_dump.py b/Geometry/CaloTopology/test/testHcalTopology_cfg_dump.py deleted file mode 100644 index 89693236ff6cf..0000000000000 --- a/Geometry/CaloTopology/test/testHcalTopology_cfg_dump.py +++ /dev/null @@ -1,237 +0,0 @@ -import FWCore.ParameterSet.Config as cms - -process = cms.Process("PROD") - -process.source = cms.Source("EmptySource") -process.generator = cms.EDProducer("FlatRandomEGunProducer", - PGunParameters = cms.PSet( - PartID = cms.vint32(14), - MaxEta = cms.double(3.5), - MaxPhi = cms.double(3.14159265359), - MinEta = cms.double(-3.5), - MinE = cms.double(9.99), - MinPhi = cms.double(-3.14159265359), - MaxE = cms.double(10.01) - ), - Verbosity = cms.untracked.int32(0), - AddAntiParticle = cms.bool(False), - firstRun = cms.untracked.uint32(1) -) - - -process.randomEngineStateProducer = cms.EDProducer("RandomEngineStateProducer") - - -process.prod = cms.EDAnalyzer("HcalTopologyTester") - - -process.p1 = cms.Path(process.generator+process.prod) - - -process.MessageLogger = cms.Service("MessageLogger", - debugModules = cms.untracked.vstring('*'), - cout = cms.untracked.PSet( - default = cms.untracked.PSet( - limit = cms.untracked.int32(0) - ), - threshold = cms.untracked.string('DEBUG'), - HCalGeom = cms.untracked.PSet( - limit = cms.untracked.int32(0) - ) - ), - categories = cms.untracked.vstring('HCalGeom'), - destinations = cms.untracked.vstring('cout') -) - - -process.RandomNumberGeneratorService = cms.Service("RandomNumberGeneratorService", - horeco = cms.PSet( - initialSeed = cms.untracked.uint32(541321), - engineName = cms.untracked.string('TRandom3') - ), - externalLHEProducer = cms.PSet( - initialSeed = cms.untracked.uint32(234567), - engineName = cms.untracked.string('HepJamesRandom') - ), - saveFileName = cms.untracked.string(''), - hbhereco = cms.PSet( - initialSeed = cms.untracked.uint32(541321), - engineName = cms.untracked.string('TRandom3') - ), - simSiStripDigiSimLink = cms.PSet( - initialSeed = cms.untracked.uint32(1234567), - engineName = cms.untracked.string('HepJamesRandom') - ), - paramMuons = cms.PSet( - initialSeed = cms.untracked.uint32(54525), - engineName = cms.untracked.string('TRandom3') - ), - famosPileUp = cms.PSet( - initialSeed = cms.untracked.uint32(918273), - engineName = cms.untracked.string('TRandom3') - ), - simMuonDTDigis = cms.PSet( - initialSeed = cms.untracked.uint32(1234567), - engineName = cms.untracked.string('HepJamesRandom') - ), - siTrackerGaussianSmearingRecHits = cms.PSet( - initialSeed = cms.untracked.uint32(24680), - engineName = cms.untracked.string('TRandom3') - ), - ecalPreshowerRecHit = cms.PSet( - initialSeed = cms.untracked.uint32(6541321), - engineName = cms.untracked.string('TRandom3') - ), - generator = cms.PSet( - initialSeed = cms.untracked.uint32(456789), - engineName = cms.untracked.string('HepJamesRandom') - ), - simMuonRPCDigis = cms.PSet( - initialSeed = cms.untracked.uint32(1234567), - engineName = cms.untracked.string('HepJamesRandom') - ), - hiSignal = cms.PSet( - initialSeed = cms.untracked.uint32(123456789), - engineName = cms.untracked.string('HepJamesRandom') - ), - mixSimCaloHits = cms.PSet( - initialSeed = cms.untracked.uint32(918273), - engineName = cms.untracked.string('TRandom3') - ), - mix = cms.PSet( - initialSeed = cms.untracked.uint32(12345), - engineName = cms.untracked.string('HepJamesRandom') - ), - VtxSmeared = cms.PSet( - initialSeed = cms.untracked.uint32(98765432), - engineName = cms.untracked.string('HepJamesRandom') - ), - LHCTransport = cms.PSet( - initialSeed = cms.untracked.uint32(87654321), - engineName = cms.untracked.string('TRandom3') - ), - ecalRecHit = cms.PSet( - initialSeed = cms.untracked.uint32(654321), - engineName = cms.untracked.string('TRandom3') - ), - mixData = cms.PSet( - initialSeed = cms.untracked.uint32(12345), - engineName = cms.untracked.string('HepJamesRandom') - ), - mixRecoTracks = cms.PSet( - initialSeed = cms.untracked.uint32(918273), - engineName = cms.untracked.string('TRandom3') - ), - hiSignalG4SimHits = cms.PSet( - initialSeed = cms.untracked.uint32(11), - engineName = cms.untracked.string('HepJamesRandom') - ), - famosSimHits = cms.PSet( - initialSeed = cms.untracked.uint32(13579), - engineName = cms.untracked.string('TRandom3') - ), - MuonSimHits = cms.PSet( - initialSeed = cms.untracked.uint32(987346), - engineName = cms.untracked.string('TRandom3') - ), - g4SimHits = cms.PSet( - initialSeed = cms.untracked.uint32(11), - engineName = cms.untracked.string('HepJamesRandom') - ), - hiSignalLHCTransport = cms.PSet( - initialSeed = cms.untracked.uint32(88776655), - engineName = cms.untracked.string('TRandom3') - ), - mixGenPU = cms.PSet( - initialSeed = cms.untracked.uint32(918273), - engineName = cms.untracked.string('TRandom3') - ), - l1ParamMuons = cms.PSet( - initialSeed = cms.untracked.uint32(6453209), - engineName = cms.untracked.string('TRandom3') - ), - simBeamSpotFilter = cms.PSet( - initialSeed = cms.untracked.uint32(87654321), - engineName = cms.untracked.string('HepJamesRandom') - ), - simMuonCSCDigis = cms.PSet( - initialSeed = cms.untracked.uint32(11223344), - engineName = cms.untracked.string('HepJamesRandom') - ), - hfreco = cms.PSet( - initialSeed = cms.untracked.uint32(541321), - engineName = cms.untracked.string('TRandom3') - ) -) - - -process.hcalParameters = cms.ESProducer('HcalParametersESModule', - appendToDataLabel = cms.string('') -) - - -process.hcalDDDSimConstants = cms.ESProducer('HcalDDDSimConstantsESModule', - appendToDataLabel = cms.string('') -) - - -process.hcalDDDRecConstants = cms.ESProducer('HcalDDDRecConstantsESModule', - appendToDataLabel = cms.string('') -) - - -process.hcalTopologyIdeal = cms.ESProducer("HcalTopologyIdealEP", - Exclude = cms.untracked.string(''), - appendToDataLabel = cms.string(''), - hcalTopologyConstants = cms.PSet( - - ) -) - - -process.HepPDTESSource = cms.ESSource("HepPDTESSource", - pdtFileName = cms.FileInPath('SimGeneral/HepPDTESSource/data/particle.tbl') -) - - -process.XMLIdealGeometryESSource = cms.ESSource("XMLIdealGeometryESSource", - geomXMLFiles = cms.vstring('Geometry/CMSCommonData/data/materials.xml', - 'Geometry/HcalCommonData/data/average/hcalforwardmaterial.xml', - 'Geometry/CMSCommonData/data/rotations.xml', - 'Geometry/HcalCommonData/data/hcalrotations.xml', - 'Geometry/CMSCommonData/data/normal/cmsextent.xml', - 'Geometry/CMSCommonData/data/cms.xml', - 'Geometry/CMSCommonData/data/cmsMother.xml', - 'Geometry/CMSCommonData/data/caloBase.xml', - 'Geometry/CMSCommonData/data/cmsCalo.xml', - 'Geometry/CMSCommonData/data/muonBase.xml', - 'Geometry/CMSCommonData/data/cmsMuon.xml', - 'Geometry/CMSCommonData/data/mgnt.xml', - 'Geometry/CMSCommonData/data/muonMB.xml', - 'Geometry/CMSCommonData/data/muonMagnet.xml', - 'Geometry/CMSCommonData/data/eta4/etaMax.xml', - 'Geometry/HcalCommonData/data/Phase0/hcalalgo.xml', - 'Geometry/HcalCommonData/data/hcalcablealgo.xml', - 'Geometry/HcalCommonData/data/hcalbarrelalgo.xml', - 'Geometry/HcalCommonData/data/Phase0/hcalendcapalgo.xml', - 'Geometry/HcalCommonData/data/hcalouteralgo.xml', - 'Geometry/HcalCommonData/data/hcalforwardalgo.xml', - 'Geometry/HcalCommonData/data/Phase0/hcalSimNumbering.xml', - 'Geometry/HcalCommonData/data/Phase0/hcalRecNumbering.xml', - 'Geometry/ForwardCommonData/data/bundle/forwardshield.xml', - 'Geometry/ForwardCommonData/data/forward.xml', - 'Geometry/HcalSimData/data/CaloUtil.xml', - 'Geometry/HcalCommonData/data/hcalsens.xml', - 'Geometry/HcalSimData/data/hf.xml', - 'Geometry/HcalSimData/data/hfpmt.xml', - 'Geometry/HcalSimData/data/hffibrebundle.xml', - 'Geometry/HcalSimData/data/HcalProdCuts.xml', - 'Geometry/CMSCommonData/data/FieldParameters.xml'), - rootNodeName = cms.string('cms:OCMS') -) - - -process.maxEvents = cms.untracked.PSet( - input = cms.untracked.int32(1) -) - From b11bf78e88350a43749411df5c2d881d2e261257 Mon Sep 17 00:00:00 2001 From: Sunanda Date: Sat, 26 Sep 2015 14:49:17 +0200 Subject: [PATCH 4/4] Remove dependency on CoralBase --- Geometry/CaloTopology/test/BuildFile.xml | 1 - Geometry/CaloTopology/test/HcalTopologyTester.cc | 1 - 2 files changed, 2 deletions(-) diff --git a/Geometry/CaloTopology/test/BuildFile.xml b/Geometry/CaloTopology/test/BuildFile.xml index 8e1219596093c..a1f3dcf758d13 100644 --- a/Geometry/CaloTopology/test/BuildFile.xml +++ b/Geometry/CaloTopology/test/BuildFile.xml @@ -3,7 +3,6 @@ - diff --git a/Geometry/CaloTopology/test/HcalTopologyTester.cc b/Geometry/CaloTopology/test/HcalTopologyTester.cc index d00c941d95056..2486019cdf70f 100644 --- a/Geometry/CaloTopology/test/HcalTopologyTester.cc +++ b/Geometry/CaloTopology/test/HcalTopologyTester.cc @@ -19,7 +19,6 @@ #include "Geometry/CaloTopology/interface/HcalTopology.h" #include "DataFormats/HcalDetId/interface/HcalDetId.h" #include "DataFormats/HcalDetId/interface/HcalSubdetector.h" -#include "CoralBase/Exception.h" class HcalTopologyTester : public edm::EDAnalyzer { public: