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

diff -u -r1.4 -r1.5
--- AbstractPlots.java	29 Apr 2008 19:05:53 -0000	1.4
+++ AbstractPlots.java	29 Aug 2008 21:47:36 -0000	1.5
@@ -8,49 +8,29 @@

 import org.lcsim.slic.diagnostics.layer.LayerInfoDriver;
 
 /**

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

+ * Provides basic AIDA utilities for creating plots from a single LCIO collection.

  * 
  * @author jeremym

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

+ * @version $Id: AbstractPlots.java,v 1.5 2008/08/29 21:47:36 jeremy Exp $

  */
 public abstract class AbstractPlots
 {    
     private EventHeader eventHeader;
     

-    protected String collectionName = "";
-    protected String baseDir = "/";
-    
-    LCMetaData meta = null;

+    protected String collectionName;
+    protected String baseDir;    
+    LCMetaData meta;

     
     public AbstractPlots(LCMetaData meta)
     {
     	if (meta == null)
     		throw new RuntimeException("LCMetaData points to null!");

-    	this.meta = meta;
-    	this.baseDir = "/" + meta.getClass().getSimpleName();

+    	this.meta = meta;    	

     	this.collectionName = meta.getName();

-    	setupAidaDir();    	

+    	this.baseDir = "/" + meta.getType().getSimpleName() + "/" + getCollectionName();
+    	setupAidaDir();

     }

-    
-    /*
-    public AbstractPlots(String baseDir, LCMetaData meta)
-    {
-        this.meta = meta;
-        
-        if ( baseDir != null ) 
-        {
-            this.baseDir = "/" + baseDir;
-        }
-        
-        if ( meta != null )
-        {
-            collectionName = meta.getName();
-        }
-        
-        setupAidaDir();
-    }
-    */
-    

+           

     public void setEventHeader(EventHeader eventHeader)
     {
         this.eventHeader = eventHeader;

@@ -71,14 +51,16 @@

         return collectionName;
     }
     

+    /*

     public String getDir()
     {
         return getBaseDir() + "/" + getCollectionName();
     }

+    */

     
     public void cd()
     {

-        tree().cd(this.getDir());

+        tree().cd(this.getBaseDir());

     }
     
     public void cd(String dir)

@@ -93,12 +75,14 @@

     
     public void setupAidaDir()
     {

-        setupAidaDir(getDir());

+        setupAidaDir(getBaseDir());

     }
     
     /** Create new folder base + collName from root ("/"). */
     public final void setupAidaDir(String dir)
     {          

+    	System.out.println("creating dir " + dir);
+    	

         /* Create if not exists. */
         try
         {

@@ -119,6 +103,8 @@

         {
             throw new RuntimeException("Failed to setup AIDA dir. - " + dir);
         }

+        
+        System.out.println("created dir " + dir);

     }
     
     protected void beginEvents()