LISTSERV 16.5 - LCD-CVS Archives

- - /* /\/\/\ ID description /\/\/\ */ - public int getFieldCount(); - public String getFieldName(int index); - public int getFieldIndex(String name); - public void setIDDescription(IDDescriptor id);

+ + /* /\/\/\ ID description /\/\/\ */ + public int getFieldCount(); + public String getFieldName(int index); + public int getFieldIndex(String name); + public void setIDDescription(IDDescriptor id);

- int klay = values[layerIndex]; - int kx = values[xIndex]; - int ky = values[yIndex]; - // System.out.println("Ref.ID: ref="+klay+" "+kx+" "+ky - // +" (hex "+Long.toHexString(saveID)+")"); - // long system = (saveID>>7) & 0x1ff; - // System.out.println("hit pos: x="+getX()+", y="+getY()+", - // z="+getZ()+", system="+system);

+// int klay = values[layerIndex]; +// int kx = values[xIndex]; +// int ky = values[yIndex]; +// System.out.println("Ref.ID: ref="+klay+" "+kx+" "+ky +// +" (hex "+Long.toHexString(saveID)+")"); +// long system = (saveID>>7) & 0x1ff; +// System.out.println("hit pos: x="+getX()+", y="+getY() +// +", z="+getZ()+", system="+system);

- // int kklay = values[layerIndex]; - // int kkx = values[xIndex]; - // int kky = values[yIndex]; - // System.out.println("In a border? - // Neighbors="+size+"/"+result.length - // +", ref="+kklay+" "+kkx+" "+kky); -

- // int kklay = values[layerIndex]; - // int kkx = values[xIndex]; - // int kky = values[yIndex]; - // System.out.println("Neighbors="+size+"/"+result.length - // +", ref="+kklay+" "+kkx+" "+kky - // +" (hex "+Long.toHexString(encoder.getID())+")"); - - // System.out.println("Leaving getNeighbours: current id=" - // +values[layerIndex]+" "+values[xIndex] - // +" "+values[yIndex]);

double theta = Math.atan2(rho, z); if(theta < 0) { // If never prints out, the whole if can be dropped System.out.println("ProjCylinder: Is this really needed?!?");

// In order to be general, we should not assume that all // layers have the same thickness. Therefore, one has to // guess the starting layer (based on average thickness), and

GeomConverter/src/org/lcsim/geometry/util

BaseIDDecoder.java 1.8 -> 1.9

diff -u -r1.8 -r1.9
--- BaseIDDecoder.java	14 Feb 2006 21:13:05 -0000	1.8
+++ BaseIDDecoder.java	15 Mar 2006 23:47:33 -0000	1.9
@@ -17,33 +17,33 @@

  * A basic implementation of org.lcsim.geometry.IDDecoder
  * for others to extend.  It uses the org.lcsim.geometry.util
  * classes for functionality.

- *

+ *

  * @author jeremym
  */
 public class BaseIDDecoder
         implements org.lcsim.geometry.IDDecoder

-{

+{

     protected org.lcsim.geometry.util.IDDecoder decoder;
     protected IDDescriptor descriptor;
     protected int[] values;
     protected boolean valid = false;
     protected Subdetector detector;
     protected int layerIndex;

     public BaseIDDecoder()
     {}

     public BaseIDDecoder( IDDescriptor id)
     {
         setIDDescription(id);
     }

     public org.lcsim.geometry.ExpandedIdentifier getExpandedIdentifier()
     {

-        org.lcsim.geometry.util.ExpandedIdentifier id =

+        org.lcsim.geometry.util.ExpandedIdentifier id =

             new org.lcsim.geometry.util.ExpandedIdentifier();
         if (isValid())

-        {

+        {

             for (int i=0; i < descriptor.fieldCount(); i++)
             {
                 String fieldname = descriptor.fieldName(i);

@@ -57,101 +57,101 @@

         }
         return id;
     }

     public org.lcsim.geometry.ExpandedIdentifier getExpandedIdentifier(long id)
     {
         setID(id);
         return getExpandedIdentifier();
     }

     public double getX()
     {
         return 0;
     }

     public double getY()
     {
         return 0;
     }

     public double getZ()
     {
         return 0;
     }

     public double getPhi()
     {
         return 0;
     }

     public double getTheta()
     {
         return 0;
     }

     public double[] getPosition()
     {
         return new double[] { getX(), getY(), getZ() };
     }

     public void setID(long id)
     {
         decoder.setID(id);
         decoder.getValues(values);

-        valid = true;

+        valid = true;

     // FIXME: dup of util.IDDecoder method
     public int getValue(String field)
     {
         return decoder.getValue(field);
     }

     // FIXME: dup of util.IDDecoder method
     public int getValue(int index)
     {
         return decoder.getValue(index);
     }

     // FIXME: dup of util.IDDecoder method
     public String getFieldName(int index)
     {
         return decoder.getFieldName(index);
     }

     // FIXME: dup of util.IDDecoder method
     public int getFieldIndex(String name)
     {
         return decoder.getFieldIndex(name);
     }

     // FIXME: dup of util.IDDecoder method
     public int getFieldCount()
     {
         return values.length;
     }

     public void setIDDescription(IDDescriptor id)

-    {

+    {

         descriptor = id;
         decoder = new org.lcsim.geometry.util.IDDecoder(id);
         values = new int[id.fieldCount()];

         // FIXME: doesn't belong here
         setLayerIndex(id);
     }

     public IDDescriptor getIDDescription()
     {
         return descriptor;
     }

     // FIXME: dup of util.IDDecoder method
     public String toString()
     {
         return decoder == null ? "NoDecoder" : decoder.toString();
     }

     public boolean isValid()
     {
         return valid;

@@ -161,27 +161,27 @@

     {
         return BarrelEndcapFlag.createBarrelEndcapFlag(decoder.getValue("barrel"));
     }

     public void setSubdetector(Subdetector d)
     {
         detector = d;
     }

     public Subdetector getSubdetector()
     {
         return detector;
     }

     private void setLayerIndex(IDDescriptor id)
     {
         layerIndex = id.indexOf("layer");
     }

     public int getLayer()
     {
         return values[layerIndex];
     }

     public int getSystemID()
     {
         int idx = descriptor.indexOf("system");

@@ -195,7 +195,7 @@

         }
         return sysid;
     }

     public int getSystemNumber()
     {
         return getSystemID();

@@ -206,12 +206,12 @@

         long[] dummyNeighbours = {0, 0, 0};
         return dummyNeighbours;
     }

     public boolean supportsNeighbours()
     {
         return false;
     }

     public long[] getNeighbourIDs()
     {
         return getNeighbourIDs(1,1,1);

@@ -222,8 +222,18 @@

         return 0;
     }

+    public long findCellContainingXYZ(double[] pos)
+    {
+        return 0;
+    }
+
+    public long findCellContainingXYZ(double x, double y, double z)
+    {
+        return 0;
+    }
+

     public Hep3Vector getPositionVector()
     {
         return new BasicHep3Vector(getPosition());

-    }    
-}

\ No newline at end of file

+    }
+}

Commit in `GeomConverter/src/org/lcsim/geometry` on MAIN
`IDDecoder.java`	+38	-36	1.14 -> 1.15
`segmentation/GridXYZ.java`	+33	-41	1.19 -> 1.20
`/ProjectiveCylinder.java`	+7	-2	1.23 -> 1.24
`/ProjectiveZPlane.java`	+18	-14	1.20 -> 1.21
`util/BaseIDDecoder.java`	+47	-37	1.8 -> 1.9
	+143	-130