diff --git a/compact/ci_HCAL.xml b/compact/ci_HCAL.xml index a5d335e9ba336e47bc73a6c33d7d8ef899b2368f..ba4c8465767de6b13958cd1736b323e85c3ad949 100644 --- a/compact/ci_HCAL.xml +++ b/compact/ci_HCAL.xml @@ -2,7 +2,7 @@ xmlns:xs="http://www.w3.org/2001/XMLSchema" xs:noNamespaceSchemaLocation="http://www.lcsim.org/schemas/compact/1.0/compact.xsd"> - <!-- Some information about detector --> + <!-- Some information about detector--> <info name="Central Ion HCAL" title="Central Ion HCAL" author="Marshall Scott" url="https://eicweb.phy.anl.gov/EIC/detectors/reference_detector.git" @@ -10,15 +10,12 @@ version="v1 2021-03-31"> <comment>Central Ion HCAL</comment> </info> - - <!-- Use DD4hep elements and materials definitions --> + <includes> - <gdmlFile ref="elements.xml"/> - <gdmlFile ref="materials.xml"/> - <gdmlFile ref="refdetector_defs.xml"/> </includes> - <!-- Define the dimensions of the world volume --> + + <!-- These definitons are in the definitions.xml file <define> <constant name="ci_HCAL_id" value="1"/> <constant name="ci_HCAL_rin" value="0 * cm"/> @@ -33,6 +30,7 @@ <constant name="ci_HCAL_lay_thickness" value="2* cm"/> <constant name="ci_HCAL_lay_gapz" value="2* cm"/> </define> + --> <limits> <comment>Not defined within the ci_HCAL.hh file</comment> @@ -42,14 +40,10 @@ <comment>Not defined within the ci_HCAL.hh file</comment> </regions> - <!-- Common Generic visualization attributes --> - <!-- change this --> - <comment>Common Generic visualization attributes</comment> <display> - <vis name="ci_HCALVis" r= "0.8" g="0.4" b="0.3" alpha="0.8" showDaughters="true" visible="true"/> </display> - <!-- Define detector, currentky dummy values --> + <!-- Define detector --> <detectors> <comment> Central Ion HCAL diff --git a/compact/definitions.xml b/compact/definitions.xml index 032c7fcc65ff189ac18fa9ce7250b3a9766b5933..e7bb5498da9745626e2fc8df2bcd1c22f546386d 100644 --- a/compact/definitions.xml +++ b/compact/definitions.xml @@ -490,14 +490,14 @@ Central Ion GEM Parameters -------------------------- </comment> - <constant name="ci_GEM_id" value="1"> - <constant name="ci_GEM_rin" value="10 * cm"> - <constant name="ci_GEM_rout" value="95 * cm"> - <constant name="ci_GEM_sizez" value="30 * cm"> - <constant name="ci_GEM_shiftz" value="0 * cm"> - <constant name="ci_GEM_posz" value="0 * cm"> - <constant name="ci_GEM_posx" value="0 * cm"> - <constant name="ci_GEM_nlayers" value="8"> + <constant name="ci_GEM_id" value="1"/> + <constant name="ci_GEM_rin" value="10 * cm"/> + <constant name="ci_GEM_rout" value="95 * cm"/> + <constant name="ci_GEM_sizez" value="30 * cm"/> + <constant name="ci_GEM_shiftz" value="0 * cm"/> + <constant name="ci_GEM_posz" value="0 * cm"/> + <constant name="ci_GEM_posx" value="0 * cm"/> + <constant name="ci_GEM_nlayers" value="8"/>