diff -u -r1.3 -r1.4
--- ClusterAnalysisDriver.java	1 Jul 2006 22:10:42 -0000	1.3
+++ ClusterAnalysisDriver.java	31 Jul 2006 18:24:30 -0000	1.4
@@ -26,21 +26,40 @@

     boolean gotit;
     public ClusterAnalysisDriver(String[] clnames)
     {

-        this(clnames,defhitcolls,defFSPlist, clnames[0]);

+        this(clnames,defhitcolls,defFSPlist, clnames[0], null);
+    }
+    public ClusterAnalysisDriver(String[] clnames,ClusterAnalysis anal)
+    {
+        this(clnames,defhitcolls,defFSPlist, clnames[0], anal);

     }
     public ClusterAnalysisDriver(String[] clnames, String[] hcnames)
     {

-        this(clnames,hcnames,defFSPlist, clnames[0]);

+        this(clnames,hcnames,defFSPlist, clnames[0], null);
+    }
+    public ClusterAnalysisDriver(String[] clnames, String[] hcnames, ClusterAnalysis anal)
+    {
+        this(clnames,hcnames,defFSPlist, clnames[0], anal);

     }
     public ClusterAnalysisDriver(String[] clnames, String[] hcnames,
         String fsPname)
     {

-        this(clnames,hcnames,fsPname, clnames[0]);

+        this(clnames,hcnames,fsPname, clnames[0], null);
+    }
+    public ClusterAnalysisDriver(String[] clnames, String[] hcnames,
+        String fsPname, ClusterAnalysis anal)
+    {
+        this(clnames,hcnames,fsPname, clnames[0], anal);

     }
     public ClusterAnalysisDriver(String[] clnames, String[] hcnames,
         String fsPname, String fname)
     {

+        this(clnames,hcnames,fsPname, fname, null);
+    }
+    public ClusterAnalysisDriver(String[] clnames, String[] hcnames,
+        String fsPname, String fname, ClusterAnalysis anal)
+    {

         first = true;

+        analyzer = anal;

         clustercollnames = clnames;
         hitcollnames = hcnames;
         MCPCname = clnames[0]+"MCPC";

@@ -62,9 +81,12 @@

 //        System.out.println("Cluster lists = "+cllist);
 //        System.out.println("FSParticle list = "+fsParticleListName);
 //        System.out.println("Folder name = "+foldername);

-        DefaultClusterAnalysis defanal = new DefaultClusterAnalysis(MCPCname,
-            CMCPname, foldername);
-        analyzer = defanal;

+        if(analyzer == null)
+        {
+            DefaultClusterAnalysis defanal = new DefaultClusterAnalysis(MCPCname,
+                CMCPname, foldername);
+            analyzer = defanal;
+        }

         gotit = false;
         crcllists = new CreateClusterAnalysisLists(hitcollnames,clustercollnames,
             fsParticleListName,MCPCname,CMCPname);

diff -u -r1.3 -r1.4
--- DefaultClusterAnalysis.java	15 Mar 2006 16:45:38 -0000	1.3
+++ DefaultClusterAnalysis.java	31 Jul 2006 18:24:30 -0000	1.4
@@ -120,10 +120,10 @@

 	tree = org.lcsim.util.aida.AIDA.defaultInstance().tree();
         histogramFactory = analysisFactory.createHistogramFactory(tree);
         TreeName = "/"+Treename;

-        tree.mkdir(TreeName);
-        tree.mkdir(TreeName+"/GeneratedParticleProperties");
-        tree.mkdir(TreeName+"/EventProperties");
-        tree.mkdir(TreeName+"/ClusterProperties");

+        tree.mkdirs(TreeName);
+        tree.mkdirs(TreeName+"/GeneratedParticleProperties");
+        tree.mkdirs(TreeName+"/EventProperties");
+        tree.mkdirs(TreeName+"/ClusterProperties");

         
         //Event sums
         EvtGenEall = new double[ntypes+1];

@@ -199,7 +199,7 @@

         
         for(int i=0;i<ntypes+1;i++)
         {

-            tree.mkdir(TreeName+"/EventProperties/"+typeNames[i]);

+            tree.mkdirs(TreeName+"/EventProperties/"+typeNames[i]);

             tree.cd(TreeName+"/EventProperties/"+typeNames[i]);
             cEvtGenFSE[i] = histogramFactory.createCloud1D(
                 typeNames[i]+":Final State Generated Energy per event");

@@ -243,7 +243,7 @@

                 typeNames[i]+":Fraction of visible Gen E Found per event");
             cEvtNClusters[i] = histogramFactory.createCloud1D(
                 typeNames[i]+":# Clusters per event");

-            tree.mkdir(TreeName+"/GeneratedParticleProperties/"+typeNames[i]);

+            tree.mkdirs(TreeName+"/GeneratedParticleProperties/"+typeNames[i]);

             tree.cd(TreeName+"/GeneratedParticleProperties/"+typeNames[i]);
             cPartGenEall[i] = histogramFactory.createCloud1D(
                 typeNames[i]+":Generated Energy of all particles");

@@ -263,7 +263,7 @@

                 typeNames[i]+":Cos theta of visible particles",100,-1.,1.);
             hPartCosfound[i] = histogramFactory.createHistogram1D(
                 typeNames[i]+":Cos theta of found particles",100,-1.,1.);

-            tree.mkdir(TreeName+"/ClusterProperties/"+typeNames[i]);

+            tree.mkdirs(TreeName+"/ClusterProperties/"+typeNames[i]);

             tree.cd(TreeName+"/ClusterProperties/"+typeNames[i]);
             cClPrimFracPartE[i] = histogramFactory.createCloud1D(
                 typeNames[i]+":Fraction of particle E in Primary cluster");