Print

Print


Commit in GeomConverter/src/org/lcsim/geometry/compact/converter/lcdd on MAIN
LCDDDetector.java-121.16 -> 1.17
util/LCDD.java+12-11.21 -> 1.22
+12-13
2 modified files
JM: Fix GeomConverter build failure.

GeomConverter/src/org/lcsim/geometry/compact/converter/lcdd
LCDDDetector.java 1.16 -> 1.17
diff -u -r1.16 -r1.17
--- LCDDDetector.java	17 Sep 2006 01:51:34 -0000	1.16
+++ LCDDDetector.java	18 Sep 2006 05:13:55 -0000	1.17
@@ -202,18 +202,6 @@
             }
         }
         
-        // Set the world volume to invisible.
-        VisAttributes worldVis = new VisAttributes("WorldVis");
-        worldVis.setVisible(false);
-        lcdd.getWorldVolume().setVisAttributes(worldVis);
-        lcdd.add(worldVis);
-        
-        // Set the tracking volume to invisible.
-        VisAttributes trackingVis = new VisAttributes("TrackingVis");
-        trackingVis.setVisible(false);               
-        lcdd.getTrackingVolume().setVisAttributes(trackingVis);
-        lcdd.add(trackingVis);
-        
         /* fields */
         for (Field field : getFields().values())
         {

GeomConverter/src/org/lcsim/geometry/compact/converter/lcdd/util
LCDD.java 1.21 -> 1.22
diff -u -r1.21 -r1.22
--- LCDD.java	17 Sep 2006 01:51:35 -0000	1.21
+++ LCDD.java	18 Sep 2006 05:13:56 -0000	1.22
@@ -85,7 +85,7 @@
         trackingVolume.setSolid(trackingSolid);
         structure.setTrackingVolume(trackingVolume);
         worldVolume.addPhysVol(new PhysVol(trackingVolume));
-        
+                
         Element setup = new Element("setup");
         setup.setAttribute("name","Default");
         setup.setAttribute("version","1.0");
@@ -119,6 +119,17 @@
         structure.removeContent(worldVolume);
         structure.addContent(worldVolume);
         
+        // Set the world volume to invisible.
+        VisAttributes worldVis = new VisAttributes("WorldVis");
+        worldVis.setVisible(false);
+        this.getWorldVolume().setVisAttributes(worldVis);
+        this.add(worldVis);
+        
+        // Set the tracking volume to invisible.
+        VisAttributes trackingVis = new VisAttributes("TrackingVis");
+        trackingVis.setVisible(false);               
+        this.getTrackingVolume().setVisAttributes(trackingVis);
+        this.add(trackingVis);                
     }
     
     public Solids getSolids()
CVSspam 0.2.8