Commit in LCDetectors/detectors/sidloi on MAIN
compact.xml+40-901.31 -> 1.32
moved ad hoc comments into comment elements (update your GeomConv)

LCDetectors/detectors/sidloi
compact.xml 1.31 -> 1.32
diff -u -r1.31 -r1.32
--- compact.xml	17 Apr 2009 19:37:04 -0000	1.31
+++ compact.xml	17 Apr 2009 22:32:50 -0000	1.32
@@ -6,7 +6,7 @@
         author="Norman Graf, Jeremy McCormick"
         url="http://confluence.slac.stanford.edu/display/ilc/sidloi"
         status="development"
-        version="$Id: compact.xml,v 1.31 2009/04/17 19:37:04 jeremy Exp $">
+        version="$Id: compact.xml,v 1.32 2009/04/17 22:32:50 jeremy Exp $">
         <comment>The compact format for the Silicon Detector as described in the LOI 090204</comment>        
     </info>
     <define>
@@ -152,9 +152,10 @@
     </display>
     <detectors>
         
-        <!-- Trackers  -->
-        <!-- Vertex Detector Barrel -->
+        <comment>Trackers</comment> 
+
         <detector id="1" name="SiVertexBarrel" type="SiTrackerBarrel" readout="SiVertexBarrelHits" insideTrackingVolume="true">
+            <comment>Vertex Detector Barrel</comment>
             <module name="VtxBarrelModuleInner" vis="SiVertexBarrelModuleVis">
                 <module_envelope width="9.8" length="63.0 * 2" thickness="0.6"/>
                 <module_component width="7.6" length="125.0" thickness="VXD_CF_sensor" material="CarbonFiber_25percent" sensitive="false">
@@ -211,8 +212,9 @@
                 <z_layout dr="0.0" z0="0.0" nz="1"/>
             </layer>
         </detector>
+
+        <comment>Vertex Detector Endcaps</comment>
         
-        <!-- Vertex Detector Endcaps -->
         <detector id="2" name="SiVertexEndcap" type="SiTrackerEndcap2" readout="SiVertexEndcapHits">    
             <module name="SiVertexEndcapModule1">
                 <trd x1="3.034" x2="14.682" z="29.280" />
@@ -247,33 +249,9 @@
                 <ring r="48.0" zstart="180" nmodules="16" dz="0.011" module="SiVertexEndcapModule2"/>
             </layer>
         </detector> 
-        <!-- TODO: Need to check values of the dz attribute. -->
-        <!-- TODO: need to check on the supports for these modules. -->
-        <!--
-        <detector id="2" name="SiVertexEndcap" type="SiTrackerEndcap" readout="SiVertexEndcapHits">
-        <module name="SiVertexEndcapModule">
-        <module_component thickness="VXD_CF_sensor" material="CarbonFiber_25percent" />
-        <module_component thickness="0.005*cm" material="Epoxy" />
-        <module_component thickness="0.002*cm" material="Silicon" sensitive="true" />
-        <module_component thickness="0.0093*cm"   material="Silicon" />
-        </module>
-        <layer id="1" inner_r="1.4*cm" outer_r="7.1*cm" inner_z="7.18*cm" thickness="0.1*cm" nwedges="16" module="SiVertexEndcapModule" vis="SiVertexEndcapLayerVis">
-        <module_parameters r_size="19.0" phi_size_max="10.0"/>
-        </layer>
-        <layer id="2" inner_r="1.6*cm" outer_r="7.1*cm" inner_z="9.02*cm" thickness="0.1*cm" nwedges="16" module="SiVertexEndcapModule" vis="SiVertexEndcapLayerVis">
-        <module_parameters r_size="19.0" phi_size_max="10.0" />
-        </layer>            
-        <layer id="3" inner_r="1.8*cm" outer_r="7.1*cm" inner_z="12.16*cm" thickness="0.1*cm" nwedges="16" module="SiVertexEndcapModule" vis="SiVertexEndcapLayerVis">
-        <module_parameters r_size="19.0" phi_size_max="10.0" />
-        </layer>
-        <layer id="4" inner_r="2.0*cm" outer_r="7.1*cm" inner_z="17.0*cm" thickness="0.1*cm" nwedges="16" module="SiVertexEndcapModule" vis="SiVertexEndcapLayerVis">
-        <module_parameters r_size="19.0" phi_size_max="10.0" />
-        </layer>
-        </detector> 
-        -->
- 
-        <!-- Outer Tracker Barrel -->
+
         <detector id="3" name="SiTrackerBarrel" type="SiTrackerBarrel" readout="SiTrackerBarrelHits">
