From bee3359587d8adf09f70ca22b5a7616bb6bdc3d8 Mon Sep 17 00:00:00 2001 From: myliu <201916234@mail.sdu.edu.cn> Date: Sun, 31 Oct 2021 21:51:50 +0800 Subject: [PATCH] Modify the name of the DC's xml file --- .../{DC_Simple_v01_03.xml => DC_Stero_v01_01.xml} | 3 ++- .../{DC_Simple_v01_01.xml => DC_Straight_v01_01.xml} | 0 .../{DC_Simple_v01_02.xml => DC_Straight_v01_02.xml} | 0 Detector/DetDriftChamber/CMakeLists.txt | 2 +- .../compact/{det_inclined_wire.xml => det_stero.xml} | 2 +- .../{DriftChamber_tile.cpp => DriftChamber_stero.cpp} | 2 +- 6 files changed, 5 insertions(+), 4 deletions(-) rename Detector/DetCRD/compact/CRD_common_v01/{DC_Simple_v01_03.xml => DC_Stero_v01_01.xml} (93%) rename Detector/DetCRD/compact/CRD_common_v01/{DC_Simple_v01_01.xml => DC_Straight_v01_01.xml} (100%) rename Detector/DetCRD/compact/CRD_common_v01/{DC_Simple_v01_02.xml => DC_Straight_v01_02.xml} (100%) rename Detector/DetDriftChamber/compact/{det_inclined_wire.xml => det_stero.xml} (96%) rename Detector/DetDriftChamber/src/driftchamber/{DriftChamber_tile.cpp => DriftChamber_stero.cpp} (99%) 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 801ad541..fe303a52 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 7321b5e6..70a29ad7 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 b3cbfd81..44e91908 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 9fc2da07..0b9061a9 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); -- GitLab