Print

Print


Commit in GeomConverter/src/org/lcsim/geometry/segmentation on RefactorBranch
ProjectiveCylinder.java+2-11.18 -> 1.18.2.1
ProjectiveZPlane.java+2-11.16 -> 1.16.2.1
+4-2
2 modified files
Update segmentations to use SegmentationBase utility methods.

GeomConverter/src/org/lcsim/geometry/segmentation
ProjectiveCylinder.java 1.18 -> 1.18.2.1
diff -u -r1.18 -r1.18.2.1
--- ProjectiveCylinder.java	29 Jul 2005 23:08:14 -0000	1.18
+++ ProjectiveCylinder.java	28 Sep 2005 00:13:29 -0000	1.18.2.1
@@ -5,6 +5,7 @@
 import org.lcsim.geometry.layer.Layering;
 import org.lcsim.geometry.util.IDDescriptor;
 import org.lcsim.geometry.util.IDEncoder;
+import org.lcsim.geometry.Layered;
 
 /**
  *
@@ -76,7 +77,7 @@
       {
          int l = values[layerIndex] + i;
 
-         if (l<0 || l>=detector.getLayering().getLayerCount()) continue;
+         if (l<0 || l>= getNumberOfLayers() ) continue;
          encoder.setValue(layerIndex,l);
 
          for (int j=-deltaTheta;j<=deltaTheta;j++)

GeomConverter/src/org/lcsim/geometry/segmentation
ProjectiveZPlane.java 1.16 -> 1.16.2.1
diff -u -r1.16 -r1.16.2.1
--- ProjectiveZPlane.java	29 Jul 2005 23:08:14 -0000	1.16
+++ ProjectiveZPlane.java	28 Sep 2005 00:13:29 -0000	1.16.2.1
@@ -6,6 +6,7 @@
 import org.jdom.Element;
 import org.lcsim.geometry.util.IDDescriptor;
 import org.lcsim.geometry.util.IDEncoder;
+import org.lcsim.geometry.Layered;
 
 /**
  * @author tonyj
@@ -89,7 +90,7 @@
         {
             int l = values[layerIndex] + i;
             
-            if (l<0 || l>=detector.getLayering().getLayerCount()) continue;
+            if (l<0 || l>= getNumberOfLayers() ) continue;
             encoder.setValue(layerIndex,l);
             
             for (int j=-deltaTheta;j<=deltaTheta;j++)
CVSspam 0.2.8