Print

Print


Commit in GeomConverter/src/org/lcsim/geometry/segmentation on MAIN
NonprojectiveCylinder.java+4-41.8 -> 1.9
ProjectiveCylinder.java+4-41.14 -> 1.15
SegmentationBase.java+7-61.3 -> 1.4
+15-14
3 modified files
Took out global/local enum because not used currently.

GeomConverter/src/org/lcsim/geometry/segmentation
NonprojectiveCylinder.java 1.8 -> 1.9
diff -u -r1.8 -r1.9
--- NonprojectiveCylinder.java	12 Jul 2005 18:23:30 -0000	1.8
+++ NonprojectiveCylinder.java	13 Jul 2005 07:07:15 -0000	1.9
@@ -53,10 +53,10 @@
      * In the simulator, this is actually local because local -> global
      * is applied depending on cylinder's position.  --JM
      */
-    public CoordinateSystemType getCoordinateSystemType()
-    {
-        return CoordinateSystemType.GLOBAL;
-    }
+    //public CoordinateSystemType getCoordinateSystemType()
+    //{
+    //    return CoordinateSystemType.GLOBAL;
+    //}
 
     void setGridSizePhi(double gsp)
     {

GeomConverter/src/org/lcsim/geometry/segmentation
ProjectiveCylinder.java 1.14 -> 1.15
diff -u -r1.14 -r1.15
--- ProjectiveCylinder.java	12 Jul 2005 18:23:30 -0000	1.14
+++ ProjectiveCylinder.java	13 Jul 2005 07:07:15 -0000	1.15
@@ -25,10 +25,10 @@
       phiBins = node.getAttribute("phiBins").getIntValue();
    }
 
-   public CoordinateSystemType getCoordinateSystemType()
-   {
-       return CoordinateSystemType.GLOBAL;
-   }
+   //public CoordinateSystemType getCoordinateSystemType()
+   //{
+   //    return CoordinateSystemType.GLOBAL;
+   //}
 
    public double getPhi()
    {

GeomConverter/src/org/lcsim/geometry/segmentation
SegmentationBase.java 1.3 -> 1.4
diff -u -r1.3 -r1.4
--- SegmentationBase.java	13 Jul 2005 05:28:07 -0000	1.3
+++ SegmentationBase.java	13 Jul 2005 07:07:15 -0000	1.4
@@ -22,14 +22,15 @@
  *
  * FIXME: Why not implement functions that "callback" to the detector object within the detector class instead?
  * FIXME: It makes no sense that this class extends what is, in effect, a CalorimeterId, e.g. CalorimeterIDDecoder.
+ * Why couple these two classes so closely?
  *
  */
 public abstract class SegmentationBase
         extends org.lcsim.geometry.compact.Segmentation
         implements CalorimeterIDDecoder
 {
-    public enum CoordinateSystemType
-    { GLOBAL, LOCAL, UNDEFINED };
+    //public enum CoordinateSystemType
+    //{ GLOBAL, LOCAL, UNDEFINED };
     
     protected IDDecoder decoder;
     protected IDEncoder encoder;
@@ -46,10 +47,10 @@
         super(e);
     }
     
-    public CoordinateSystemType getCoordinateSystemType()
-    {
-        return CoordinateSystemType.UNDEFINED;
-    }
+    //public CoordinateSystemType getCoordinateSystemType()
+    //{
+    //    return CoordinateSystemType.UNDEFINED;
+    //}
     
     abstract public double getX();
     
CVSspam 0.2.8