From a543106109140ec67e002acf83f452fea914f27e Mon Sep 17 00:00:00 2001 From: Markus Frank <Markus.Frank@cern.ch> Date: Thu, 5 Apr 2018 10:48:46 +0200 Subject: [PATCH] Merge DDCMS and DDCMSTests --- CMakeLists.txt | 1 - DDDB/CMakeLists.txt | 30 --- examples/CMakeLists.txt | 2 +- examples/{DDCMSTests => DDCMS}/CMS-pixbar.png | Bin .../CMS-tracker-sim-1.png | Bin .../CMS-tracker-sim-2.png | Bin .../{DDCMSTests => DDCMS}/CMS-tracker1.png | Bin .../{DDCMSTests => DDCMS}/CMS-tracker2.png | Bin .../{DDCMSTests => DDCMS}/CMS-tracker3.png | Bin examples/DDCMS/CMakeLists.txt | 177 +++++++++++++ examples/{DDCMSTests => DDCMS}/data/cms.xml | 0 .../data/cms_tracker.xml | 0 .../{DDCMSTests => DDCMS}/data/cmsextent.xml | 0 .../data/dd4hep-config.xml | 0 .../{DDCMSTests => DDCMS}/data/materials.xml | 0 .../{DDCMSTests => DDCMS}/data/pixbar.xml | 0 .../data/pixbarladder.xml | 0 .../data/pixbarladderfull.xml | 0 .../data/pixbarladderhalf.xml | 0 .../data/pixbarlayer.xml | 0 .../data/pixbarlayer0.xml | 0 .../data/pixbarlayer1.xml | 0 .../data/pixbarlayer2.xml | 0 .../data/pixbarmaterial.xml | 0 .../{DDCMSTests => DDCMS}/data/pixfwd.xml | 0 .../data/pixfwdBlade.xml | 0 .../data/pixfwdCommon.xml | 0 .../data/pixfwdCylinder.xml | 0 .../{DDCMSTests => DDCMS}/data/pixfwdDisk.xml | 0 .../data/pixfwdMaterials.xml | 0 .../data/pixfwdNipple.xml | 0 .../data/pixfwdPanel.xml | 0 .../data/pixfwdPanelBase.xml | 0 .../{DDCMSTests => DDCMS}/data/pixfwdPlaq.xml | 0 .../data/pixfwdPlaq1x2.xml | 0 .../data/pixfwdPlaq1x5.xml | 0 .../data/pixfwdPlaq2x3.xml | 0 .../data/pixfwdPlaq2x4.xml | 0 .../data/pixfwdPlaq2x5.xml | 0 .../{DDCMSTests => DDCMS}/data/pixfwdTest.xml | 0 examples/{DDCMSTests => DDCMS}/data/tec.xml | 0 .../data/tecbackplate.xml | 0 .../data/tecmaterial.xml | 0 .../{DDCMSTests => DDCMS}/data/tecmodpar.xml | 0 .../{DDCMSTests => DDCMS}/data/tecmodule0.xml | 0 .../data/tecmodule0r.xml | 0 .../data/tecmodule0s.xml | 0 .../{DDCMSTests => DDCMS}/data/tecmodule1.xml | 0 .../data/tecmodule1r.xml | 0 .../data/tecmodule1s.xml | 0 .../{DDCMSTests => DDCMS}/data/tecmodule2.xml | 0 .../{DDCMSTests => DDCMS}/data/tecmodule3.xml | 0 .../{DDCMSTests => DDCMS}/data/tecmodule4.xml | 0 .../data/tecmodule4r.xml | 0 .../data/tecmodule4s.xml | 0 .../{DDCMSTests => DDCMS}/data/tecmodule5.xml | 0 .../{DDCMSTests => DDCMS}/data/tecmodule6.xml | 0 .../{DDCMSTests => DDCMS}/data/tecpetal0.xml | 0 .../{DDCMSTests => DDCMS}/data/tecpetal0b.xml | 0 .../{DDCMSTests => DDCMS}/data/tecpetal0f.xml | 0 .../{DDCMSTests => DDCMS}/data/tecpetal3.xml | 0 .../{DDCMSTests => DDCMS}/data/tecpetal3b.xml | 0 .../{DDCMSTests => DDCMS}/data/tecpetal3f.xml | 0 .../{DDCMSTests => DDCMS}/data/tecpetal6b.xml | 0 .../{DDCMSTests => DDCMS}/data/tecpetal6f.xml | 0 .../{DDCMSTests => DDCMS}/data/tecpetal8b.xml | 0 .../{DDCMSTests => DDCMS}/data/tecpetal8f.xml | 0 .../{DDCMSTests => DDCMS}/data/tecpetalb.xml | 0 .../{DDCMSTests => DDCMS}/data/tecpetalf.xml | 0 .../{DDCMSTests => DDCMS}/data/tecpetpar.xml | 0 .../{DDCMSTests => DDCMS}/data/tecring0.xml | 0 .../{DDCMSTests => DDCMS}/data/tecring0b.xml | 0 .../{DDCMSTests => DDCMS}/data/tecring0f.xml | 0 .../{DDCMSTests => DDCMS}/data/tecring1.xml | 0 .../{DDCMSTests => DDCMS}/data/tecring1b.xml | 0 .../{DDCMSTests => DDCMS}/data/tecring1f.xml | 0 .../{DDCMSTests => DDCMS}/data/tecring2.xml | 0 .../{DDCMSTests => DDCMS}/data/tecring2b.xml | 0 .../{DDCMSTests => DDCMS}/data/tecring2f.xml | 0 .../{DDCMSTests => DDCMS}/data/tecring3.xml | 0 .../{DDCMSTests => DDCMS}/data/tecring3b.xml | 0 .../{DDCMSTests => DDCMS}/data/tecring3f.xml | 0 .../{DDCMSTests => DDCMS}/data/tecring4.xml | 0 .../{DDCMSTests => DDCMS}/data/tecring4b.xml | 0 .../{DDCMSTests => DDCMS}/data/tecring4f.xml | 0 .../{DDCMSTests => DDCMS}/data/tecring5.xml | 0 .../{DDCMSTests => DDCMS}/data/tecring5b.xml | 0 .../{DDCMSTests => DDCMS}/data/tecring5f.xml | 0 .../{DDCMSTests => DDCMS}/data/tecring6.xml | 0 .../{DDCMSTests => DDCMS}/data/tecring6b.xml | 0 .../{DDCMSTests => DDCMS}/data/tecring6f.xml | 0 .../data/tecservices.xml | 0 .../{DDCMSTests => DDCMS}/data/tecwheel.xml | 0 .../{DDCMSTests => DDCMS}/data/tecwheel6.xml | 0 .../{DDCMSTests => DDCMS}/data/tecwheela.xml | 0 .../{DDCMSTests => DDCMS}/data/tecwheelb.xml | 0 .../{DDCMSTests => DDCMS}/data/tecwheelc.xml | 0 .../{DDCMSTests => DDCMS}/data/tecwheeld.xml | 0 examples/{DDCMSTests => DDCMS}/data/tib.xml | 0 .../{DDCMSTests => DDCMS}/data/tiblayer0.xml | 0 .../{DDCMSTests => DDCMS}/data/tiblayer1.xml | 0 .../{DDCMSTests => DDCMS}/data/tiblayer2.xml | 0 .../{DDCMSTests => DDCMS}/data/tiblayer3.xml | 0 .../data/tiblayerpar.xml | 0 .../data/tibmaterial.xml | 0 .../{DDCMSTests => DDCMS}/data/tibmodpar.xml | 0 .../{DDCMSTests => DDCMS}/data/tibmodule0.xml | 0 .../data/tibmodule0a.xml | 0 .../data/tibmodule0b.xml | 0 .../{DDCMSTests => DDCMS}/data/tibmodule2.xml | 0 .../{DDCMSTests => DDCMS}/data/tibstring0.xml | 0 .../data/tibstring0ll.xml | 0 .../data/tibstring0lr.xml | 0 .../data/tibstring0ul.xml | 0 .../data/tibstring0ur.xml | 0 .../{DDCMSTests => DDCMS}/data/tibstring1.xml | 0 .../data/tibstring1ll.xml | 0 .../data/tibstring1lr.xml | 0 .../data/tibstring1ul.xml | 0 .../data/tibstring1ur.xml | 0 .../{DDCMSTests => DDCMS}/data/tibstring2.xml | 0 .../data/tibstring2ll.xml | 0 .../data/tibstring2lr.xml | 0 .../data/tibstring2ul.xml | 0 .../data/tibstring2ur.xml | 0 .../{DDCMSTests => DDCMS}/data/tibstring3.xml | 0 .../data/tibstring3ll.xml | 0 .../data/tibstring3lr.xml | 0 .../data/tibstring3ul.xml | 0 .../data/tibstring3ur.xml | 0 .../data/tibstringpar.xml | 0 .../data/tibtidcommonmaterial.xml | 0 .../data/tibtidservices.xml | 0 .../data/tibtidservicesb.xml | 0 .../data/tibtidservicesf.xml | 0 examples/{DDCMSTests => DDCMS}/data/tid.xml | 0 examples/{DDCMSTests => DDCMS}/data/tidb.xml | 0 examples/{DDCMSTests => DDCMS}/data/tidf.xml | 0 .../data/tidmaterial.xml | 0 .../{DDCMSTests => DDCMS}/data/tidmodpar.xml | 0 .../{DDCMSTests => DDCMS}/data/tidmodule0.xml | 0 .../data/tidmodule0l.xml | 0 .../data/tidmodule0r.xml | 0 .../{DDCMSTests => DDCMS}/data/tidmodule1.xml | 0 .../data/tidmodule1l.xml | 0 .../data/tidmodule1r.xml | 0 .../{DDCMSTests => DDCMS}/data/tidmodule2.xml | 0 .../{DDCMSTests => DDCMS}/data/tidring0.xml | 0 .../{DDCMSTests => DDCMS}/data/tidring0b.xml | 0 .../{DDCMSTests => DDCMS}/data/tidring0f.xml | 0 .../{DDCMSTests => DDCMS}/data/tidring1.xml | 0 .../{DDCMSTests => DDCMS}/data/tidring1b.xml | 0 .../{DDCMSTests => DDCMS}/data/tidring1f.xml | 0 .../{DDCMSTests => DDCMS}/data/tidring2.xml | 0 .../{DDCMSTests => DDCMS}/data/tidringpar.xml | 0 examples/{DDCMSTests => DDCMS}/data/tob.xml | 0 .../data/tobmaterial.xml | 0 .../{DDCMSTests => DDCMS}/data/tobmodpar.xml | 0 .../{DDCMSTests => DDCMS}/data/tobmodule0.xml | 0 .../{DDCMSTests => DDCMS}/data/tobmodule2.xml | 0 .../{DDCMSTests => DDCMS}/data/tobmodule4.xml | 0 .../{DDCMSTests => DDCMS}/data/tobrod0.xml | 0 .../{DDCMSTests => DDCMS}/data/tobrod0c.xml | 0 .../{DDCMSTests => DDCMS}/data/tobrod0h.xml | 0 .../{DDCMSTests => DDCMS}/data/tobrod0l.xml | 0 .../{DDCMSTests => DDCMS}/data/tobrod1.xml | 0 .../{DDCMSTests => DDCMS}/data/tobrod1h.xml | 0 .../{DDCMSTests => DDCMS}/data/tobrod1l.xml | 0 .../{DDCMSTests => DDCMS}/data/tobrod2.xml | 0 .../{DDCMSTests => DDCMS}/data/tobrod2c.xml | 0 .../{DDCMSTests => DDCMS}/data/tobrod2h.xml | 0 .../{DDCMSTests => DDCMS}/data/tobrod2l.xml | 0 .../{DDCMSTests => DDCMS}/data/tobrod3.xml | 0 .../{DDCMSTests => DDCMS}/data/tobrod3h.xml | 0 .../{DDCMSTests => DDCMS}/data/tobrod3l.xml | 0 .../{DDCMSTests => DDCMS}/data/tobrod4.xml | 0 .../{DDCMSTests => DDCMS}/data/tobrod4c.xml | 0 .../{DDCMSTests => DDCMS}/data/tobrod4h.xml | 0 .../{DDCMSTests => DDCMS}/data/tobrod4l.xml | 0 .../{DDCMSTests => DDCMS}/data/tobrod5.xml | 0 .../{DDCMSTests => DDCMS}/data/tobrod5h.xml | 0 .../{DDCMSTests => DDCMS}/data/tobrod5l.xml | 0 .../{DDCMSTests => DDCMS}/data/tobrodpar.xml | 0 .../{DDCMSTests => DDCMS}/data/tracker.xml | 0 .../data/trackerParameters.xml | 0 .../data/trackerStructureTopology.xml | 0 .../data/trackerbulkhead.xml | 0 .../data/trackermaterial.xml | 0 .../data/trackerother.xml | 0 .../data/trackerpixbar.xml | 0 .../data/trackerpixfwd.xml | 0 .../{DDCMSTests => DDCMS}/data/trackertec.xml | 0 .../{DDCMSTests => DDCMS}/data/trackertib.xml | 0 .../data/trackertibtidservices.xml | 0 .../{DDCMSTests => DDCMS}/data/trackertid.xml | 0 .../{DDCMSTests => DDCMS}/data/trackertob.xml | 0 .../{DDCMSTests => DDCMS}/data/vacuum.xml | 0 examples/{DDCMSTests => DDCMS}/eve/DDEve.xml | 0 .../pictures/CMS-pixbar.png | Bin .../pictures/CMS-tracker-sim-1.png | Bin .../pictures/CMS-tracker-sim-2.png | Bin .../pictures/CMS-tracker1.png | Bin .../pictures/CMS-tracker2.png | Bin .../pictures/CMS-tracker3.png | Bin .../scripts/CMSTrackerSim.py | 0 examples/DDCMSTests/CMakeLists.txt | 200 --------------- examples/DDCMSTests/README.txt | 18 -- examples/DDCMSTests/include/DDCMS/DDCMS.h | 239 ------------------ .../DDCMSTests/include/DDCMS/DDCMSPlugins.h | 68 ----- examples/DDCMSTests/include/DDCMS/DDCMSTags.h | 148 ----------- examples/DDCMSTests/src/Example.cpp | 0 examples/DDDB/CMakeLists.txt | 18 +- .../DDDB}/include/DDDB/DDDBConditionsLoader.h | 0 .../DDDB}/include/DDDB/DDDBConversion.h | 0 .../DDDB}/include/DDDB/DDDBDimension.h | 0 .../DDDB}/include/DDDB/DDDBHelper.h | 0 .../DDDB}/include/DDDB/DDDBReader.h | 0 .../DDDB}/include/DDDB/DDDBReaderContext.h | 0 .../DDDB}/include/DDDB/DDDBTags.h | 0 .../DDDB}/include/Detector/DeAlignmentCall.h | 0 .../DDDB}/include/Detector/DeIOV.h | 0 .../DDDB}/include/Detector/DeStatic.h | 0 .../DDDB}/include/Detector/DeVP.h | 0 .../include/Detector/DeVPConditionCalls.h | 0 .../DDDB}/include/Detector/DeVPGeneric.h | 0 .../DDDB}/include/Detector/DeVPSensor.h | 0 .../DDDB}/include/Detector/DeVelo.h | 0 .../include/Detector/DeVeloConditionCalls.h | 0 .../DDDB}/include/Detector/DeVeloGeneric.h | 0 .../DDDB}/include/Detector/DeVeloSensor.h | 0 .../DDDB}/include/Detector/DetectorElement.h | 0 .../include/Detector/DetectorElement_inl.h | 0 .../DDDB}/include/Detector/IDetService.h | 0 .../DDDB}/include/Detector/ParameterMap.h | 0 .../DDDB}/include/Kernel/VPConstants.h | 0 .../DDDB}/src/DDDBConversion.cpp | 0 {DDDB => examples/DDDB}/src/DDDBDimension.cpp | 0 {DDDB => examples/DDDB}/src/DDDBHelper.cpp | 0 {DDDB => examples/DDDB}/src/DDDBReader.cpp | 0 {DDDB => examples/DDDB}/src/DDDBTags.cpp | 0 .../DDDB}/src/Detector/DeAlignmentCall.cpp | 0 .../DDDB}/src/Detector/DeHandles.cpp | 0 .../DDDB}/src/Detector/DeIOV.cpp | 0 .../DDDB}/src/Detector/DeStatic.cpp | 0 {DDDB => examples/DDDB}/src/Detector/DeVP.cpp | 0 .../DDDB}/src/Detector/DeVPConditionCalls.cpp | 0 .../DDDB}/src/Detector/DeVPGeneric.cpp | 0 .../DDDB}/src/Detector/DeVPSensor.cpp | 0 .../DDDB}/src/Detector/DeVelo.cpp | 0 .../src/Detector/DeVeloConditionCalls.cpp | 0 .../DDDB}/src/Detector/DeVeloGeneric.cpp | 0 .../DDDB}/src/Detector/DeVeloHandles.cpp | 0 .../DDDB}/src/Detector/DeVeloSensor.cpp | 0 .../DDDB}/src/Detector/DetectorElement.cpp | 0 .../DDDB}/src/Detector/ParameterMap.cpp | 0 .../DDDB}/src/plugins/CondDB2DDDB.cpp | 0 .../DDDB}/src/plugins/DDDB2Objects.cpp | 0 .../DDDB}/src/plugins/DDDBAlignmentTest.cpp | 0 .../src/plugins/DDDBConditionsLoader.cpp | 0 .../DDDB}/src/plugins/DDDBDerivedCondTest.cpp | 0 .../DDDB}/src/plugins/DDDBDetectorDumps.cpp | 0 .../DDDB}/src/plugins/DDDBExecutor.cpp | 0 .../DDDB}/src/plugins/DDDBFileReader.cpp | 0 .../DDDB}/src/plugins/DDDBLogVolumeDump.cpp | 0 .../DDDB}/src/plugins/DDDBPlugins.cpp | 0 .../DDDB}/src/plugins/DDDBvis.cpp | 0 .../DDDB}/src/plugins/DeVeloServiceTest.cpp | 0 .../DDDB}/src/plugins/DeVeloTest.cpp | 0 .../DDDB}/src/plugins/DetService.cpp | 0 .../DDDB}/src/plugins/DetService.h | 0 270 files changed, 195 insertions(+), 706 deletions(-) delete mode 100644 DDDB/CMakeLists.txt rename examples/{DDCMSTests => DDCMS}/CMS-pixbar.png (100%) rename examples/{DDCMSTests => DDCMS}/CMS-tracker-sim-1.png (100%) rename examples/{DDCMSTests => DDCMS}/CMS-tracker-sim-2.png (100%) rename examples/{DDCMSTests => DDCMS}/CMS-tracker1.png (100%) rename examples/{DDCMSTests => DDCMS}/CMS-tracker2.png (100%) rename examples/{DDCMSTests => DDCMS}/CMS-tracker3.png (100%) rename examples/{DDCMSTests => DDCMS}/data/cms.xml (100%) rename examples/{DDCMSTests => DDCMS}/data/cms_tracker.xml (100%) rename examples/{DDCMSTests => DDCMS}/data/cmsextent.xml (100%) rename examples/{DDCMSTests => DDCMS}/data/dd4hep-config.xml (100%) rename examples/{DDCMSTests => DDCMS}/data/materials.xml (100%) rename examples/{DDCMSTests => DDCMS}/data/pixbar.xml (100%) rename examples/{DDCMSTests => DDCMS}/data/pixbarladder.xml (100%) rename examples/{DDCMSTests => DDCMS}/data/pixbarladderfull.xml (100%) rename examples/{DDCMSTests => DDCMS}/data/pixbarladderhalf.xml (100%) rename examples/{DDCMSTests => DDCMS}/data/pixbarlayer.xml (100%) rename examples/{DDCMSTests => DDCMS}/data/pixbarlayer0.xml (100%) rename examples/{DDCMSTests => DDCMS}/data/pixbarlayer1.xml (100%) rename examples/{DDCMSTests => DDCMS}/data/pixbarlayer2.xml (100%) rename examples/{DDCMSTests => DDCMS}/data/pixbarmaterial.xml (100%) rename examples/{DDCMSTests => DDCMS}/data/pixfwd.xml (100%) rename examples/{DDCMSTests => DDCMS}/data/pixfwdBlade.xml (100%) rename examples/{DDCMSTests => DDCMS}/data/pixfwdCommon.xml (100%) rename examples/{DDCMSTests => DDCMS}/data/pixfwdCylinder.xml (100%) rename examples/{DDCMSTests => DDCMS}/data/pixfwdDisk.xml (100%) rename examples/{DDCMSTests => DDCMS}/data/pixfwdMaterials.xml (100%) rename examples/{DDCMSTests => DDCMS}/data/pixfwdNipple.xml (100%) rename examples/{DDCMSTests => DDCMS}/data/pixfwdPanel.xml (100%) rename examples/{DDCMSTests => DDCMS}/data/pixfwdPanelBase.xml (100%) rename examples/{DDCMSTests => DDCMS}/data/pixfwdPlaq.xml (100%) rename examples/{DDCMSTests => DDCMS}/data/pixfwdPlaq1x2.xml (100%) rename examples/{DDCMSTests => DDCMS}/data/pixfwdPlaq1x5.xml (100%) rename examples/{DDCMSTests => DDCMS}/data/pixfwdPlaq2x3.xml (100%) rename examples/{DDCMSTests => DDCMS}/data/pixfwdPlaq2x4.xml (100%) rename examples/{DDCMSTests => DDCMS}/data/pixfwdPlaq2x5.xml (100%) rename examples/{DDCMSTests => DDCMS}/data/pixfwdTest.xml (100%) rename examples/{DDCMSTests => DDCMS}/data/tec.xml (100%) rename examples/{DDCMSTests => DDCMS}/data/tecbackplate.xml (100%) rename examples/{DDCMSTests => DDCMS}/data/tecmaterial.xml (100%) rename examples/{DDCMSTests => DDCMS}/data/tecmodpar.xml (100%) rename examples/{DDCMSTests => DDCMS}/data/tecmodule0.xml (100%) rename examples/{DDCMSTests => DDCMS}/data/tecmodule0r.xml (100%) rename examples/{DDCMSTests => DDCMS}/data/tecmodule0s.xml (100%) rename examples/{DDCMSTests => DDCMS}/data/tecmodule1.xml (100%) rename examples/{DDCMSTests => DDCMS}/data/tecmodule1r.xml (100%) rename examples/{DDCMSTests => DDCMS}/data/tecmodule1s.xml (100%) rename examples/{DDCMSTests => DDCMS}/data/tecmodule2.xml (100%) rename examples/{DDCMSTests => DDCMS}/data/tecmodule3.xml (100%) rename examples/{DDCMSTests => DDCMS}/data/tecmodule4.xml (100%) rename examples/{DDCMSTests => DDCMS}/data/tecmodule4r.xml (100%) rename examples/{DDCMSTests => DDCMS}/data/tecmodule4s.xml (100%) rename examples/{DDCMSTests => DDCMS}/data/tecmodule5.xml (100%) rename examples/{DDCMSTests => DDCMS}/data/tecmodule6.xml (100%) rename examples/{DDCMSTests => DDCMS}/data/tecpetal0.xml (100%) rename examples/{DDCMSTests => DDCMS}/data/tecpetal0b.xml (100%) rename examples/{DDCMSTests => DDCMS}/data/tecpetal0f.xml (100%) rename examples/{DDCMSTests => DDCMS}/data/tecpetal3.xml (100%) rename examples/{DDCMSTests => DDCMS}/data/tecpetal3b.xml (100%) rename examples/{DDCMSTests => DDCMS}/data/tecpetal3f.xml (100%) rename examples/{DDCMSTests => DDCMS}/data/tecpetal6b.xml (100%) rename examples/{DDCMSTests => DDCMS}/data/tecpetal6f.xml (100%) rename examples/{DDCMSTests => DDCMS}/data/tecpetal8b.xml (100%) rename examples/{DDCMSTests => DDCMS}/data/tecpetal8f.xml (100%) rename examples/{DDCMSTests => DDCMS}/data/tecpetalb.xml (100%) rename examples/{DDCMSTests => DDCMS}/data/tecpetalf.xml (100%) rename examples/{DDCMSTests => DDCMS}/data/tecpetpar.xml (100%) rename examples/{DDCMSTests => DDCMS}/data/tecring0.xml (100%) rename examples/{DDCMSTests => DDCMS}/data/tecring0b.xml (100%) rename examples/{DDCMSTests => DDCMS}/data/tecring0f.xml (100%) rename examples/{DDCMSTests => DDCMS}/data/tecring1.xml (100%) rename examples/{DDCMSTests => DDCMS}/data/tecring1b.xml (100%) rename examples/{DDCMSTests => DDCMS}/data/tecring1f.xml (100%) rename examples/{DDCMSTests => DDCMS}/data/tecring2.xml (100%) rename examples/{DDCMSTests => DDCMS}/data/tecring2b.xml (100%) rename examples/{DDCMSTests => DDCMS}/data/tecring2f.xml (100%) rename examples/{DDCMSTests => DDCMS}/data/tecring3.xml (100%) rename examples/{DDCMSTests => DDCMS}/data/tecring3b.xml (100%) rename examples/{DDCMSTests => DDCMS}/data/tecring3f.xml (100%) rename examples/{DDCMSTests => DDCMS}/data/tecring4.xml (100%) rename examples/{DDCMSTests => DDCMS}/data/tecring4b.xml (100%) rename examples/{DDCMSTests => DDCMS}/data/tecring4f.xml (100%) rename examples/{DDCMSTests => DDCMS}/data/tecring5.xml (100%) rename examples/{DDCMSTests => DDCMS}/data/tecring5b.xml (100%) rename examples/{DDCMSTests => DDCMS}/data/tecring5f.xml (100%) rename examples/{DDCMSTests => DDCMS}/data/tecring6.xml (100%) rename examples/{DDCMSTests => DDCMS}/data/tecring6b.xml (100%) rename examples/{DDCMSTests => DDCMS}/data/tecring6f.xml (100%) rename examples/{DDCMSTests => DDCMS}/data/tecservices.xml (100%) rename examples/{DDCMSTests => DDCMS}/data/tecwheel.xml (100%) rename examples/{DDCMSTests => DDCMS}/data/tecwheel6.xml (100%) rename examples/{DDCMSTests => DDCMS}/data/tecwheela.xml (100%) rename examples/{DDCMSTests => DDCMS}/data/tecwheelb.xml (100%) rename examples/{DDCMSTests => DDCMS}/data/tecwheelc.xml (100%) rename examples/{DDCMSTests => DDCMS}/data/tecwheeld.xml (100%) rename examples/{DDCMSTests => DDCMS}/data/tib.xml (100%) rename examples/{DDCMSTests => DDCMS}/data/tiblayer0.xml (100%) rename examples/{DDCMSTests => DDCMS}/data/tiblayer1.xml (100%) rename examples/{DDCMSTests => DDCMS}/data/tiblayer2.xml (100%) rename examples/{DDCMSTests => DDCMS}/data/tiblayer3.xml (100%) rename examples/{DDCMSTests => DDCMS}/data/tiblayerpar.xml (100%) rename examples/{DDCMSTests => DDCMS}/data/tibmaterial.xml (100%) rename examples/{DDCMSTests => DDCMS}/data/tibmodpar.xml (100%) rename examples/{DDCMSTests => DDCMS}/data/tibmodule0.xml (100%) rename examples/{DDCMSTests => DDCMS}/data/tibmodule0a.xml (100%) rename examples/{DDCMSTests => DDCMS}/data/tibmodule0b.xml (100%) rename examples/{DDCMSTests => DDCMS}/data/tibmodule2.xml (100%) rename examples/{DDCMSTests => DDCMS}/data/tibstring0.xml (100%) rename examples/{DDCMSTests => DDCMS}/data/tibstring0ll.xml (100%) rename examples/{DDCMSTests => DDCMS}/data/tibstring0lr.xml (100%) rename examples/{DDCMSTests => DDCMS}/data/tibstring0ul.xml (100%) rename examples/{DDCMSTests => DDCMS}/data/tibstring0ur.xml (100%) rename examples/{DDCMSTests => DDCMS}/data/tibstring1.xml (100%) rename examples/{DDCMSTests => DDCMS}/data/tibstring1ll.xml (100%) rename examples/{DDCMSTests => DDCMS}/data/tibstring1lr.xml (100%) rename examples/{DDCMSTests => DDCMS}/data/tibstring1ul.xml (100%) rename examples/{DDCMSTests => DDCMS}/data/tibstring1ur.xml (100%) rename examples/{DDCMSTests => DDCMS}/data/tibstring2.xml (100%) rename examples/{DDCMSTests => DDCMS}/data/tibstring2ll.xml (100%) rename examples/{DDCMSTests => DDCMS}/data/tibstring2lr.xml (100%) rename examples/{DDCMSTests => DDCMS}/data/tibstring2ul.xml (100%) rename examples/{DDCMSTests => DDCMS}/data/tibstring2ur.xml (100%) rename examples/{DDCMSTests => DDCMS}/data/tibstring3.xml (100%) rename examples/{DDCMSTests => DDCMS}/data/tibstring3ll.xml (100%) rename examples/{DDCMSTests => DDCMS}/data/tibstring3lr.xml (100%) rename examples/{DDCMSTests => DDCMS}/data/tibstring3ul.xml (100%) rename examples/{DDCMSTests => DDCMS}/data/tibstring3ur.xml (100%) rename examples/{DDCMSTests => DDCMS}/data/tibstringpar.xml (100%) rename examples/{DDCMSTests => DDCMS}/data/tibtidcommonmaterial.xml (100%) rename examples/{DDCMSTests => DDCMS}/data/tibtidservices.xml (100%) rename examples/{DDCMSTests => DDCMS}/data/tibtidservicesb.xml (100%) rename examples/{DDCMSTests => DDCMS}/data/tibtidservicesf.xml (100%) rename examples/{DDCMSTests => DDCMS}/data/tid.xml (100%) rename examples/{DDCMSTests => DDCMS}/data/tidb.xml (100%) rename examples/{DDCMSTests => DDCMS}/data/tidf.xml (100%) rename examples/{DDCMSTests => DDCMS}/data/tidmaterial.xml (100%) rename examples/{DDCMSTests => DDCMS}/data/tidmodpar.xml (100%) rename examples/{DDCMSTests => DDCMS}/data/tidmodule0.xml (100%) rename examples/{DDCMSTests => DDCMS}/data/tidmodule0l.xml (100%) rename examples/{DDCMSTests => DDCMS}/data/tidmodule0r.xml (100%) rename examples/{DDCMSTests => DDCMS}/data/tidmodule1.xml (100%) rename examples/{DDCMSTests => DDCMS}/data/tidmodule1l.xml (100%) rename examples/{DDCMSTests => DDCMS}/data/tidmodule1r.xml (100%) rename examples/{DDCMSTests => DDCMS}/data/tidmodule2.xml (100%) rename examples/{DDCMSTests => DDCMS}/data/tidring0.xml (100%) rename examples/{DDCMSTests => DDCMS}/data/tidring0b.xml (100%) rename examples/{DDCMSTests => DDCMS}/data/tidring0f.xml (100%) rename examples/{DDCMSTests => DDCMS}/data/tidring1.xml (100%) rename examples/{DDCMSTests => DDCMS}/data/tidring1b.xml (100%) rename examples/{DDCMSTests => DDCMS}/data/tidring1f.xml (100%) rename examples/{DDCMSTests => DDCMS}/data/tidring2.xml (100%) rename examples/{DDCMSTests => DDCMS}/data/tidringpar.xml (100%) rename examples/{DDCMSTests => DDCMS}/data/tob.xml (100%) rename examples/{DDCMSTests => DDCMS}/data/tobmaterial.xml (100%) rename examples/{DDCMSTests => DDCMS}/data/tobmodpar.xml (100%) rename examples/{DDCMSTests => DDCMS}/data/tobmodule0.xml (100%) rename examples/{DDCMSTests => DDCMS}/data/tobmodule2.xml (100%) rename examples/{DDCMSTests => DDCMS}/data/tobmodule4.xml (100%) rename examples/{DDCMSTests => DDCMS}/data/tobrod0.xml (100%) rename examples/{DDCMSTests => DDCMS}/data/tobrod0c.xml (100%) rename examples/{DDCMSTests => DDCMS}/data/tobrod0h.xml (100%) rename examples/{DDCMSTests => DDCMS}/data/tobrod0l.xml (100%) rename examples/{DDCMSTests => DDCMS}/data/tobrod1.xml (100%) rename examples/{DDCMSTests => DDCMS}/data/tobrod1h.xml (100%) rename examples/{DDCMSTests => DDCMS}/data/tobrod1l.xml (100%) rename examples/{DDCMSTests => DDCMS}/data/tobrod2.xml (100%) rename examples/{DDCMSTests => DDCMS}/data/tobrod2c.xml (100%) rename examples/{DDCMSTests => DDCMS}/data/tobrod2h.xml (100%) rename examples/{DDCMSTests => DDCMS}/data/tobrod2l.xml (100%) rename examples/{DDCMSTests => DDCMS}/data/tobrod3.xml (100%) rename examples/{DDCMSTests => DDCMS}/data/tobrod3h.xml (100%) rename examples/{DDCMSTests => DDCMS}/data/tobrod3l.xml (100%) rename examples/{DDCMSTests => DDCMS}/data/tobrod4.xml (100%) rename examples/{DDCMSTests => DDCMS}/data/tobrod4c.xml (100%) rename examples/{DDCMSTests => DDCMS}/data/tobrod4h.xml (100%) rename examples/{DDCMSTests => DDCMS}/data/tobrod4l.xml (100%) rename examples/{DDCMSTests => DDCMS}/data/tobrod5.xml (100%) rename examples/{DDCMSTests => DDCMS}/data/tobrod5h.xml (100%) rename examples/{DDCMSTests => DDCMS}/data/tobrod5l.xml (100%) rename examples/{DDCMSTests => DDCMS}/data/tobrodpar.xml (100%) rename examples/{DDCMSTests => DDCMS}/data/tracker.xml (100%) rename examples/{DDCMSTests => DDCMS}/data/trackerParameters.xml (100%) rename examples/{DDCMSTests => DDCMS}/data/trackerStructureTopology.xml (100%) rename examples/{DDCMSTests => DDCMS}/data/trackerbulkhead.xml (100%) rename examples/{DDCMSTests => DDCMS}/data/trackermaterial.xml (100%) rename examples/{DDCMSTests => DDCMS}/data/trackerother.xml (100%) rename examples/{DDCMSTests => DDCMS}/data/trackerpixbar.xml (100%) rename examples/{DDCMSTests => DDCMS}/data/trackerpixfwd.xml (100%) rename examples/{DDCMSTests => DDCMS}/data/trackertec.xml (100%) rename examples/{DDCMSTests => DDCMS}/data/trackertib.xml (100%) rename examples/{DDCMSTests => DDCMS}/data/trackertibtidservices.xml (100%) rename examples/{DDCMSTests => DDCMS}/data/trackertid.xml (100%) rename examples/{DDCMSTests => DDCMS}/data/trackertob.xml (100%) rename examples/{DDCMSTests => DDCMS}/data/vacuum.xml (100%) rename examples/{DDCMSTests => DDCMS}/eve/DDEve.xml (100%) rename examples/{DDCMSTests => DDCMS}/pictures/CMS-pixbar.png (100%) rename examples/{DDCMSTests => DDCMS}/pictures/CMS-tracker-sim-1.png (100%) rename examples/{DDCMSTests => DDCMS}/pictures/CMS-tracker-sim-2.png (100%) rename examples/{DDCMSTests => DDCMS}/pictures/CMS-tracker1.png (100%) rename examples/{DDCMSTests => DDCMS}/pictures/CMS-tracker2.png (100%) rename examples/{DDCMSTests => DDCMS}/pictures/CMS-tracker3.png (100%) rename examples/{DDCMSTests => DDCMS}/scripts/CMSTrackerSim.py (100%) delete mode 100644 examples/DDCMSTests/CMakeLists.txt delete mode 100644 examples/DDCMSTests/README.txt delete mode 100644 examples/DDCMSTests/include/DDCMS/DDCMS.h delete mode 100644 examples/DDCMSTests/include/DDCMS/DDCMSPlugins.h delete mode 100644 examples/DDCMSTests/include/DDCMS/DDCMSTags.h delete mode 100644 examples/DDCMSTests/src/Example.cpp rename {DDDB => examples/DDDB}/include/DDDB/DDDBConditionsLoader.h (100%) rename {DDDB => examples/DDDB}/include/DDDB/DDDBConversion.h (100%) rename {DDDB => examples/DDDB}/include/DDDB/DDDBDimension.h (100%) rename {DDDB => examples/DDDB}/include/DDDB/DDDBHelper.h (100%) rename {DDDB => examples/DDDB}/include/DDDB/DDDBReader.h (100%) rename {DDDB => examples/DDDB}/include/DDDB/DDDBReaderContext.h (100%) rename {DDDB => examples/DDDB}/include/DDDB/DDDBTags.h (100%) rename {DDDB => examples/DDDB}/include/Detector/DeAlignmentCall.h (100%) rename {DDDB => examples/DDDB}/include/Detector/DeIOV.h (100%) rename {DDDB => examples/DDDB}/include/Detector/DeStatic.h (100%) rename {DDDB => examples/DDDB}/include/Detector/DeVP.h (100%) rename {DDDB => examples/DDDB}/include/Detector/DeVPConditionCalls.h (100%) rename {DDDB => examples/DDDB}/include/Detector/DeVPGeneric.h (100%) rename {DDDB => examples/DDDB}/include/Detector/DeVPSensor.h (100%) rename {DDDB => examples/DDDB}/include/Detector/DeVelo.h (100%) rename {DDDB => examples/DDDB}/include/Detector/DeVeloConditionCalls.h (100%) rename {DDDB => examples/DDDB}/include/Detector/DeVeloGeneric.h (100%) rename {DDDB => examples/DDDB}/include/Detector/DeVeloSensor.h (100%) rename {DDDB => examples/DDDB}/include/Detector/DetectorElement.h (100%) rename {DDDB => examples/DDDB}/include/Detector/DetectorElement_inl.h (100%) rename {DDDB => examples/DDDB}/include/Detector/IDetService.h (100%) rename {DDDB => examples/DDDB}/include/Detector/ParameterMap.h (100%) rename {DDDB => examples/DDDB}/include/Kernel/VPConstants.h (100%) rename {DDDB => examples/DDDB}/src/DDDBConversion.cpp (100%) rename {DDDB => examples/DDDB}/src/DDDBDimension.cpp (100%) rename {DDDB => examples/DDDB}/src/DDDBHelper.cpp (100%) rename {DDDB => examples/DDDB}/src/DDDBReader.cpp (100%) rename {DDDB => examples/DDDB}/src/DDDBTags.cpp (100%) rename {DDDB => examples/DDDB}/src/Detector/DeAlignmentCall.cpp (100%) rename {DDDB => examples/DDDB}/src/Detector/DeHandles.cpp (100%) rename {DDDB => examples/DDDB}/src/Detector/DeIOV.cpp (100%) rename {DDDB => examples/DDDB}/src/Detector/DeStatic.cpp (100%) rename {DDDB => examples/DDDB}/src/Detector/DeVP.cpp (100%) rename {DDDB => examples/DDDB}/src/Detector/DeVPConditionCalls.cpp (100%) rename {DDDB => examples/DDDB}/src/Detector/DeVPGeneric.cpp (100%) rename {DDDB => examples/DDDB}/src/Detector/DeVPSensor.cpp (100%) rename {DDDB => examples/DDDB}/src/Detector/DeVelo.cpp (100%) rename {DDDB => examples/DDDB}/src/Detector/DeVeloConditionCalls.cpp (100%) rename {DDDB => examples/DDDB}/src/Detector/DeVeloGeneric.cpp (100%) rename {DDDB => examples/DDDB}/src/Detector/DeVeloHandles.cpp (100%) rename {DDDB => examples/DDDB}/src/Detector/DeVeloSensor.cpp (100%) rename {DDDB => examples/DDDB}/src/Detector/DetectorElement.cpp (100%) rename {DDDB => examples/DDDB}/src/Detector/ParameterMap.cpp (100%) rename {DDDB => examples/DDDB}/src/plugins/CondDB2DDDB.cpp (100%) rename {DDDB => examples/DDDB}/src/plugins/DDDB2Objects.cpp (100%) rename {DDDB => examples/DDDB}/src/plugins/DDDBAlignmentTest.cpp (100%) rename {DDDB => examples/DDDB}/src/plugins/DDDBConditionsLoader.cpp (100%) rename {DDDB => examples/DDDB}/src/plugins/DDDBDerivedCondTest.cpp (100%) rename {DDDB => examples/DDDB}/src/plugins/DDDBDetectorDumps.cpp (100%) rename {DDDB => examples/DDDB}/src/plugins/DDDBExecutor.cpp (100%) rename {DDDB => examples/DDDB}/src/plugins/DDDBFileReader.cpp (100%) rename {DDDB => examples/DDDB}/src/plugins/DDDBLogVolumeDump.cpp (100%) rename {DDDB => examples/DDDB}/src/plugins/DDDBPlugins.cpp (100%) rename {DDDB => examples/DDDB}/src/plugins/DDDBvis.cpp (100%) rename {DDDB => examples/DDDB}/src/plugins/DeVeloServiceTest.cpp (100%) rename {DDDB => examples/DDDB}/src/plugins/DeVeloTest.cpp (100%) rename {DDDB => examples/DDDB}/src/plugins/DetService.cpp (100%) rename {DDDB => examples/DDDB}/src/plugins/DetService.h (100%) diff --git a/CMakeLists.txt b/CMakeLists.txt index 5de9c10e1..2be0b1113 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -124,7 +124,6 @@ add_subdirectory(DDG4) add_subdirectory(DDCond) add_subdirectory(DDAlign) add_subdirectory(DDEve) -add_subdirectory(DDDB) dd4hep_enable_tests( DDTest ) add_subdirectory(UtilityApps) diff --git a/DDDB/CMakeLists.txt b/DDDB/CMakeLists.txt deleted file mode 100644 index b078ba9fa..000000000 --- a/DDDB/CMakeLists.txt +++ /dev/null @@ -1,30 +0,0 @@ -#========================================================================== -# AIDA Detector description implementation -#-------------------------------------------------------------------------- -# Copyright (C) Organisation europeenne pour la Recherche nucleaire (CERN) -# All rights reserved. -# -# For the licensing terms see $DD4hepINSTALL/LICENSE. -# For the list of contributors see $DD4hepINSTALL/doc/CREDITS. -# -#========================================================================== -# -# DDDB is a detector description convention developed by the LHCb experiment. -# For further information concerning the DTD, please see: -# http://lhcb-comp.web.cern.ch/lhcb-comp/Frameworks/DetDesc/Documents/lhcbDtd.pdf -# The usage of Xerces-C is mandatory due to the entity resolution mechanism -# -#================================================================================= - -dd4hep_package( DDDB - USES DDCore DDAlign DDCond - INCLUDE_DIRS include - INSTALL_INCLUDES include/DDDB include/Detector include/Kernel) -# -#---DDCond library -------------------------------------------------------------- -dd4hep_add_package_library(DDDB - SOURCES src/*.cpp src/Detector/*.cpp ) -# -#---DDDB plugin library ------------------------------------------------------- -dd4hep_add_plugin(DDDBPlugins SOURCES src/plugins/*.cpp - USES DDCore DDAlign DDCond ) diff --git a/examples/CMakeLists.txt b/examples/CMakeLists.txt index a3bab7475..9ce85bcc2 100644 --- a/examples/CMakeLists.txt +++ b/examples/CMakeLists.txt @@ -52,7 +52,7 @@ dd4hep_enable_tests ( AlignDet ClientTests Conditions - DDCMSTests + DDCMS DDDB DDG4 Persistency diff --git a/examples/DDCMSTests/CMS-pixbar.png b/examples/DDCMS/CMS-pixbar.png similarity index 100% rename from examples/DDCMSTests/CMS-pixbar.png rename to examples/DDCMS/CMS-pixbar.png diff --git a/examples/DDCMSTests/CMS-tracker-sim-1.png b/examples/DDCMS/CMS-tracker-sim-1.png similarity index 100% rename from examples/DDCMSTests/CMS-tracker-sim-1.png rename to examples/DDCMS/CMS-tracker-sim-1.png diff --git a/examples/DDCMSTests/CMS-tracker-sim-2.png b/examples/DDCMS/CMS-tracker-sim-2.png similarity index 100% rename from examples/DDCMSTests/CMS-tracker-sim-2.png rename to examples/DDCMS/CMS-tracker-sim-2.png diff --git a/examples/DDCMSTests/CMS-tracker1.png b/examples/DDCMS/CMS-tracker1.png similarity index 100% rename from examples/DDCMSTests/CMS-tracker1.png rename to examples/DDCMS/CMS-tracker1.png diff --git a/examples/DDCMSTests/CMS-tracker2.png b/examples/DDCMS/CMS-tracker2.png similarity index 100% rename from examples/DDCMSTests/CMS-tracker2.png rename to examples/DDCMS/CMS-tracker2.png diff --git a/examples/DDCMSTests/CMS-tracker3.png b/examples/DDCMS/CMS-tracker3.png similarity index 100% rename from examples/DDCMSTests/CMS-tracker3.png rename to examples/DDCMS/CMS-tracker3.png diff --git a/examples/DDCMS/CMakeLists.txt b/examples/DDCMS/CMakeLists.txt index b905111e0..5ba56f9c2 100644 --- a/examples/DDCMS/CMakeLists.txt +++ b/examples/DDCMS/CMakeLists.txt @@ -12,6 +12,11 @@ # DDCMS is a detector description convention developed by the CMS experiment. # #================================================================================= +cmake_minimum_required(VERSION 3.3 FATAL_ERROR) + +include ( ${DD4hep_DIR}/cmake/DD4hep.cmake ) +#------------------------------------------------------------------------------ +dd4hep_configure_output () dd4hep_package( DDCMS USES [DD4hep REQUIRED COMPONENTS DDCore] @@ -31,3 +36,175 @@ dd4hep_package( DDCMS dd4hep_add_plugin ( DDCMS SOURCES src/*.cpp src/plugins/*.cpp USES [DD4hep REQUIRED COMPONENTS DDCore DDAlign DDCond] [ROOT REQUIRED COMPONENTS Geom GenVector]) + +#---Package installation procedure(s) ----------------------------------------- +dd4hep_install_dir( data DESTINATION ${DD4hep_DIR}/examples/DDCMS ) +dd4hep_install_dir( eve DESTINATION ${DD4hep_DIR}/examples/DDCMS ) +dd4hep_install_dir( scripts DESTINATION ${DD4hep_DIR}/examples/DDCMS ) +# +#---Testing-------------------------------------------------------------------- +dd4hep_configure_scripts ( DDCMS DEFAULT_SETUP WITH_TESTS ) +# +# Test CMS tracker detector construction +dd4hep_add_test_reg( DDCMS_LoadGeometry + COMMAND "${CMAKE_INSTALL_PREFIX}/bin/run_test_DDCMS.sh" + EXEC_ARGS geoPluginRun + -input file:${CMAKE_CURRENT_SOURCE_DIR}/data/cms_tracker.xml -destroy -print WARNING + -plugin DD4hep_PlacedVolumeProcessor -recursive -processor DDCMS_DetElementCreator + REGEX_PASS "Instrumented 5 subdetectors with 36091 DetElements 25776 sensitives out of 224404 volumes and 1161 sensitive placements." + REGEX_FAIL "Exception" + REGEX_FAIL "FAILED" + ) +# +# Dump CMS material table +dd4hep_add_test_reg( DDCMS_DumpMaterials + COMMAND "${CMAKE_INSTALL_PREFIX}/bin/run_test_DDCMS.sh" + EXEC_ARGS geoPluginRun -print WARNING + -input file:${CMAKE_CURRENT_SOURCE_DIR}/data/dd4hep-config.xml + -destroy -plugin DD4hep_MaterialTable -type xml + REGEX_PASS "material name=\"tobmaterial_TOB_ax_services_C18\"" + REGEX_FAIL "Exception" + REGEX_FAIL "FAILED" + ) +# +# Dump CMS volume tree +dd4hep_add_test_reg( DDCMS_DumpVolumes + COMMAND "${CMAKE_INSTALL_PREFIX}/bin/run_test_DDCMS.sh" + EXEC_ARGS geoPluginRun -print WARNING + -input file:${CMAKE_CURRENT_SOURCE_DIR}/data/dd4hep-config.xml + -destroy -plugin DD4hep_VolumeDump -sensitive -volids + REGEX_PASS "Checked 224414 physical volume placements. 25776 are sensitive." + REGEX_FAIL "Exception" + REGEX_FAIL "FAILED" + ) +# +# Dump CMS detector element tree +dd4hep_add_test_reg( DDCMS_DumpDetElements + COMMAND "${CMAKE_INSTALL_PREFIX}/bin/run_test_DDCMS.sh" + EXEC_ARGS geoPluginRun -print WARNING + -input file:${CMAKE_CURRENT_SOURCE_DIR}/data/dd4hep-config.xml + -destroy -plugin DD4hep_DetectorDump -sensitive + REGEX_PASS "Scanned a total of 36096 elements." + REGEX_FAIL "Exception" + REGEX_FAIL "FAILED" + ) +# +# Dump CMS detector element tree of SD PixelBarrel +dd4hep_add_test_reg( DDCMS_VolumeMgrTest_PixelBarrel + COMMAND "${CMAKE_INSTALL_PREFIX}/bin/run_test_DDCMS.sh" + EXEC_ARGS geoPluginRun + -input file:${CMAKE_CURRENT_SOURCE_DIR}/data/dd4hep-config.xml + -destroy -print WARNING + -plugin DD4hep_VolumeMgrTest PixelBarrel_1 + REGEX_PASS "PASSED: Checked 10981 objects. Num.Errors:0" + REGEX_FAIL "Exception" + REGEX_FAIL "FAILED" + ) +# +# Dump CMS detector element tree of SD TIB +dd4hep_add_test_reg( DDCMS_VolumeMgrTest_TIB + COMMAND "${CMAKE_INSTALL_PREFIX}/bin/run_test_DDCMS.sh" + EXEC_ARGS geoPluginRun + -input file:${CMAKE_CURRENT_SOURCE_DIR}/data/dd4hep-config.xml + -destroy -print WARNING + -plugin DD4hep_VolumeMgrTest TIB_1 + REGEX_PASS "PASSED: Checked 47964 objects. Num.Errors:0" + REGEX_FAIL "Exception" + REGEX_FAIL "FAILED" + ) +# +# Dump CMS detector element tree of SD TOB +dd4hep_add_test_reg( DDCMS_VolumeMgrTest_TOB + COMMAND "${CMAKE_INSTALL_PREFIX}/bin/run_test_DDCMS.sh" + EXEC_ARGS geoPluginRun + -input file:${CMAKE_CURRENT_SOURCE_DIR}/data/dd4hep-config.xml + -destroy -print WARNING + -plugin DD4hep_VolumeMgrTest TOB_1 + REGEX_PASS "PASSED: Checked 150699 objects. Num.Errors:0" + REGEX_FAIL "Exception" + REGEX_FAIL "FAILED" + ) +# +# Dump CMS detector element tree of SD TOB +dd4hep_add_test_reg( DDCMS_Geant4_LONGTEST + COMMAND "${CMAKE_INSTALL_PREFIX}/bin/run_test_DDCMS.sh" + EXEC_ARGS python ${CMAKE_CURRENT_SOURCE_DIR}/scripts/CMSTrackerSim.py batch test numevents 2 + REGEX_PASS "\\+\\+\\+ Finished run 0 after 2 events \\(2 events in total\\)" + REGEX_FAIL "Exception;EXCEPTION;ERROR;FAILED" + ) +# +# Test saving geometry to ROOT file +dd4hep_add_test_reg( DDCMS_Persist_Save_LONGTEST + COMMAND "${CMAKE_INSTALL_PREFIX}/bin/run_test_DDCMS.sh" + EXEC_ARGS geoPluginRun + -input file:${CMAKE_CURRENT_SOURCE_DIR}/data/dd4hep-config.xml + -destroy -print WARNING + -plugin DD4hep_Geometry2ROOT -output DDCMS_geometry.root + REGEX_PASS "\\+\\+\\+ Successfully saved geometry data to file." + REGEX_FAIL " ERROR ;EXCEPTION;Exception;FAILED" + ) +# +# Test restoring geometry from ROOT file: Volume Manager +dd4hep_add_test_reg( DDCMS_Persist_Restore_LONGTEST + COMMAND "${CMAKE_INSTALL_PREFIX}/bin/run_test_DDCMS.sh" + EXEC_ARGS geoPluginRun -print WARNING + -plugin DD4hep_RootLoader DDCMS_geometry.root + DEPENDS DDCMS_Persist_Save_LONGTEST + REGEX_PASS "\\+\\+\\+ Successfully loaded detector description from file" + REGEX_FAIL " ERROR ;EXCEPTION;Exception;FAILED" + ) +# +# Test restoring geometry from ROOT file: Volume Manager loading+nominals +dd4hep_add_test_reg( DDCMS_Persist_Restore_VolMgr1_LONGTEST + COMMAND "${CMAKE_INSTALL_PREFIX}/bin/run_test_DDCMS.sh" + EXEC_ARGS geoPluginRun -print WARNING + -plugin DD4hep_RootLoader DDCMS_geometry.root + -plugin DD4hep_CheckVolumeManager + DEPENDS DDCMS_Persist_Save_LONGTEST + REGEX_PASS "\\+\\+\\+ PASSED Checked 36096 VolumeManager contexts. Num.Errors: 0" + REGEX_FAIL " ERROR ;EXCEPTION;Exception;FAILED" + ) +# +# Test restoring geometry from ROOT file: Test Volume Manager results +dd4hep_add_test_reg( DDCMS_Persist_Restore_VolMgr2_LONGTEST + COMMAND "${CMAKE_INSTALL_PREFIX}/bin/run_test_DDCMS.sh" + EXEC_ARGS geoPluginRun -print WARNING + -plugin DD4hep_RootLoader DDCMS_geometry.root + -plugin DD4hep_VolumeMgrTest PixelBarrel_1 + DEPENDS DDCMS_Persist_Save_LONGTEST + REGEX_PASS "\\+\\+\\+ PASSED: Checked 10981 objects. Num.Errors:0" + REGEX_FAIL " ERROR ;EXCEPTION;Exception;FAILED" + ) +# +# Test restoring geometry from ROOT file: DetElement nominal alignments +# Note: BeamCal has a problem. Need to be taken into account +dd4hep_add_test_reg( DDCMS_Persist_Restore_Nominal_LONGTEST + COMMAND "${CMAKE_INSTALL_PREFIX}/bin/run_test_DDCMS.sh" + EXEC_ARGS geoPluginRun -print WARNING + -plugin DD4hep_RootLoader DDCMS_geometry.root + -plugin DD4hep_CheckNominals + DEPENDS DDCMS_Persist_Save_LONGTEST + REGEX_PASS "\\+\\+\\+ PASSED Checked 25776 DetElements. Num.Errors: 0" + ) +# +# Test restoring geometry from ROOT file: Sensitive detectors +dd4hep_add_test_reg( DDCMS_Persist_Restore_Sensitives_LONGTEST + COMMAND "${CMAKE_INSTALL_PREFIX}/bin/run_test_DDCMS.sh" + EXEC_ARGS geoPluginRun -print WARNING + -plugin DD4hep_RootLoader DDCMS_geometry.root + -plugin DD4hep_CheckSensitives + DEPENDS DDCMS_Persist_Save_LONGTEST + REGEX_PASS "\\+\\+\\+ PASSED Checked 5 SensitiveDetector objects. Num.Errors: 0" + REGEX_FAIL " ERROR ;EXCEPTION;Exception;FAILED" + ) +# +# Test restoring geometry from ROOT file: Readout structures +dd4hep_add_test_reg( DDCMS_Persist_Restore_Readouts_LONGTEST + COMMAND "${CMAKE_INSTALL_PREFIX}/bin/run_test_DDCMS.sh" + EXEC_ARGS geoPluginRun -print WARNING + -plugin DD4hep_RootLoader DDCMS_geometry.root + -plugin DD4hep_CheckReadouts + DEPENDS DDCMS_Persist_Save_LONGTEST + REGEX_PASS "\\+\\+\\+ PASSED Checked 5 readout objects. Num.Errors: 0" + REGEX_FAIL " ERROR ;EXCEPTION;Exception;FAILED" + ) diff --git a/examples/DDCMSTests/data/cms.xml b/examples/DDCMS/data/cms.xml similarity index 100% rename from examples/DDCMSTests/data/cms.xml rename to examples/DDCMS/data/cms.xml diff --git a/examples/DDCMSTests/data/cms_tracker.xml b/examples/DDCMS/data/cms_tracker.xml similarity index 100% rename from examples/DDCMSTests/data/cms_tracker.xml rename to examples/DDCMS/data/cms_tracker.xml diff --git a/examples/DDCMSTests/data/cmsextent.xml b/examples/DDCMS/data/cmsextent.xml similarity index 100% rename from examples/DDCMSTests/data/cmsextent.xml rename to examples/DDCMS/data/cmsextent.xml diff --git a/examples/DDCMSTests/data/dd4hep-config.xml b/examples/DDCMS/data/dd4hep-config.xml similarity index 100% rename from examples/DDCMSTests/data/dd4hep-config.xml rename to examples/DDCMS/data/dd4hep-config.xml diff --git a/examples/DDCMSTests/data/materials.xml b/examples/DDCMS/data/materials.xml similarity index 100% rename from examples/DDCMSTests/data/materials.xml rename to examples/DDCMS/data/materials.xml diff --git a/examples/DDCMSTests/data/pixbar.xml b/examples/DDCMS/data/pixbar.xml similarity index 100% rename from examples/DDCMSTests/data/pixbar.xml rename to examples/DDCMS/data/pixbar.xml diff --git a/examples/DDCMSTests/data/pixbarladder.xml b/examples/DDCMS/data/pixbarladder.xml similarity index 100% rename from examples/DDCMSTests/data/pixbarladder.xml rename to examples/DDCMS/data/pixbarladder.xml diff --git a/examples/DDCMSTests/data/pixbarladderfull.xml b/examples/DDCMS/data/pixbarladderfull.xml similarity index 100% rename from examples/DDCMSTests/data/pixbarladderfull.xml rename to examples/DDCMS/data/pixbarladderfull.xml diff --git a/examples/DDCMSTests/data/pixbarladderhalf.xml b/examples/DDCMS/data/pixbarladderhalf.xml similarity index 100% rename from examples/DDCMSTests/data/pixbarladderhalf.xml rename to examples/DDCMS/data/pixbarladderhalf.xml diff --git a/examples/DDCMSTests/data/pixbarlayer.xml b/examples/DDCMS/data/pixbarlayer.xml similarity index 100% rename from examples/DDCMSTests/data/pixbarlayer.xml rename to examples/DDCMS/data/pixbarlayer.xml diff --git a/examples/DDCMSTests/data/pixbarlayer0.xml b/examples/DDCMS/data/pixbarlayer0.xml similarity index 100% rename from examples/DDCMSTests/data/pixbarlayer0.xml rename to examples/DDCMS/data/pixbarlayer0.xml diff --git a/examples/DDCMSTests/data/pixbarlayer1.xml b/examples/DDCMS/data/pixbarlayer1.xml similarity index 100% rename from examples/DDCMSTests/data/pixbarlayer1.xml rename to examples/DDCMS/data/pixbarlayer1.xml diff --git a/examples/DDCMSTests/data/pixbarlayer2.xml b/examples/DDCMS/data/pixbarlayer2.xml similarity index 100% rename from examples/DDCMSTests/data/pixbarlayer2.xml rename to examples/DDCMS/data/pixbarlayer2.xml diff --git a/examples/DDCMSTests/data/pixbarmaterial.xml b/examples/DDCMS/data/pixbarmaterial.xml similarity index 100% rename from examples/DDCMSTests/data/pixbarmaterial.xml rename to examples/DDCMS/data/pixbarmaterial.xml diff --git a/examples/DDCMSTests/data/pixfwd.xml b/examples/DDCMS/data/pixfwd.xml similarity index 100% rename from examples/DDCMSTests/data/pixfwd.xml rename to examples/DDCMS/data/pixfwd.xml diff --git a/examples/DDCMSTests/data/pixfwdBlade.xml b/examples/DDCMS/data/pixfwdBlade.xml similarity index 100% rename from examples/DDCMSTests/data/pixfwdBlade.xml rename to examples/DDCMS/data/pixfwdBlade.xml diff --git a/examples/DDCMSTests/data/pixfwdCommon.xml b/examples/DDCMS/data/pixfwdCommon.xml similarity index 100% rename from examples/DDCMSTests/data/pixfwdCommon.xml rename to examples/DDCMS/data/pixfwdCommon.xml diff --git a/examples/DDCMSTests/data/pixfwdCylinder.xml b/examples/DDCMS/data/pixfwdCylinder.xml similarity index 100% rename from examples/DDCMSTests/data/pixfwdCylinder.xml rename to examples/DDCMS/data/pixfwdCylinder.xml diff --git a/examples/DDCMSTests/data/pixfwdDisk.xml b/examples/DDCMS/data/pixfwdDisk.xml similarity index 100% rename from examples/DDCMSTests/data/pixfwdDisk.xml rename to examples/DDCMS/data/pixfwdDisk.xml diff --git a/examples/DDCMSTests/data/pixfwdMaterials.xml b/examples/DDCMS/data/pixfwdMaterials.xml similarity index 100% rename from examples/DDCMSTests/data/pixfwdMaterials.xml rename to examples/DDCMS/data/pixfwdMaterials.xml diff --git a/examples/DDCMSTests/data/pixfwdNipple.xml b/examples/DDCMS/data/pixfwdNipple.xml similarity index 100% rename from examples/DDCMSTests/data/pixfwdNipple.xml rename to examples/DDCMS/data/pixfwdNipple.xml diff --git a/examples/DDCMSTests/data/pixfwdPanel.xml b/examples/DDCMS/data/pixfwdPanel.xml similarity index 100% rename from examples/DDCMSTests/data/pixfwdPanel.xml rename to examples/DDCMS/data/pixfwdPanel.xml diff --git a/examples/DDCMSTests/data/pixfwdPanelBase.xml b/examples/DDCMS/data/pixfwdPanelBase.xml similarity index 100% rename from examples/DDCMSTests/data/pixfwdPanelBase.xml rename to examples/DDCMS/data/pixfwdPanelBase.xml diff --git a/examples/DDCMSTests/data/pixfwdPlaq.xml b/examples/DDCMS/data/pixfwdPlaq.xml similarity index 100% rename from examples/DDCMSTests/data/pixfwdPlaq.xml rename to examples/DDCMS/data/pixfwdPlaq.xml diff --git a/examples/DDCMSTests/data/pixfwdPlaq1x2.xml b/examples/DDCMS/data/pixfwdPlaq1x2.xml similarity index 100% rename from examples/DDCMSTests/data/pixfwdPlaq1x2.xml rename to examples/DDCMS/data/pixfwdPlaq1x2.xml diff --git a/examples/DDCMSTests/data/pixfwdPlaq1x5.xml b/examples/DDCMS/data/pixfwdPlaq1x5.xml similarity index 100% rename from examples/DDCMSTests/data/pixfwdPlaq1x5.xml rename to examples/DDCMS/data/pixfwdPlaq1x5.xml diff --git a/examples/DDCMSTests/data/pixfwdPlaq2x3.xml b/examples/DDCMS/data/pixfwdPlaq2x3.xml similarity index 100% rename from examples/DDCMSTests/data/pixfwdPlaq2x3.xml rename to examples/DDCMS/data/pixfwdPlaq2x3.xml diff --git a/examples/DDCMSTests/data/pixfwdPlaq2x4.xml b/examples/DDCMS/data/pixfwdPlaq2x4.xml similarity index 100% rename from examples/DDCMSTests/data/pixfwdPlaq2x4.xml rename to examples/DDCMS/data/pixfwdPlaq2x4.xml diff --git a/examples/DDCMSTests/data/pixfwdPlaq2x5.xml b/examples/DDCMS/data/pixfwdPlaq2x5.xml similarity index 100% rename from examples/DDCMSTests/data/pixfwdPlaq2x5.xml rename to examples/DDCMS/data/pixfwdPlaq2x5.xml diff --git a/examples/DDCMSTests/data/pixfwdTest.xml b/examples/DDCMS/data/pixfwdTest.xml similarity index 100% rename from examples/DDCMSTests/data/pixfwdTest.xml rename to examples/DDCMS/data/pixfwdTest.xml diff --git a/examples/DDCMSTests/data/tec.xml b/examples/DDCMS/data/tec.xml similarity index 100% rename from examples/DDCMSTests/data/tec.xml rename to examples/DDCMS/data/tec.xml diff --git a/examples/DDCMSTests/data/tecbackplate.xml b/examples/DDCMS/data/tecbackplate.xml similarity index 100% rename from examples/DDCMSTests/data/tecbackplate.xml rename to examples/DDCMS/data/tecbackplate.xml diff --git a/examples/DDCMSTests/data/tecmaterial.xml b/examples/DDCMS/data/tecmaterial.xml similarity index 100% rename from examples/DDCMSTests/data/tecmaterial.xml rename to examples/DDCMS/data/tecmaterial.xml diff --git a/examples/DDCMSTests/data/tecmodpar.xml b/examples/DDCMS/data/tecmodpar.xml similarity index 100% rename from examples/DDCMSTests/data/tecmodpar.xml rename to examples/DDCMS/data/tecmodpar.xml diff --git a/examples/DDCMSTests/data/tecmodule0.xml b/examples/DDCMS/data/tecmodule0.xml similarity index 100% rename from examples/DDCMSTests/data/tecmodule0.xml rename to examples/DDCMS/data/tecmodule0.xml diff --git a/examples/DDCMSTests/data/tecmodule0r.xml b/examples/DDCMS/data/tecmodule0r.xml similarity index 100% rename from examples/DDCMSTests/data/tecmodule0r.xml rename to examples/DDCMS/data/tecmodule0r.xml diff --git a/examples/DDCMSTests/data/tecmodule0s.xml b/examples/DDCMS/data/tecmodule0s.xml similarity index 100% rename from examples/DDCMSTests/data/tecmodule0s.xml rename to examples/DDCMS/data/tecmodule0s.xml diff --git a/examples/DDCMSTests/data/tecmodule1.xml b/examples/DDCMS/data/tecmodule1.xml similarity index 100% rename from examples/DDCMSTests/data/tecmodule1.xml rename to examples/DDCMS/data/tecmodule1.xml diff --git a/examples/DDCMSTests/data/tecmodule1r.xml b/examples/DDCMS/data/tecmodule1r.xml similarity index 100% rename from examples/DDCMSTests/data/tecmodule1r.xml rename to examples/DDCMS/data/tecmodule1r.xml diff --git a/examples/DDCMSTests/data/tecmodule1s.xml b/examples/DDCMS/data/tecmodule1s.xml similarity index 100% rename from examples/DDCMSTests/data/tecmodule1s.xml rename to examples/DDCMS/data/tecmodule1s.xml diff --git a/examples/DDCMSTests/data/tecmodule2.xml b/examples/DDCMS/data/tecmodule2.xml similarity index 100% rename from examples/DDCMSTests/data/tecmodule2.xml rename to examples/DDCMS/data/tecmodule2.xml diff --git a/examples/DDCMSTests/data/tecmodule3.xml b/examples/DDCMS/data/tecmodule3.xml similarity index 100% rename from examples/DDCMSTests/data/tecmodule3.xml rename to examples/DDCMS/data/tecmodule3.xml diff --git a/examples/DDCMSTests/data/tecmodule4.xml b/examples/DDCMS/data/tecmodule4.xml similarity index 100% rename from examples/DDCMSTests/data/tecmodule4.xml rename to examples/DDCMS/data/tecmodule4.xml diff --git a/examples/DDCMSTests/data/tecmodule4r.xml b/examples/DDCMS/data/tecmodule4r.xml similarity index 100% rename from examples/DDCMSTests/data/tecmodule4r.xml rename to examples/DDCMS/data/tecmodule4r.xml diff --git a/examples/DDCMSTests/data/tecmodule4s.xml b/examples/DDCMS/data/tecmodule4s.xml similarity index 100% rename from examples/DDCMSTests/data/tecmodule4s.xml rename to examples/DDCMS/data/tecmodule4s.xml diff --git a/examples/DDCMSTests/data/tecmodule5.xml b/examples/DDCMS/data/tecmodule5.xml similarity index 100% rename from examples/DDCMSTests/data/tecmodule5.xml rename to examples/DDCMS/data/tecmodule5.xml diff --git a/examples/DDCMSTests/data/tecmodule6.xml b/examples/DDCMS/data/tecmodule6.xml similarity index 100% rename from examples/DDCMSTests/data/tecmodule6.xml rename to examples/DDCMS/data/tecmodule6.xml diff --git a/examples/DDCMSTests/data/tecpetal0.xml b/examples/DDCMS/data/tecpetal0.xml similarity index 100% rename from examples/DDCMSTests/data/tecpetal0.xml rename to examples/DDCMS/data/tecpetal0.xml diff --git a/examples/DDCMSTests/data/tecpetal0b.xml b/examples/DDCMS/data/tecpetal0b.xml similarity index 100% rename from examples/DDCMSTests/data/tecpetal0b.xml rename to examples/DDCMS/data/tecpetal0b.xml diff --git a/examples/DDCMSTests/data/tecpetal0f.xml b/examples/DDCMS/data/tecpetal0f.xml similarity index 100% rename from examples/DDCMSTests/data/tecpetal0f.xml rename to examples/DDCMS/data/tecpetal0f.xml diff --git a/examples/DDCMSTests/data/tecpetal3.xml b/examples/DDCMS/data/tecpetal3.xml similarity index 100% rename from examples/DDCMSTests/data/tecpetal3.xml rename to examples/DDCMS/data/tecpetal3.xml diff --git a/examples/DDCMSTests/data/tecpetal3b.xml b/examples/DDCMS/data/tecpetal3b.xml similarity index 100% rename from examples/DDCMSTests/data/tecpetal3b.xml rename to examples/DDCMS/data/tecpetal3b.xml diff --git a/examples/DDCMSTests/data/tecpetal3f.xml b/examples/DDCMS/data/tecpetal3f.xml similarity index 100% rename from examples/DDCMSTests/data/tecpetal3f.xml rename to examples/DDCMS/data/tecpetal3f.xml diff --git a/examples/DDCMSTests/data/tecpetal6b.xml b/examples/DDCMS/data/tecpetal6b.xml similarity index 100% rename from examples/DDCMSTests/data/tecpetal6b.xml rename to examples/DDCMS/data/tecpetal6b.xml diff --git a/examples/DDCMSTests/data/tecpetal6f.xml b/examples/DDCMS/data/tecpetal6f.xml similarity index 100% rename from examples/DDCMSTests/data/tecpetal6f.xml rename to examples/DDCMS/data/tecpetal6f.xml diff --git a/examples/DDCMSTests/data/tecpetal8b.xml b/examples/DDCMS/data/tecpetal8b.xml similarity index 100% rename from examples/DDCMSTests/data/tecpetal8b.xml rename to examples/DDCMS/data/tecpetal8b.xml diff --git a/examples/DDCMSTests/data/tecpetal8f.xml b/examples/DDCMS/data/tecpetal8f.xml similarity index 100% rename from examples/DDCMSTests/data/tecpetal8f.xml rename to examples/DDCMS/data/tecpetal8f.xml diff --git a/examples/DDCMSTests/data/tecpetalb.xml b/examples/DDCMS/data/tecpetalb.xml similarity index 100% rename from examples/DDCMSTests/data/tecpetalb.xml rename to examples/DDCMS/data/tecpetalb.xml diff --git a/examples/DDCMSTests/data/tecpetalf.xml b/examples/DDCMS/data/tecpetalf.xml similarity index 100% rename from examples/DDCMSTests/data/tecpetalf.xml rename to examples/DDCMS/data/tecpetalf.xml diff --git a/examples/DDCMSTests/data/tecpetpar.xml b/examples/DDCMS/data/tecpetpar.xml similarity index 100% rename from examples/DDCMSTests/data/tecpetpar.xml rename to examples/DDCMS/data/tecpetpar.xml diff --git a/examples/DDCMSTests/data/tecring0.xml b/examples/DDCMS/data/tecring0.xml similarity index 100% rename from examples/DDCMSTests/data/tecring0.xml rename to examples/DDCMS/data/tecring0.xml diff --git a/examples/DDCMSTests/data/tecring0b.xml b/examples/DDCMS/data/tecring0b.xml similarity index 100% rename from examples/DDCMSTests/data/tecring0b.xml rename to examples/DDCMS/data/tecring0b.xml diff --git a/examples/DDCMSTests/data/tecring0f.xml b/examples/DDCMS/data/tecring0f.xml similarity index 100% rename from examples/DDCMSTests/data/tecring0f.xml rename to examples/DDCMS/data/tecring0f.xml diff --git a/examples/DDCMSTests/data/tecring1.xml b/examples/DDCMS/data/tecring1.xml similarity index 100% rename from examples/DDCMSTests/data/tecring1.xml rename to examples/DDCMS/data/tecring1.xml diff --git a/examples/DDCMSTests/data/tecring1b.xml b/examples/DDCMS/data/tecring1b.xml similarity index 100% rename from examples/DDCMSTests/data/tecring1b.xml rename to examples/DDCMS/data/tecring1b.xml diff --git a/examples/DDCMSTests/data/tecring1f.xml b/examples/DDCMS/data/tecring1f.xml similarity index 100% rename from examples/DDCMSTests/data/tecring1f.xml rename to examples/DDCMS/data/tecring1f.xml diff --git a/examples/DDCMSTests/data/tecring2.xml b/examples/DDCMS/data/tecring2.xml similarity index 100% rename from examples/DDCMSTests/data/tecring2.xml rename to examples/DDCMS/data/tecring2.xml diff --git a/examples/DDCMSTests/data/tecring2b.xml b/examples/DDCMS/data/tecring2b.xml similarity index 100% rename from examples/DDCMSTests/data/tecring2b.xml rename to examples/DDCMS/data/tecring2b.xml diff --git a/examples/DDCMSTests/data/tecring2f.xml b/examples/DDCMS/data/tecring2f.xml similarity index 100% rename from examples/DDCMSTests/data/tecring2f.xml rename to examples/DDCMS/data/tecring2f.xml diff --git a/examples/DDCMSTests/data/tecring3.xml b/examples/DDCMS/data/tecring3.xml similarity index 100% rename from examples/DDCMSTests/data/tecring3.xml rename to examples/DDCMS/data/tecring3.xml diff --git a/examples/DDCMSTests/data/tecring3b.xml b/examples/DDCMS/data/tecring3b.xml similarity index 100% rename from examples/DDCMSTests/data/tecring3b.xml rename to examples/DDCMS/data/tecring3b.xml diff --git a/examples/DDCMSTests/data/tecring3f.xml b/examples/DDCMS/data/tecring3f.xml similarity index 100% rename from examples/DDCMSTests/data/tecring3f.xml rename to examples/DDCMS/data/tecring3f.xml diff --git a/examples/DDCMSTests/data/tecring4.xml b/examples/DDCMS/data/tecring4.xml similarity index 100% rename from examples/DDCMSTests/data/tecring4.xml rename to examples/DDCMS/data/tecring4.xml diff --git a/examples/DDCMSTests/data/tecring4b.xml b/examples/DDCMS/data/tecring4b.xml similarity index 100% rename from examples/DDCMSTests/data/tecring4b.xml rename to examples/DDCMS/data/tecring4b.xml diff --git a/examples/DDCMSTests/data/tecring4f.xml b/examples/DDCMS/data/tecring4f.xml similarity index 100% rename from examples/DDCMSTests/data/tecring4f.xml rename to examples/DDCMS/data/tecring4f.xml diff --git a/examples/DDCMSTests/data/tecring5.xml b/examples/DDCMS/data/tecring5.xml similarity index 100% rename from examples/DDCMSTests/data/tecring5.xml rename to examples/DDCMS/data/tecring5.xml diff --git a/examples/DDCMSTests/data/tecring5b.xml b/examples/DDCMS/data/tecring5b.xml similarity index 100% rename from examples/DDCMSTests/data/tecring5b.xml rename to examples/DDCMS/data/tecring5b.xml diff --git a/examples/DDCMSTests/data/tecring5f.xml b/examples/DDCMS/data/tecring5f.xml similarity index 100% rename from examples/DDCMSTests/data/tecring5f.xml rename to examples/DDCMS/data/tecring5f.xml diff --git a/examples/DDCMSTests/data/tecring6.xml b/examples/DDCMS/data/tecring6.xml similarity index 100% rename from examples/DDCMSTests/data/tecring6.xml rename to examples/DDCMS/data/tecring6.xml diff --git a/examples/DDCMSTests/data/tecring6b.xml b/examples/DDCMS/data/tecring6b.xml similarity index 100% rename from examples/DDCMSTests/data/tecring6b.xml rename to examples/DDCMS/data/tecring6b.xml diff --git a/examples/DDCMSTests/data/tecring6f.xml b/examples/DDCMS/data/tecring6f.xml similarity index 100% rename from examples/DDCMSTests/data/tecring6f.xml rename to examples/DDCMS/data/tecring6f.xml diff --git a/examples/DDCMSTests/data/tecservices.xml b/examples/DDCMS/data/tecservices.xml similarity index 100% rename from examples/DDCMSTests/data/tecservices.xml rename to examples/DDCMS/data/tecservices.xml diff --git a/examples/DDCMSTests/data/tecwheel.xml b/examples/DDCMS/data/tecwheel.xml similarity index 100% rename from examples/DDCMSTests/data/tecwheel.xml rename to examples/DDCMS/data/tecwheel.xml diff --git a/examples/DDCMSTests/data/tecwheel6.xml b/examples/DDCMS/data/tecwheel6.xml similarity index 100% rename from examples/DDCMSTests/data/tecwheel6.xml rename to examples/DDCMS/data/tecwheel6.xml diff --git a/examples/DDCMSTests/data/tecwheela.xml b/examples/DDCMS/data/tecwheela.xml similarity index 100% rename from examples/DDCMSTests/data/tecwheela.xml rename to examples/DDCMS/data/tecwheela.xml diff --git a/examples/DDCMSTests/data/tecwheelb.xml b/examples/DDCMS/data/tecwheelb.xml similarity index 100% rename from examples/DDCMSTests/data/tecwheelb.xml rename to examples/DDCMS/data/tecwheelb.xml diff --git a/examples/DDCMSTests/data/tecwheelc.xml b/examples/DDCMS/data/tecwheelc.xml similarity index 100% rename from examples/DDCMSTests/data/tecwheelc.xml rename to examples/DDCMS/data/tecwheelc.xml diff --git a/examples/DDCMSTests/data/tecwheeld.xml b/examples/DDCMS/data/tecwheeld.xml similarity index 100% rename from examples/DDCMSTests/data/tecwheeld.xml rename to examples/DDCMS/data/tecwheeld.xml diff --git a/examples/DDCMSTests/data/tib.xml b/examples/DDCMS/data/tib.xml similarity index 100% rename from examples/DDCMSTests/data/tib.xml rename to examples/DDCMS/data/tib.xml diff --git a/examples/DDCMSTests/data/tiblayer0.xml b/examples/DDCMS/data/tiblayer0.xml similarity index 100% rename from examples/DDCMSTests/data/tiblayer0.xml rename to examples/DDCMS/data/tiblayer0.xml diff --git a/examples/DDCMSTests/data/tiblayer1.xml b/examples/DDCMS/data/tiblayer1.xml similarity index 100% rename from examples/DDCMSTests/data/tiblayer1.xml rename to examples/DDCMS/data/tiblayer1.xml diff --git a/examples/DDCMSTests/data/tiblayer2.xml b/examples/DDCMS/data/tiblayer2.xml similarity index 100% rename from examples/DDCMSTests/data/tiblayer2.xml rename to examples/DDCMS/data/tiblayer2.xml diff --git a/examples/DDCMSTests/data/tiblayer3.xml b/examples/DDCMS/data/tiblayer3.xml similarity index 100% rename from examples/DDCMSTests/data/tiblayer3.xml rename to examples/DDCMS/data/tiblayer3.xml diff --git a/examples/DDCMSTests/data/tiblayerpar.xml b/examples/DDCMS/data/tiblayerpar.xml similarity index 100% rename from examples/DDCMSTests/data/tiblayerpar.xml rename to examples/DDCMS/data/tiblayerpar.xml diff --git a/examples/DDCMSTests/data/tibmaterial.xml b/examples/DDCMS/data/tibmaterial.xml similarity index 100% rename from examples/DDCMSTests/data/tibmaterial.xml rename to examples/DDCMS/data/tibmaterial.xml diff --git a/examples/DDCMSTests/data/tibmodpar.xml b/examples/DDCMS/data/tibmodpar.xml similarity index 100% rename from examples/DDCMSTests/data/tibmodpar.xml rename to examples/DDCMS/data/tibmodpar.xml diff --git a/examples/DDCMSTests/data/tibmodule0.xml b/examples/DDCMS/data/tibmodule0.xml similarity index 100% rename from examples/DDCMSTests/data/tibmodule0.xml rename to examples/DDCMS/data/tibmodule0.xml diff --git a/examples/DDCMSTests/data/tibmodule0a.xml b/examples/DDCMS/data/tibmodule0a.xml similarity index 100% rename from examples/DDCMSTests/data/tibmodule0a.xml rename to examples/DDCMS/data/tibmodule0a.xml diff --git a/examples/DDCMSTests/data/tibmodule0b.xml b/examples/DDCMS/data/tibmodule0b.xml similarity index 100% rename from examples/DDCMSTests/data/tibmodule0b.xml rename to examples/DDCMS/data/tibmodule0b.xml diff --git a/examples/DDCMSTests/data/tibmodule2.xml b/examples/DDCMS/data/tibmodule2.xml similarity index 100% rename from examples/DDCMSTests/data/tibmodule2.xml rename to examples/DDCMS/data/tibmodule2.xml diff --git a/examples/DDCMSTests/data/tibstring0.xml b/examples/DDCMS/data/tibstring0.xml similarity index 100% rename from examples/DDCMSTests/data/tibstring0.xml rename to examples/DDCMS/data/tibstring0.xml diff --git a/examples/DDCMSTests/data/tibstring0ll.xml b/examples/DDCMS/data/tibstring0ll.xml similarity index 100% rename from examples/DDCMSTests/data/tibstring0ll.xml rename to examples/DDCMS/data/tibstring0ll.xml diff --git a/examples/DDCMSTests/data/tibstring0lr.xml b/examples/DDCMS/data/tibstring0lr.xml similarity index 100% rename from examples/DDCMSTests/data/tibstring0lr.xml rename to examples/DDCMS/data/tibstring0lr.xml diff --git a/examples/DDCMSTests/data/tibstring0ul.xml b/examples/DDCMS/data/tibstring0ul.xml similarity index 100% rename from examples/DDCMSTests/data/tibstring0ul.xml rename to examples/DDCMS/data/tibstring0ul.xml diff --git a/examples/DDCMSTests/data/tibstring0ur.xml b/examples/DDCMS/data/tibstring0ur.xml similarity index 100% rename from examples/DDCMSTests/data/tibstring0ur.xml rename to examples/DDCMS/data/tibstring0ur.xml diff --git a/examples/DDCMSTests/data/tibstring1.xml b/examples/DDCMS/data/tibstring1.xml similarity index 100% rename from examples/DDCMSTests/data/tibstring1.xml rename to examples/DDCMS/data/tibstring1.xml diff --git a/examples/DDCMSTests/data/tibstring1ll.xml b/examples/DDCMS/data/tibstring1ll.xml similarity index 100% rename from examples/DDCMSTests/data/tibstring1ll.xml rename to examples/DDCMS/data/tibstring1ll.xml diff --git a/examples/DDCMSTests/data/tibstring1lr.xml b/examples/DDCMS/data/tibstring1lr.xml similarity index 100% rename from examples/DDCMSTests/data/tibstring1lr.xml rename to examples/DDCMS/data/tibstring1lr.xml diff --git a/examples/DDCMSTests/data/tibstring1ul.xml b/examples/DDCMS/data/tibstring1ul.xml similarity index 100% rename from examples/DDCMSTests/data/tibstring1ul.xml rename to examples/DDCMS/data/tibstring1ul.xml diff --git a/examples/DDCMSTests/data/tibstring1ur.xml b/examples/DDCMS/data/tibstring1ur.xml similarity index 100% rename from examples/DDCMSTests/data/tibstring1ur.xml rename to examples/DDCMS/data/tibstring1ur.xml diff --git a/examples/DDCMSTests/data/tibstring2.xml b/examples/DDCMS/data/tibstring2.xml similarity index 100% rename from examples/DDCMSTests/data/tibstring2.xml rename to examples/DDCMS/data/tibstring2.xml diff --git a/examples/DDCMSTests/data/tibstring2ll.xml b/examples/DDCMS/data/tibstring2ll.xml similarity index 100% rename from examples/DDCMSTests/data/tibstring2ll.xml rename to examples/DDCMS/data/tibstring2ll.xml diff --git a/examples/DDCMSTests/data/tibstring2lr.xml b/examples/DDCMS/data/tibstring2lr.xml similarity index 100% rename from examples/DDCMSTests/data/tibstring2lr.xml rename to examples/DDCMS/data/tibstring2lr.xml diff --git a/examples/DDCMSTests/data/tibstring2ul.xml b/examples/DDCMS/data/tibstring2ul.xml similarity index 100% rename from examples/DDCMSTests/data/tibstring2ul.xml rename to examples/DDCMS/data/tibstring2ul.xml diff --git a/examples/DDCMSTests/data/tibstring2ur.xml b/examples/DDCMS/data/tibstring2ur.xml similarity index 100% rename from examples/DDCMSTests/data/tibstring2ur.xml rename to examples/DDCMS/data/tibstring2ur.xml diff --git a/examples/DDCMSTests/data/tibstring3.xml b/examples/DDCMS/data/tibstring3.xml similarity index 100% rename from examples/DDCMSTests/data/tibstring3.xml rename to examples/DDCMS/data/tibstring3.xml diff --git a/examples/DDCMSTests/data/tibstring3ll.xml b/examples/DDCMS/data/tibstring3ll.xml similarity index 100% rename from examples/DDCMSTests/data/tibstring3ll.xml rename to examples/DDCMS/data/tibstring3ll.xml diff --git a/examples/DDCMSTests/data/tibstring3lr.xml b/examples/DDCMS/data/tibstring3lr.xml similarity index 100% rename from examples/DDCMSTests/data/tibstring3lr.xml rename to examples/DDCMS/data/tibstring3lr.xml diff --git a/examples/DDCMSTests/data/tibstring3ul.xml b/examples/DDCMS/data/tibstring3ul.xml similarity index 100% rename from examples/DDCMSTests/data/tibstring3ul.xml rename to examples/DDCMS/data/tibstring3ul.xml diff --git a/examples/DDCMSTests/data/tibstring3ur.xml b/examples/DDCMS/data/tibstring3ur.xml similarity index 100% rename from examples/DDCMSTests/data/tibstring3ur.xml rename to examples/DDCMS/data/tibstring3ur.xml diff --git a/examples/DDCMSTests/data/tibstringpar.xml b/examples/DDCMS/data/tibstringpar.xml similarity index 100% rename from examples/DDCMSTests/data/tibstringpar.xml rename to examples/DDCMS/data/tibstringpar.xml diff --git a/examples/DDCMSTests/data/tibtidcommonmaterial.xml b/examples/DDCMS/data/tibtidcommonmaterial.xml similarity index 100% rename from examples/DDCMSTests/data/tibtidcommonmaterial.xml rename to examples/DDCMS/data/tibtidcommonmaterial.xml diff --git a/examples/DDCMSTests/data/tibtidservices.xml b/examples/DDCMS/data/tibtidservices.xml similarity index 100% rename from examples/DDCMSTests/data/tibtidservices.xml rename to examples/DDCMS/data/tibtidservices.xml diff --git a/examples/DDCMSTests/data/tibtidservicesb.xml b/examples/DDCMS/data/tibtidservicesb.xml similarity index 100% rename from examples/DDCMSTests/data/tibtidservicesb.xml rename to examples/DDCMS/data/tibtidservicesb.xml diff --git a/examples/DDCMSTests/data/tibtidservicesf.xml b/examples/DDCMS/data/tibtidservicesf.xml similarity index 100% rename from examples/DDCMSTests/data/tibtidservicesf.xml rename to examples/DDCMS/data/tibtidservicesf.xml diff --git a/examples/DDCMSTests/data/tid.xml b/examples/DDCMS/data/tid.xml similarity index 100% rename from examples/DDCMSTests/data/tid.xml rename to examples/DDCMS/data/tid.xml diff --git a/examples/DDCMSTests/data/tidb.xml b/examples/DDCMS/data/tidb.xml similarity index 100% rename from examples/DDCMSTests/data/tidb.xml rename to examples/DDCMS/data/tidb.xml diff --git a/examples/DDCMSTests/data/tidf.xml b/examples/DDCMS/data/tidf.xml similarity index 100% rename from examples/DDCMSTests/data/tidf.xml rename to examples/DDCMS/data/tidf.xml diff --git a/examples/DDCMSTests/data/tidmaterial.xml b/examples/DDCMS/data/tidmaterial.xml similarity index 100% rename from examples/DDCMSTests/data/tidmaterial.xml rename to examples/DDCMS/data/tidmaterial.xml diff --git a/examples/DDCMSTests/data/tidmodpar.xml b/examples/DDCMS/data/tidmodpar.xml similarity index 100% rename from examples/DDCMSTests/data/tidmodpar.xml rename to examples/DDCMS/data/tidmodpar.xml diff --git a/examples/DDCMSTests/data/tidmodule0.xml b/examples/DDCMS/data/tidmodule0.xml similarity index 100% rename from examples/DDCMSTests/data/tidmodule0.xml rename to examples/DDCMS/data/tidmodule0.xml diff --git a/examples/DDCMSTests/data/tidmodule0l.xml b/examples/DDCMS/data/tidmodule0l.xml similarity index 100% rename from examples/DDCMSTests/data/tidmodule0l.xml rename to examples/DDCMS/data/tidmodule0l.xml diff --git a/examples/DDCMSTests/data/tidmodule0r.xml b/examples/DDCMS/data/tidmodule0r.xml similarity index 100% rename from examples/DDCMSTests/data/tidmodule0r.xml rename to examples/DDCMS/data/tidmodule0r.xml diff --git a/examples/DDCMSTests/data/tidmodule1.xml b/examples/DDCMS/data/tidmodule1.xml similarity index 100% rename from examples/DDCMSTests/data/tidmodule1.xml rename to examples/DDCMS/data/tidmodule1.xml diff --git a/examples/DDCMSTests/data/tidmodule1l.xml b/examples/DDCMS/data/tidmodule1l.xml similarity index 100% rename from examples/DDCMSTests/data/tidmodule1l.xml rename to examples/DDCMS/data/tidmodule1l.xml diff --git a/examples/DDCMSTests/data/tidmodule1r.xml b/examples/DDCMS/data/tidmodule1r.xml similarity index 100% rename from examples/DDCMSTests/data/tidmodule1r.xml rename to examples/DDCMS/data/tidmodule1r.xml diff --git a/examples/DDCMSTests/data/tidmodule2.xml b/examples/DDCMS/data/tidmodule2.xml similarity index 100% rename from examples/DDCMSTests/data/tidmodule2.xml rename to examples/DDCMS/data/tidmodule2.xml diff --git a/examples/DDCMSTests/data/tidring0.xml b/examples/DDCMS/data/tidring0.xml similarity index 100% rename from examples/DDCMSTests/data/tidring0.xml rename to examples/DDCMS/data/tidring0.xml diff --git a/examples/DDCMSTests/data/tidring0b.xml b/examples/DDCMS/data/tidring0b.xml similarity index 100% rename from examples/DDCMSTests/data/tidring0b.xml rename to examples/DDCMS/data/tidring0b.xml diff --git a/examples/DDCMSTests/data/tidring0f.xml b/examples/DDCMS/data/tidring0f.xml similarity index 100% rename from examples/DDCMSTests/data/tidring0f.xml rename to examples/DDCMS/data/tidring0f.xml diff --git a/examples/DDCMSTests/data/tidring1.xml b/examples/DDCMS/data/tidring1.xml similarity index 100% rename from examples/DDCMSTests/data/tidring1.xml rename to examples/DDCMS/data/tidring1.xml diff --git a/examples/DDCMSTests/data/tidring1b.xml b/examples/DDCMS/data/tidring1b.xml similarity index 100% rename from examples/DDCMSTests/data/tidring1b.xml rename to examples/DDCMS/data/tidring1b.xml diff --git a/examples/DDCMSTests/data/tidring1f.xml b/examples/DDCMS/data/tidring1f.xml similarity index 100% rename from examples/DDCMSTests/data/tidring1f.xml rename to examples/DDCMS/data/tidring1f.xml diff --git a/examples/DDCMSTests/data/tidring2.xml b/examples/DDCMS/data/tidring2.xml similarity index 100% rename from examples/DDCMSTests/data/tidring2.xml rename to examples/DDCMS/data/tidring2.xml diff --git a/examples/DDCMSTests/data/tidringpar.xml b/examples/DDCMS/data/tidringpar.xml similarity index 100% rename from examples/DDCMSTests/data/tidringpar.xml rename to examples/DDCMS/data/tidringpar.xml diff --git a/examples/DDCMSTests/data/tob.xml b/examples/DDCMS/data/tob.xml similarity index 100% rename from examples/DDCMSTests/data/tob.xml rename to examples/DDCMS/data/tob.xml diff --git a/examples/DDCMSTests/data/tobmaterial.xml b/examples/DDCMS/data/tobmaterial.xml similarity index 100% rename from examples/DDCMSTests/data/tobmaterial.xml rename to examples/DDCMS/data/tobmaterial.xml diff --git a/examples/DDCMSTests/data/tobmodpar.xml b/examples/DDCMS/data/tobmodpar.xml similarity index 100% rename from examples/DDCMSTests/data/tobmodpar.xml rename to examples/DDCMS/data/tobmodpar.xml diff --git a/examples/DDCMSTests/data/tobmodule0.xml b/examples/DDCMS/data/tobmodule0.xml similarity index 100% rename from examples/DDCMSTests/data/tobmodule0.xml rename to examples/DDCMS/data/tobmodule0.xml diff --git a/examples/DDCMSTests/data/tobmodule2.xml b/examples/DDCMS/data/tobmodule2.xml similarity index 100% rename from examples/DDCMSTests/data/tobmodule2.xml rename to examples/DDCMS/data/tobmodule2.xml diff --git a/examples/DDCMSTests/data/tobmodule4.xml b/examples/DDCMS/data/tobmodule4.xml similarity index 100% rename from examples/DDCMSTests/data/tobmodule4.xml rename to examples/DDCMS/data/tobmodule4.xml diff --git a/examples/DDCMSTests/data/tobrod0.xml b/examples/DDCMS/data/tobrod0.xml similarity index 100% rename from examples/DDCMSTests/data/tobrod0.xml rename to examples/DDCMS/data/tobrod0.xml diff --git a/examples/DDCMSTests/data/tobrod0c.xml b/examples/DDCMS/data/tobrod0c.xml similarity index 100% rename from examples/DDCMSTests/data/tobrod0c.xml rename to examples/DDCMS/data/tobrod0c.xml diff --git a/examples/DDCMSTests/data/tobrod0h.xml b/examples/DDCMS/data/tobrod0h.xml similarity index 100% rename from examples/DDCMSTests/data/tobrod0h.xml rename to examples/DDCMS/data/tobrod0h.xml diff --git a/examples/DDCMSTests/data/tobrod0l.xml b/examples/DDCMS/data/tobrod0l.xml similarity index 100% rename from examples/DDCMSTests/data/tobrod0l.xml rename to examples/DDCMS/data/tobrod0l.xml diff --git a/examples/DDCMSTests/data/tobrod1.xml b/examples/DDCMS/data/tobrod1.xml similarity index 100% rename from examples/DDCMSTests/data/tobrod1.xml rename to examples/DDCMS/data/tobrod1.xml diff --git a/examples/DDCMSTests/data/tobrod1h.xml b/examples/DDCMS/data/tobrod1h.xml similarity index 100% rename from examples/DDCMSTests/data/tobrod1h.xml rename to examples/DDCMS/data/tobrod1h.xml diff --git a/examples/DDCMSTests/data/tobrod1l.xml b/examples/DDCMS/data/tobrod1l.xml similarity index 100% rename from examples/DDCMSTests/data/tobrod1l.xml rename to examples/DDCMS/data/tobrod1l.xml diff --git a/examples/DDCMSTests/data/tobrod2.xml b/examples/DDCMS/data/tobrod2.xml similarity index 100% rename from examples/DDCMSTests/data/tobrod2.xml rename to examples/DDCMS/data/tobrod2.xml diff --git a/examples/DDCMSTests/data/tobrod2c.xml b/examples/DDCMS/data/tobrod2c.xml similarity index 100% rename from examples/DDCMSTests/data/tobrod2c.xml rename to examples/DDCMS/data/tobrod2c.xml diff --git a/examples/DDCMSTests/data/tobrod2h.xml b/examples/DDCMS/data/tobrod2h.xml similarity index 100% rename from examples/DDCMSTests/data/tobrod2h.xml rename to examples/DDCMS/data/tobrod2h.xml diff --git a/examples/DDCMSTests/data/tobrod2l.xml b/examples/DDCMS/data/tobrod2l.xml similarity index 100% rename from examples/DDCMSTests/data/tobrod2l.xml rename to examples/DDCMS/data/tobrod2l.xml diff --git a/examples/DDCMSTests/data/tobrod3.xml b/examples/DDCMS/data/tobrod3.xml similarity index 100% rename from examples/DDCMSTests/data/tobrod3.xml rename to examples/DDCMS/data/tobrod3.xml diff --git a/examples/DDCMSTests/data/tobrod3h.xml b/examples/DDCMS/data/tobrod3h.xml similarity index 100% rename from examples/DDCMSTests/data/tobrod3h.xml rename to examples/DDCMS/data/tobrod3h.xml diff --git a/examples/DDCMSTests/data/tobrod3l.xml b/examples/DDCMS/data/tobrod3l.xml similarity index 100% rename from examples/DDCMSTests/data/tobrod3l.xml rename to examples/DDCMS/data/tobrod3l.xml diff --git a/examples/DDCMSTests/data/tobrod4.xml b/examples/DDCMS/data/tobrod4.xml similarity index 100% rename from examples/DDCMSTests/data/tobrod4.xml rename to examples/DDCMS/data/tobrod4.xml diff --git a/examples/DDCMSTests/data/tobrod4c.xml b/examples/DDCMS/data/tobrod4c.xml similarity index 100% rename from examples/DDCMSTests/data/tobrod4c.xml rename to examples/DDCMS/data/tobrod4c.xml diff --git a/examples/DDCMSTests/data/tobrod4h.xml b/examples/DDCMS/data/tobrod4h.xml similarity index 100% rename from examples/DDCMSTests/data/tobrod4h.xml rename to examples/DDCMS/data/tobrod4h.xml diff --git a/examples/DDCMSTests/data/tobrod4l.xml b/examples/DDCMS/data/tobrod4l.xml similarity index 100% rename from examples/DDCMSTests/data/tobrod4l.xml rename to examples/DDCMS/data/tobrod4l.xml diff --git a/examples/DDCMSTests/data/tobrod5.xml b/examples/DDCMS/data/tobrod5.xml similarity index 100% rename from examples/DDCMSTests/data/tobrod5.xml rename to examples/DDCMS/data/tobrod5.xml diff --git a/examples/DDCMSTests/data/tobrod5h.xml b/examples/DDCMS/data/tobrod5h.xml similarity index 100% rename from examples/DDCMSTests/data/tobrod5h.xml rename to examples/DDCMS/data/tobrod5h.xml diff --git a/examples/DDCMSTests/data/tobrod5l.xml b/examples/DDCMS/data/tobrod5l.xml similarity index 100% rename from examples/DDCMSTests/data/tobrod5l.xml rename to examples/DDCMS/data/tobrod5l.xml diff --git a/examples/DDCMSTests/data/tobrodpar.xml b/examples/DDCMS/data/tobrodpar.xml similarity index 100% rename from examples/DDCMSTests/data/tobrodpar.xml rename to examples/DDCMS/data/tobrodpar.xml diff --git a/examples/DDCMSTests/data/tracker.xml b/examples/DDCMS/data/tracker.xml similarity index 100% rename from examples/DDCMSTests/data/tracker.xml rename to examples/DDCMS/data/tracker.xml diff --git a/examples/DDCMSTests/data/trackerParameters.xml b/examples/DDCMS/data/trackerParameters.xml similarity index 100% rename from examples/DDCMSTests/data/trackerParameters.xml rename to examples/DDCMS/data/trackerParameters.xml diff --git a/examples/DDCMSTests/data/trackerStructureTopology.xml b/examples/DDCMS/data/trackerStructureTopology.xml similarity index 100% rename from examples/DDCMSTests/data/trackerStructureTopology.xml rename to examples/DDCMS/data/trackerStructureTopology.xml diff --git a/examples/DDCMSTests/data/trackerbulkhead.xml b/examples/DDCMS/data/trackerbulkhead.xml similarity index 100% rename from examples/DDCMSTests/data/trackerbulkhead.xml rename to examples/DDCMS/data/trackerbulkhead.xml diff --git a/examples/DDCMSTests/data/trackermaterial.xml b/examples/DDCMS/data/trackermaterial.xml similarity index 100% rename from examples/DDCMSTests/data/trackermaterial.xml rename to examples/DDCMS/data/trackermaterial.xml diff --git a/examples/DDCMSTests/data/trackerother.xml b/examples/DDCMS/data/trackerother.xml similarity index 100% rename from examples/DDCMSTests/data/trackerother.xml rename to examples/DDCMS/data/trackerother.xml diff --git a/examples/DDCMSTests/data/trackerpixbar.xml b/examples/DDCMS/data/trackerpixbar.xml similarity index 100% rename from examples/DDCMSTests/data/trackerpixbar.xml rename to examples/DDCMS/data/trackerpixbar.xml diff --git a/examples/DDCMSTests/data/trackerpixfwd.xml b/examples/DDCMS/data/trackerpixfwd.xml similarity index 100% rename from examples/DDCMSTests/data/trackerpixfwd.xml rename to examples/DDCMS/data/trackerpixfwd.xml diff --git a/examples/DDCMSTests/data/trackertec.xml b/examples/DDCMS/data/trackertec.xml similarity index 100% rename from examples/DDCMSTests/data/trackertec.xml rename to examples/DDCMS/data/trackertec.xml diff --git a/examples/DDCMSTests/data/trackertib.xml b/examples/DDCMS/data/trackertib.xml similarity index 100% rename from examples/DDCMSTests/data/trackertib.xml rename to examples/DDCMS/data/trackertib.xml diff --git a/examples/DDCMSTests/data/trackertibtidservices.xml b/examples/DDCMS/data/trackertibtidservices.xml similarity index 100% rename from examples/DDCMSTests/data/trackertibtidservices.xml rename to examples/DDCMS/data/trackertibtidservices.xml diff --git a/examples/DDCMSTests/data/trackertid.xml b/examples/DDCMS/data/trackertid.xml similarity index 100% rename from examples/DDCMSTests/data/trackertid.xml rename to examples/DDCMS/data/trackertid.xml diff --git a/examples/DDCMSTests/data/trackertob.xml b/examples/DDCMS/data/trackertob.xml similarity index 100% rename from examples/DDCMSTests/data/trackertob.xml rename to examples/DDCMS/data/trackertob.xml diff --git a/examples/DDCMSTests/data/vacuum.xml b/examples/DDCMS/data/vacuum.xml similarity index 100% rename from examples/DDCMSTests/data/vacuum.xml rename to examples/DDCMS/data/vacuum.xml diff --git a/examples/DDCMSTests/eve/DDEve.xml b/examples/DDCMS/eve/DDEve.xml similarity index 100% rename from examples/DDCMSTests/eve/DDEve.xml rename to examples/DDCMS/eve/DDEve.xml diff --git a/examples/DDCMSTests/pictures/CMS-pixbar.png b/examples/DDCMS/pictures/CMS-pixbar.png similarity index 100% rename from examples/DDCMSTests/pictures/CMS-pixbar.png rename to examples/DDCMS/pictures/CMS-pixbar.png diff --git a/examples/DDCMSTests/pictures/CMS-tracker-sim-1.png b/examples/DDCMS/pictures/CMS-tracker-sim-1.png similarity index 100% rename from examples/DDCMSTests/pictures/CMS-tracker-sim-1.png rename to examples/DDCMS/pictures/CMS-tracker-sim-1.png diff --git a/examples/DDCMSTests/pictures/CMS-tracker-sim-2.png b/examples/DDCMS/pictures/CMS-tracker-sim-2.png similarity index 100% rename from examples/DDCMSTests/pictures/CMS-tracker-sim-2.png rename to examples/DDCMS/pictures/CMS-tracker-sim-2.png diff --git a/examples/DDCMSTests/pictures/CMS-tracker1.png b/examples/DDCMS/pictures/CMS-tracker1.png similarity index 100% rename from examples/DDCMSTests/pictures/CMS-tracker1.png rename to examples/DDCMS/pictures/CMS-tracker1.png diff --git a/examples/DDCMSTests/pictures/CMS-tracker2.png b/examples/DDCMS/pictures/CMS-tracker2.png similarity index 100% rename from examples/DDCMSTests/pictures/CMS-tracker2.png rename to examples/DDCMS/pictures/CMS-tracker2.png diff --git a/examples/DDCMSTests/pictures/CMS-tracker3.png b/examples/DDCMS/pictures/CMS-tracker3.png similarity index 100% rename from examples/DDCMSTests/pictures/CMS-tracker3.png rename to examples/DDCMS/pictures/CMS-tracker3.png diff --git a/examples/DDCMSTests/scripts/CMSTrackerSim.py b/examples/DDCMS/scripts/CMSTrackerSim.py similarity index 100% rename from examples/DDCMSTests/scripts/CMSTrackerSim.py rename to examples/DDCMS/scripts/CMSTrackerSim.py diff --git a/examples/DDCMSTests/CMakeLists.txt b/examples/DDCMSTests/CMakeLists.txt deleted file mode 100644 index 2dc5e6f7e..000000000 --- a/examples/DDCMSTests/CMakeLists.txt +++ /dev/null @@ -1,200 +0,0 @@ -#========================================================================== -# AIDA Detector description implementation -#-------------------------------------------------------------------------- -# Copyright (C) Organisation europeenne pour la Recherche nucleaire (CERN) -# All rights reserved. -# -# For the licensing terms see $DD4hepINSTALL/LICENSE. -# For the list of contributors see $DD4hepINSTALL/doc/CREDITS. -# -#========================================================================== -# -# DDCMS is a detector description convention developed by the CMS experiment. -# -#========================================================================== -cmake_minimum_required(VERSION 3.3 FATAL_ERROR) - -include ( ${DD4hep_DIR}/cmake/DD4hep.cmake ) -#------------------------------------------------------------------------------ -dd4hep_configure_output () -dd4hep_package (DDCMSTests MAJOR 0 MINOR 0 PATCH 1 - USES DDCMS - [ROOT REQUIRED COMPONENTS Geom GenVector] - [DD4hep REQUIRED COMPONENTS DDCore] - [CLHEP REQUIRED] - OPTIONAL XERCESC - INCLUDE_DIRS include ) - -#------------------------------------------------------------------------------ -dd4hep_add_plugin(DDCMSTests SOURCES src/*.cpp) -#---Package installation procedure(s) ----------------------------------------- -dd4hep_install_dir( data DESTINATION ${DD4hep_DIR}/examples/DDCMS ) -dd4hep_install_dir( eve DESTINATION ${DD4hep_DIR}/examples/DDCMS ) -dd4hep_install_dir( scripts DESTINATION ${DD4hep_DIR}/examples/DDCMS ) -# -#---Testing-------------------------------------------------------------------- -dd4hep_configure_scripts ( DDCMS DEFAULT_SETUP WITH_TESTS ) -# -# Test CMS tracker detector construction -dd4hep_add_test_reg( DDCMS_LoadGeometry - COMMAND "${CMAKE_INSTALL_PREFIX}/bin/run_test_DDCMS.sh" - EXEC_ARGS geoPluginRun - -input file:${CMAKE_CURRENT_SOURCE_DIR}/data/cms_tracker.xml -destroy -print WARNING - -plugin DD4hep_PlacedVolumeProcessor -recursive -processor DDCMS_DetElementCreator - REGEX_PASS "Instrumented 5 subdetectors with 36091 DetElements 25776 sensitives out of 224404 volumes and 1161 sensitive placements." - REGEX_FAIL "Exception" - REGEX_FAIL "FAILED" - ) -# -# Dump CMS material table -dd4hep_add_test_reg( DDCMS_DumpMaterials - COMMAND "${CMAKE_INSTALL_PREFIX}/bin/run_test_DDCMS.sh" - EXEC_ARGS geoPluginRun -print WARNING - -input file:${CMAKE_CURRENT_SOURCE_DIR}/data/dd4hep-config.xml - -destroy -plugin DD4hep_MaterialTable -type xml - REGEX_PASS "material name=\"tobmaterial_TOB_ax_services_C18\"" - REGEX_FAIL "Exception" - REGEX_FAIL "FAILED" - ) -# -# Dump CMS volume tree -dd4hep_add_test_reg( DDCMS_DumpVolumes - COMMAND "${CMAKE_INSTALL_PREFIX}/bin/run_test_DDCMS.sh" - EXEC_ARGS geoPluginRun -print WARNING - -input file:${CMAKE_CURRENT_SOURCE_DIR}/data/dd4hep-config.xml - -destroy -plugin DD4hep_VolumeDump -sensitive -volids - REGEX_PASS "Checked 224414 physical volume placements. 25776 are sensitive." - REGEX_FAIL "Exception" - REGEX_FAIL "FAILED" - ) -# -# Dump CMS detector element tree -dd4hep_add_test_reg( DDCMS_DumpDetElements - COMMAND "${CMAKE_INSTALL_PREFIX}/bin/run_test_DDCMS.sh" - EXEC_ARGS geoPluginRun -print WARNING - -input file:${CMAKE_CURRENT_SOURCE_DIR}/data/dd4hep-config.xml - -destroy -plugin DD4hep_DetectorDump -sensitive - REGEX_PASS "Scanned a total of 36096 elements." - REGEX_FAIL "Exception" - REGEX_FAIL "FAILED" - ) -# -# Dump CMS detector element tree of SD PixelBarrel -dd4hep_add_test_reg( DDCMS_VolumeMgrTest_PixelBarrel - COMMAND "${CMAKE_INSTALL_PREFIX}/bin/run_test_DDCMS.sh" - EXEC_ARGS geoPluginRun - -input file:${CMAKE_CURRENT_SOURCE_DIR}/data/dd4hep-config.xml - -destroy -print WARNING - -plugin DD4hep_VolumeMgrTest PixelBarrel_1 - REGEX_PASS "PASSED: Checked 10981 objects. Num.Errors:0" - REGEX_FAIL "Exception" - REGEX_FAIL "FAILED" - ) -# -# Dump CMS detector element tree of SD TIB -dd4hep_add_test_reg( DDCMS_VolumeMgrTest_TIB - COMMAND "${CMAKE_INSTALL_PREFIX}/bin/run_test_DDCMS.sh" - EXEC_ARGS geoPluginRun - -input file:${CMAKE_CURRENT_SOURCE_DIR}/data/dd4hep-config.xml - -destroy -print WARNING - -plugin DD4hep_VolumeMgrTest TIB_1 - REGEX_PASS "PASSED: Checked 47964 objects. Num.Errors:0" - REGEX_FAIL "Exception" - REGEX_FAIL "FAILED" - ) -# -# Dump CMS detector element tree of SD TOB -dd4hep_add_test_reg( DDCMS_VolumeMgrTest_TOB - COMMAND "${CMAKE_INSTALL_PREFIX}/bin/run_test_DDCMS.sh" - EXEC_ARGS geoPluginRun - -input file:${CMAKE_CURRENT_SOURCE_DIR}/data/dd4hep-config.xml - -destroy -print WARNING - -plugin DD4hep_VolumeMgrTest TOB_1 - REGEX_PASS "PASSED: Checked 150699 objects. Num.Errors:0" - REGEX_FAIL "Exception" - REGEX_FAIL "FAILED" - ) -# -# Dump CMS detector element tree of SD TOB -dd4hep_add_test_reg( DDCMS_Geant4_LONGTEST - COMMAND "${CMAKE_INSTALL_PREFIX}/bin/run_test_DDCMS.sh" - EXEC_ARGS python ${CMAKE_CURRENT_SOURCE_DIR}/scripts/CMSTrackerSim.py batch test numevents 2 - REGEX_PASS "\\+\\+\\+ Finished run 0 after 2 events \\(2 events in total\\)" - REGEX_FAIL "Exception;EXCEPTION;ERROR;FAILED" - ) -# -# Test saving geometry to ROOT file -dd4hep_add_test_reg( DDCMS_Persist_Save_LONGTEST - COMMAND "${CMAKE_INSTALL_PREFIX}/bin/run_test_DDCMS.sh" - EXEC_ARGS geoPluginRun - -input file:${CMAKE_CURRENT_SOURCE_DIR}/data/dd4hep-config.xml - -destroy -print WARNING - -plugin DD4hep_Geometry2ROOT -output DDCMS_geometry.root - REGEX_PASS "\\+\\+\\+ Successfully saved geometry data to file." - REGEX_FAIL " ERROR ;EXCEPTION;Exception;FAILED" - ) -# -# Test restoring geometry from ROOT file: Volume Manager -dd4hep_add_test_reg( DDCMS_Persist_Restore_LONGTEST - COMMAND "${CMAKE_INSTALL_PREFIX}/bin/run_test_DDCMS.sh" - EXEC_ARGS geoPluginRun -print WARNING - -plugin DD4hep_RootLoader DDCMS_geometry.root - DEPENDS DDCMS_Persist_Save_LONGTEST - REGEX_PASS "\\+\\+\\+ Successfully loaded detector description from file" - REGEX_FAIL " ERROR ;EXCEPTION;Exception;FAILED" - ) -# -# Test restoring geometry from ROOT file: Volume Manager loading+nominals -dd4hep_add_test_reg( DDCMS_Persist_Restore_VolMgr1_LONGTEST - COMMAND "${CMAKE_INSTALL_PREFIX}/bin/run_test_DDCMS.sh" - EXEC_ARGS geoPluginRun -print WARNING - -plugin DD4hep_RootLoader DDCMS_geometry.root - -plugin DD4hep_CheckVolumeManager - DEPENDS DDCMS_Persist_Save_LONGTEST - REGEX_PASS "\\+\\+\\+ PASSED Checked 36096 VolumeManager contexts. Num.Errors: 0" - REGEX_FAIL " ERROR ;EXCEPTION;Exception;FAILED" - ) -# -# Test restoring geometry from ROOT file: Test Volume Manager results -dd4hep_add_test_reg( DDCMS_Persist_Restore_VolMgr2_LONGTEST - COMMAND "${CMAKE_INSTALL_PREFIX}/bin/run_test_DDCMS.sh" - EXEC_ARGS geoPluginRun -print WARNING - -plugin DD4hep_RootLoader DDCMS_geometry.root - -plugin DD4hep_VolumeMgrTest PixelBarrel_1 - DEPENDS DDCMS_Persist_Save_LONGTEST - REGEX_PASS "\\+\\+\\+ PASSED: Checked 10981 objects. Num.Errors:0" - REGEX_FAIL " ERROR ;EXCEPTION;Exception;FAILED" - ) -# -# Test restoring geometry from ROOT file: DetElement nominal alignments -# Note: BeamCal has a problem. Need to be taken into account -dd4hep_add_test_reg( DDCMS_Persist_Restore_Nominal_LONGTEST - COMMAND "${CMAKE_INSTALL_PREFIX}/bin/run_test_DDCMS.sh" - EXEC_ARGS geoPluginRun -print WARNING - -plugin DD4hep_RootLoader DDCMS_geometry.root - -plugin DD4hep_CheckNominals - DEPENDS DDCMS_Persist_Save_LONGTEST - REGEX_PASS "\\+\\+\\+ PASSED Checked 25776 DetElements. Num.Errors: 0" - ) -# -# Test restoring geometry from ROOT file: Sensitive detectors -dd4hep_add_test_reg( DDCMS_Persist_Restore_Sensitives_LONGTEST - COMMAND "${CMAKE_INSTALL_PREFIX}/bin/run_test_DDCMS.sh" - EXEC_ARGS geoPluginRun -print WARNING - -plugin DD4hep_RootLoader DDCMS_geometry.root - -plugin DD4hep_CheckSensitives - DEPENDS DDCMS_Persist_Save_LONGTEST - REGEX_PASS "\\+\\+\\+ PASSED Checked 5 SensitiveDetector objects. Num.Errors: 0" - REGEX_FAIL " ERROR ;EXCEPTION;Exception;FAILED" - ) -# -# Test restoring geometry from ROOT file: Readout structures -dd4hep_add_test_reg( DDCMS_Persist_Restore_Readouts_LONGTEST - COMMAND "${CMAKE_INSTALL_PREFIX}/bin/run_test_DDCMS.sh" - EXEC_ARGS geoPluginRun -print WARNING - -plugin DD4hep_RootLoader DDCMS_geometry.root - -plugin DD4hep_CheckReadouts - DEPENDS DDCMS_Persist_Save_LONGTEST - REGEX_PASS "\\+\\+\\+ PASSED Checked 5 readout objects. Num.Errors: 0" - REGEX_FAIL " ERROR ;EXCEPTION;Exception;FAILED" - ) diff --git a/examples/DDCMSTests/README.txt b/examples/DDCMSTests/README.txt deleted file mode 100644 index 7f84b2ab9..000000000 --- a/examples/DDCMSTests/README.txt +++ /dev/null @@ -1,18 +0,0 @@ -Package DDCMS -============= - -This is a small test development to demonstrate how to -convert a small part of the CMS geometry to DD4hep. -It is by no means complete. - - M.Frank, September 2017 - - -geoPluginRun -input file:checkout/examples/DDCMS/data/cms_tracker.xml \ - -ui -interpreter \ - -plugin DD4hep_PlacedVolumeProcessor -recursive -processor DDCMS_DetElementCreator \ - -plugin DD4hep_VolumeManager \ - -plugin DD4hep_DetectorDump -sensitive \ - -plugin DD4hep_VolumeDump -sensitive -volids \ - -plugin DD4hep_GeometryDisplay - -end-plugin diff --git a/examples/DDCMSTests/include/DDCMS/DDCMS.h b/examples/DDCMSTests/include/DDCMS/DDCMS.h deleted file mode 100644 index 7159a1843..000000000 --- a/examples/DDCMSTests/include/DDCMS/DDCMS.h +++ /dev/null @@ -1,239 +0,0 @@ -//========================================================================== -// AIDA Detector description implementation -//-------------------------------------------------------------------------- -// Copyright (C) Organisation europeenne pour la Recherche nucleaire (CERN) -// All rights reserved. -// -// For the licensing terms see $DD4hepINSTALL/LICENSE. -// For the list of contributors see $DD4hepINSTALL/doc/CREDITS. -// -// Author : M.Frank -// -//========================================================================== -// -// DDCMS is a detector description convention developed by the CMS experiment. -// -//========================================================================== -#ifndef DD4HEP_DDCMS_DDCMS_H -#define DD4HEP_DDCMS_DDCMS_H - -// Framework includes -#include "XML/XML.h" -#include "DD4hep/DetElement.h" -#include "DDCMS/DDCMSTags.h" - -// C/C++ include files -#include <map> -#include <sstream> - -/// Namespace for the AIDA detector description toolkit -namespace dd4hep { - - /// Namespace of DDCMS conversion namespace - namespace cms { - - // Forward declaration - class ParsingContext; - - /// XML namespace for the evaluator - /* - * - * \author M.Frank - * \version 1.0 - * \ingroup DD4HEP_CORE - */ - class Namespace { - public: - /// Reference to the global parsing context - ParsingContext* context = 0; - std::string name; - bool pop = false; - public: - /// NO Default constructor - Namespace() = delete; - /// Initializing constructor - Namespace(ParsingContext* ctx, xml_h element); - Namespace(ParsingContext& ctx, xml_h element, bool); - /// Initializing constructor - Namespace(ParsingContext* ctx); - /// Initializing constructor - Namespace(ParsingContext& ctx); - /// NO Copy constructor - Namespace(const Namespace& copy) = delete; - /// Standard destructor (Non virtual!) - ~Namespace(); - /// NO assignment - Namespace& operator=(const Namespace& copy) = delete; - /// Prepend name with namespace - std::string prepend(const std::string& n) const; - /// Resolve namespace during XML parsing - std::string real_name(const std::string& v) const; - /// Strip off the namespace part of a given name - static std::string obj_name(const std::string& name); - /// Return the namespace name of a component - static std::string ns_name(const std::string& n); - template <typename T> T attr(xml_elt_t elt,const xml_tag_t& n) const { - std::string val = real_name(elt.attr<std::string>(n)); - elt.setAttr(n,val); - return elt.attr<T>(n); - } - /// Add a new constant to the namespace - void addConstant(const std::string& name, const std::string& value, const std::string& type) const; - /// Add a new constant to the namespace as fully indicated by the name - void addConstantNS(const std::string& name, const std::string& value, const std::string& type) const; - - /// Access material by its namespace dressed name - Material material(const std::string& name) const; - Solid solid(const std::string& name) const; - /// Add solid to current namespace - Solid addSolid(const std::string& name,Solid solid) const; - /// Add solid to current namespace as fully indicated by the name - Solid addSolidNS(const std::string& name,Solid solid) const; - - Volume volume(const std::string& name, bool exc=true) const; - /// Add volume to current namespace - Volume addVolume(Volume vol) const; - /// Add volume to current namespace as fully indicated by the name - Volume addVolumeNS(Volume vol) const; - - const Rotation3D& rotation(const std::string& name) const; - /// Add rotation matrix to current namespace - void addRotation(const std::string& name,const Rotation3D& rot) const; - }; - - /// XML parser context to store intermediate stuff - /* - * - * \author M.Frank - * \version 1.0 - * \ingroup DD4HEP_CORE - */ - class ParsingContext { - public: - Detector* description; - std::map<std::string, Rotation3D> rotations; - std::map<std::string, Solid> shapes; - std::map<std::string, Volume> volumes; - std::set<std::string> disabledAlgs; - std::vector<std::string> namespaces; - bool geo_inited = false; - - // Debug flags - bool debug_includes = false; - bool debug_constants = false; - bool debug_materials = false; - bool debug_rotations = false; - bool debug_shapes = false; - bool debug_volumes = false; - bool debug_placements = false; - bool debug_namespaces = false; - bool debug_visattr = false; - bool debug_algorithms = false; - - public: - ParsingContext(Detector* det) : description(det) { namespaces.push_back(""); } - ~ParsingContext() = default; - const std::string& ns() const { return namespaces.back(); } - }; - - /// Encapsulation of the CMS detector description algorithm arguments - /* - * - * \author M.Frank - * \version 1.0 - * \ingroup DD4HEP_CORE - */ - class AlgoArguments { - protected: - /// Access raw argument as a string by name - xml_h raw_arg(const std::string& name) const; - /// Access namespace resolved argument as a string by name - std::string resolved_scalar_arg(const std::string& name) const; - - public: - std::string name; - ParsingContext& context; - xml_h element; - - /// Initializing constructor - AlgoArguments(ParsingContext& ctxt, xml_h algorithm); - /// Default constructor - AlgoArguments() = delete; - /// Copy constructor - AlgoArguments(const AlgoArguments& copy) = delete; - /// Assignment operator - AlgoArguments& operator=(const AlgoArguments& copy) = delete; - /// Standatd destructor - ~AlgoArguments() = default; - - /// Access value of rParent child node - std::string parentName() const; - /// Access value of child'name from the xml element - std::string childName() const; - /// Check the existence of an argument by name - bool find(const std::string& name) const; - /// Access typed argument by name - template<typename T> T value(const std::string& name) const; - /// Shortcut to access string arguments - std::string str(const std::string& nam) const; - /// Shortcut to access double arguments - double dble(const std::string& nam) const; - /// Shortcut to access integer arguments - int integer(const std::string& nam) const; - /// Shortcut to access vector<double> arguments - std::vector<double> vecDble(const std::string& nam) const; - /// Shortcut to access vector<int> arguments - std::vector<int> vecInt(const std::string& nam) const; - /// Shortcut to access vector<int> arguments - std::vector<std::string> vecStr(const std::string& nam) const; - }; - - /// Re-direct debug messages to the DD4hep printer - /* - * - * \author M.Frank - * \version 1.0 - * \ingroup DD4HEP_CORE - */ - class LogDebug : public std::stringstream { - protected: - std::string tag; - int level; - bool pop = false; - public: - LogDebug() = delete; - LogDebug(const LogDebug& copy) = delete; - LogDebug& operator=(const LogDebug& copy) = delete; - LogDebug(const std::string& tag_value, bool /* set_context */); - LogDebug(const std::string& tag_value); - ~LogDebug(); - static void setDebugAlgorithms(bool value); - }; - - /// Re-direct warning messages to the DD4hep printer - /* - * - * \author M.Frank - * \version 1.0 - * \ingroup DD4HEP_CORE - */ - class LogWarn : public LogDebug { - public: - LogWarn() = delete; - LogWarn(const LogWarn& copy) = delete; - LogWarn& operator=(const LogWarn& copy) = delete; - LogWarn(const std::string& tag_value); - }; - - - /// Helper: Convert the name of a placed volume into a subdetector name - std::string detElementName(PlacedVolume pv); - /// Create 3D rotation matrix from angles. - Rotation3D make_rotation3D(double thetaX, double phiX, - double thetaY, double phiY, - double thetaZ, double phiZ); - - } /* End namespace cms */ -} /* End namespace dd4hep */ - -#endif /* DD4HEP_DDCMS_DDCMS_H */ diff --git a/examples/DDCMSTests/include/DDCMS/DDCMSPlugins.h b/examples/DDCMSTests/include/DDCMS/DDCMSPlugins.h deleted file mode 100644 index 63fd22c82..000000000 --- a/examples/DDCMSTests/include/DDCMS/DDCMSPlugins.h +++ /dev/null @@ -1,68 +0,0 @@ -//========================================================================== -// AIDA Detector description implementation -//-------------------------------------------------------------------------- -// Copyright (C) Organisation europeenne pour la Recherche nucleaire (CERN) -// All rights reserved. -// -// For the licensing terms see $DD4hepINSTALL/LICENSE. -// For the list of contributors see $DD4hepINSTALL/doc/CREDITS. -// -// Author : M.Frank -// -//========================================================================== -// -// DDCMS is a detector description convention developed by the CMS experiment. -// -//========================================================================== -#ifndef DD4HEP_DDCMS_DDCMSPLUGINS_H -#define DD4HEP_DDCMS_DDCMSPLUGINS_H - -// Framework includes -#include "DDCMS/DDCMS.h" -#include "DD4hep/Plugins.h" -#include "CLHEP/Units/SystemOfUnits.h" - -/// Namespace for the AIDA detector description toolkit -namespace dd4hep { - - // Forward declarations - class SensitiveDetector; - - /// Standard factory to create Detector elements from an XML representation. - /** - * \author M.Frank - * \version 1.0 - * \date 2012/07/31 - * \ingroup DD4HEP_CMS - */ - template <typename T> class DDCMSDetElementFactory : public PluginFactoryBase { - public: - static long create(Detector& dsc, - cms::ParsingContext& ctx, - xml::Handle_t elt, - SensitiveDetector& sens); - }; -} /* End namespace dd4hep */ - -namespace { - - /// Forward declartion of the base factory template - template <typename P, typename S> class Factory; - DD4HEP_PLUGIN_FACTORY_ARGS_4(long,dd4hep::Detector*,dd4hep::cms::ParsingContext*,ns::xml_h*,dd4hep::SensitiveDetector*) - { return dd4hep::DDCMSDetElementFactory<P>::create(*a0,*a1,*a2,*a3); } -} - -#define DECLARE_DDCMS_DETELEMENT(name,func) \ - DD4HEP_OPEN_PLUGIN(dd4hep,ddcms_det_element_##name) { \ - typedef DDCMSDetElementFactory< ddcms_det_element_##name > _IMP; \ - template <> long \ - _IMP::create(dd4hep::Detector& d, \ - cms::ParsingContext& c, \ - xml::Handle_t e, \ - SensitiveDetector& h) \ - { return func(d,c,e,h); } \ - DD4HEP_PLUGINSVC_FACTORY(ddcms_det_element_##name,name, \ - long(dd4hep::Detector*,dd4hep::cms::ParsingContext*, \ - ns::xml_h*,dd4hep::SensitiveDetector*),__LINE__) } - -#endif /* DD4HEP_DDCMS_DDCMSPLUGINS_H */ diff --git a/examples/DDCMSTests/include/DDCMS/DDCMSTags.h b/examples/DDCMSTests/include/DDCMS/DDCMSTags.h deleted file mode 100644 index f7415c2bd..000000000 --- a/examples/DDCMSTests/include/DDCMS/DDCMSTags.h +++ /dev/null @@ -1,148 +0,0 @@ -//========================================================================== -// AIDA Detector description implementation -//-------------------------------------------------------------------------- -// Copyright (C) Organisation europeenne pour la Recherche nucleaire (CERN) -// All rights reserved. -// -// For the licensing terms see $DD4hepINSTALL/LICENSE. -// For the list of contributors see $DD4hepINSTALL/doc/CREDITS. -// -// Author : M.Frank -// -//========================================================================== -// -// DDCMS is a detector description convention developed by the CMS experiment. -// -//========================================================================== - -// Framework includes -#ifndef DD4HEP_DDCMS_DDCMSTAGS_H -#define DD4HEP_DDCMS_DDCMSTAGS_H - -// Framework include files -#include "XML/XMLElements.h" -#ifndef UNICODE -#define UNICODE(x) extern const ::dd4hep::xml::Tag_t Unicode_##x -#endif - -/// Namespace for the AIDA detector description toolkit -namespace dd4hep { - - /// Namespace of DDCMS conversion namespace - namespace DDCMS { - UNICODE(DDCMS); - - UNICODE(DDDefinition); - - UNICODE(ConstantsSection); - UNICODE(Constant); - - UNICODE(MaterialSection); - UNICODE(ElementaryMaterial); - UNICODE(CompositeMaterial); - UNICODE(atomicWeight); - UNICODE(density); - UNICODE(symbol); - UNICODE(atomicNumber); - UNICODE(MaterialFraction); - - - UNICODE(RotationSection); - UNICODE(Rotation); - UNICODE(rRotation); - UNICODE(thetaX); - UNICODE(phiX); - UNICODE(thetaY); - UNICODE(phiY); - UNICODE(thetaZ); - UNICODE(phiZ); - - UNICODE(TransformationSection); - UNICODE(Transformation); - - UNICODE(SolidSection); - - UNICODE(Box); - UNICODE(dx); - UNICODE(dy); - UNICODE(dz); - - UNICODE(Tubs); - UNICODE(rMin); - UNICODE(rMax); - UNICODE(startPhi); - UNICODE(deltaPhi); - - UNICODE(Polycone); - UNICODE(ZSection); - UNICODE(z); - - UNICODE(Trapezoid); - UNICODE(alp1); - UNICODE(h1); - UNICODE(bl1); - UNICODE(tl1); - UNICODE(alp2); - UNICODE(h2); - UNICODE(bl2); - UNICODE(tl2); - - UNICODE(Torus); - UNICODE(torusRadius); - UNICODE(innerRadius); - UNICODE(outerRadius); - - UNICODE(SubtractionSolid); - - UNICODE(LogicalPartSection); - UNICODE(LogicalPart); - UNICODE(rSolid); - UNICODE(rMaterial); - - UNICODE(PosPartSection); - UNICODE(PosPart); - UNICODE(copyNumber); - UNICODE(rParent); - UNICODE(ChildName); - UNICODE(rChild); - UNICODE(Translation); - - UNICODE(Algorithm); - UNICODE(String); - UNICODE(Numeric); - UNICODE(Vector); - UNICODE(nEntries); - - UNICODE(VisSection); - UNICODE(vismaterial); - UNICODE(vis); - - - /// Debug flags - UNICODE(debug_constants); - UNICODE(debug_materials); - UNICODE(debug_shapes); - UNICODE(debug_volumes); - UNICODE(debug_placements); - UNICODE(debug_namespaces); - UNICODE(debug_rotations); - UNICODE(debug_visattr); - UNICODE(debug_includes); - UNICODE(debug_algorithms); - - /// DD4hep specific - UNICODE(open_geometry); - UNICODE(close_geometry); - UNICODE(IncludeSection); - UNICODE(Include); - UNICODE(DisabledAlgo); - - } /* End namespace DDCMS */ -} /* End namespace dd4hep */ - -#undef UNICODE // Do not miss this one! -#include "XML/XMLTags.h" - -#define _CMU(a) ::dd4hep::DDCMS::Unicode_##a - -#endif /* DD4HEP_DDCMS_DDCMSTAGS_H */ diff --git a/examples/DDCMSTests/src/Example.cpp b/examples/DDCMSTests/src/Example.cpp deleted file mode 100644 index e69de29bb..000000000 diff --git a/examples/DDDB/CMakeLists.txt b/examples/DDDB/CMakeLists.txt index 9f82e15bf..850e1cc39 100644 --- a/examples/DDDB/CMakeLists.txt +++ b/examples/DDDB/CMakeLists.txt @@ -27,8 +27,24 @@ if (DD4HEP_USE_XERCESC) dd4hep_package (DDDB MAJOR 0 MINOR 0 PATCH 1 USES [XERCESC REQUIRED] [ROOT REQUIRED COMPONENTS Geom] - [DD4hep REQUIRED COMPONENTS DDCore DDDB] + [DD4hep REQUIRED COMPONENTS DDCore DDCond] + INCLUDE_DIRS include + INSTALL_INCLUDES include/DDDB include/Detector include/Kernel ) + + # + #---DDDB library -------------------------------------------------------------- + dd4hep_add_package_library(DDDB + SOURCES src/*.cpp src/Detector/*.cpp + USES [ROOT REQUIRED COMPONENTS Geom GenVector] + ) + # + #---DDDB plugin library ------------------------------------------------------- + dd4hep_add_plugin(DDDBPlugins + SOURCES src/plugins/*.cpp + USES [ROOT REQUIRED COMPONENTS Geom GenVector] DDDB + ) + #---Package installation procedure(s) ----------------------------------------- install ( PROGRAMS scripts/run_dddb.sh DESTINATION bin) install ( PROGRAMS scripts/display_dddb.sh DESTINATION bin) diff --git a/DDDB/include/DDDB/DDDBConditionsLoader.h b/examples/DDDB/include/DDDB/DDDBConditionsLoader.h similarity index 100% rename from DDDB/include/DDDB/DDDBConditionsLoader.h rename to examples/DDDB/include/DDDB/DDDBConditionsLoader.h diff --git a/DDDB/include/DDDB/DDDBConversion.h b/examples/DDDB/include/DDDB/DDDBConversion.h similarity index 100% rename from DDDB/include/DDDB/DDDBConversion.h rename to examples/DDDB/include/DDDB/DDDBConversion.h diff --git a/DDDB/include/DDDB/DDDBDimension.h b/examples/DDDB/include/DDDB/DDDBDimension.h similarity index 100% rename from DDDB/include/DDDB/DDDBDimension.h rename to examples/DDDB/include/DDDB/DDDBDimension.h diff --git a/DDDB/include/DDDB/DDDBHelper.h b/examples/DDDB/include/DDDB/DDDBHelper.h similarity index 100% rename from DDDB/include/DDDB/DDDBHelper.h rename to examples/DDDB/include/DDDB/DDDBHelper.h diff --git a/DDDB/include/DDDB/DDDBReader.h b/examples/DDDB/include/DDDB/DDDBReader.h similarity index 100% rename from DDDB/include/DDDB/DDDBReader.h rename to examples/DDDB/include/DDDB/DDDBReader.h diff --git a/DDDB/include/DDDB/DDDBReaderContext.h b/examples/DDDB/include/DDDB/DDDBReaderContext.h similarity index 100% rename from DDDB/include/DDDB/DDDBReaderContext.h rename to examples/DDDB/include/DDDB/DDDBReaderContext.h diff --git a/DDDB/include/DDDB/DDDBTags.h b/examples/DDDB/include/DDDB/DDDBTags.h similarity index 100% rename from DDDB/include/DDDB/DDDBTags.h rename to examples/DDDB/include/DDDB/DDDBTags.h diff --git a/DDDB/include/Detector/DeAlignmentCall.h b/examples/DDDB/include/Detector/DeAlignmentCall.h similarity index 100% rename from DDDB/include/Detector/DeAlignmentCall.h rename to examples/DDDB/include/Detector/DeAlignmentCall.h diff --git a/DDDB/include/Detector/DeIOV.h b/examples/DDDB/include/Detector/DeIOV.h similarity index 100% rename from DDDB/include/Detector/DeIOV.h rename to examples/DDDB/include/Detector/DeIOV.h diff --git a/DDDB/include/Detector/DeStatic.h b/examples/DDDB/include/Detector/DeStatic.h similarity index 100% rename from DDDB/include/Detector/DeStatic.h rename to examples/DDDB/include/Detector/DeStatic.h diff --git a/DDDB/include/Detector/DeVP.h b/examples/DDDB/include/Detector/DeVP.h similarity index 100% rename from DDDB/include/Detector/DeVP.h rename to examples/DDDB/include/Detector/DeVP.h diff --git a/DDDB/include/Detector/DeVPConditionCalls.h b/examples/DDDB/include/Detector/DeVPConditionCalls.h similarity index 100% rename from DDDB/include/Detector/DeVPConditionCalls.h rename to examples/DDDB/include/Detector/DeVPConditionCalls.h diff --git a/DDDB/include/Detector/DeVPGeneric.h b/examples/DDDB/include/Detector/DeVPGeneric.h similarity index 100% rename from DDDB/include/Detector/DeVPGeneric.h rename to examples/DDDB/include/Detector/DeVPGeneric.h diff --git a/DDDB/include/Detector/DeVPSensor.h b/examples/DDDB/include/Detector/DeVPSensor.h similarity index 100% rename from DDDB/include/Detector/DeVPSensor.h rename to examples/DDDB/include/Detector/DeVPSensor.h diff --git a/DDDB/include/Detector/DeVelo.h b/examples/DDDB/include/Detector/DeVelo.h similarity index 100% rename from DDDB/include/Detector/DeVelo.h rename to examples/DDDB/include/Detector/DeVelo.h diff --git a/DDDB/include/Detector/DeVeloConditionCalls.h b/examples/DDDB/include/Detector/DeVeloConditionCalls.h similarity index 100% rename from DDDB/include/Detector/DeVeloConditionCalls.h rename to examples/DDDB/include/Detector/DeVeloConditionCalls.h diff --git a/DDDB/include/Detector/DeVeloGeneric.h b/examples/DDDB/include/Detector/DeVeloGeneric.h similarity index 100% rename from DDDB/include/Detector/DeVeloGeneric.h rename to examples/DDDB/include/Detector/DeVeloGeneric.h diff --git a/DDDB/include/Detector/DeVeloSensor.h b/examples/DDDB/include/Detector/DeVeloSensor.h similarity index 100% rename from DDDB/include/Detector/DeVeloSensor.h rename to examples/DDDB/include/Detector/DeVeloSensor.h diff --git a/DDDB/include/Detector/DetectorElement.h b/examples/DDDB/include/Detector/DetectorElement.h similarity index 100% rename from DDDB/include/Detector/DetectorElement.h rename to examples/DDDB/include/Detector/DetectorElement.h diff --git a/DDDB/include/Detector/DetectorElement_inl.h b/examples/DDDB/include/Detector/DetectorElement_inl.h similarity index 100% rename from DDDB/include/Detector/DetectorElement_inl.h rename to examples/DDDB/include/Detector/DetectorElement_inl.h diff --git a/DDDB/include/Detector/IDetService.h b/examples/DDDB/include/Detector/IDetService.h similarity index 100% rename from DDDB/include/Detector/IDetService.h rename to examples/DDDB/include/Detector/IDetService.h diff --git a/DDDB/include/Detector/ParameterMap.h b/examples/DDDB/include/Detector/ParameterMap.h similarity index 100% rename from DDDB/include/Detector/ParameterMap.h rename to examples/DDDB/include/Detector/ParameterMap.h diff --git a/DDDB/include/Kernel/VPConstants.h b/examples/DDDB/include/Kernel/VPConstants.h similarity index 100% rename from DDDB/include/Kernel/VPConstants.h rename to examples/DDDB/include/Kernel/VPConstants.h diff --git a/DDDB/src/DDDBConversion.cpp b/examples/DDDB/src/DDDBConversion.cpp similarity index 100% rename from DDDB/src/DDDBConversion.cpp rename to examples/DDDB/src/DDDBConversion.cpp diff --git a/DDDB/src/DDDBDimension.cpp b/examples/DDDB/src/DDDBDimension.cpp similarity index 100% rename from DDDB/src/DDDBDimension.cpp rename to examples/DDDB/src/DDDBDimension.cpp diff --git a/DDDB/src/DDDBHelper.cpp b/examples/DDDB/src/DDDBHelper.cpp similarity index 100% rename from DDDB/src/DDDBHelper.cpp rename to examples/DDDB/src/DDDBHelper.cpp diff --git a/DDDB/src/DDDBReader.cpp b/examples/DDDB/src/DDDBReader.cpp similarity index 100% rename from DDDB/src/DDDBReader.cpp rename to examples/DDDB/src/DDDBReader.cpp diff --git a/DDDB/src/DDDBTags.cpp b/examples/DDDB/src/DDDBTags.cpp similarity index 100% rename from DDDB/src/DDDBTags.cpp rename to examples/DDDB/src/DDDBTags.cpp diff --git a/DDDB/src/Detector/DeAlignmentCall.cpp b/examples/DDDB/src/Detector/DeAlignmentCall.cpp similarity index 100% rename from DDDB/src/Detector/DeAlignmentCall.cpp rename to examples/DDDB/src/Detector/DeAlignmentCall.cpp diff --git a/DDDB/src/Detector/DeHandles.cpp b/examples/DDDB/src/Detector/DeHandles.cpp similarity index 100% rename from DDDB/src/Detector/DeHandles.cpp rename to examples/DDDB/src/Detector/DeHandles.cpp diff --git a/DDDB/src/Detector/DeIOV.cpp b/examples/DDDB/src/Detector/DeIOV.cpp similarity index 100% rename from DDDB/src/Detector/DeIOV.cpp rename to examples/DDDB/src/Detector/DeIOV.cpp diff --git a/DDDB/src/Detector/DeStatic.cpp b/examples/DDDB/src/Detector/DeStatic.cpp similarity index 100% rename from DDDB/src/Detector/DeStatic.cpp rename to examples/DDDB/src/Detector/DeStatic.cpp diff --git a/DDDB/src/Detector/DeVP.cpp b/examples/DDDB/src/Detector/DeVP.cpp similarity index 100% rename from DDDB/src/Detector/DeVP.cpp rename to examples/DDDB/src/Detector/DeVP.cpp diff --git a/DDDB/src/Detector/DeVPConditionCalls.cpp b/examples/DDDB/src/Detector/DeVPConditionCalls.cpp similarity index 100% rename from DDDB/src/Detector/DeVPConditionCalls.cpp rename to examples/DDDB/src/Detector/DeVPConditionCalls.cpp diff --git a/DDDB/src/Detector/DeVPGeneric.cpp b/examples/DDDB/src/Detector/DeVPGeneric.cpp similarity index 100% rename from DDDB/src/Detector/DeVPGeneric.cpp rename to examples/DDDB/src/Detector/DeVPGeneric.cpp diff --git a/DDDB/src/Detector/DeVPSensor.cpp b/examples/DDDB/src/Detector/DeVPSensor.cpp similarity index 100% rename from DDDB/src/Detector/DeVPSensor.cpp rename to examples/DDDB/src/Detector/DeVPSensor.cpp diff --git a/DDDB/src/Detector/DeVelo.cpp b/examples/DDDB/src/Detector/DeVelo.cpp similarity index 100% rename from DDDB/src/Detector/DeVelo.cpp rename to examples/DDDB/src/Detector/DeVelo.cpp diff --git a/DDDB/src/Detector/DeVeloConditionCalls.cpp b/examples/DDDB/src/Detector/DeVeloConditionCalls.cpp similarity index 100% rename from DDDB/src/Detector/DeVeloConditionCalls.cpp rename to examples/DDDB/src/Detector/DeVeloConditionCalls.cpp diff --git a/DDDB/src/Detector/DeVeloGeneric.cpp b/examples/DDDB/src/Detector/DeVeloGeneric.cpp similarity index 100% rename from DDDB/src/Detector/DeVeloGeneric.cpp rename to examples/DDDB/src/Detector/DeVeloGeneric.cpp diff --git a/DDDB/src/Detector/DeVeloHandles.cpp b/examples/DDDB/src/Detector/DeVeloHandles.cpp similarity index 100% rename from DDDB/src/Detector/DeVeloHandles.cpp rename to examples/DDDB/src/Detector/DeVeloHandles.cpp diff --git a/DDDB/src/Detector/DeVeloSensor.cpp b/examples/DDDB/src/Detector/DeVeloSensor.cpp similarity index 100% rename from DDDB/src/Detector/DeVeloSensor.cpp rename to examples/DDDB/src/Detector/DeVeloSensor.cpp diff --git a/DDDB/src/Detector/DetectorElement.cpp b/examples/DDDB/src/Detector/DetectorElement.cpp similarity index 100% rename from DDDB/src/Detector/DetectorElement.cpp rename to examples/DDDB/src/Detector/DetectorElement.cpp diff --git a/DDDB/src/Detector/ParameterMap.cpp b/examples/DDDB/src/Detector/ParameterMap.cpp similarity index 100% rename from DDDB/src/Detector/ParameterMap.cpp rename to examples/DDDB/src/Detector/ParameterMap.cpp diff --git a/DDDB/src/plugins/CondDB2DDDB.cpp b/examples/DDDB/src/plugins/CondDB2DDDB.cpp similarity index 100% rename from DDDB/src/plugins/CondDB2DDDB.cpp rename to examples/DDDB/src/plugins/CondDB2DDDB.cpp diff --git a/DDDB/src/plugins/DDDB2Objects.cpp b/examples/DDDB/src/plugins/DDDB2Objects.cpp similarity index 100% rename from DDDB/src/plugins/DDDB2Objects.cpp rename to examples/DDDB/src/plugins/DDDB2Objects.cpp diff --git a/DDDB/src/plugins/DDDBAlignmentTest.cpp b/examples/DDDB/src/plugins/DDDBAlignmentTest.cpp similarity index 100% rename from DDDB/src/plugins/DDDBAlignmentTest.cpp rename to examples/DDDB/src/plugins/DDDBAlignmentTest.cpp diff --git a/DDDB/src/plugins/DDDBConditionsLoader.cpp b/examples/DDDB/src/plugins/DDDBConditionsLoader.cpp similarity index 100% rename from DDDB/src/plugins/DDDBConditionsLoader.cpp rename to examples/DDDB/src/plugins/DDDBConditionsLoader.cpp diff --git a/DDDB/src/plugins/DDDBDerivedCondTest.cpp b/examples/DDDB/src/plugins/DDDBDerivedCondTest.cpp similarity index 100% rename from DDDB/src/plugins/DDDBDerivedCondTest.cpp rename to examples/DDDB/src/plugins/DDDBDerivedCondTest.cpp diff --git a/DDDB/src/plugins/DDDBDetectorDumps.cpp b/examples/DDDB/src/plugins/DDDBDetectorDumps.cpp similarity index 100% rename from DDDB/src/plugins/DDDBDetectorDumps.cpp rename to examples/DDDB/src/plugins/DDDBDetectorDumps.cpp diff --git a/DDDB/src/plugins/DDDBExecutor.cpp b/examples/DDDB/src/plugins/DDDBExecutor.cpp similarity index 100% rename from DDDB/src/plugins/DDDBExecutor.cpp rename to examples/DDDB/src/plugins/DDDBExecutor.cpp diff --git a/DDDB/src/plugins/DDDBFileReader.cpp b/examples/DDDB/src/plugins/DDDBFileReader.cpp similarity index 100% rename from DDDB/src/plugins/DDDBFileReader.cpp rename to examples/DDDB/src/plugins/DDDBFileReader.cpp diff --git a/DDDB/src/plugins/DDDBLogVolumeDump.cpp b/examples/DDDB/src/plugins/DDDBLogVolumeDump.cpp similarity index 100% rename from DDDB/src/plugins/DDDBLogVolumeDump.cpp rename to examples/DDDB/src/plugins/DDDBLogVolumeDump.cpp diff --git a/DDDB/src/plugins/DDDBPlugins.cpp b/examples/DDDB/src/plugins/DDDBPlugins.cpp similarity index 100% rename from DDDB/src/plugins/DDDBPlugins.cpp rename to examples/DDDB/src/plugins/DDDBPlugins.cpp diff --git a/DDDB/src/plugins/DDDBvis.cpp b/examples/DDDB/src/plugins/DDDBvis.cpp similarity index 100% rename from DDDB/src/plugins/DDDBvis.cpp rename to examples/DDDB/src/plugins/DDDBvis.cpp diff --git a/DDDB/src/plugins/DeVeloServiceTest.cpp b/examples/DDDB/src/plugins/DeVeloServiceTest.cpp similarity index 100% rename from DDDB/src/plugins/DeVeloServiceTest.cpp rename to examples/DDDB/src/plugins/DeVeloServiceTest.cpp diff --git a/DDDB/src/plugins/DeVeloTest.cpp b/examples/DDDB/src/plugins/DeVeloTest.cpp similarity index 100% rename from DDDB/src/plugins/DeVeloTest.cpp rename to examples/DDDB/src/plugins/DeVeloTest.cpp diff --git a/DDDB/src/plugins/DetService.cpp b/examples/DDDB/src/plugins/DetService.cpp similarity index 100% rename from DDDB/src/plugins/DetService.cpp rename to examples/DDDB/src/plugins/DetService.cpp diff --git a/DDDB/src/plugins/DetService.h b/examples/DDDB/src/plugins/DetService.h similarity index 100% rename from DDDB/src/plugins/DetService.h rename to examples/DDDB/src/plugins/DetService.h -- GitLab