Commit in lcsim/src/org/lcsim/contrib/onoprien/vsegment/geom/sensortype on MAIN
Cylinder.java+3-31.2 -> 1.3
CylinderLZR.java+3-31.1 -> 1.2
Rectangle.java+3-31.1 -> 1.2
+9-9
3 modified files
Changes to reference frame API.
Generic ITrackerHit implementation.
Additional hit making algorithms.

lcsim/src/org/lcsim/contrib/onoprien/vsegment/geom/sensortype
Cylinder.java 1.2 -> 1.3
diff -u -r1.2 -r1.3
--- Cylinder.java	5 Sep 2008 21:40:02 -0000	1.2
+++ Cylinder.java	15 Sep 2008 15:44:06 -0000	1.3
@@ -21,7 +21,7 @@
  * reference surface specified by the radius supplied to the constructor.
  *
  * @author D.Onoprienko
- * @version $Id: Cylinder.java,v 1.2 2008/09/05 21:40:02 onoprien Exp $
+ * @version $Id: Cylinder.java,v 1.3 2008/09/15 15:44:06 onoprien Exp $
  */
 public class Cylinder extends Rectangle {
   
@@ -115,8 +115,8 @@
     int nU = channelID % _nDivU;
     int nV = channelID / _nDivU;
     ArrayList<Integer> out = new ArrayList<Integer>(8);
-    int vDown = ((_hitType.nMeasDir() == 2) && (nV > 0)) ? nV-1 : nV;
-    int vUp = ((_hitType.nMeasDir() == 2) && (nV < _nDivV-1)) ? nV+1 : nV;
+    int vDown = ((_hitType.nMeasured() == 2) && (nV > 0)) ? nV-1 : nV;
+    int vUp = ((_hitType.nMeasured() == 2) && (nV < _nDivV-1)) ? nV+1 : nV;
     for (int iV = vDown; iV < vUp; iV++) {
       for (int iU = nU-1; iU < nU+1; iU++) {
         while (nU < 0) nU += _nDivU;

lcsim/src/org/lcsim/contrib/onoprien/vsegment/geom/sensortype
CylinderLZR.java 1.1 -> 1.2
diff -u -r1.1 -r1.2
--- CylinderLZR.java	5 Sep 2008 21:40:02 -0000	1.1
+++ CylinderLZR.java	15 Sep 2008 15:44:06 -0000	1.2
@@ -18,7 +18,7 @@
  * radius supplied to the constructor.
  *
  * @author D.Onoprienko
- * @version $Id: CylinderLZR.java,v 1.1 2008/09/05 21:40:02 onoprien Exp $
+ * @version $Id: CylinderLZR.java,v 1.2 2008/09/15 15:44:06 onoprien Exp $
  */
 public class CylinderLZR extends Rectangle {
   
@@ -112,8 +112,8 @@
     int nU = channelID % _nDivU;
     int nV = channelID / _nDivU;
     ArrayList<Integer> out = new ArrayList<Integer>(8);
-    int vDown = ((_hitType.nMeasDir() == 2) && (nV > 0)) ? nV-1 : nV;
-    int vUp = ((_hitType.nMeasDir() == 2) && (nV < _nDivV-1)) ? nV+1 : nV;
+    int vDown = ((_hitType.nMeasured() == 2) && (nV > 0)) ? nV-1 : nV;
+    int vUp = ((_hitType.nMeasured() == 2) && (nV < _nDivV-1)) ? nV+1 : nV;
     for (int iV = vDown; iV < vUp; iV++) {
       for (int iU = nU-1; iU < nU+1; iU++) {
         while (nU < 0) nU += _nDivU;

lcsim/src/org/lcsim/contrib/onoprien/vsegment/geom/sensortype
Rectangle.java 1.1 -> 1.2
diff -u -r1.1 -r1.2
--- Rectangle.java	3 Sep 2008 04:28:29 -0000	1.1
+++ Rectangle.java	15 Sep 2008 15:44:06 -0000	1.2
@@ -18,7 +18,7 @@
  * surface is defined by the <tt>W = 0</tt> plane in the sensor local reference frame.
  *
  * @author D.Onoprienko
- * @version $Id: Rectangle.java,v 1.1 2008/09/03 04:28:29 onoprien Exp $
+ * @version $Id: Rectangle.java,v 1.2 2008/09/15 15:44:06 onoprien Exp $
  */
 public class Rectangle implements SensorType {
   
@@ -265,8 +265,8 @@
     int nU = channelID % _nDivU;
     int nV = channelID / _nDivU;
     ArrayList<Integer> out = new ArrayList<Integer>(8);
-    int vDown = ((_hitType.nMeasDir() == 2) && (nV > 0)) ? nV-1 : nV;
-    int vUp = ((_hitType.nMeasDir() == 2) && (nV < _nDivV-1)) ? nV+1 : nV;
+    int vDown = ((_hitType.nMeasured() == 2) && (nV > 0)) ? nV-1 : nV;
+    int vUp = ((_hitType.nMeasured() == 2) && (nV < _nDivV-1)) ? nV+1 : nV;
     int uDown = (nU > 0) ? nU-1 : nU;
     int uUp = (nU < _nDivU-1) ? nU+1 : nU;
     for (int iV = vDown; iV < vUp; iV++) {
CVSspam 0.2.8