+            <comment>Outer Tracker Barrel</comment>
             <module name="SiTrackerModule_Layer1" vis="SiTrackerBarrelModuleVis">                
                 <module_envelope width="97.79" length="97.79" thickness="0.3*cm"/>                
                 <module_component width="97.79" length="97.79" thickness="0.02*cm" material="PEEK" sensitive="false">
@@ -451,8 +429,8 @@
             </layer>
         </detector>
         
-        <!-- Outer Tracker Endcaps -->
         <detector id="4" name="SiTrackerEndcap" type="SiTrackerEndcap2" readout="SiTrackerEndcapHits" reflect="true">
+            <comment>Outer Tracker Endcaps</comment>
             <module name="Module1" vis="SiTrackerEndcapModuleVis">
                 <trd x1="36.112" x2="46.635" z="100.114/2" />
                 <module_component thickness="0.00052*cm"   material="Copper" />
@@ -523,8 +501,8 @@
             </layer>
         </detector>
         
-        <!-- Forward Tracker inside Vertex Support Barrel -->
         <detector id="15" name="SiTrackerForward" type="SiTrackerEndcap2" readout="SiTrackerForwardHits">    
+            <comment>Forward Tracker inside Vertex Support Barrel</comment>
             <module name="SiTrackerForwardModule1">
                 <trd x1="5.620" x2="32.435" z="67.405" />
                 <module_component thickness="0.002*cm" material="Silicon" sensitive="true" />
@@ -550,31 +528,11 @@
                 <ring r="142.0" zstart="834" nmodules="16" dz="0.011" module="SiTrackerForwardModule3"/>
             </layer>
         </detector>
-        <!-- TODO: Need to check values of the dz attribute. -->
-        <!-- TODO: Need to add SiC support disks -->     
-        <!--
-        <detector id="15" name="SiTrackerForward" type="SiTrackerEndcap" readout="SiTrackerForwardHits">    
-        <module name="SiTrackerForwardModule">
-        <module_component thickness="VXD_CF_sensor" material="CarbonFiber_25percent" />
-        <module_component thickness="0.005*cm" material="Epoxy" />
-        <module_component thickness="0.002*cm" material="Silicon" sensitive="true" />
-        <module_component thickness="0.0093*cm"   material="Silicon" />
-        </module>
-        <layer id="1" inner_r="22.7" outer_r="166.7" inner_z="206.225" thickness="1.0" nwedges="12" module="SiTrackerForwardModule"  vis="SiTrackerForwardVis">
-        <module_parameters r_size="18.0" phi_size_max="5" />
-        </layer>
-        <layer id="2" inner_r="76.7" outer_r="166.7" inner_z="540.677" thickness="1.0" nwedges="12" module="SiTrackerForwardModule"  vis="SiTrackerForwardVis">
-        <module_parameters r_size="18.0" phi_size_max="5" />
-        </layer>    
-        <layer id="3" inner_r="112.7" outer_r="166.7" inner_z="831.761" thickness="1.0" nwedges="12" module="SiTrackerForwardModule"  vis="SiTrackerForwardVis">
-        <module_parameters r_size="18.0" phi_size_max="5" />
-        </layer>        
-        </detector>
-        -->
-        <!-- Calorimeters  -->        
 
-        <!-- EM Calorimeter Barrel -->
+        <comment>Calorimeters</comment>
+
         <detector id="5" name="EcalBarrel" type="EcalBarrel" readout="EcalBarrelHits" vis="EcalBarrelVis">
