diff -u -r1.4 -r1.5
--- test.properties	7 Mar 2008 01:26:04 -0000	1.4
+++ test.properties	29 Apr 2008 19:05:52 -0000	1.5
@@ -18,7 +18,7 @@

 config.maxEvents=20
 config.eventNoticeInterval=1
 config.verbosity=4

-config.convertClouds=true

+config.convertClouds=false

 config.autoname=false
 config.saveAsZip=true
 config.outputDir=.

diff -u -r1.30 -r1.31
--- SlicDiagnosticsDriver.java	3 Apr 2008 00:05:43 -0000	1.30
+++ SlicDiagnosticsDriver.java	29 Apr 2008 19:05:52 -0000	1.31
@@ -14,9 +14,8 @@

 import org.lcsim.recon.cluster.cheat.CheatClusterDriver;
 import org.lcsim.slic.diagnostics.calorimeterhit.CalorimeterDirectoryMaker;
 import org.lcsim.slic.diagnostics.calorimeterhit.CalorimeterEventPlots;

-import org.lcsim.slic.diagnostics.calorimeterhit.CalorimeterPlotsNoDetector;
-import org.lcsim.slic.diagnostics.calorimeterhit.CalorimeterPlotsNoDetectorDriver;

 import org.lcsim.slic.diagnostics.calorimeterhit.CalorimeterHitPlotsDriver;

+import org.lcsim.slic.diagnostics.calorimeterhit.CalorimeterPlotsNoDetectorDriver;

 import org.lcsim.slic.diagnostics.cluster.ClusterDirectoryMaker;
 import org.lcsim.slic.diagnostics.cluster.ClusterPlotsDriver;
 import org.lcsim.slic.diagnostics.generichit.CollectionStatisticsMaker;

@@ -140,7 +139,8 @@

         // SimCalorimeterHit hit plots.
         if (_options.getBooleanOption("calorimeter.hit"))
         {

-            subdrivers.add(new CalorimeterHitPlotsDriver(this));

+            //subdrivers.add(new CalorimeterHitPlotsDriver(this));
+        	add(new CalorimeterHitPlotsDriver());

             calorimeter=true;
         }        
         

@@ -154,7 +154,7 @@

         // SimTrackerHit hit plots.
         if (_options.getBooleanOption("tracker.hit"))
         {

-            subdrivers.add(new TrackerHitPlotsDriver(this));

+            subdrivers.add(new TrackerHitPlotsDriver());

             tracker=true;
         }
         

@@ -168,7 +168,7 @@

         // Cluster basic plots.
         if (_options.getBooleanOption("cluster.clusterPlots"))
         {

-            subdrivers.add(new ClusterPlotsDriver(this));

+            subdrivers.add(new ClusterPlotsDriver());

             cluster=true;
         }         
                       

@@ -244,7 +244,7 @@

             add(new Cloud2HistogramConverter());
         }
         

-        add(new CalorimeterPlotsNoDetectorDriver(this));                       

+        add(new CalorimeterPlotsNoDetectorDriver(this));     

     }
   
     public void add(Driver subdriver)

diff -u -r1.3 -r1.4
--- CalorimeterHitPlots.java	5 Mar 2008 10:28:41 -0000	1.3
+++ CalorimeterHitPlots.java	29 Apr 2008 19:05:52 -0000	1.4
@@ -32,9 +32,9 @@

  * collections of SimCalorimeterHits are done by GenericHitPlots.
  * 
  * @author jeremym

- * @version $Id: CalorimeterHitPlots.java,v 1.3 2008/03/05 10:28:41 jeremy Exp $

+ * @version $Id: CalorimeterHitPlots.java,v 1.4 2008/04/29 19:05:52 jeremy Exp $

  */

-class CalorimeterHitPlots extends AbstractPlots

