From 01180604e586d68d20dcc983059d3b0666c61448 Mon Sep 17 00:00:00 2001 From: jhrdinka <julia.hrdinka@cern.ch> Date: Tue, 9 Jan 2018 16:15:07 +0100 Subject: [PATCH] Make FCChh Tracker exactely the same as in FCCSW rel 0.8.3 --- .../FCChhBaseline/FCChhTrackerTkLayout.xml | 163 ------------------ .../FCChhBaseline/FCChh_DectDimensions.xml | 160 +++++++++++++++++ .../FCChhBaseline/FCChh_DectEmptyMaster.xml | 26 +++ .../compact/FCChhBaseline/Tracker.xml | 36 ++++ .../src/FCChhTrackerTkLayout_Beampipe.cpp | 2 +- 5 files changed, 223 insertions(+), 164 deletions(-) delete mode 100644 Detectors/DD4hepDetector/compact/FCChhBaseline/FCChhTrackerTkLayout.xml create mode 100644 Detectors/DD4hepDetector/compact/FCChhBaseline/FCChh_DectDimensions.xml create mode 100644 Detectors/DD4hepDetector/compact/FCChhBaseline/FCChh_DectEmptyMaster.xml create mode 100644 Detectors/DD4hepDetector/compact/FCChhBaseline/Tracker.xml diff --git a/Detectors/DD4hepDetector/compact/FCChhBaseline/FCChhTrackerTkLayout.xml b/Detectors/DD4hepDetector/compact/FCChhBaseline/FCChhTrackerTkLayout.xml deleted file mode 100644 index abe7c8c7..00000000 --- a/Detectors/DD4hepDetector/compact/FCChhBaseline/FCChhTrackerTkLayout.xml +++ /dev/null @@ -1,163 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<lccdd xmlns:compact="http://www.lcsim.org/schemas/compact/1.0" xmlns:xs="http://www.w3.org/2001/XMLSchema" xs:noNamespaceSchemaLocation="http://www.lcsim.org/schemas/compact/1.0/compact.xsd"> - - <includes> - <gdmlFile ref="elements.xml"/> - <gdmlFile ref="materials.xml"/> - </includes> - <info name="TkLayoutTracker" title="TkLayoutTracker" author="Z.Drasal" url="http://fcc-tklayout.web.cern.ch/fcc-tklayout" status="optimization" version="FCChh_v3.03"> - <comment>The tracker geometry as designed and optimized by tkLayout software - design version: FCChh_v3.03</comment> - </info> - <define> - <constant name="world_size" value="30*m"/> - <constant name="world_x" value="world_size"/> - <constant name="world_y" value="world_size"/> - <constant name="world_z" value="world_size"/> - <!-- BEAM PIPE --> - <constant name="CentralBeamTube_dz" value="1600.0*cm"/> - <constant name="CentralBeamTube_rmax" value="2.1*cm"/> - <constant name="CentralBeamTube_rmin" value="2.*cm"/> - - <constant name="ForwardBeamTube_rmin1" value="2.*cm"/> - <constant name="ForwardBeamTube_rmax1" value="2.1*cm"/> - <constant name="ForwardBeamTube_rmin2" value="2.6*cm"/> - <constant name="ForwardBeamTube_rmax2" value="2.7*cm"/> - <constant name="ForwardBeamTube_dz" value="850*cm"/> - <constant name="ForwardBeamTube_zOffset" value="1650*cm"/> - - <!-- MAGNET SYSTEM --> - <!-- Central Solenoid --> - <constant name="BarSolenoid_dz" value="1000*cm"/> - <constant name="BarSolenoid_rmin" value="510*cm"/> - <constant name="BarSolenoid_rmax" value="610*cm"/> - - <!-- Forward Solenoids --> - <constant name="FwdSolenoid_dz" value="200*cm"/> - <constant name="FwdSolenoid_rmin" value="265*cm"/> - <constant name="FwdSolenoid_rmax" value="365*cm"/> - <constant name="FwdSolenoid_zOffset" value="1200*cm+FwdSolenoid_dz"/> - - <!-- TRACKER DIMENSIONS --> - <constant name="Tracker_rmin" value="24*mm"/> - <constant name="Tracker_rmax" value="1700*mm"/> - <constant name="Tracker_dz" value="5000*mm"/> - <!-- Tracker Barrel --> - <constant name="BarTrackerInner_id" value="0"/> - <constant name="BarTrackerOuter_id" value="1"/> - - <!-- Tracker End-caps --> - <constant name="EndCapTrackerInner_id" value="2"/> - <constant name="EndCapTrackerOuter_id" value="3"/> - - <!-- not explicitly defined, up to tracker design --> - <!-- Tracker Forward --> - <constant name="FwdTracker_id" value="4"/> - <constant name="FwdTracker_rmin1" value="60*mm"/> - <constant name="FwdTracker_rmax1" value="3500*mm"/> - <constant name="FwdTracker_z1" value="2500*mm"/> - <constant name="FwdTracker_rmin2" value="2000*mm"/> - <constant name="FwdTracker_rmax2" value="3505*mm"/> - <constant name="FwdTracker_z2" value="2000*mm"/> - <constant name="FwdTracker_zOffset" value="14000*mm"/> - - <!-- E(M)CAL DIMENSIONS --> - <!-- E(M)Cal Barrel --> - <constant name="BarECal_id" value="5"/> - <constant name="BarECal_rmin" value="1750*mm"/> - <constant name="BarECal_rmax" value="2750*mm"/> - <constant name="BarECal_dz" value="5000*mm"/> - <!-- E(M)Cal End-caps --> - <constant name="EndCapECal_id" value="6"/> - <constant name="EndCapECal_rmin1" value="864.278*mm"/> - <constant name="EndCapECal_rmax1" value="2800*mm"/> - <constant name="EndCapECal_rmin2" value="1467.641*mm"/> - <constant name="EndCapECal_rmax2" value="2800*mm"/> - <constant name="EndCapECal_dz" value="1850*mm"/> - <constant name="EndCapECal_zOffset" value="5300*mm + EndCapECal_dz"/> - <!-- E(M)Cal forward --> - <constant name="FwdECal_id" value="7"/> - <constant name="FwdECal_rmin" value="30*mm"/> - <constant name="FwdECal_rmax" value="3500*mm"/> - <constant name="FwdECal_dz" value="750*mm"/> - <constant name="FwdECal_zOffset" value="16500*mm+FwdECal_dz"/> - - - <!-- HCAL DIMENSIONS --> - <!-- HCal Barrel --> - <constant name="BarHCal_id" value="8"/> - <constant name="BarHCal_rmin" value="2850*mm"/> - <constant name="BarHCal_rmax" value="4850*mm"/> - <constant name="BarHCal_dz" value="4600*mm"/> - <!-- HCal End-Cap --> - <constant name="EndCapHCal_id" value="9"/> - <constant name="EndCapHCal_rmin" value="2850*mm"/> - <constant name="EndCapHCal_rmax" value="4550*mm"/> - <constant name="EndCapHCal_dz" value="2000*mm"/> - <constant name="EndCapHCal_zOffset" value="5000*mm + EndCapHCal_dz"/> - <!-- HCal forward --> - <constant name="FwdHCal_id" value="10"/> - <constant name="FwdHCal_rmin" value="30*mm"/> - <constant name="FwdHCal_rmax" value="3500*mm"/> - <constant name="FwdHCal_dz" value="1250*mm"/> - <constant name="FwdHCal_zOffset" value="18000*mm + FwdHCal_dz"/> - - <!-- MUON SYSTEM DIMENSIONS --> - <!-- Muon system barrel --> - <constant name="BarMuon_id" value="11"/> - <constant name="BarMuon_rmin1" value="5250*mm"/> - <constant name="BarMuon_rmax1" value="9000*mm"/> - <constant name="BarMuon_z1" value="13000*mm"/> - <constant name="BarMuon_rmin2" value="5245*mm"/> - <constant name="BarMuon_rmax2" value="6500*mm"/> - <constant name="BarMuon_z2" value="10500*mm"/> - <!-- Muon system end-caps --> - <constant name="EndCapMuon_id" value="12"/> - <constant name="EndCapMuon_rmin1" value="2458.67*mm"/> - <constant name="EndCapMuon_rmax1" value="4750*mm"/> - <constant name="EndCapMuon_rmin2" value="2724.47*mm"/> - <constant name="EndCapMuon_rmax2" value="4750*mm"/> - <constant name="EndCapMuon_dz" value="500*mm"/> - <constant name="EndCapMuon_zOffset" value="9750*mm"/> - - <!-- Muon system forward --> - <constant name="FwdBarMuon_id" value="13"/> - <constant name="FwdBarMuon_rmin" value="5250*mm"/> - <constant name="FwdBarMuon_rmax" value="7000*mm"/> - <constant name="FwdBarMuon_dz" value="1750*mm"/> - <constant name="FwdBarMuon_zOffset" value="14000*mm + FwdBarMuon_dz"/> - - <constant name="FwdMuon_id" value="14"/> - <constant name="FwdMuon_rmin" value="30*mm"/> - <constant name="FwdMuon_rmax" value="7000*mm"/> - <constant name="FwdMuon_dz" value="1500*mm"/> - <constant name="FwdMuon_zOffset" value="20500*mm + FwdMuon_dz"/> - </define> - - <readouts> - <readout name="TrackerBarrelReadout"> - <segmentation type="CartesianGridXZ" grid_size_x="0.005*mm" grid_size_z="0.010*mm"/> - <id>system:4,layer:5,module:18,x:-15,z:-15</id> - </readout> - <readout name="TrackerEndcapReadout"> - <segmentation type="CartesianGridXZ" grid_size_x="0.005*mm" grid_size_z="0.010*mm"/> - <id>system:4,posneg:1,disc:5,component:17,x:-15,z:-15</id> - </readout> - </readouts> - <include ref="FCChh_v3.03_Definitions.xml"/> - <detectors> - <detector id="0" name="beampipe" type="FCChhBeampipe"> - <dimensions rmin="CentralBeamTube_rmin" rmax="CentralBeamTube_rmax" z="CentralBeamTube_dz" material="Beryllium" vis="violet"/> - </detector> - <detector id="101" name="FCChhInner" type="DD4hep_SubdetectorAssembly" vis="BlueVisTrans"> - <composite name="InnerBRL"/> - <composite name="InnerECAP"/> - </detector> - <detector id="102" name="FCChhOuter" type="DD4hep_SubdetectorAssembly" vis="BlueVisTrans"> - <composite name="OuterBRL"/> - <composite name="OuterECAP"/> - </detector> - <detector id="103" name="FCChhFwdEcap" type="DD4hep_SubdetectorAssembly" vis="BlueVisTrans"> - <composite name="FwdECAP"/> - </detector> - </detectors> -</lccdd> diff --git a/Detectors/DD4hepDetector/compact/FCChhBaseline/FCChh_DectDimensions.xml b/Detectors/DD4hepDetector/compact/FCChhBaseline/FCChh_DectDimensions.xml new file mode 100644 index 00000000..aedebd6c --- /dev/null +++ b/Detectors/DD4hepDetector/compact/FCChhBaseline/FCChh_DectDimensions.xml @@ -0,0 +1,160 @@ +<?xml version="1.0" encoding="UTF-8"?> +<lccdd xmlns:compact="http://www.lcsim.org/schemas/compact/1.0" + xmlns:xs="http://www.w3.org/2001/XMLSchema" + xs:noNamespaceSchemaLocation="http://www.lcsim.org/schemas/compact/1.0/compact.xsd"> + + <info name="FCCDectDimensions" + title="master file with includes and world dimension" + author="C. Helsens, J. Lingemann" + url="no" + status="development" + version="1.0"> + <comment> + Dimensions for FCChhBaseline1: Design with Twin Solenoid, 6 T, 12 m bore, 10 Tm dipole + Sources: FCC hadron detector meeting 31 Aug 2016 (excel table): https://indico.cern.ch/event/557687/ + FCC hadron detector meeting 28 Sep 2016 (slides): https://indico.cern.ch/event/557688/ + Reference Geometry v7, can be found: /eos/experiment/fcc/hh/simulation/reference_geometry_5m_4T_v7.pdf + </comment> + </info> + + + <define> + <!-- BEAM PIPE --> + <constant name="CentralBeamTube_dz" value="800.0*cm"/> + <constant name="CentralBeamTube_rmax" value="2.08*cm"/> + <constant name="CentralBeamTube_rmin" value="2.*cm"/> + + <constant name="ForwardBeamTube_rmin1" value="2.*cm"/> + <constant name="ForwardBeamTube_rmax1" value="2.08*cm"/> + <constant name="ForwardBeamTube_rmin2" value="6.15*cm"/> + <constant name="ForwardBeamTube_rmax2" value="6.23*cm"/> + <constant name="ForwardBeamTube_dz" value="850*cm"/> + <constant name="ForwardBeamTube_zOffset" value="CentralBeamTube_dz + ForwardBeamTube_dz"/> + + <!-- MAGNET SYSTEM --> + <!-- Central Solenoid --> + <constant name="BarSolenoid_dz" value="950*cm"/> + <constant name="BarSolenoid_rmin" value="5450*mm"/> + <constant name="BarSolenoid_rmax" value="6000*mm"/> + <constant name="BarSolenoidCryo1_rmin" value="5000*mm"/> + <constant name="BarSolenoidCryo1_rmax" value="5090*mm"/> + <constant name="BarSolenoidCryo_dz" value="10000*mm"/> + <constant name="BarSolenoidCryo2_rmin" value="6250*mm"/> + <constant name="BarSolenoidCryo2_rmax" value="6305*mm"/> + <constant name="BarSolenoidCryoFlange_dz" value="53.5*mm"/> + <constant name="BarSolenoidCryoFlange_offset" value="BarSolenoidCryo_dz-BarSolenoidCryoFlange_dz"/> + + <!-- Forward Solenoids --> + <constant name="FwdSolenoid_dz" value="1700*mm"/> + <constant name="FwdSolenoid_rmin" value="280*cm"/> + <constant name="FwdSolenoid_rmax" value="307*cm"/> + <constant name="FwdSolenoid_zOffset" value="1230*cm+FwdSolenoid_dz"/> + <constant name="FwdSolenoidCryo1_rmin" value="2650*mm"/> + <constant name="FwdSolenoidCryo1_rmax" value="2670*mm"/> + <constant name="FwdSolenoidCryo_dz" value="2135*mm"/> + <constant name="FwdSolenoidCryo2_rmin" value="3500*mm"/> + <constant name="FwdSolenoidCryo2_rmax" value="3560*mm"/> + <constant name="FwdSolenoidCryoFlange1_dz" value="35*mm"/> + <constant name="FwdSolenoidCryoFlange2_dz" value="100*mm"/> + <constant name="FwdSolenoidCryoFlange1_offset" value="FwdSolenoid_zOffset-FwdSolenoidCryo_dz+FwdSolenoidCryoFlange1_dz"/> + <constant name="FwdSolenoidCryoFlange2_offset" value="FwdSolenoid_zOffset+FwdSolenoidCryo_dz-FwdSolenoidCryoFlange2_dz"/> + + <!-- TRACKER DIMENSIONS --> + <constant name="Tracker_rmin" value="23.28*mm"/> + <constant name="Tracker_rmax" value="1700*mm"/> + <constant name="Tracker_dz" value="5009.7*mm"/> + <!-- Tracker Barrel --> + <constant name="BarTrackerInner_id" value="0"/> + <constant name="BarTrackerOuter_id" value="1"/> + <!-- not explicitly defined, up to tracker design --> + + <!-- Tracker End-caps --> + <constant name="EndCapTrackerInner_id" value="2"/> + <constant name="EndCapTrackerOuter_id" value="3"/> + + <!-- Tracker Forward --> + <constant name="FwdTracker_id" value="4"/> + <!-- single layer close to ExCal --> + <constant name="FwdTracker_rmin1" value="40*mm"/> + <constant name="FwdTracker_rmax1" value="1076.8*mm"/> + <constant name="FwdTracker_zOffset1" value="7500*mm"/> + <!-- the rest of the tracking layers inside the forward solenoid / shielding --> + <constant name="FwdTracker_rmin2" value="60*mm"/> + <constant name="FwdTracker_rmax2" value="1549.8*mm"/> + <constant name="FwdTracker_z2" value="3009.65*mm"/> + <constant name="FwdTracker_zOffset2" value="10*m + FwdTracker_z2"/> + + <!-- CALORIMETER DIMENSIONS --> + <!-- ECal Barrel (EM B) --> + <constant name="BarECal_id" value="5"/> + <constant name="BarECal_rmin" value="1750*mm"/> + <constant name="BarECal_rmax" value="2750*mm"/> + <constant name="BarECal_dz" value="5000*mm"/> + <!-- HCal Barrel (HCAL B) --> + <constant name="BarHCal_id" value="8"/> + <constant name="BarHCal_rmin" value="2850*mm"/> + <constant name="BarHCal_rmax" value="4890*mm"/> + <constant name="BarHCal_dz" value="4600*mm"/> + <!-- Calorimeter endcaps (EMEC + HEC)--> + <constant name="ExtBarECal_id" value="6"/> + <constant name="HadronicEndCap_id" value="7"/> + <constant name="ExtBarCal_dz" value="1500*mm"/> + <constant name="ExtBarCal_zOffset" value="5300*mm + ExtBarCal_dz"/> + <constant name="ExtBarCal_rmin1" value="(ExtBarCal_zOffset - ExtBarCal_dz)* tan (2*atan(exp(-2.5))) - 0.1*m"/> + <constant name="ExtBarCal_rmin2" value="(ExtBarCal_zOffset + ExtBarCal_dz)* tan (2*atan(exp(-2.5))) - 0.1*m"/> + <constant name="ExtBarCal_rmax" value="2700*mm"/> + <!-- HCal extended barrel (HCAL EB) --> + <constant name="ExtBarHCal_id" value="9"/> + <constant name="ExtBarHCal1_rmin" value="3500*mm"/> + <constant name="ExtBarHCal1_rmax" value="4590*mm"/> + <constant name="ExtBarHCal2_rmin" value="2850*mm"/> + <constant name="ExtBarHCal2_rmax" value="4590*mm"/> + <constant name="ExtBarHCal1_dz" value="150*mm"/> + <constant name="ExtBarHCal1_zOffset" value="5000*mm + ExtBarHCal1_dz"/> + <constant name="ExtBarHCal2_dz" value="1600*mm"/> + <constant name="ExtBarHCal2_zOffset" value="ExtBarHCal1_zOffset + ExtBarHCal1_dz + ExtBarHCal2_dz"/> + <!-- Forward calorimeters (EMFWD + HFWD) --> + <constant name="FwdECal_id" value="10"/> + <constant name="FwdHCal_id" value="11"/> + <constant name="FwdCal_dz" value="1500*mm"/> + <constant name="FwdCal_zOffset" value="16500*mm + FwdCal_dz"/> + <constant name="FwdCal_rmin1" value="(FwdCal_zOffset - FwdCal_dz) * tan (2*atan(exp(-6.5)))"/> + <constant name="FwdCal_rmin2" value="(FwdCal_zOffset + FwdCal_dz) * tan (2*atan(exp(-6.5)))"/> + <constant name="FwdCal_active_rmin1" value="(FwdCal_zOffset - FwdCal_dz) * tan (2*atan(exp(-6)))"/> + <constant name="FwdCal_active_rmin2" value="(FwdCal_zOffset + FwdCal_dz) * tan (2*atan(exp(-6)))"/> + <constant name="FwdCal_rmax" value="3600*mm"/> + + <!-- MUON SYSTEM DIMENSIONS --> + <!-- Muon system barrel --> + <constant name="BarMuon_id" value="12"/> + <constant name="BarMuon_rmin1" value="5250*mm"/> + <constant name="BarMuon_rmax1" value="9000*mm"/> + <constant name="BarMuon_z1" value="13000*mm"/> + <constant name="BarMuon_rmin2" value="5245*mm"/> + <constant name="BarMuon_rmax2" value="6500*mm"/> + <constant name="BarMuon_z2" value="10500*mm"/> + <!-- Muon system end-caps --> + <constant name="EndCapMuon_id" value="13"/> + <constant name="EndCapMuon_rmin1" value="2458.67*mm"/> + <constant name="EndCapMuon_rmax1" value="4750*mm"/> + <constant name="EndCapMuon_rmin2" value="2724.47*mm"/> + <constant name="EndCapMuon_rmax2" value="4750*mm"/> + <constant name="EndCapMuon_dz" value="500*mm"/> + <constant name="EndCapMuon_zOffset" value="9500*mm"/> + + <!-- Muon system forward --> + <constant name="FwdBarMuon_id" value="14"/> + <constant name="FwdBarMuon_rmin" value="5250*mm"/> + <constant name="FwdBarMuon_rmax" value="7000*mm"/> + <constant name="FwdBarMuon_dz" value="1750*mm"/> + <constant name="FwdBarMuon_zOffset" value="14000*mm + FwdBarMuon_dz"/> + + <constant name="FwdMuon_id" value="15"/> + <constant name="FwdMuon_rmin" value="62.3*mm"/> + <constant name="FwdMuon_rmax" value="7000*mm"/> + <constant name="FwdMuon_dz" value="1500*mm"/> + <constant name="FwdMuon_zOffset" value="19700*mm + FwdMuon_dz"/> + + </define> + +</lccdd> \ No newline at end of file diff --git a/Detectors/DD4hepDetector/compact/FCChhBaseline/FCChh_DectEmptyMaster.xml b/Detectors/DD4hepDetector/compact/FCChhBaseline/FCChh_DectEmptyMaster.xml new file mode 100644 index 00000000..1cf450a3 --- /dev/null +++ b/Detectors/DD4hepDetector/compact/FCChhBaseline/FCChh_DectEmptyMaster.xml @@ -0,0 +1,26 @@ +<?xml version="1.0" encoding="UTF-8"?> +<lccdd xmlns:compact="http://www.lcsim.org/schemas/compact/1.0" + xmlns:xs="http://www.w3.org/2001/XMLSchema" + xs:noNamespaceSchemaLocation="http://www.lcsim.org/schemas/compact/1.0/compact.xsd"> + + <includes> + <gdmlFile ref="../elements.xml"/> + <gdmlFile ref="../materials.xml"/> + </includes> + + <info name="FCCDectMaster" + title="master file with includes and world dimension" + author="C. Helsens" + url="no" + status="development" + version="1.0"> + <comment>Use this one if you want to use official dimensions but only place one detector inside</comment> + </info> + <define> + <constant name="world_size" value="30*m"/> + <constant name="world_x" value="world_size"/> + <constant name="world_y" value="world_size"/> + <constant name="world_z" value="world_size"/> + </define> + <include ref="FCChh_DectDimensions.xml" /> +</lccdd> \ No newline at end of file diff --git a/Detectors/DD4hepDetector/compact/FCChhBaseline/Tracker.xml b/Detectors/DD4hepDetector/compact/FCChhBaseline/Tracker.xml new file mode 100644 index 00000000..77c296f3 --- /dev/null +++ b/Detectors/DD4hepDetector/compact/FCChhBaseline/Tracker.xml @@ -0,0 +1,36 @@ +<?xml version="1.0" encoding="UTF-8"?> +<lccdd xmlns:compact="http://www.lcsim.org/schemas/compact/1.0" xmlns:xs="http://www.w3.org/2001/XMLSchema" xs:noNamespaceSchemaLocation="http://www.lcsim.org/schemas/compact/1.0/compact.xsd"> + + <info name="TkLayoutTracker" title="TkLayoutTracker" author="Z.Drasal" url="http://fcc-tklayout.web.cern.ch/fcc-tklayout" status="optimization" version="FCChh_v3.03"> + <comment>The tracker geometry as designed and optimized by tkLayout software - design version: FCChh_v3.03</comment> + </info> + + + <readouts> + <readout name="TrackerBarrelReadout"> + <segmentation type="CartesianGridXZ" grid_size_x="0.005*mm" grid_size_z="0.010*mm"/> + <id>system:4,layer:5,module:18,x:-15,z:-15</id> + </readout> + <readout name="TrackerEndcapReadout"> + <segmentation type="CartesianGridXZ" grid_size_x="0.005*mm" grid_size_z="0.010*mm"/> + <id>system:4,posneg:1,disc:5,component:17,x:-15,z:-15</id> + </readout> + </readouts> + <include ref="FCChh_v3.03_Definitions.xml"/> + <detectors> + <detector id="0" name="beampipe" type="BeamTube"> + <dimensions rmin="CentralBeamTube_rmin" rmax="CentralBeamTube_rmax" z="CentralBeamTube_dz" material="Beryllium" vis="violet"/> + </detector> + <detector id="101" name="FCChhInner" type="DD4hep_SubdetectorAssembly" vis="BlueVisTrans"> + <composite name="InnerBRL"/> + <composite name="InnerECAP"/> + </detector> + <detector id="102" name="FCChhOuter" type="DD4hep_SubdetectorAssembly" vis="BlueVisTrans"> + <composite name="OuterBRL"/> + <composite name="OuterECAP"/> + </detector> + <detector id="103" name="FCChhFwdEcap" type="DD4hep_SubdetectorAssembly" vis="BlueVisTrans"> + <composite name="FwdECAP"/> + </detector> + </detectors> +</lccdd> diff --git a/Detectors/DD4hepDetector/src/FCChhTrackerTkLayout_Beampipe.cpp b/Detectors/DD4hepDetector/src/FCChhTrackerTkLayout_Beampipe.cpp index 5b1e1a94..5ec17624 100644 --- a/Detectors/DD4hepDetector/src/FCChhTrackerTkLayout_Beampipe.cpp +++ b/Detectors/DD4hepDetector/src/FCChhTrackerTkLayout_Beampipe.cpp @@ -38,4 +38,4 @@ create_element(dd4hep::Detector& lcdd, xml_h e, dd4hep::SensitiveDetector) return beamtube; } -DECLARE_DETELEMENT(FCChhBeampipe, create_element) +DECLARE_DETELEMENT(BeamTube, create_element) -- GitLab