+            <comment>EM Calorimeter Barrel</comment>
             <dimensions numsides="12" rmin="EcalBarrel_rmin" z="1765.0*2" />
             <staves vis="EcalBarrelStaveVis"/>
             <layer repeat="1">
@@ -601,8 +559,8 @@
             </layer>
         </detector>
         
-        <!-- EM Calorimeter Endcaps -->
         <detector id="6" name="EcalEndcap" type="PolyhedraEndcapCalorimeter2" reflect="true" readout="EcalEndcapHits" vis="EcalEndcapVis">
+            <comment>EM Calorimeter Endcaps</comment>
             <dimensions numsides="12" zmin="EcalEndcap_zmin" rmin="200.0" rmax="1264.5" />
             <layer repeat="1">
                 <slice material = "Silicon" thickness = "0.032*cm" sensitive = "yes" limits="cal_limits" />
@@ -628,8 +586,8 @@
             </layer>
         </detector>
         
-        <!-- Hadron Calorimeter Barrel -->
         <detector id="7" name="HcalBarrel" type="PolyhedraBarrelCalorimeter" readout="HcalBarrelHits" vis="HcalBarrelVis">
+            <comment>Hadron Calorimeter Barrel</comment>
             <dimensions numsides="12" rmin="1419.0" z="3018.0 * 2"/>
             <staves vis="HcalBarrelStavesVis"/>
             <layer repeat="40">
@@ -642,8 +600,8 @@
             </layer>
         </detector>
         
-        <!-- Hadron Calorimeter Endcaps -->
         <detector id="8" name="HcalEndcap" type="PolyhedraEndcapCalorimeter2" readout="HcalEndcapHits" vis="HcalEndcapVis">
+            <comment>Hadron Calorimeter Endcaps</comment>
             <dimensions numsides="12" zmin="1805.0" rmin="200.0" rmax="1469.0" />
             <layer repeat="45">
                 <slice material = "Steel235" thickness = "1.89*cm" />
@@ -655,8 +613,8 @@
             </layer>
         </detector>
         
-        <!-- Muon Calorimeter Barrel -->
         <detector id="9" name="MuonBarrel" type="PolyhedraBarrelCalorimeter" readout="MuonBarrelHits" vis="MuonBarrelVis">
+            <comment>Muon Calorimeter Barrel</comment>
             <dimensions numsides="8" rmin="3464.0" z="3018.0 * 2"/>
             <staves vis="MuonBarrelStavesVis"/>
             <layer repeat="11" vis="MuonBarrelLayerVis">
@@ -679,8 +637,8 @@
             </layer>
         </detector>
         
-        <!-- Muon Calorimeter Endcaps -->
         <detector id="10" name="MuonEndcap" type="PolyhedraEndcapCalorimeter2" readout="MuonEndcapHits" reflect="true" vis="MuonEndcapVis">
+            <comment>Muon Calorimeter Endcaps</comment>
             <dimensions numsides="8" zmin="3028.0" rmin="200.0" rmax="6082.0" />
             <layer repeat="11" vis="MuonEndcapLayerVis">
                 <slice material="Iron" thickness="20.0*cm"  vis="MuonEndcapAbsorberVis"/>
@@ -702,8 +660,8 @@
             </layer>
         </detector>
         
-        <!-- Luminosity Calorimeter -->
         <detector id="11" name="LumiCal" reflect="true" type="CylindricalEndcapCalorimeter" readout="LumiCalHits" vis="LumiCalVis">
+            <comment>Luminosity Calorimeter</comment>
             <dimensions inner_r = "6.0*cm" inner_z = "168.0*cm" outer_r = "19.5*cm" />
             <layer repeat="20" >
                 <slice material = "TungstenDens24" thickness = "0.271*cm" />
@@ -721,8 +679,8 @@
             </layer>
         </detector>
         
-        <!-- Beam Calorimeter -->
         <detector id="12" name="BeamCal" reflect="true" type="ForwardDetector" readout="BeamCalHits" vis="BeamCalVis">