+public class CalorimeterHitPlots extends AbstractPlots

 {
     // Plots
     ICloud1D _mcpCountPerHit;

@@ -67,7 +67,7 @@

 
     public CalorimeterHitPlots(LCMetaData meta)
     {

-        super(SimCalorimeterHitDir, meta);

+        super(meta);

         definePlots();
         setSegmentationType(meta);
         setupSegmentationPlots();

diff -u -r1.3 -r1.4
--- CalorimeterHitPlotsDriver.java	3 Apr 2008 00:05:43 -0000	1.3
+++ CalorimeterHitPlotsDriver.java	29 Apr 2008 19:05:52 -0000	1.4
@@ -1,45 +1,19 @@

 package org.lcsim.slic.diagnostics.calorimeterhit;
 

-import java.util.List;
-import org.lcsim.event.EventHeader;
-import org.lcsim.event.EventHeader.LCMetaData;

 import org.lcsim.event.SimCalorimeterHit;

-import org.lcsim.slic.diagnostics.SlicDiagnosticsDriver;
-import org.lcsim.slic.diagnostics.util.PlotsDriver;

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

 
 /**

- * Driver for a set of CalorimeterHitPlots.

+ * Driver for CalorimeterHitPlots.

  * 
  * @author jeremym

- * @version $Id: CalorimeterHitPlotsDriver.java,v 1.3 2008/04/03 00:05:43 jeremy Exp $

+ * @version $Id: CalorimeterHitPlotsDriver.java,v 1.4 2008/04/29 19:05:52 jeremy Exp $

  */

-public class CalorimeterHitPlotsDriver extends PlotsDriver

+public class CalorimeterHitPlotsDriver 
+extends GenericPlotsDriver<SimCalorimeterHit, CalorimeterHitPlots>

 {

-    public CalorimeterHitPlotsDriver(SlicDiagnosticsDriver mom)
-    {
-        super(mom);
-    }
-    
-    protected void process(EventHeader event)
-    {
-        super.process(event);
-        
-        List<List<SimCalorimeterHit>> collections = event.get(SimCalorimeterHit.class);
-        for ( List<SimCalorimeterHit> collection : collections)
-        {
-            LCMetaData meta = event.getMetaData(collection);
-            CalorimeterHitPlots calPlots = getCalorimeterHitPlots(meta);
-            calPlots.fill(event, collection);
-        }
-    }
-    
-    private CalorimeterHitPlots getCalorimeterHitPlots(LCMetaData meta)
-    {
-        String name = meta.getName();
-        if ( _plots.get(name) == null )
-        {
-            _plots.put(name, new CalorimeterHitPlots(meta) );
-        }
-        return (CalorimeterHitPlots)_plots.get(name);
-    }       

+	public CalorimeterHitPlotsDriver()
+	{
+		super(SimCalorimeterHit.class, CalorimeterHitPlots.class);
+	}

 }

\ No newline at end of file

diff -u -r1.1 -r1.2
--- CalorimeterPlotsNoDetector.java	3 Apr 2008 00:05:43 -0000	1.1
+++ CalorimeterPlotsNoDetector.java	29 Apr 2008 19:05:52 -0000	1.2
@@ -1,6 +1,5 @@

 package org.lcsim.slic.diagnostics.calorimeterhit;
 

-import static org.lcsim.slic.diagnostics.SlicDiagnosticsDirectories.SimCalorimeterHitDir;

 import static org.lcsim.slic.diagnostics.util.AidaHelper.c1d;
 import static org.lcsim.slic.diagnostics.util.AidaHelper.c2d;
 import static org.lcsim.slic.diagnostics.util.VecUtil.getCylindricalRadius;

@@ -57,7 +56,7 @@

 	
 	public CalorimeterPlotsNoDetector(LCMetaData meta)
 	{

-		super(SimCalorimeterHitDir, meta);

+		super(meta);

 		definePlots();	       	       	      	
 	}
 	

diff -u -r1.1 -r1.2
--- ClusterDirectoryMaker.java	23 Jan 2007 23:27:58 -0000	1.1
+++ ClusterDirectoryMaker.java	29 Apr 2008 19:05:52 -0000	1.2
@@ -2,11 +2,12 @@

 
 import org.lcsim.event.Cluster;
 import org.lcsim.slic.diagnostics.util.DirectoryMaker;

+import static org.lcsim.slic.diagnostics.SlicDiagnosticsDirectories.ClusterDir;

 
 public class ClusterDirectoryMaker extends DirectoryMaker< Cluster >
 {
     public ClusterDirectoryMaker()
     {

-        super("/Clusters",Cluster.class);

+        super(ClusterDir,Cluster.class);

     }
 }

diff -u -r1.1 -r1.2
--- ClusterPlots.java	13 Jan 2007 00:18:21 -0000	1.1
+++ ClusterPlots.java	29 Apr 2008 19:05:52 -0000	1.2
@@ -17,9 +17,9 @@

  * Some basic plots of cluster collections.
  * 
  * @author jeremym

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

+ * @version $Id: ClusterPlots.java,v 1.2 2008/04/29 19:05:52 jeremy Exp $

  */

-class ClusterPlots extends AbstractPlots

+public class ClusterPlots extends AbstractPlots

 {
     ICloud1D _clusterCount;
     ICloud2D _XY;

@@ -35,7 +35,7 @@

 
     public ClusterPlots(LCMetaData meta)
     {

-        super("Clusters", meta);

+        super(meta);

         definePlots();
     }
     

diff -u -r1.1 -r1.2
--- ClusterPlotsDriver.java	13 Jan 2007 00:18:21 -0000	1.1
+++ ClusterPlotsDriver.java	29 Apr 2008 19:05:52 -0000	1.2
@@ -1,47 +1,19 @@

 package org.lcsim.slic.diagnostics.cluster;
 

-import java.util.List;
-

 import org.lcsim.event.Cluster;

-import org.lcsim.event.EventHeader;
-import org.lcsim.event.SimCalorimeterHit;
-import org.lcsim.event.EventHeader.LCMetaData;
-import org.lcsim.slic.diagnostics.SlicDiagnosticsDriver;
-import org.lcsim.slic.diagnostics.util.PlotsDriver;

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

 
 /**
  * Driver for a set of ClusterPlots.
  * 
  * @author jeremym

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

+ * @version $Id: ClusterPlotsDriver.java,v 1.2 2008/04/29 19:05:52 jeremy Exp $

  */

-public class ClusterPlotsDriver extends PlotsDriver

+public class ClusterPlotsDriver 
+extends GenericPlotsDriver<Cluster, ClusterPlots>

 {         

-    public ClusterPlotsDriver(SlicDiagnosticsDriver mom)
-    {
-        super(mom);
-    }
-    
-    protected void process(EventHeader event)
-    {
-        super.process(event);               
-        
-        List<List<Cluster>> clusterCollections = event.get(Cluster.class);
-        for ( List<Cluster> clusters : clusterCollections)
-        {
-            LCMetaData meta = event.getMetaData(clusters);
-            ClusterPlots clusterPlots = getClusterPlots(meta);
-            clusterPlots.fill(event);
-        }        
-    }
-    
-    private ClusterPlots getClusterPlots(LCMetaData meta)

+    public ClusterPlotsDriver()

     {

-        String name = meta.getName();
-        if ( _plots.get(name) == null )
-        {
-            _plots.put(name, new ClusterPlots(meta) );
-        }
-        return (ClusterPlots)_plots.get(name);

+    	super(Cluster.class, ClusterPlots.class);

     }
 }

\ No newline at end of file

diff -u -r1.2 -r1.3
--- EventSummaryPlots.java	3 Apr 2008 00:05:43 -0000	1.2
+++ EventSummaryPlots.java	29 Apr 2008 19:05:52 -0000	1.3
@@ -15,7 +15,7 @@

  * Plots of combined event statistics.
  *
  * @author jeremym

- * @version $Id: EventSummaryPlots.java,v 1.2 2008/04/03 00:05:43 jeremy Exp $

+ * @version $Id: EventSummaryPlots.java,v 1.3 2008/04/29 19:05:52 jeremy Exp $

  */
 class EventSummaryPlots extends AbstractPlots
 {

@@ -70,7 +70,7 @@

     
     EventSummaryPlots()
     {

-        super("Event", null);

+        super(null);

         definePlots();
     }
     

diff -u -r1.5 -r1.6
--- GenericHitPlots.java	5 Mar 2008 10:28:43 -0000	1.5
+++ GenericHitPlots.java	29 Apr 2008 19:05:52 -0000	1.6
@@ -23,7 +23,7 @@

  * A set of simple diagnostic plots on lists of GenericHits.
  * 
  * @author jeremym

- * @version $Id: GenericHitPlots.java,v 1.5 2008/03/05 10:28:43 jeremy Exp $

+ * @version $Id: GenericHitPlots.java,v 1.6 2008/04/29 19:05:52 jeremy Exp $

  */
 public class GenericHitPlots extends Driver 
 {

@@ -52,10 +52,10 @@

 				
 				if ( hitType == SimCalorimeterHit.class )
 				{

-					directory = "/"+SimCalorimeterHitDir;

+					directory = SimCalorimeterHitDir;

 				}
 				else {

-					directory = "/"+SimTrackerHitDir;

+					directory = SimTrackerHitDir;

 				}
 
 				directory += "/" + collectionName;

diff -u -r1.1 -r1.2
--- MCParticlePlots.java	13 Jan 2007 00:18:22 -0000	1.1
+++ MCParticlePlots.java	29 Apr 2008 19:05:52 -0000	1.2
@@ -26,7 +26,7 @@

  * A set of MCParticle plots, including plots for each particle type by PDGID.
  * 
  * @author jeremym

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

+ * @version $Id: MCParticlePlots.java,v 1.2 2008/04/29 19:05:52 jeremy Exp $

  */
 public class MCParticlePlots extends AbstractPlots
 {

@@ -52,7 +52,7 @@

 
     public MCParticlePlots(LCMetaData meta)
     {

-        super("MCParticles", meta);

+        super(meta);

         definePlots();
     }
 

diff -u -r1.3 -r1.4
--- TrackerHitPlots.java	5 Mar 2008 10:28:53 -0000	1.3
+++ TrackerHitPlots.java	29 Apr 2008 19:05:52 -0000	1.4
@@ -16,7 +16,7 @@

  * Plots on SimTrackerHit collections.
  *
  * @author jeremym

- * @version $Id: TrackerHitPlots.java,v 1.3 2008/03/05 10:28:53 jeremy Exp $

+ * @version $Id: TrackerHitPlots.java,v 1.4 2008/04/29 19:05:52 jeremy Exp $

  */
 class TrackerHitPlots extends AbstractPlots
 {

@@ -26,7 +26,7 @@

 
     public TrackerHitPlots(LCMetaData meta)
     {

-        super(SimTrackerHitDir, meta);

+        super(meta);

         definePlots();
     }
 

diff -u -r1.2 -r1.3
--- TrackerHitPlotsDriver.java	23 Jan 2007 23:27:59 -0000	1.2
+++ TrackerHitPlotsDriver.java	29 Apr 2008 19:05:52 -0000	1.3
@@ -1,45 +1,25 @@

 package org.lcsim.slic.diagnostics.trackerhit;
 
 import java.util.List;

+

 import org.lcsim.event.EventHeader;

-import org.lcsim.event.EventHeader.LCMetaData;

 import org.lcsim.event.SimTrackerHit;

+import org.lcsim.event.TrackerHit;
+import org.lcsim.event.EventHeader.LCMetaData;

 import org.lcsim.slic.diagnostics.SlicDiagnosticsDriver;

-import org.lcsim.slic.diagnostics.util.PlotsDriver;

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

 
 /**
  * Driver for TrackerHitPlots.
  * 
  * @author jeremym

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

+ * @version $Id: TrackerHitPlotsDriver.java,v 1.3 2008/04/29 19:05:52 jeremy Exp $

  */

-public class TrackerHitPlotsDriver extends PlotsDriver

+public class TrackerHitPlotsDriver 
+extends GenericPlotsDriver<TrackerHit, TrackerHitPlots>

 {    

-    public TrackerHitPlotsDriver(SlicDiagnosticsDriver mom)
-    {
-        super(mom);
-    }
-    
-    protected void process(EventHeader event)
-    {
-        super.process(event);
-        
-        List<List<SimTrackerHit>> collections = event.get(SimTrackerHit.class);
-        for ( List<SimTrackerHit> collection : collections)
-        {
-            LCMetaData meta = event.getMetaData(collection);
-            TrackerHitPlots trkPlots = getTrackerHitPlots(meta);
-            trkPlots.fill(event,collection);
-        }
-    }
-    
-    private TrackerHitPlots getTrackerHitPlots(LCMetaData meta)

+    public TrackerHitPlotsDriver()

     {

-        String name = meta.getName();
-        if ( _plots.get(name) == null )
-        {
-            _plots.put(name, new TrackerHitPlots(meta) );
-        }
-        return (TrackerHitPlots)_plots.get(name);

+    	super(TrackerHit.class, TrackerHitPlots.class);

     }
 }

\ No newline at end of file

diff -N GenericPlotsDriver.java
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ GenericPlotsDriver.java	29 Apr 2008 19:05:53 -0000	1.1
@@ -0,0 +1,51 @@

+package org.lcsim.slic.diagnostics.util;
+
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import org.lcsim.event.EventHeader;
+import org.lcsim.event.EventHeader.LCMetaData;
+import org.lcsim.util.Driver;
+
+public class GenericPlotsDriver <T,P extends AbstractPlots> extends Driver
+{
+	Class<T> subscribeType;
+	Class<P> plotType;
+	Map<String, AbstractPlots> plots = new HashMap<String, AbstractPlots>();
+	
+	public GenericPlotsDriver(Class<T> subscribeType, Class<P> plotType)
+	{
+		this.subscribeType = subscribeType;
+		this.plotType = plotType;
+	}
+	
+	protected void process(EventHeader event)
+    {  
+        List<List<T>> collections = event.get(this.subscribeType);
+        for ( List<T> collection : collections)
+        {
+            LCMetaData meta = event.getMetaData(collection);
+            AbstractPlots plots = getPlots(meta);
+            if (plots == null)
+            	throw new RuntimeException("Failed to create plot driver for collection " + meta.getName());
+            plots.fill(event);
+        }
+    }
+    
+    private AbstractPlots getPlots(LCMetaData meta)
+    {
+        String name = meta.getName();
+        if ( plots.get(name) == null )
+        {
+        	try {
+        		plots.put(name, (AbstractPlots)plotType.getDeclaredConstructors()[0].newInstance(meta));
+        	}
+        	catch (Exception x)
+        	{
+        		throw new RuntimeException(x);
+        	}
+        }
+        return plots.get(name);
+    }       
+}

\ No newline at end of file

diff -u -r1.3 -r1.4
--- AbstractPlots.java	5 Mar 2008 10:28:55 -0000	1.3
+++ AbstractPlots.java	29 Apr 2008 19:05:53 -0000	1.4
@@ -11,7 +11,7 @@

  * This class encapsulates plots based on a single LCIO collection, i.e. a List of some type.
  * 
  * @author jeremym

- * @version $Id: AbstractPlots.java,v 1.3 2008/03/05 10:28:55 jeremy Exp $

+ * @version $Id: AbstractPlots.java,v 1.4 2008/04/29 19:05:53 jeremy Exp $

  */
 public abstract class AbstractPlots
 {    

@@ -22,6 +22,17 @@

     
     LCMetaData meta = null;
     

+    public AbstractPlots(LCMetaData meta)
+    {
+    	if (meta == null)
+    		throw new RuntimeException("LCMetaData points to null!");
+    	this.meta = meta;
+    	this.baseDir = "/" + meta.getClass().getSimpleName();
+    	this.collectionName = meta.getName();
+    	setupAidaDir();    	
+    }
+    
+    /*

     public AbstractPlots(String baseDir, LCMetaData meta)
     {
         this.meta = meta;

@@ -38,6 +49,7 @@

         
         setupAidaDir();
     }

+    */

     
     public void setEventHeader(EventHeader eventHeader)
     {

diff -u -r1.9 -r1.10
--- RunnerTest.java	5 Mar 2008 00:00:20 -0000	1.9
+++ RunnerTest.java	29 Apr 2008 19:05:53 -0000	1.10
@@ -67,7 +67,7 @@

         
         options.setStringOption("config.outputFile", "RunnerTest");
         options.setIntegerOption("config.maxEvents", 1);

-        options.setBooleanOption("config.convertClouds",true);

+        options.setBooleanOption("config.convertClouds",false);

                                 
         Runner.run(files,options);
     }