Commit in GeomConverter on MAIN
src/org/lcsim/geometry/compact/converter/lcdd/SiTrackerEndcap2.java+91.6 -> 1.7
testResources/org/lcsim/geometry/compact/converter/lcdd/SiTrackerEndcap2Test.xml+7-131.2 -> 1.3
+16-13
2 modified files
JM: visualization for SiTrackerEndcap2 modules and module components (no layers)

GeomConverter/src/org/lcsim/geometry/compact/converter/lcdd
SiTrackerEndcap2.java 1.6 -> 1.7
diff -u -r1.6 -r1.7
--- SiTrackerEndcap2.java	6 Dec 2008 00:26:48 -0000	1.6
+++ SiTrackerEndcap2.java	12 Feb 2009 02:56:00 -0000	1.7
@@ -147,6 +147,10 @@
 	    lcdd.add(envelope);
 	    Volume volume = new Volume(params.getName() + "Volume", envelope, vacuum);
 	    makeModuleComponents(volume, params, sd, lcdd);
+	    if (params.getVis() != null)
+	    {
+	    	volume.setVisAttributes(lcdd.getVisAttributes(params.getVis()));
+	    }
 	    lcdd.add(volume);
 	    return volume;
 	}
@@ -208,6 +212,11 @@
                 volume.setSensitiveDetector(sd);
                 ++sensor;
             }
+            
+            if (component.getVis() != null)
+    	    {
+    	    	volume.setVisAttributes(lcdd.getVisAttributes(component.getVis()));
+    	    }
 
             posY += thickness / 2;
         }   

GeomConverter/testResources/org/lcsim/geometry/compact/converter/lcdd
SiTrackerEndcap2Test.xml 1.2 -> 1.3
diff -u -r1.2 -r1.3
--- SiTrackerEndcap2Test.xml	3 Dec 2008 00:53:45 -0000	1.2
+++ SiTrackerEndcap2Test.xml	12 Feb 2009 02:56:01 -0000	1.3
@@ -15,26 +15,20 @@
   </define>
   <materials>
   </materials>
-<!--
   <display>
-    <vis name="TestVis" alpha="1.0" r="1.0" g="0.0" b="0.0" drawingStyle="wireframe" lineStyle="unbroken" showDaughters="true" visible="true"/>
+    <vis name="ModuleVis" alpha="1.0" r="1.0" g="0.0" b="0.0" drawingStyle="wireframe" lineStyle="unbroken" showDaughters="true" visible="true"/>
+    <vis name="SensorVis" alpha="1.0" r="1.0" g="1.0" b="0.0" drawingStyle="solid" showDaughters="false" visible="true"/>
   </display>
--->
   <detectors>
     <detector id="1" name="SiTrackerEndcap2" type="SiTrackerEndcap2" readout="TestReadout">
-        <module name="Module1">
-            <trd x1="65.2422" x2="88.47" z="110.48" />
-            <module_component thickness="1.0" material="Silicon"/>
-        </module>
-        <module name="Module2">
+        <module name="Module1" vis="ModuleVis">
             <trd x1="88.63" x2="118.5" z="92.6" />
-            <module_component thickness="5.0" material="Silicon" sensitive="true"/>
-            <module_component thickness="2.0" material="Silicon"/>
-            <module_component thickness="5.0" material="Silicon" sensitive="true"/>
+            <module_component thickness="5.0" material="Silicon" sensitive="true" vis="SensorVis"/>
+            <module_component thickness="2.0" material="Silicon" vis="InvisibleNoDaughters"/>
+            <module_component thickness="5.0" material="Silicon" sensitive="true" vis="SensorVis"/>
         </module>
         <layer id="1">
-            <ring r="1210.0" phi0="0.0" zstart="855.0" dz="1.25" nmodules="24" module="Module2"/>
-<!--            <ring r="200.0" phi0="0.0" zstart="1100.0" dz="1.1" nmodules="30" module="Module1"/>-->
+            <ring r="1210.0" phi0="0.0" zstart="855.0" dz="1.25" nmodules="24" module="Module1"/>
         </layer>
     </detector>
   </detectors>
CVSspam 0.2.8