+            <comment>Beam Calorimeter</comment>
             <dimensions outer_r="12.96*cm" inner_r="0.0*cm" inner_z="295.0*cm" />
             <beampipe crossing_angle="0.014" outgoing_r="1.55*cm" incoming_r="1.05*cm" />
             <layer repeat="50">
@@ -734,16 +692,14 @@
             </layer>
         </detector>
                 
+        <comment>START DEAD MATERIAL AND SUPPORTS</comment>
+       
+        <comment>Beampipe</comment> 
         
-        <!-- /\/\/\ START DEAD MATERIAL AND SUPPORTS. /\/\/\ -->
-        
-        <!-- Beampipe -->
-        
-        <!-- Central Be Beampipe -->        
         <detector name="Beampipe" type="PolyconeSupport" insideTrackingVolume="true" vis="BeampipeVis">
+            <comment>Central Be Beampipe</comment>
             <material name="Beryllium"/>
-            <zplane rmin="((37.5-6.25)*bp_cone_slope+1.2)*cm"
-            rmax="((37.5-6.25)*bp_cone_slope+1.2875)*cm" z="-37.5*cm" />
+            <zplane rmin="((37.5-6.25)*bp_cone_slope+1.2)*cm" rmax="((37.5-6.25)*bp_cone_slope+1.2875)*cm" z="-37.5*cm" />
             <zplane rmin="1.2*cm" rmax="1.2875*cm"   z="-6.251*cm"/>
             <zplane rmin="1.2*cm" rmax="1.240*cm" z="-6.25*cm"/>
             <zplane rmin="1.2*cm" rmax="1.240*cm" z="6.25*cm" />
@@ -752,7 +708,7 @@
             rmax="((37.5-6.25)*bp_cone_slope+1.2875)*cm" z="37.5*cm" />
         </detector>
        
-        <!-- Steel beampipe cones -->
+        <comment>Steel beampipe cones</comment>
        
         <detector name="ForwardSupportTube" type="PolyconeSupport" insideTrackingVolume="false" vis="InvisibleNoDaughters">
            <material name="Steel235"/>
@@ -766,7 +722,7 @@
             <zplane rmin = "15.5*cm" rmax="19.5*cm" z="-182.0*cm" />
         </detector>
         
-        <!-- Incoming and outgoing beampipes in far forward region -->        
+        <comment>Incoming and outgoing beampipes in far forward region</comment>
         
         <detector name="NorthIncomingBeampipe" type="TubeSegment" vis="InvisibleNoDaughters">
             <material name="Iron" />
@@ -796,9 +752,8 @@
             <rotation x="0.0" y="0.0070" z="0.0" />
         </detector>
         
-        <!-- BeamPipe Liner to shield bremsstrahlung photons-->
-        
         <detector name="BeamPipeLiner" type="PolyconeSupport" insideTrackingVolume="true" vis="InvisibleNoDaughters">
+            <comment>BeamPipe Liner to shield bremsstrahlung photons</comment>
             <material name="Titanium"/>
             <zplane rmin = "((tracking_region_zmax-6.25*cm)*bp_cone_slope+1.1925*cm)" rmax="((tracking_region_zmax-6.25*cm)*bp_cone_slope+1.2*cm)" z="-tracking_region_zmax" />
             <zplane rmin="1.1925*cm"    rmax="1.2*cm"  z="-6.251*cm"/>
@@ -808,9 +763,8 @@
             <zplane rmin = "((tracking_region_zmax-6.25*cm)*bp_cone_slope+1.1925*cm)" rmax="((tracking_region_zmax-6.25*cm)*bp_cone_slope+1.2*cm)" z="tracking_region_zmax" />
         </detector>   
        
-        <!-- Vacuum inside beampipe -->
-        
         <detector name="BeamPipeVacuum" type="PolyconeSupport" insideTrackingVolume="true" vis="InvisibleNoDaughters">
