SlicDiagnostics/src/org/lcsim/slic/diagnostics

diff -u -r1.28 -r1.29
--- SlicDiagnosticsDriver.java	7 Mar 2008 01:26:05 -0000	1.28
+++ SlicDiagnosticsDriver.java	7 Mar 2008 01:59:14 -0000	1.29
@@ -54,11 +54,12 @@

     private EventHeader _currentEvent = null;    
     private int _verbosity = 0;
     private int _evtCnt = 0;

-    private int _eventNoticeInterval = 100;       

+    private int _eventNoticeInterval = 100; 

 
     public SlicDiagnosticsDriver(UserOptions options)
     {
         super();        

+        message("Starting up!");

         setUserOptions(options);        
         addSubDrivers();
     }

@@ -66,7 +67,8 @@

     public SlicDiagnosticsDriver()
     {
         super();        

-        setUserOptions(new UserOptions());        

+        message("Starting up!");
+        setUserOptions(new UserOptions());

         addSubDrivers();
     }
 

@@ -244,10 +246,20 @@

         }
                        
         // Print list of registered drivers.

-        for (Driver driver : this.drivers())
-        {                  
-            message("subdriver <" + driver.getClass().getCanonicalName()+">");
-        }

+        //if (_verbosity > 0)
+        //{
+        //    for (Driver driver : this.drivers())
+        //    {                  
+        //        message("subdriver <" + driver.getClass().getCanonicalName()+">");
+        //    }
+        //}
+    }
+  
+    public void add(Driver subdriver)
+    {
+        super.add(subdriver);
+        if (_verbosity > 0)
+            message("added " + subdriver.getName());

     }
 
     protected void process(EventHeader event)

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

diff -u -r1.2 -r1.3
--- Cloud2HistogramConverter.java	24 Jan 2007 00:53:37 -0000	1.2
+++ Cloud2HistogramConverter.java	7 Mar 2008 01:59:14 -0000	1.3
@@ -11,6 +11,8 @@

 {
     protected void endOfData()
     {

+	SlicDiagnosticsDriver.message("Connverting clouds to histograms ...");
+

         ITree tree = tree();
         
         String names[] = tree.listObjectNames("/", true);

@@ -20,7 +22,7 @@

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

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

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

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

@@ -28,5 +30,6 @@

                 }
             }
         }        

+	SlicDiagnosticsDriver.message("Done converting clouds to histograms.");

     }

-}

\ No newline at end of file

+}

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

diff -u -r1.3 -r1.4
--- CommandLineProcessor.java	7 Mar 2008 01:45:31 -0000	1.3
+++ CommandLineProcessor.java	7 Mar 2008 01:59:14 -0000	1.4
@@ -28,7 +28,7 @@

  * Main.
  * 
  * @author Jeremy McCormick

- * @version $Id: CommandLineProcessor.java,v 1.3 2008/03/07 01:45:31 jeremy Exp $

+ * @version $Id: CommandLineProcessor.java,v 1.4 2008/03/07 01:59:14 jeremy Exp $

  */
 public class CommandLineProcessor
 {

@@ -308,7 +308,7 @@

         if (cl.hasOption("D"))
         {        	
         	_userOptions.setStringOption("config.outputDir",cl.getOptionValue("D"));

-        	System.out.println("-D = " + _userOptions.getStringOption("config.outputDir"));

+        	//System.out.println("-D = " + _userOptions.getStringOption("config.outputDir"));

         }
 
         // If neither of above 2 are selected for output filename,

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

diff -u -r1.3 -r1.4
--- Runner.java	7 Mar 2008 01:26:05 -0000	1.3
+++ Runner.java	7 Mar 2008 01:59:14 -0000	1.4
@@ -12,7 +12,7 @@

  * by using LCIOEventSource and LCSimLoop.
  *
  * @author jeremym

- * @version $Id: Runner.java,v 1.3 2008/03/07 01:26:05 jeremy Exp $

+ * @version $Id: Runner.java,v 1.4 2008/03/07 01:59:14 jeremy Exp $

  */
 public class Runner
 {    

@@ -28,8 +28,8 @@

         // New driver
         SlicDiagnosticsDriver driver = new SlicDiagnosticsDriver(options);
         

-        System.out.println("user options");
-        System.out.println(options.toString());

+        //System.out.println("user options");
+        //System.out.println(options.toString());

         
         // Set name of output AIDA file.
         driver.setAidaFileName(options.getStringOption("config.outputFile").toString());