diff --git a/Detector/DetCRD/compact/CRD_common_v01/DC_Simple_v01_03.xml b/Detector/DetCRD/compact/CRD_common_v01/DC_Stero_v01_01.xml similarity index 93% rename from Detector/DetCRD/compact/CRD_common_v01/DC_Simple_v01_03.xml rename to Detector/DetCRD/compact/CRD_common_v01/DC_Stero_v01_01.xml index 801ad541c80b5e3fa353f0f819157e196ca409f8..fe303a5212d5b051e4a30143460ffd900b3e2acc 100644 --- a/Detector/DetCRD/compact/CRD_common_v01/DC_Simple_v01_03.xml +++ b/Detector/DetCRD/compact/CRD_common_v01/DC_Stero_v01_01.xml @@ -46,11 +46,12 @@ <regions> <region name="DriftChamberRegion"> + <limitsetref name="DC_limits"/> </region> </regions> <detectors> - <detector id="DetID_DC" name="DriftChamber_tile" type="DriftChamber_tile" readout="DriftChamberHitsCollection" vis="DCVis" sensitive="true" region="DriftChamberRegion" limits="DC_limits"> + <detector id="DetID_DC" name="DriftChamber_Stero" type="DriftChamber_Stero" readout="DriftChamberHitsCollection" vis="DCVis" sensitive="true" insideTrackingVolume="true" limits="DC_limits"> <material name="Air"/> <chamber id="0" material="GasHe_90Isob_10"/> <side material="CarbonFiber"/> diff --git a/Detector/DetCRD/compact/CRD_common_v01/DC_Simple_v01_01.xml b/Detector/DetCRD/compact/CRD_common_v01/DC_Straight_v01_01.xml similarity index 100% rename from Detector/DetCRD/compact/CRD_common_v01/DC_Simple_v01_01.xml rename to Detector/DetCRD/compact/CRD_common_v01/DC_Straight_v01_01.xml diff --git a/Detector/DetCRD/compact/CRD_common_v01/DC_Simple_v01_02.xml b/Detector/DetCRD/compact/CRD_common_v01/DC_Straight_v01_02.xml similarity index 100% rename from Detector/DetCRD/compact/CRD_common_v01/DC_Simple_v01_02.xml rename to Detector/DetCRD/compact/CRD_common_v01/DC_Straight_v01_02.xml diff --git a/Detector/DetDriftChamber/CMakeLists.txt b/Detector/DetDriftChamber/CMakeLists.txt index 7321b5e644c092fdec4c075a1bdaabe492d8d93a..70a29ad7765a5fa9d8b5016015493ceb2c6450d9 100644 --- a/Detector/DetDriftChamber/CMakeLists.txt +++ b/Detector/DetDriftChamber/CMakeLists.txt @@ -16,7 +16,7 @@ find_package(ROOT COMPONENTS MathCore GenVector Geom REQUIRED) gaudi_add_module(DetDriftChamber SOURCES src/driftchamber/DriftChamber.cpp - SOURCES src/driftchamber/DriftChamber_tile.cpp + SOURCES src/driftchamber/DriftChamber_stero.cpp LINK DetSegmentation ${DD4hep_COMPONENT_LIBRARIES} # ROOT Geant4 diff --git a/Detector/DetDriftChamber/compact/det_inclined_wire.xml b/Detector/DetDriftChamber/compact/det_stero.xml similarity index 96% rename from Detector/DetDriftChamber/compact/det_inclined_wire.xml rename to Detector/DetDriftChamber/compact/det_stero.xml index b3cbfd81c536f4a30be8935ededb48f8facff04b..44e919087fb9b596765009bcf80e401893eac054 100644 --- a/Detector/DetDriftChamber/compact/det_inclined_wire.xml +++ b/Detector/DetDriftChamber/compact/det_stero.xml @@ -83,7 +83,7 @@ </regions> <detectors> - <detector id="DetID_DC" name="DriftChamber_tile" type="DriftChamber_tile" readout="DriftChamberHitsCollection" vis="VisibleBlue" sensitive="true" region="DriftChamberRegion" limits="DC_limits"> + <detector id="DetID_DC" name="DriftChamber_Stero" type="DriftChamber_Stero" readout="DriftChamberHitsCollection" vis="VisibleBlue" sensitive="true" region="DriftChamberRegion" limits="DC_limits"> <material name="Air"/> <chamber id="0" material="GasHe_90Isob_10"/> <side material="CarbonFiber"/> diff --git a/Detector/DetDriftChamber/src/driftchamber/DriftChamber_tile.cpp b/Detector/DetDriftChamber/src/driftchamber/DriftChamber_stero.cpp similarity index 99% rename from Detector/DetDriftChamber/src/driftchamber/DriftChamber_tile.cpp rename to Detector/DetDriftChamber/src/driftchamber/DriftChamber_stero.cpp index 9fc2da07025559574cca2aa31b0c1c03a5329b43..0b9061a9f1706de60bf6b81e931a296f9155adaf 100644 --- a/Detector/DetDriftChamber/src/driftchamber/DriftChamber_tile.cpp +++ b/Detector/DetDriftChamber/src/driftchamber/DriftChamber_stero.cpp @@ -304,4 +304,4 @@ static dd4hep::Ref_t create_detector(dd4hep::Detector& theDetector, } -DECLARE_DETELEMENT(DriftChamber_tile, create_detector); +DECLARE_DETELEMENT(DriftChamber_Stero, create_detector);