changed .xml

compact/ci_HCAL.xml

@@ -11,14 +11,11 @@
     <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

compact/definitions.xml

@@ -604,14 +604,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"/>
 
 
 >>>>>>> 57cf00b (Changed .xml files and ci_GEM.cpp)