+            <comment>Vacuum inside beampipe</comment>
             <material name="Vacuum"/>
             <zplane rmin="0.*cm" rmax="((tracking_region_zmax-6.25)*bp_cone_slope+1.1925)" z="-tracking_region_zmax" />
             <zplane rmin="0.*cm" rmax="1.1925*cm"  z="-6.251*cm"/>
@@ -834,11 +788,10 @@
             <zplane rmin="0.*cm" rmax="6.0*cm"    z="-tracking_region_zmax" />
         </detector> 
         
+        <comment>Vertex Detector Supports and Readout</comment>
         
-        <!-- Vertex Detector Supports and Readout -->
-        
-        <!-- Double-walled Carbon Fiber support tube -->
         <detector name="VertexBarrelSupports" type="MultiLayerTracker">
+            <comment>Double-walled Carbon Fiber support tube</comment>
             <layer id="6" inner_r = "16.87*cm" outer_z = "89.48*cm">
                 <slice material = "CarbonFiber" thickness ="VXD_CF_support"/>
             </layer>
@@ -856,9 +809,8 @@
             </layer>
         </detector>
         
-        <!-- Readout and Cabling  -->
-       
         <detector name="VertexReadout" type="DiskTracker" reflect="true">
+            <comment>Readout and Cabling</comment>
             <layer id="1" inner_r = "1.46*cm" outer_r = "1.66*cm"  inner_z= "6.4*cm">
                 <slice material = "G10" thickness ="0.5*cm"/>
             </layer>
@@ -952,10 +904,10 @@
             <zplane rmin = "1.542*cm"  rmax="1.842*cm"  z="12.0*cm"/>
         </detector>
         
-        <!-- Outer Tracker Supports and Readout -->
+        <comment>Outer Tracker Supports and Readout</comment>
         
-        <!-- Barrels  -->
         <detector name="TrackerBarrelSupports" type="MultiLayerTracker">
+            <comment>Barrels</comment>
             <layer id="1" inner_r="206.0" outer_z="577.328">
                 <slice material="CarbonFiber" thickness="0.05*cm" />
                 <slice material="Rohacell31_15percent" thickness="0.8075*cm" />
@@ -983,7 +935,8 @@
             </layer>
         </detector>
         
-        <!-- Dished endcap disks  -->
+        <comment>Dished endcap disks</comment>
+
         <detector name="SiTrackerEndcapSupport1" type="PolyconeSupport" insideTrackingVolume="true" vis="InvisibleNoDaughters">
             <material name="CarbonFiber"/>
             <zplane rmin="510.448" rmax="510.448" z="750.417-0.001" />
@@ -1153,9 +1106,8 @@
             <zplane rmin="206.234" rmax="206.234" z="-1636.392-0.001" />
         </detector>        
        
-        <!-- Readouts -->
-        
         <detector name="TrackerReadout" type="DiskTracker" reflect="true">
+            <comment>Readouts</comment>
             <layer id="1" inner_r="25.7*cm" inner_z="590.402" outer_r="45.6*cm">
                 <slice material="G10" thickness="0.057*cm" />
                 <slice material="Copper" thickness="0.0038*cm" />
@@ -1177,9 +1129,8 @@
                 <slice material="Copper" thickness="0.0164*cm" />
             </layer>
         </detector>
-  
-       
-        <!-- Masks -->
+ 
+        <comment>Masks</comment>
         
         <detector name="ForwardM1" type="PolyconeSupport" insideTrackingVolume="false" vis="InvisibleNoDaughters">
             <material name="TungstenDens24"/>
@@ -1201,8 +1152,7 @@
             </layer>
         </detector>
   
-      
-        <!-- Solenoid -->
+        <comment>Solenoid</comment>
         
         <detector name="SolenoidCoilBarrel" type="MultiLayerTracker" insideTrackingVolume="false">
             <layer id="1" inner_r="SolenoidBarrelInnerRadius" outer_z="SolenoidBarrelOuterZ" vis="SolenoidBarrelLayerVis">
CVSspam 0.2.8