lcsim

diff -u -r1.92 -r1.93
--- pom.xml	25 Mar 2009 02:01:42 -0000	1.92
+++ pom.xml	25 Mar 2009 02:05:29 -0000	1.93
@@ -118,11 +118,8 @@

                         <exclude>org/lcsim/PFATest.java</exclude>
                         <exclude>org/lcsim/recon/cluster/directedtree/DirectedTreeCompareTest.java</exclude>
                         <exclude>org/lcsim/recon/cluster/nn/NearestNeighborClustererTest.java</exclude> 

-<!--                        <exclude>org/lcsim/CombinedTrackerDigiTest.java</exclude>-->

                         <exclude>org/lcsim/LCIOReadTest.java</exclude>
                         <exclude>org/lcsim/LCIOReconReadTest.java</exclude> 

-                        <!-- FIXME: Why is this hanging and not completing now? --> 
-                        <exclude>org/lcsim/util/lcio/RawTrackerHitIOTest.java</exclude>

                     </excludes>
                 </configuration>
             </plugin>

lcsim/test/org/lcsim/util/lcio

diff -u -r1.4 -r1.5
--- RawTrackerHitIOTest.java	25 Mar 2009 01:01:16 -0000	1.4
+++ RawTrackerHitIOTest.java	25 Mar 2009 02:05:29 -0000	1.5
@@ -29,7 +29,6 @@

 	public void testRawTrackerHitIO() throws Exception
 	{
 		// Read in a file and write out some test RawTrackerHits.

-	    System.out.println("1");

 		FileCache cache = new FileCache();
 		File inputFile = cache.getCachedFile(new URL("http://www.lcsim.org/test/lcio/muons10_Theta4-176_1-10GeV_SLIC-v2r5p3_geant4-v9r1p2_LCPhys_sid01_planar_tracker.slcio"));
 		LCSimLoop loop = new LCSimLoop();

@@ -37,18 +36,14 @@

 		loop.add(new SimpleRawHitMaker());
 		File outputFile = new TestOutputFile("RawTrackerHitIOTest.slcio");
 		loop.add(new LCIODriver(outputFile));

-		System.out.println("2");

 		loop.loop(1,null);

-		System.out.println("3");

 		loop.dispose();
 						
 		// Read back file from above.
 		loop = new LCSimLoop();
 		loop.setLCIORecordSource(outputFile);
 		loop.add(new RawTrackerHitCheck());

-		System.out.println("4");

 		loop.loop(1,null);

-		System.out.println("5");

 		loop.dispose();				
 	}
 	

@@ -56,8 +51,6 @@

 	{
 		public void process(EventHeader event)
 		{

-		    System.out.println("SimpleRawHitMaker.process");
-		    

 			List<SimTrackerHit> simHits = event.get(SimTrackerHit.class, "SiTrackerBarrel_RO");
 			List<RawTrackerHit> rawHits = new ArrayList<RawTrackerHit>();
 			for (SimTrackerHit simHit : simHits)

@@ -69,7 +62,6 @@

 			}
 			int flag = (1 << LCIOConstants.RTHBIT_HITS);
 			event.put("RawTrackerHits", rawHits, RawTrackerHit.class, flag, "SiTrackerBarrel_RO");

-			System.out.println("SimpleRawHitMaker.process - done");

 		}
 	}
 	

@@ -77,7 +69,6 @@

 	{
 		public void process(EventHeader event)
 		{

-		    System.out.println("RawTrackerHitCheck.process");

 			List<RawTrackerHit> rawHits = event.get(RawTrackerHit.class, "RawTrackerHits");
 			int simHitsRead = 0;
 			for (RawTrackerHit rawHit : rawHits)

@@ -92,11 +83,8 @@

 					++simHitsRead;
 				}
 			}			

-			if (simHitsRead != rawHits.size())
-				throw new RuntimeException("Wrong number of SimTrackerHits!");
-			else
-				System.out.println("Read <" + rawHits.size() + "> RawTrackerHits -- okay!");
-			System.out.println("RawTrackerHitCheck.process - done");

+			assertEquals("Wrong number of SimTrackerHits!", simHitsRead, rawHits.size());
+			System.out.println("Read <" + rawHits.size() + "> RawTrackerHits -- okay!");

 		}
 	}
 }

\ No newline at end of file