From 18b6fd0b5f794a57fca70a9630cf116a27a60285 Mon Sep 17 00:00:00 2001 From: Ianna Osborne Date: Mon, 14 Sep 2020 12:20:43 +0200 Subject: [PATCH 1/5] DD4hep API cleanup --- .../DDCMS/interface/DDAlgoArguments.h | 14 +-- .../DDCMS/interface/DDCompactView.h | 4 +- .../DDCMS/interface/DDDetector.h | 10 +- .../DDCMS/interface/DDExpandedView.h | 40 -------- .../DDCMS/interface/DDFilteredView.h | 5 +- .../DDCMS/interface/DDTranslation.h | 5 +- .../DDCMS/interface/DDVolumeProcessor.h | 88 ------------------ .../DDCMS/plugins/DDCMSDetector.cc | 2 +- .../plugins/test/DDTestNavigateGeometry.cc | 91 ------------------- DetectorDescription/DDCMS/src/DDDetector.cc | 7 -- .../DDCMS/src/DDFilteredView.cc | 6 -- .../EcalAlgo/test/python/testEcalGeometry.py | 5 - 12 files changed, 17 insertions(+), 260 deletions(-) delete mode 100644 DetectorDescription/DDCMS/interface/DDExpandedView.h delete mode 100644 DetectorDescription/DDCMS/interface/DDVolumeProcessor.h delete mode 100644 DetectorDescription/DDCMS/plugins/test/DDTestNavigateGeometry.cc diff --git a/DetectorDescription/DDCMS/interface/DDAlgoArguments.h b/DetectorDescription/DDCMS/interface/DDAlgoArguments.h index 99a0934354a4f..0ca42da6ca9e3 100644 --- a/DetectorDescription/DDCMS/interface/DDAlgoArguments.h +++ b/DetectorDescription/DDCMS/interface/DDAlgoArguments.h @@ -1,17 +1,17 @@ -#ifndef DETECTOR_DESCRIPTION_DD_ALGO_ARGUMENTS_H -#define DETECTOR_DESCRIPTION_DD_ALGO_ARGUMENTS_H +#ifndef DetectorDescription_DDCMS_DDAlgoArguments_h +#define DetectorDescription_DDCMS_DDAlgoArguments_h #include "XML/XML.h" -#include "DD4hep/DetElement.h" #include "DetectorDescription/DDCMS/interface/DDXMLTags.h" #include "DetectorDescription/DDCMS/interface/DDNamespace.h" #include "DetectorDescription/DDCMS/interface/DDParsingContext.h" +#include "DetectorDescription/DDCMS/interface/DDRotationMatrix.h" +#include "DetectorDescription/DDCMS/interface/DDTranslation.h" #include #include namespace cms { - using DD3Vector = ROOT::Math::DisplacementVector3D>; static constexpr long s_executed = 1l; @@ -19,11 +19,11 @@ namespace cms { inline unsigned int hash(const std::string& str) { return hash(str.c_str()); } - dd4hep::Rotation3D makeRotation3D(double thetaX, double phiX, double thetaY, double phiY, double thetaZ, double phiZ); + DDRotationMatrix makeRotation3D(double thetaX, double phiX, double thetaY, double phiY, double thetaZ, double phiZ); - dd4hep::Rotation3D makeRotReflect(double thetaX, double phiX, double thetaY, double phiY, double thetaZ, double phiZ); + DDRotationMatrix makeRotReflect(double thetaX, double phiX, double thetaY, double phiY, double thetaZ, double phiZ); - dd4hep::Rotation3D makeRotation3D(dd4hep::Rotation3D rotation, const std::string& axis, double angle); + DDRotationMatrix makeRotation3D(DDRotationMatrix rotation, const std::string& axis, double angle); class DDAlgoArguments { public: diff --git a/DetectorDescription/DDCMS/interface/DDCompactView.h b/DetectorDescription/DDCMS/interface/DDCompactView.h index 159563e720194..87192d0273ef0 100644 --- a/DetectorDescription/DDCMS/interface/DDCompactView.h +++ b/DetectorDescription/DDCMS/interface/DDCompactView.h @@ -1,5 +1,5 @@ -#ifndef DETECTOR_DESCRIPTION_DD_COMPACT_VIEW_H -#define DETECTOR_DESCRIPTION_DD_COMPACT_VIEW_H +#ifndef DetectorDescription_DDCMS_DDCompactView_h +#define DetectorDescription_DDCMS_DDCompactView_h // -*- C++ -*- // diff --git a/DetectorDescription/DDCMS/interface/DDDetector.h b/DetectorDescription/DDCMS/interface/DDDetector.h index 186fb4c8b5c04..46e7a3665f954 100644 --- a/DetectorDescription/DDCMS/interface/DDDetector.h +++ b/DetectorDescription/DDCMS/interface/DDDetector.h @@ -1,5 +1,5 @@ -#ifndef DETECTOR_DESCRIPTION_DD_DETECTOR_H -#define DETECTOR_DESCRIPTION_DD_DETECTOR_H +#ifndef DetectorDescription_DDCMS_DDDetector_h +#define DetectorDescription_DDCMS_DDDetector_h #include #include @@ -22,15 +22,9 @@ namespace cms { //! Handle to the world volume containing everything dd4hep::Volume worldVolume() const; - //! Access to the physical volume of the world detector element - dd4hep::PlacedVolume worldPlacement() const; - //! Reference to the top-most (world) detector element dd4hep::DetElement world() const; - //! The map of sub-detectors - const dd4hep::Detector::HandleMap& detectors() const; - //! The geometry manager of this instance TGeoManager& manager() const; diff --git a/DetectorDescription/DDCMS/interface/DDExpandedView.h b/DetectorDescription/DDCMS/interface/DDExpandedView.h deleted file mode 100644 index e3f9e0138a709..0000000000000 --- a/DetectorDescription/DDCMS/interface/DDExpandedView.h +++ /dev/null @@ -1,40 +0,0 @@ -#ifndef DETECTOR_DESCRIPTION_DD_EXPANDED_VIEW_H -#define DETECTOR_DESCRIPTION_DD_EXPANDED_VIEW_H - -// -*- C++ -*- -// -// Package: DetectorDescription/Core -// Class: DDExpandedView -// -/**\class DDExpandedView - - Description: DD Expanded View Facade - - Implementation: - The DDExpandedView facade serves as a launching point for a broader - refactor of monolithic or tightly-coupled systems in favor of more - loosely-coupled code. -*/ -// -// Original Author: Ianna Osborne -// Created: Wed, 22 May 2019 12:59:09 GMT -// -// - -namespace cms { - - class DDCompactView; - class DDFilteredView; - - class DDExpandedView { - friend class cms::DDFilteredView; - - public: - DDExpandedView(const cms::DDCompactView& cpv) : m_cpv(cpv) {} - - private: - const cms::DDCompactView& m_cpv; - }; -} // namespace cms - -#endif diff --git a/DetectorDescription/DDCMS/interface/DDFilteredView.h b/DetectorDescription/DDCMS/interface/DDFilteredView.h index 0ed351b0581ce..f6ea147ccc409 100644 --- a/DetectorDescription/DDCMS/interface/DDFilteredView.h +++ b/DetectorDescription/DDCMS/interface/DDFilteredView.h @@ -1,5 +1,5 @@ -#ifndef DETECTOR_DESCRIPTION_DD_FILTERED_VIEW_H -#define DETECTOR_DESCRIPTION_DD_FILTERED_VIEW_H +#ifndef DetectorDescription_DDCMS_DDFilteredView_h +#define DetectorDescription_DDCMS_DDFilteredView_h // -*- C++ -*- // @@ -236,7 +236,6 @@ namespace cms { int nodeCopyNo(const std::string_view) const; std::vector> toNodeNames(const std::string&); bool match(const std::string&, const std::vector>&) const; - const TClass* getShape() const; //! set the current node to the first sibling bool firstSibling(); diff --git a/DetectorDescription/DDCMS/interface/DDTranslation.h b/DetectorDescription/DDCMS/interface/DDTranslation.h index dfda06e9490cb..197e7f7327885 100644 --- a/DetectorDescription/DDCMS/interface/DDTranslation.h +++ b/DetectorDescription/DDCMS/interface/DDTranslation.h @@ -1,9 +1,10 @@ #ifndef DetectorDescription_DDCMS_DDTranslation_h #define DetectorDescription_DDCMS_DDTranslation_h + #include //! A DD Translation is currently implemented with Root Vector3D -typedef ROOT::Math::DisplacementVector3D > DD3Vector; -typedef ROOT::Math::DisplacementVector3D > DDTranslation; +using DD3Vector = ROOT::Math::DisplacementVector3D>; +using DDTranslation = ROOT::Math::DisplacementVector3D>; #endif diff --git a/DetectorDescription/DDCMS/interface/DDVolumeProcessor.h b/DetectorDescription/DDCMS/interface/DDVolumeProcessor.h deleted file mode 100644 index 1fe63b3d22907..0000000000000 --- a/DetectorDescription/DDCMS/interface/DDVolumeProcessor.h +++ /dev/null @@ -1,88 +0,0 @@ -#ifndef DETECTOR_DESCRIPTION_DD_VOLUME_PROCESSOR_H -#define DETECTOR_DESCRIPTION_DD_VOLUME_PROCESSOR_H - -#include "DD4hep/VolumeProcessor.h" -#include "FWCore/MessageLogger/interface/MessageLogger.h" - -#include -#include -#include - -namespace cms { - - class DDVolumeProcessor : public dd4hep::PlacedVolumeProcessor { - public: - using Volume = dd4hep::Volume; - using PlacedVolume = dd4hep::PlacedVolume; - using PlacedVolumeProcessor = dd4hep::PlacedVolumeProcessor; - - DDVolumeProcessor() = default; - ~DDVolumeProcessor() override = default; - - std::string_view stripNamespace(std::string_view v) { - auto first = v.find_first_of(":"); - v.remove_prefix(std::min(first + 1, v.size())); - return v; - } - - std::string_view stripCopyNo(std::string_view v) { - auto found = v.find_last_of("_"); - if (found != v.npos) { - v.remove_suffix(v.size() - found); - } - return v; - } - - std::vector split(std::string_view str, const char* delims) { - std::vector ret; - - std::string_view::size_type start = 0; - auto pos = str.find_first_of(delims, start); - while (pos != std::string_view::npos) { - if (pos != start) { - ret.emplace_back(str.substr(start, pos - start)); - } - start = pos + 1; - pos = str.find_first_of(delims, start); - } - if (start < str.length()) - ret.emplace_back(str.substr(start, str.length() - start)); - return ret; - } - - bool compare(std::string_view s1, std::string_view s2) { - if (s1 == s2) - return true; - edm::LogVerbatim("Geometry") << '\"' << s1 << "\" does not match \"" << s2 << "\"\n"; - return false; - } - - /// Callback to retrieve PlacedVolume information of an entire Placement - int process(PlacedVolume pv, int level, bool recursive) override { - m_volumes.emplace_back(pv.name()); - int ret = PlacedVolumeProcessor::process(pv, level, recursive); - m_volumes.pop_back(); - return ret; - } - - /// Volume callback - int operator()(PlacedVolume pv, int level) override { - Volume vol = pv.volume(); - edm::LogVerbatim("Geometry").log([&level, &vol, this](auto& log) { - log << "\nHierarchical level:" << level << " Placement:"; - for (const auto& i : m_volumes) - log << "/" << i << ", \n"; - log << "\n\tMaterial:" << vol.material().name() << "\tSolid: " << vol.solid().name() << "\n"; - }); - ++m_count; - return 1; - } - int count() const { return m_count; } - - private: - int m_count = 0; - std::vector m_volumes; - }; -} // namespace cms - -#endif diff --git a/DetectorDescription/DDCMS/plugins/DDCMSDetector.cc b/DetectorDescription/DDCMS/plugins/DDCMSDetector.cc index 14b5d80ef80cc..6cbe89eb8cfb5 100644 --- a/DetectorDescription/DDCMS/plugins/DDCMSDetector.cc +++ b/DetectorDescription/DDCMS/plugins/DDCMSDetector.cc @@ -39,7 +39,7 @@ void DDCMSDetector::analyze(const Event&, const EventSetup& iEventSetup) { LogVerbatim("Geometry") << "Iterate over the detectors:\n"; LogVerbatim("Geometry").log([&](auto& log) { - for (auto const& it : det->detectors()) { + for (auto const& it : det->description()->detectors()) { dd4hep::DetElement det(it.second); log << it.first << ": " << det.path(); } diff --git a/DetectorDescription/DDCMS/plugins/test/DDTestNavigateGeometry.cc b/DetectorDescription/DDCMS/plugins/test/DDTestNavigateGeometry.cc deleted file mode 100644 index 54322a4414d81..0000000000000 --- a/DetectorDescription/DDCMS/plugins/test/DDTestNavigateGeometry.cc +++ /dev/null @@ -1,91 +0,0 @@ -#include "FWCore/Framework/interface/one/EDAnalyzer.h" -#include "FWCore/Framework/interface/MakerMacros.h" -#include "FWCore/Framework/interface/ESTransientHandle.h" -#include "FWCore/Framework/interface/EventSetup.h" -#include "FWCore/MessageLogger/interface/MessageLogger.h" -#include "Geometry/Records/interface/IdealGeometryRecord.h" -#include "DetectorDescription/DDCMS/interface/DDDetector.h" -#include "Geometry/Records/interface/DDVectorRegistryRcd.h" -#include "DetectorDescription/DDCMS/interface/DDVectorRegistry.h" -#include "DetectorDescription/DDCMS/interface/DDVolumeProcessor.h" -#include "DD4hep/Detector.h" -#include "DD4hep/DD4hepRootPersistency.h" -#include "DD4hep/DetectorTools.h" -#include "DD4hep/VolumeProcessor.h" - -#include -#include - -using namespace std; -using namespace cms; -using namespace edm; -using namespace dd4hep; - -class DDTestNavigateGeometry : public one::EDAnalyzer<> { -public: - explicit DDTestNavigateGeometry(const ParameterSet&); - - void beginJob() override {} - void analyze(Event const& iEvent, EventSetup const&) override; - void endJob() override {} - -private: - const ESInputTag m_tag; - const string m_detElementPath; - const string m_placedVolPath; -}; - -DDTestNavigateGeometry::DDTestNavigateGeometry(const ParameterSet& iConfig) - : m_tag(iConfig.getParameter("DDDetector")), - m_detElementPath(iConfig.getParameter("detElementPath")), - m_placedVolPath(iConfig.getParameter("placedVolumePath")) {} - -void DDTestNavigateGeometry::analyze(const Event&, const EventSetup& iEventSetup) { - LogVerbatim("Geometry") << "\nDDTestNavigateGeometry::analyze: " << m_tag; - - const DDVectorRegistryRcd& regRecord = iEventSetup.get(); - ESTransientHandle reg; - regRecord.get(m_tag, reg); - - LogVerbatim("Geometry").log([®](auto& log) { - for (const auto& p : reg->vectors) { - log << "\n " << p.first << " => "; - for (const auto& i : p.second) - log << i << ", "; - } - }); - - const auto& ddRecord = iEventSetup.get(); - ESTransientHandle det; - ddRecord.get(m_tag, det); - - DetElement startDetEl, world = det->world(); - LogVerbatim("Geometry") << "World placement path " << world.placementPath() << ", path " << world.path(); - PlacedVolume startPVol = world.placement(); - if (!m_detElementPath.empty()) { - LogVerbatim("Geometry") << "Det element path is " << m_detElementPath; - startDetEl = det->findElement(m_detElementPath); - if (startDetEl.isValid()) - LogVerbatim("Geometry") << "Found starting DetElement!\n"; - } else if (!m_placedVolPath.empty()) { - LogVerbatim("Geometry") << "Placed volume path is " << m_placedVolPath; - startPVol = dd4hep::detail::tools::findNode(world.placement(), m_placedVolPath); - if (startPVol.isValid()) - LogVerbatim("Geometry") << "Found srarting PlacedVolume!\n"; - } - if (!startPVol.isValid()) { - if (!startDetEl.isValid()) { - except("VolumeScanner", "Failed to find start conditions for the volume scan"); - } - startPVol = startDetEl.placement(); - } - - DDVolumeProcessor proc; - LogVerbatim("Geometry") << startPVol.name(); - PlacedVolumeScanner().scanPlacements(proc, startPVol, 0, true); - - LogVerbatim("Geometry") << "VolumeScanner" - << "+++ Visited a total of %d placed volumes." << proc.count(); -} - -DEFINE_FWK_MODULE(DDTestNavigateGeometry); diff --git a/DetectorDescription/DDCMS/src/DDDetector.cc b/DetectorDescription/DDCMS/src/DDDetector.cc index 3629203993429..04a4fea35edc1 100644 --- a/DetectorDescription/DDCMS/src/DDDetector.cc +++ b/DetectorDescription/DDCMS/src/DDDetector.cc @@ -42,18 +42,11 @@ namespace cms { return m_description->worldVolume(); } - dd4hep::PlacedVolume DDDetector::worldPlacement() const { return world().placement(); } - dd4hep::DetElement DDDetector::world() const { assert(m_description); return m_description->world(); } - const dd4hep::Detector::HandleMap& DDDetector::detectors() const { - assert(m_description); - return m_description->detectors(); - } - TGeoManager& DDDetector::manager() const { assert(m_description); return m_description->manager(); diff --git a/DetectorDescription/DDCMS/src/DDFilteredView.cc b/DetectorDescription/DDCMS/src/DDFilteredView.cc index 4a21c2052a53a..b4f3897fc2b96 100644 --- a/DetectorDescription/DDCMS/src/DDFilteredView.cc +++ b/DetectorDescription/DDCMS/src/DDFilteredView.cc @@ -599,12 +599,6 @@ const ExpandedNodes& DDFilteredView::history() { return nodes_; } -const TClass* DDFilteredView::getShape() const { - assert(node_); - Volume currVol = node_->GetVolume(); - return (currVol->GetShape()->IsA()); -} - std::string_view DDFilteredView::name() const { return (volume().volume().name()); } dd4hep::Solid DDFilteredView::solid() const { return (volume().volume().solid()); } diff --git a/Geometry/EcalAlgo/test/python/testEcalGeometry.py b/Geometry/EcalAlgo/test/python/testEcalGeometry.py index ee14341d07e4b..a44f77dd9619d 100644 --- a/Geometry/EcalAlgo/test/python/testEcalGeometry.py +++ b/Geometry/EcalAlgo/test/python/testEcalGeometry.py @@ -56,8 +56,3 @@ ) process.p = cms.Path(process.testDump) -###process.test = cms.EDAnalyzer("DDCMSDetector", -### DDDetector = cms.ESInputTag('', 'Ecal') -### ) -### -###process.p = cms.Path(process.test) From 6fcde3c74adc672a95612ba7f50a2e7457e7a888 Mon Sep 17 00:00:00 2001 From: Ianna Osborne Date: Mon, 14 Sep 2020 12:44:59 +0200 Subject: [PATCH 2/5] code format --- DetectorDescription/DDCMS/plugins/DDCMSDetector.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/DetectorDescription/DDCMS/plugins/DDCMSDetector.cc b/DetectorDescription/DDCMS/plugins/DDCMSDetector.cc index 6cbe89eb8cfb5..16bb608420a70 100644 --- a/DetectorDescription/DDCMS/plugins/DDCMSDetector.cc +++ b/DetectorDescription/DDCMS/plugins/DDCMSDetector.cc @@ -39,7 +39,7 @@ void DDCMSDetector::analyze(const Event&, const EventSetup& iEventSetup) { LogVerbatim("Geometry") << "Iterate over the detectors:\n"; LogVerbatim("Geometry").log([&](auto& log) { - for (auto const& it : det->description()->detectors()) { + for (auto const& it : det->description()->detectors()) { dd4hep::DetElement det(it.second); log << it.first << ": " << det.path(); } From 6f1963956fbccfc2c6c46489449fc62f81a1bad3 Mon Sep 17 00:00:00 2001 From: Ianna Osborne Date: Mon, 14 Sep 2020 14:16:37 +0200 Subject: [PATCH 3/5] remove unit test associated with a removed class --- DetectorDescription/DDCMS/test/BuildFile.xml | 5 --- .../DDCMS/test/DDExpandedView.cppunit.cc | 42 ------------------- 2 files changed, 47 deletions(-) delete mode 100644 DetectorDescription/DDCMS/test/DDExpandedView.cppunit.cc diff --git a/DetectorDescription/DDCMS/test/BuildFile.xml b/DetectorDescription/DDCMS/test/BuildFile.xml index 946faa8763873..7a557940646e4 100644 --- a/DetectorDescription/DDCMS/test/BuildFile.xml +++ b/DetectorDescription/DDCMS/test/BuildFile.xml @@ -4,11 +4,6 @@ - - - - - diff --git a/DetectorDescription/DDCMS/test/DDExpandedView.cppunit.cc b/DetectorDescription/DDCMS/test/DDExpandedView.cppunit.cc deleted file mode 100644 index 268f5eca2585f..0000000000000 --- a/DetectorDescription/DDCMS/test/DDExpandedView.cppunit.cc +++ /dev/null @@ -1,42 +0,0 @@ -#include - -#include "DetectorDescription/DDCMS/interface/DDCompactView.h" -#include "DetectorDescription/DDCMS/interface/DDExpandedView.h" -#include "DetectorDescription/DDCMS/interface/DDDetector.h" -#include "FWCore/ParameterSet/interface/FileInPath.h" -#include "DD4hep/Detector.h" - -#include -#include - -#include "cppunit/TestAssert.h" -#include "cppunit/TestFixture.h" - -using namespace cms; -using namespace std; - -class testDDExpandedView : public CppUnit::TestFixture { - CPPUNIT_TEST_SUITE(testDDExpandedView); - CPPUNIT_TEST(checkExpandedView); - CPPUNIT_TEST_SUITE_END(); - -public: - void setUp() override; - void tearDown() override {} - void checkExpandedView(); - -private: - string fileName_; -}; - -CPPUNIT_TEST_SUITE_REGISTRATION(testDDExpandedView); - -void testDDExpandedView::setUp() { - fileName_ = edm::FileInPath("Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2021.xml").fullPath(); -} - -void testDDExpandedView::checkExpandedView() { - const DDDetector det("DUMMY", fileName_); - DDCompactView cpview(det); - DDExpandedView epview(cpview); -} From 36fe1fa56a4021ea5c34d5d407fa2b4e56946bd4 Mon Sep 17 00:00:00 2001 From: Ianna Osborne Date: Mon, 14 Sep 2020 16:35:14 +0200 Subject: [PATCH 4/5] remove configuration for removed nevigator --- .../test/python/testDDDetectorESProducer.py | 56 ------------------- 1 file changed, 56 deletions(-) delete mode 100644 DetectorDescription/DDCMS/test/python/testDDDetectorESProducer.py diff --git a/DetectorDescription/DDCMS/test/python/testDDDetectorESProducer.py b/DetectorDescription/DDCMS/test/python/testDDDetectorESProducer.py deleted file mode 100644 index 261aae4628022..0000000000000 --- a/DetectorDescription/DDCMS/test/python/testDDDetectorESProducer.py +++ /dev/null @@ -1,56 +0,0 @@ -import FWCore.ParameterSet.Config as cms - -process = cms.Process("DDCMSDetectorTest") - -process.source = cms.Source("EmptySource") -process.maxEvents = cms.untracked.PSet( - input = cms.untracked.int32(1) - ) - -process.MessageLogger = cms.Service( - "MessageLogger", - statistics = cms.untracked.vstring('cout', 'geometry'), - categories = cms.untracked.vstring('Geometry'), - cout = cms.untracked.PSet( - threshold = cms.untracked.string('WARNING'), - noLineBreaks = cms.untracked.bool(True) - ), - geometry = cms.untracked.PSet( - INFO = cms.untracked.PSet( - limit = cms.untracked.int32(0) - ), - noLineBreaks = cms.untracked.bool(True), - DEBUG = cms.untracked.PSet( - limit = cms.untracked.int32(0) - ), - WARNING = cms.untracked.PSet( - limit = cms.untracked.int32(0) - ), - ERROR = cms.untracked.PSet( - limit = cms.untracked.int32(0) - ), - threshold = cms.untracked.string('INFO'), - Geometry = cms.untracked.PSet( - limit = cms.untracked.int32(-1) - ) - ), - destinations = cms.untracked.vstring('cout', - 'geometry') - ) - -process.DDDetectorESProducer = cms.ESSource("DDDetectorESProducer", - confGeomXMLFiles = cms.FileInPath('Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2021.xml'), - appendToDataLabel = cms.string('MUON') - ) - -process.DDVectorRegistryESProducer = cms.ESProducer("DDVectorRegistryESProducer", - appendToDataLabel = cms.string('MUON') - ) - -process.test = cms.EDAnalyzer("DDTestNavigateGeometry", - DDDetector = cms.ESInputTag('','MUON'), - detElementPath = cms.string(''), - placedVolumePath = cms.string('/world_volume_1/OCMS_1/CMSE_1/MUON_1') - ) - -process.p = cms.Path(process.test) From 66e770fae9c563a301f0dab703a122b9a5b06420 Mon Sep 17 00:00:00 2001 From: Ianna Osborne Date: Tue, 15 Sep 2020 08:59:09 +0200 Subject: [PATCH 5/5] remove test configuration of a removed plugin --- .../DDCMS/test/python/testNavigateGeometry.py | 54 ------------------- 1 file changed, 54 deletions(-) delete mode 100644 DetectorDescription/DDCMS/test/python/testNavigateGeometry.py diff --git a/DetectorDescription/DDCMS/test/python/testNavigateGeometry.py b/DetectorDescription/DDCMS/test/python/testNavigateGeometry.py deleted file mode 100644 index 7f65e4437b819..0000000000000 --- a/DetectorDescription/DDCMS/test/python/testNavigateGeometry.py +++ /dev/null @@ -1,54 +0,0 @@ -import FWCore.ParameterSet.Config as cms - -process = cms.Process("NavigateGeometryTest") - -process.source = cms.Source("EmptySource") -process.maxEvents = cms.untracked.PSet( - input = cms.untracked.int32(1) - ) - -process.MessageLogger = cms.Service( - "MessageLogger", - statistics = cms.untracked.vstring('cout', 'navGeometry'), - categories = cms.untracked.vstring('Geometry'), - cout = cms.untracked.PSet( - threshold = cms.untracked.string('WARNING'), - noLineBreaks = cms.untracked.bool(True) - ), - navGeometry = cms.untracked.PSet( - INFO = cms.untracked.PSet( - limit = cms.untracked.int32(0) - ), - noLineBreaks = cms.untracked.bool(True), - DEBUG = cms.untracked.PSet( - limit = cms.untracked.int32(0) - ), - WARNING = cms.untracked.PSet( - limit = cms.untracked.int32(0) - ), - ERROR = cms.untracked.PSet( - limit = cms.untracked.int32(0) - ), - threshold = cms.untracked.string('INFO'), - Geometry = cms.untracked.PSet( - limit = cms.untracked.int32(-1) - ) - ), - destinations = cms.untracked.vstring('cout', - 'navGeometry') - ) - -process.DDDetectorESProducer = cms.ESSource("DDDetectorESProducer", - confGeomXMLFiles = cms.FileInPath('Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2021.xml'), - appendToDataLabel = cms.string('MUON') - ) -process.DDVectorRegistryESProducer = cms.ESProducer("DDVectorRegistryESProducer", - appendToDataLabel = cms.string('MUON')) - -process.test = cms.EDAnalyzer("DDTestNavigateGeometry", - DDDetector = cms.ESInputTag('','MUON'), - detElementPath = cms.string('detElementPath'), - placedVolumePath = cms.string('placedVolPath') - ) - -process.p = cms.Path(process.test)