Print

Print


Commit in GeomConverter/src/org/lcsim/geometry/compact/converter/lcdd on MAIN
AbstractTestBeam.java+1-11.3 -> 1.4
CylindricalBarrelCalorimeter.java+1-11.6 -> 1.7
CylindricalEndcapCalorimeter.java+2-21.12 -> 1.13
DiskTracker.java+1-11.14 -> 1.15
ForwardDetector.java+1-11.8 -> 1.9
PolyhedraBarrelCalorimeter.java+1-11.6 -> 1.7
PolyhedraEndcapCalorimeter.java+1-11.4 -> 1.5
+8-8
7 modified files
region must be set before limit for valid LCDD

GeomConverter/src/org/lcsim/geometry/compact/converter/lcdd
AbstractTestBeam.java 1.3 -> 1.4
diff -u -r1.3 -r1.4
--- AbstractTestBeam.java	28 Oct 2005 00:34:20 -0000	1.3
+++ AbstractTestBeam.java	1 Dec 2005 04:11:10 -0000	1.4
@@ -166,8 +166,8 @@
                 if ( sensitive ) sliceVolume.setSensitiveDetector(sens);
                 
                 /* FIXME: these need to be called automatically whenever a new volume is created --JM */
-                setLimitSet(lcdd, slice, sliceVolume);
                 setRegion(lcdd, slice, sliceVolume);
+                setLimitSet(lcdd, slice, sliceVolume);                
                 
                 structure.addVolume(sliceVolume);
                 

GeomConverter/src/org/lcsim/geometry/compact/converter/lcdd
CylindricalBarrelCalorimeter.java 1.6 -> 1.7
diff -u -r1.6 -r1.7
--- CylindricalBarrelCalorimeter.java	28 Oct 2005 00:34:20 -0000	1.6
+++ CylindricalBarrelCalorimeter.java	1 Dec 2005 04:11:10 -0000	1.7
@@ -82,8 +82,8 @@
                     if (sensitive) volume.setSensitiveDetector(sens);
                     
                     /* FIXME: these need to be called automatically whenever a new volume is created --JM */
-                    setLimitSet(lcdd, slice, volume);
                     setRegion(lcdd, slice, volume);
+                    setLimitSet(lcdd, slice, volume);
                     
                     structure.addVolume(volume);
                     volume1.addPhysVol(new PhysVol(volume));

GeomConverter/src/org/lcsim/geometry/compact/converter/lcdd
CylindricalEndcapCalorimeter.java 1.12 -> 1.13
diff -u -r1.12 -r1.13
--- CylindricalEndcapCalorimeter.java	28 Oct 2005 00:34:20 -0000	1.12
+++ CylindricalEndcapCalorimeter.java	1 Dec 2005 04:11:10 -0000	1.13
@@ -96,9 +96,9 @@
                     volume.setSolid(tube);
                     if (sensitive) volume.setSensitiveDetector(sens);
                     
-                    /* FIXME: these need to be called automatically whenever a new volume is created --JM */
-                    setLimitSet(lcdd, slice, volume);
+                    /* FIXME: these need to be called automatically whenever a new volume is created --JM */                    
                     setRegion(lcdd, slice, volume);
+                    setLimitSet(lcdd, slice, volume);
                     
                     structure.addVolume(volume);
                     

GeomConverter/src/org/lcsim/geometry/compact/converter/lcdd
DiskTracker.java 1.14 -> 1.15
diff -u -r1.14 -r1.15
--- DiskTracker.java	28 Oct 2005 00:34:20 -0000	1.14
+++ DiskTracker.java	1 Dec 2005 04:11:10 -0000	1.15
@@ -92,8 +92,8 @@
                 if (sensitive) volume.setSensitiveDetector(sens);
                 
                 /* FIXME: these need to be called automatically whenever a new volume is created --JM */
-                setLimitSet(lcdd, slice, volume);
                 setRegion(lcdd, slice, volume);
+                setLimitSet(lcdd, slice, volume);                
                 
                 PhysVol physvol = new PhysVol(volume);
                 physvol.setZ(z-zmin -layerWidth/2 + w/2);

GeomConverter/src/org/lcsim/geometry/compact/converter/lcdd
ForwardDetector.java 1.8 -> 1.9
diff -u -r1.8 -r1.9
--- ForwardDetector.java	28 Oct 2005 00:34:20 -0000	1.8
+++ ForwardDetector.java	1 Dec 2005 04:11:10 -0000	1.9
@@ -289,8 +289,8 @@
                     }
                     
                     /* FIXME: these need to be called automatically whenever a new volume is created --JM */
-                    setLimitSet(lcdd, sliceElem, sliceVolume);
                     setRegion(lcdd, sliceElem, sliceVolume);
+                    setLimitSet(lcdd, sliceElem, sliceVolume);                    
                     
                     structure.addVolume(sliceVolume);
                     

GeomConverter/src/org/lcsim/geometry/compact/converter/lcdd
PolyhedraBarrelCalorimeter.java 1.6 -> 1.7
diff -u -r1.6 -r1.7
--- PolyhedraBarrelCalorimeter.java	28 Oct 2005 00:34:20 -0000	1.6
+++ PolyhedraBarrelCalorimeter.java	1 Dec 2005 04:11:11 -0000	1.7
@@ -152,8 +152,8 @@
                     if ( sensitive ) sliceVolume.setSensitiveDetector(sens);
                     
                     /* FIXME: these need to be called automatically whenever a new volume is created --JM */
-                    setLimitSet(lcdd, slice, sliceVolume);
                     setRegion(lcdd, slice, sliceVolume);
+                    setLimitSet(lcdd, slice, sliceVolume);                    
                     
                     structure.addVolume(sliceVolume);
                     

GeomConverter/src/org/lcsim/geometry/compact/converter/lcdd
PolyhedraEndcapCalorimeter.java 1.4 -> 1.5
diff -u -r1.4 -r1.5
--- PolyhedraEndcapCalorimeter.java	28 Oct 2005 00:34:21 -0000	1.4
+++ PolyhedraEndcapCalorimeter.java	1 Dec 2005 04:11:11 -0000	1.5
@@ -150,8 +150,8 @@
                     if ( sensitive ) sliceVolume.setSensitiveDetector(sens);
                     
                     /* FIXME: these need to be called automatically whenever a new volume is created --JM */
-                    setLimitSet(lcdd, slice, sliceVolume);
                     setRegion(lcdd, slice, sliceVolume);
+                    setLimitSet(lcdd, slice, sliceVolume);                    
                     
                     structure.addVolume(sliceVolume);
                     
CVSspam 0.2.8