Commit in GeomConverter on MAIN
src/org/lcsim/detector/converter/compact/DiskTrackerConverter.java+1-11.4 -> 1.5
test/org/lcsim/detector/converter/compact/DiskTrackerTest.java+5-41.2 -> 1.3
+6-5
2 modified files
JM: Working version of DiskTrackerConverter.

GeomConverter/src/org/lcsim/detector/converter/compact
DiskTrackerConverter.java 1.4 -> 1.5
diff -u -r1.4 -r1.5
--- DiskTrackerConverter.java	26 Mar 2007 20:58:45 -0000	1.4
+++ DiskTrackerConverter.java	30 Mar 2007 23:43:35 -0000	1.5
@@ -49,7 +49,7 @@
         }
 
         Rotation3D reflect = new Rotation3D();
-        reflect.setPassiveEuler(Math.PI,0,0);
+        reflect.setPassiveXYZ(0, Math.PI, 0);
              
         int sensorNum=0;
 

GeomConverter/test/org/lcsim/detector/converter/compact
DiskTrackerTest.java 1.2 -> 1.3
diff -u -r1.2 -r1.3
--- DiskTrackerTest.java	26 Mar 2007 19:36:55 -0000	1.2
+++ DiskTrackerTest.java	30 Mar 2007 23:43:35 -0000	1.3
@@ -98,13 +98,14 @@
                 "DiskTrackerTest"
         };
         
+        /*
         for (IDetectorElement de : DetectorElementStore.getInstance())
         {
             if ( de.hasGeometryInfo() )
             {
                 System.out.println(de.getName() + " " + de.getGeometry().getPosition());
             }
-        }
+        }*/
                 
         for ( int i=0; i<zpoints.length; i++ )
         {           
@@ -112,8 +113,8 @@
             
             IPhysicalVolumePath path = navigator.getPath(zpoint);
 
-            System.out.println(zpoint + " " + path.toString());
-            /*
+            //System.out.println(zpoint + " " + path.toString());
+
             assertTrue(
                     "Wrong path <" + path.toString() + "> at z = " + zpoints[i] + ".  Expected <" + pathAnswerKey[i] + ">.",
                     path.toString().equals(pathAnswerKey[i])
@@ -122,7 +123,7 @@
             IDetectorElement srch = detector.findDetectorElement(zpoint);
            
             assertTrue("Wrong path <" + path.toString() + "> at z = " + zpoints[i] + ".  Expected <" + pathAnswerKey[i] + ">.",
-                    srch.getName().equals(deAnswerKey[i]));*/
+                    srch.getName().equals(deAnswerKey[i]));
         }
     }   
 }
\ No newline at end of file
CVSspam 0.2.8