3 modified files
GeomConverter/src/org/lcsim/geometry/util
diff -u -r1.2 -r1.3
--- IDDecoderBase.java 24 Jul 2005 06:47:43 -0000 1.2
+++ IDDecoderBase.java 29 Jul 2005 23:08:13 -0000 1.3
@@ -17,7 +17,6 @@
public class IDDecoderBase implements org.lcsim.geometry.IDDecoder
{
protected IDDecoder decoder;
- protected IDEncoder encoder;
protected IDDescriptor descriptor;
protected int[] values;
@@ -69,7 +68,6 @@
{
descriptor = id;
decoder = new org.lcsim.geometry.util.IDDecoder(id);
- encoder = new org.lcsim.geometry.util.IDEncoder(id);
values = new int[id.fieldCount()];
}
@@ -107,4 +105,4 @@
{
return decoder == null ? "NoDecoder" : decoder.toString();
}
-}
\ No newline at end of file
+}
GeomConverter/src/org/lcsim/geometry/segmentation
diff -u -r1.17 -r1.18
--- ProjectiveCylinder.java 18 Jul 2005 18:00:05 -0000 1.17
+++ ProjectiveCylinder.java 29 Jul 2005 23:08:14 -0000 1.18
@@ -4,6 +4,7 @@
import org.jdom.Element;
import org.lcsim.geometry.layer.Layering;
import org.lcsim.geometry.util.IDDescriptor;
+import org.lcsim.geometry.util.IDEncoder;
/**
*
@@ -65,6 +66,7 @@
public long[] getNeighbourIDs(int deltaLayer, int deltaTheta, int deltaPhi)
{
+ IDEncoder encoder = new IDEncoder( descriptor );
encoder.setValues(values);
int nMax = (2*deltaLayer + 1)*(2*deltaTheta + 1)*(2*deltaPhi + 1) - 1;
GeomConverter/src/org/lcsim/geometry/segmentation
diff -u -r1.15 -r1.16
--- ProjectiveZPlane.java 20 Jul 2005 22:03:13 -0000 1.15
+++ ProjectiveZPlane.java 29 Jul 2005 23:08:14 -0000 1.16
@@ -5,6 +5,7 @@
import org.jdom.DataConversionException;
import org.jdom.Element;
import org.lcsim.geometry.util.IDDescriptor;
+import org.lcsim.geometry.util.IDEncoder;
/**
* @author tonyj
@@ -78,6 +79,7 @@
public long[] getNeighbourIDs(int deltaLayer, int deltaTheta, int deltaPhi)
{
+ IDEncoder encoder = new IDEncoder( descriptor );
encoder.setValues(values);
int nMax = (2*deltaLayer + 1)*(2*deltaTheta + 1)*(2*deltaPhi + 1) - 1;
@@ -121,4 +123,4 @@
{
return true;
}
-}
\ No newline at end of file
+}
CVSspam 0.2.8