Commit in GeomConverter/src/org/lcsim/geometry/compact/converter/lcdd on MAIN
PolyhedraBarrelCalorimeter.java+5-51.11 -> 1.12
PolyhedraEndcapCalorimeter.java+8-61.8 -> 1.9
+13-11
2 modified files


GeomConverter/src/org/lcsim/geometry/compact/converter/lcdd
PolyhedraBarrelCalorimeter.java 1.11 -> 1.12
diff -u -r1.11 -r1.12
--- PolyhedraBarrelCalorimeter.java	17 Oct 2006 22:14:53 -0000	1.11
+++ PolyhedraBarrelCalorimeter.java	17 Oct 2006 23:38:52 -0000	1.12
@@ -164,11 +164,6 @@
 				layer_volume.setSolid(layer_box);
 				layer_volume.setMaterial(air);
 
-				// Set region, limitset, and vis.
-				setRegion(lcdd, layer_element, layer_volume);
-				setLimitSet(lcdd, layer_element, layer_volume);
-				setVisAttributes(lcdd, node, layer_volume);
-
 				// Create the slices (sublayers) within the layer.
 				double slice_position_z = -(layer_thickness / 2);
 				
@@ -230,6 +225,11 @@
 					++slice_number;				
 				}
 
+				// Set region, limitset, and vis.
+				setRegion(lcdd, layer_element, layer_volume);
+				setLimitSet(lcdd, layer_element, layer_volume);
+				setVisAttributes(lcdd, node, layer_volume);
+				
 				// Add the layer logical volume to the structure.
 				structure.addVolume(layer_volume);
 

GeomConverter/src/org/lcsim/geometry/compact/converter/lcdd
PolyhedraEndcapCalorimeter.java 1.8 -> 1.9
diff -u -r1.8 -r1.9
--- PolyhedraEndcapCalorimeter.java	17 Oct 2006 23:20:03 -0000	1.8
+++ PolyhedraEndcapCalorimeter.java	17 Oct 2006 23:38:53 -0000	1.9
@@ -195,14 +195,16 @@
                     
                     ++slice_number;                    
                 }
-                
-                lcdd.add(layer_volume);
-                
+                                
                 setRegion(lcdd, layer_element, layer_volume);
-                setLimitSet(lcdd, layer_element, layer_volume);                    
-                
+                setLimitSet(lcdd, layer_element, layer_volume);                                    
                 setVisAttributes(lcdd, node, layer_volume);              
-                                
+                
+				// Set region, limitset, and vis.
+				setRegion(lcdd, layer_element, layer_volume);
+				setLimitSet(lcdd, layer_element, layer_volume);
+				setVisAttributes(lcdd, node, layer_volume);
+                
                 PhysVol layer_physvol = new PhysVol(layer_volume);
                 layer_physvol.setPosition(layer_position);
                 layer_physvol.addPhysVolID("layer", layer_number);
CVSspam 0.2.8