diff --git a/compact/ecal.xml b/compact/ecal.xml index c6e5f623ac28efe16408c90433139d32bc4bff67..a98a381b76bfe0771f08fd436b3c17cb2c8e60a6 100644 --- a/compact/ecal.xml +++ b/compact/ecal.xml @@ -1,15 +1,6 @@ <lccdd> <define> - <constant name="CrystalEndcap_rmin" value="VertexTrackerInnerRadius"/> - <constant name="CrystalEndcap_rmax" value="EcalEndcapN_rmin"/> - <constant name="CrystalBox_x_length" value="20.0*mm"/> - <constant name="CrystalBox_y_length" value="20.0*mm"/> - <constant name="CrystalBox_z_length" value="200.0*mm"/> - <constant name="CrystalBox_offset" value="0.000001*mm"/> - <constant name="CrystalEndcap_x_pos" value="0.0*m"/> - <constant name="CrystalEndcap_y_pos" value="0.0*m"/> - <constant name="CrystalEndcap_z_pos" value="-EcalEndcap_zmin"/> </define> <limits> @@ -23,6 +14,8 @@ <display> </display> + + <detectors> <comment> diff --git a/reference_detector.xml b/reference_detector.xml index 83ff3cdb7e409b5929ada0c076a74866ee862c5f..bff08aba0d741fb0b3f51567ead6b1f278a9b4a1 100644 --- a/reference_detector.xml +++ b/reference_detector.xml @@ -2,7 +2,6 @@ xmlns:xs="http://www.w3.org/2001/XMLSchema" xs:noNamespaceSchemaLocation="http://www.lcsim.org/schemas/compact/1.0/compact.xsd"> - <!-- Some information about detector --> <info name="Test Detector" title="Test Detector" author="Jihee Kim" url="https://eicweb.phy.anl.gov/EIC/detectors/reference_detector.git" @@ -11,13 +10,11 @@ <comment>Test Detector</comment> </info> - <!-- Use DD4hep elements and materials definitions --> <includes> <gdmlFile ref="elements.xml"/> <gdmlFile ref="materials.xml"/> </includes> - <!-- Define the dimensions of the world volume --> <define> <constant name="world_side" value="50*m"/> <constant name="world_x" value="world_side"/> @@ -41,13 +38,14 @@ <regions> </regions> - <!-- Common Generic visualization attributes --> <comment>Common Generic visualization attributes</comment> <display> <vis name="TestDetectorVis" alpha="0.4" r= "0.1" g="0.0" b="0.1" showDaughters="true" visible="true"/> </display> - <!-- Define detector --> + + <include ref="compact/ecal.xml"/> + <detectors> <comment> Central Barrel Solenoid Magnet @@ -62,6 +60,7 @@ </detector> </detectors> + <plugins> </plugins>