diff -u -r1.5 -r1.6
--- RunnerTest.java	16 Oct 2006 19:16:06 -0000	1.5
+++ RunnerTest.java	13 Jan 2007 00:42:03 -0000	1.6
@@ -11,6 +11,8 @@

 import java.net.URL;
 import java.util.ArrayList;
 

+import org.lcsim.slic.diagnostics.util.Runner;
+import org.lcsim.slic.diagnostics.util.UserOptions;

 import org.lcsim.util.cache.FileCache;
 
 import junit.framework.*;

@@ -31,19 +33,39 @@

     {
         return new TestSuite(RunnerTest.class);
     }

-        
-    public void testSingleFile() throws Exception
-    {        

+
+    public void runSingleFile(String url) throws Exception
+    {

         FileCache cache = new FileCache();
         File file = cache.getCachedFile(

-                new URL("http://www.lcsim.org/test/lcio/ZPoleUDS_50evt_SLIC_v1r9p1_sidmay05.slcio")

+                new URL(url)

         );
         
         ArrayList<File> files = new ArrayList<File>();
         files.add(file);
         

-        UserOptions options = new UserOptions("RunnerTest.properties");
-        //System.out.println("RunnerTest - outputFile " + options.getStringOption("outputFile"));
-        Runner.run(files,new UserOptions("RunnerTest.properties"));

+        UserOptions options = new UserOptions();
+
+        options.setIntegerOption("config.verbosity", 4);
+                
+        options.setBooleanOption("calorimeter.event", true);
+        options.setBooleanOption("calorimeter.hit", true);
+        options.setBooleanOption("tracker.event", true);
+        options.setBooleanOption("tracker.hit", true);
+        options.setBooleanOption("cluster.cheatClusters", true);
+        options.setBooleanOption("cluster.clusterPlots", true);
+        options.setBooleanOption("mcparticle.generator", true);
+        options.setBooleanOption("mcparticle.simulator", true);
+        options.setBooleanOption("mcparticle.statusPlots", true);
+        options.setBooleanOption("mcparticle.hitPlots", true);
+        options.setBooleanOption("mcparticle.basicPlots", true);                
+        options.setBooleanOption("genericHit", true);
+                        
+        Runner.run(files,options);
+    }
+        
+    public void testSingleFile() throws Exception
+    {        
+        runSingleFile("http://www.lcsim.org/test/lcio/ZPoleUDS_50evt_SLIC_v1r9p1_sidmay05.slcio");

     }
 }

\ No newline at end of file

diff -u -r1.5 -r1.6
--- SlicDiagnosticsDriverTest.java	13 Oct 2006 07:07:42 -0000	1.5
+++ SlicDiagnosticsDriverTest.java	13 Jan 2007 00:42:03 -0000	1.6
@@ -1,6 +1,7 @@

 package org.lcsim.slic.diagnostics;
 
 import org.lcsim.recon.cluster.nn.NearestNeighborClusterDriver;

+import org.lcsim.slic.diagnostics.util.UserOptions;

 
 import java.io.File;
 import java.net.URL;