Print

Print
Commit in GeomConverter/src/org/lcsim/geometry/segmentation on RefactorBranch
GridXYZ.java+1-11.15 -> 1.15.2.1
NonprojectiveCylinder.java+2-21.15.2.1 -> 1.15.2.2
SegmentationBase.java+11-21.6.2.1 -> 1.6.2.2
+14-5
3 modified files
Wrapped all direct calls to getLayering() in SegmentationBase utility functions.  (Will make it easier to change later.)
GeomConverter/src/org/lcsim/geometry/segmentation
GridXYZ.java 1.15 -> 1.15.2.1
diff -u -r1.15 -r1.15.2.1
--- GridXYZ.java	26 Sep 2005 19:24:05 -0000	1.15
+++ GridXYZ.java	28 Sep 2005 00:31:53 -0000	1.15.2.1
@@ -122,7 +122,7 @@

     
     private void computeGlobalPosition()
     {

-        _globalPos = getSubdetector().transformLocalToGlobal(_localPos);

+        _globalPos = transformLocalToGlobal(_localPos);

     }
     
     private void computeLocalX()
GeomConverter/src/org/lcsim/geometry/segmentation
NonprojectiveCylinder.java 1.15.2.1 -> 1.15.2.2
diff -u -r1.15.2.1 -r1.15.2.2
--- NonprojectiveCylinder.java	28 Sep 2005 00:11:33 -0000	1.15.2.1
+++ NonprojectiveCylinder.java	28 Sep 2005 00:31:53 -0000	1.15.2.2
@@ -274,7 +274,7 @@

 	double mean_t = (getRMax()-getRMin()) / getNumberOfLayers();
 
 	int ilay = (int)Math.floor( depth / mean_t );

-	LayerStack stack = ((Layered)detector).getLayering().getLayers();

+	LayerStack stack = getLayering().getLayers();

 	Layer layer = stack.getLayer(ilay);
 	double depHi = stack.getThicknessToLayerBack(ilay);
 	double depLo = depHi - layer.getThickness();

@@ -318,7 +318,7 @@

      * @param layer layer index
      */
     private double getRadiusSensitiveMid(int ilay) {

-	LayerStack stack = ((Layered)detector).getLayering().getLayers();

+	LayerStack stack = getLayering().getLayers();

 	Layer layer = stack.getLayer(ilay);
 
 	double preLayers = 0;
GeomConverter/src/org/lcsim/geometry/segmentation
SegmentationBase.java 1.6.2.1 -> 1.6.2.2
diff -u -r1.6.2.1 -r1.6.2.2
--- SegmentationBase.java	28 Sep 2005 00:13:13 -0000	1.6.2.1
+++ SegmentationBase.java	28 Sep 2005 00:31:53 -0000	1.6.2.2
@@ -8,14 +8,13 @@

 
 import org.lcsim.geometry.Layered;
 import org.jdom.Element;

+import org.lcsim.geometry.layer.Layering;

 
 /**
  * @author jeremym
  *
  * Base implementation of segmentation
  *

- * FIXME: Nothing to do here?
- *

  */
 public class SegmentationBase extends org.lcsim.geometry.compact.Segmentation
 {

@@ -42,4 +41,14 @@

     {
         return ((Layered)detector).getLayering().getLayerCount();
     }

+    
+    protected double[] transformLocalToGlobal(double[] localPos)
+    {
+        detector.transformLocalToGlobal(localPos);
+    }
+    
+    protected Layering getLayering()
+    {
+        return ((Layered)detector).getLayering();
+    }

 }

\ No newline at end of file
CVSspam 0.2.8