SlicDiagnostics/src/org/lcsim/slic/diagnostics

diff -u -r1.23 -r1.24
--- SlicDiagnosticsDriver.java	23 Jan 2007 23:27:58 -0000	1.23
+++ SlicDiagnosticsDriver.java	24 Jan 2007 00:39:01 -0000	1.24
@@ -27,6 +27,7 @@

 import org.lcsim.slic.diagnostics.trackerhit.TrackerEventPlots;
 import org.lcsim.slic.diagnostics.trackerhit.TrackerHitPlotsDriver;
 import org.lcsim.slic.diagnostics.util.CleanupDriver;

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

 import org.lcsim.slic.diagnostics.util.LayerInfoDriver;
 import org.lcsim.slic.diagnostics.util.UserOptions;
 import org.lcsim.util.Driver;

@@ -223,12 +224,15 @@

         }
         
         // Add the cleanup driver.

-        add(new CleanupDriver());  

+        add(new CleanupDriver());
+
+        // Add cloud to histogram converter.
+        add(new Cloud2HistogramConverter());

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

-            message("added plotting driver <" + driver.getClass().getCanonicalName()+">");

+            message("subdriver <" + driver.getClass().getCanonicalName()+">");

         }
     }
 

SlicDiagnostics/src/org/lcsim/slic/diagnostics/generichit

diff -u -r1.2 -r1.3
--- GenericHitPlots.java	23 Jan 2007 23:27:58 -0000	1.2
+++ GenericHitPlots.java	24 Jan 2007 00:39:01 -0000	1.3
@@ -30,7 +30,7 @@

  * creates a set of plots for each layer in the subdetector.
  * 
  * @author jeremym

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

+ * @version $Id: GenericHitPlots.java,v 1.3 2007/01/24 00:39:01 jeremy Exp $

  */
 public class GenericHitPlots extends Driver 
 {

@@ -260,7 +260,7 @@

 
             c1d(layerName + ": Hit Time", "Time (nanoseconds)", "Number of Hits");
 

-            c1d(layerName + ": log10(Hit Time)", "Time (log10(nanosecondsseconds))", "Number of Hits");

+            c1d(layerName + ": log10(Hit Time)", "Time (log10(nanoseconds))", "Number of Hits");

 
             c1d(layerName + ": Cumulative Energy", "Fraction of Total Energy", "Number of Events");
 

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

diff -N Cloud2HistogramConverter.java
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ Cloud2HistogramConverter.java	24 Jan 2007 00:39:02 -0000	1.1
@@ -0,0 +1,31 @@

+package org.lcsim.slic.diagnostics.util;
+
+import static org.lcsim.slic.diagnostics.util.AidaHelper.tree;
+import hep.aida.ICloud;
+import hep.aida.ITree;
+
+import org.lcsim.util.Driver;
+
+public class Cloud2HistogramConverter extends Driver
+{
+    protected void endOfData()
+    {
+        ITree tree = tree();
+        
+        String names[] = tree.listObjectNames("/", true);
+        String types[] = tree.listObjectTypes("/", true);
+        
+        for (int i=0; i<names.length;i++)
+        {
+            if (types[i].compareTo("ICloud1D") == -1 || types[i].compareTo("ICloud2D") == -1)
+            {
+                System.out.println("converting <" + names[i] + "> to histogram");
+                ICloud cloud = (ICloud)tree.find(names[i]);
+                if (!cloud.isConverted())
+                {
+                    cloud.convertToHistogram();
+                }
+            }
+        }        
+    }
+}

\ No newline at end of file

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

diff -u -r1.1 -r1.2
--- PlotsDriver.java	13 Jan 2007 00:18:23 -0000	1.1
+++ PlotsDriver.java	24 Jan 2007 00:39:02 -0000	1.2
@@ -10,7 +10,7 @@

  * The base class for Drivers that manipulate AbstractPlots.
  * 
  * @author jeremym

- * @version $Id: PlotsDriver.java,v 1.1 2007/01/13 00:18:23 jeremy Exp $

+ * @version $Id: PlotsDriver.java,v 1.2 2007/01/24 00:39:02 jeremy Exp $

  */
 public abstract class PlotsDriver extends Driver
 {

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

     {
         _mom = mom;
         

-        SlicDiagnosticsDriver.message(this.getClass().getSimpleName() + " is loaded.");

+        //SlicDiagnosticsDriver.message(this.getClass().getSimpleName() + " is loaded.");

     }
     
     // Sub-classes are responsible for setting-up and filling their own plots.