Print

Print


Commit in lcsim/src/org/lcsim/recon/tracking/gtrdetector on MAIN
GtrDetector.java+14-41.11 -> 1.12
JM: use IPolyhedron instead of cast to solid types

lcsim/src/org/lcsim/recon/tracking/gtrdetector
GtrDetector.java 1.11 -> 1.12
diff -u -r1.11 -r1.12
--- GtrDetector.java	8 May 2008 21:35:37 -0000	1.11
+++ GtrDetector.java	8 May 2008 22:19:51 -0000	1.12
@@ -3,7 +3,7 @@
  *
  * Created on July 30, 2005, 3:30 PM
  *
- * $Id: GtrDetector.java,v 1.11 2008/05/08 21:35:37 ngraf Exp $
+ * $Id: GtrDetector.java,v 1.12 2008/05/08 22:19:51 jeremy Exp $
  */
 
 package org.lcsim.recon.tracking.gtrdetector;
@@ -21,9 +21,9 @@
 import org.lcsim.conditions.DetectorLocator;
 import org.lcsim.detector.IDetectorElement;
 import org.lcsim.detector.IPhysicalVolume;
-import org.lcsim.detector.IRotation3D;
 import org.lcsim.detector.material.IMaterial;
 import org.lcsim.detector.solids.Box;
+import org.lcsim.detector.solids.IPolyhedron;
 import org.lcsim.detector.solids.ISolid;
 import org.lcsim.detector.solids.Point3D;
 import org.lcsim.detector.solids.Trap;
@@ -440,6 +440,15 @@
                         List<Point3D> vertices = null;
                         double zpos = 0.;
                         int[] point_ordering = null;
+                        IPolyhedron poly = null;
+                        if (solid instanceof IPolyhedron)
+                        {
+                        	 poly = (IPolyhedron)solid;
+                        	 vertices = poly.getVertices();
+                        	 point_ordering = poly.getHepRepVertexOrdering();
+                        }
+                        
+                        /*
                         if(solid instanceof Box)
                         {
                             System.out.println("Box");
@@ -461,6 +470,8 @@
                             vertices = trap.getVertices();
                             point_ordering = trap.getHepRepVertexOrdering();
                         }
+                        */
+                        
                         if (vertices == null)
                             throw new RuntimeException("No vertices found for "+sensor.getName()+"!");
                         System.out.println("sensor has "+vertices.size()+" vertices");
@@ -488,8 +499,7 @@
                     
                 }
             }
-        }
-        
+        }        
     }
     
     // return effective x/x0 for this layer
CVSspam 0.2.8