SlicDiagnostics/src/org/lcsim/slic/diagnostics

diff -u -r1.24 -r1.25
--- SlicDiagnosticsDriver.java	24 Jan 2007 00:39:01 -0000	1.24
+++ SlicDiagnosticsDriver.java	24 Jan 2007 00:53:37 -0000	1.25
@@ -101,6 +101,7 @@

         {
             add(new SimTrackerHit2GenericHit());
             generic=true;

+            tracker=true;

         }
         
         // Generic SimCalorimeterHit plots.

@@ -108,6 +109,7 @@

         {
             add(new SimCalorimeterHit2GenericHit());
             generic=true;

+            calorimeter=true;

         }                
         
         // Add the GenericHit plotting driver.

@@ -223,12 +225,15 @@

             add(driver);
         }
         

-        // Add the cleanup driver.
-        add(new CleanupDriver());
-

         // Add cloud to histogram converter.

-        add(new Cloud2HistogramConverter());

+        if (_options.getBooleanOption("config.convertClouds"))
+        {
+            add(new Cloud2HistogramConverter());
+        }

+        // Add the cleanup driver.
+        add(new CleanupDriver());
+               

         // Print list of registered drivers.
         for (Driver driver : this.drivers())
         {                  

@@ -336,7 +341,7 @@

 
     static public final void message(String m)
     {

-        System.out.println("SlicDiagnosticsDriver - " + m);

+        System.out.println("SlicDiagnostics - " + m);

     }
 
     public void setVerbosity(int verbosity)

SlicDiagnostics/src/org/lcsim/slic/diagnostics/util

diff -u -r1.1 -r1.2
--- Cloud2HistogramConverter.java	24 Jan 2007 00:39:02 -0000	1.1
+++ Cloud2HistogramConverter.java	24 Jan 2007 00:53:37 -0000	1.2
@@ -4,6 +4,7 @@

 import hep.aida.ICloud;
 import hep.aida.ITree;
 

+import org.lcsim.slic.diagnostics.SlicDiagnosticsDriver;

 import org.lcsim.util.Driver;
 
 public class Cloud2HistogramConverter extends Driver

@@ -17,9 +18,9 @@

         
         for (int i=0; i<names.length;i++)
         {

-            if (types[i].compareTo("ICloud1D") == -1 || types[i].compareTo("ICloud2D") == -1)

+            if (types[i].contains("ICloud"))

             {

-                System.out.println("converting <" + names[i] + "> to histogram");

+                SlicDiagnosticsDriver.message("converting <" + names[i] + "> of type <" + types[i] + "> to histogram");

                 ICloud cloud = (ICloud)tree.find(names[i]);
                 if (!cloud.isConverted())
                 {

SlicDiagnostics/src/org/lcsim/slic/diagnostics/util

diff -u -r1.2 -r1.3
--- UserOptions.java	23 Jan 2007 23:27:59 -0000	1.2
+++ UserOptions.java	24 Jan 2007 00:53:37 -0000	1.3
@@ -13,7 +13,7 @@

  * Represents simple options set from properties file or command-line.
  * 
  * @author Jeremy McCormick

- * @version $Id: UserOptions.java,v 1.2 2007/01/23 23:27:59 jeremy Exp $

+ * @version $Id: UserOptions.java,v 1.3 2007/01/24 00:53:37 jeremy Exp $

  */
 public final class UserOptions
 {    

@@ -112,6 +112,7 @@

         parseIntegerOption("config.verbosity",4);
         parseIntegerOption("config.maxEvents",-1);
         parseStringOption("config.outputFile","SlicDiagnosticsPlots");

+        parseBooleanOption("config.convertClouds",false);

     }
   
     /* Parse boolean property with default value. */

SlicDiagnostics/test/org/lcsim/slic/diagnostics

diff -u -r1.7 -r1.8
--- RunnerTest.java	23 Jan 2007 23:27:59 -0000	1.7
+++ RunnerTest.java	24 Jan 2007 00:53:37 -0000	1.8
@@ -66,10 +66,9 @@

         options.setBooleanOption("mcparticle.basicPlots", true);
         
         options.setStringOption("config.outputFile", "RunnerTest");

-        options.setIntegerOption("config.maxEvents", 20);
-        
-        //options.setBooleanOption("genericHit", true);
-                        

+        options.setIntegerOption("config.maxEvents", 1);
+        options.setBooleanOption("config.convertClouds",true);
+                                

         Runner.run(files,options);
     }