lcsim/src/org/lcsim/contrib/onoprien/tracking/geom/segmentation

diff -u -r1.5 -r1.6
--- CylindricalBarrelSegmenter.java	12 Jul 2007 05:00:22 -0000	1.5
+++ CylindricalBarrelSegmenter.java	14 Jul 2007 14:43:05 -0000	1.6
@@ -27,7 +27,7 @@

  * <tt>postfix</tt> equal to layer number.
  *
  * @author D.Onoprienko

- * @version $Id: CylindricalBarrelSegmenter.java,v 1.5 2007/07/12 05:00:22 onoprien Exp $

+ * @version $Id: CylindricalBarrelSegmenter.java,v 1.6 2007/07/14 14:43:05 onoprien Exp $

  */
 public class CylindricalBarrelSegmenter extends Segmenter {
   

@@ -54,7 +54,9 @@

    */
   public void detectorChanged(Detector detector) {
     super.detectorChanged(detector);

-    List<IDetectorElement> sensors = SegmentationManager.getLeaves(detector.getSubdetector(_sdName).getDetectorElement());

+    Subdetector sub = detector.getSubdetector(_sdName);
+    if (sub == null) return;
+    List<IDetectorElement> sensors = SegmentationManager.getLeaves(sub.getDetectorElement());

     Collections.sort(sensors, new Comparator<IDetectorElement>() {
       public int compare(IDetectorElement s1, IDetectorElement s2) {
         return (int)Math.signum(((Tube)(s1.getGeometry().getLogicalVolume().getSolid())).getInnerRadius()

lcsim/src/org/lcsim/contrib/onoprien/tracking/geom/segmentation

diff -u -r1.5 -r1.6
--- RingSegmenter.java	12 Jul 2007 05:00:22 -0000	1.5
+++ RingSegmenter.java	14 Jul 2007 14:43:05 -0000	1.6
@@ -32,7 +32,7 @@

  * are rotated by an angle set through a call to {@link #setStereoAngle(double angle)}.
  *
  * @author D.Onoprienko

- * @version $Id: RingSegmenter.java,v 1.5 2007/07/12 05:00:22 onoprien Exp $

+ * @version $Id: RingSegmenter.java,v 1.6 2007/07/14 14:43:05 onoprien Exp $

  */
 public class RingSegmenter extends Segmenter {
   

@@ -61,7 +61,9 @@

    */
   public void detectorChanged(Detector detector) {
     super.detectorChanged(detector);

-    List<IDetectorElement> sensors = SegmentationManager.getLeaves(detector.getSubdetector(_sdName).getDetectorElement());

+    Subdetector sub = detector.getSubdetector(_sdName);
+    if (sub == null) return;
+    List<IDetectorElement> sensors = SegmentationManager.getLeaves(sub.getDetectorElement());

     Collections.sort(sensors, new Comparator<IDetectorElement>() {
       public int compare(IDetectorElement s1, IDetectorElement s2) {
         return (int)Math.signum(s1.getGeometry().getPosition().z()-s2.getGeometry().getPosition().z());

lcsim/src/org/lcsim/contrib/onoprien/tracking/geom/sensortype

diff -u -r1.2 -r1.3
--- Ring.java	20 May 2007 03:33:24 -0000	1.2
+++ Ring.java	14 Jul 2007 14:43:05 -0000	1.3
@@ -14,7 +14,7 @@

  * center of the rectangle (strip) to which the point belongs is ouside the ring.
  *
  * @author D.Onoprienko

- * @version $Id: Ring.java,v 1.2 2007/05/20 03:33:24 onoprien Exp $

+ * @version $Id: Ring.java,v 1.3 2007/07/14 14:43:05 onoprien Exp $

  */
 public class Ring extends Rectangle {
   

@@ -29,7 +29,7 @@

    * @param pitch       Width of a strip.
    * @param length      Length of a strip.
    */

-  public Ring(double radiusMin, double radiusMax, double thickness, double pitch, double length) {

+  public Ring(double radiusMin, double radiusMax, double thickness, double length, double pitch) {

     
     _rMin = radiusMin;
     _rMax = radiusMax;