GeomConverter/src/org/lcsim/detector

diff -u -r1.38 -r1.39
--- DetectorElement.java	31 Oct 2007 17:24:01 -0000	1.38
+++ DetectorElement.java	8 Dec 2007 01:51:11 -0000	1.39
@@ -15,7 +15,7 @@

  * Implementation of {@link IDetectorElement}.
  * 
  * @author Jeremy McCormick

- * @version $Id: DetectorElement.java,v 1.38 2007/10/31 17:24:01 jeremy Exp $

+ * @version $Id: DetectorElement.java,v 1.39 2007/12/08 01:51:11 jeremy Exp $

  */
 public class DetectorElement 
 implements IDetectorElement

@@ -464,25 +464,16 @@

     {
         if ( helper == null ) 
         {

-            IDetectorElement par = getParent();
-            
-            if (par != null)

+            IDetectorElement search = getParent();
+            while (search != null)

             {

-            	while (par != null)
-            	{
-            		if (par.getIdentifierHelper() != null)
-            		{
-            			this.helper = par.getIdentifierHelper();
-            			par = null;
-            		}
-            		else
-            		{
-            			par = par.getParent();
-            		}
-            	}

+                if (search.getIdentifierHelper() != null)
+                    return search.getIdentifierHelper();
+                search = search.getParent();

             }
         }
 

+        // Might return null if no parent has a helper.

         return helper;
     }