diff -u -r1.1.1.1 -r1.2
--- ClMergeDriver.java	10 Dec 2008 22:03:06 -0000	1.1.1.1
+++ ClMergeDriver.java	12 Aug 2009 18:32:08 -0000	1.2
@@ -3,28 +3,9 @@

 import java.util.*;
 import org.lcsim.event.*;
 import org.lcsim.util.Driver;

-import org.lcsim.util.swim.*;
-import org.lcsim.util.lcio.LCIOConstants;

 import org.lcsim.recon.cluster.util.*;
 import org.lcsim.util.aida.AIDA;
 import hep.aida.ITree;

-import org.lcsim.geometry.*;
-import hep.physics.vec.Hep3Vector;
-import hep.physics.vec.BasicHep3Vector;
-import org.lcsim.geometry.subdetector.CylindricalCalorimeter;
-import org.lcsim.recon.ztracking.cheater.*;
-import org.lcsim.recon.cluster.fixedcone.*;
-import org.lcsim.recon.cluster.analysis.*;
-import org.lcsim.recon.emid.hmatrix.HMatrix;
-import org.lcsim.recon.emid.hmatrix.HMatrixTask;
-import org.lcsim.recon.emid.hmatrix.HMatrixBuilder;
-import org.lcsim.recon.emid.hmatrix.HMatrixConditionsConverter;
-import org.lcsim.math.chisq.ChisqProb;
-import org.lcsim.recon.cluster.nn.NearestNeighborCluster;
-import org.lcsim.spacegeom.*;
-import org.lcsim.util.hitmap.HitMap;
-import org.lcsim.detector.DetectorIdentifierHelper;
-import org.lcsim.detector.identifier.*;

 
 public class ClMergeDriver extends Driver
 {

@@ -56,7 +37,7 @@

         List<BasicCluster> cHADclusters = new ArrayList<BasicCluster>();
         try
         {

-            List<BasicCluster> EMclusters = event.get(BasicCluster.class,_hadclusname);

+            List<BasicCluster> EMclusters = event.get(BasicCluster.class,_emclusname);

 //            System.out.println("Number of EM Clus" + EMclusters.size());
             for (BasicCluster emclus : EMclusters)
             {

@@ -85,7 +66,7 @@

         }
 
         //  loop over all EM clusters

-        List<BasicCluster> nhclusters = new ArrayList<BasicCluster>();  // neuh clusters

+        List<BasicCluster> nhclusters = new ArrayList<BasicCluster>();

         int nmerge = 0;
         try
         {

@@ -104,8 +85,8 @@

                 if (eclth<0) eclth+=Math.PI;
                 double eclph = Math.atan2(ecpy,ecpx);
                 if (eclph<0) eclph+=2*Math.PI;

-                if (mergD) aida.cloud1D("Theta of NH Cand Clusters").fill(eclth);
-                if (mergD) aida.cloud1D("Phi of NH Cand Clusters").fill(eclph);

+                if (mergD) aida.cloud1D("Theta of E merge Clusters").fill(eclth);
+                if (mergD) aida.cloud1D("Phi of E merge Clusters").fill(eclph);

                 
                 // now check with had clusters to make mergers
                 try

@@ -124,8 +105,8 @@

                         if (hclth<0) hclth+=Math.PI;
                         double hclph = Math.atan2(hcpy,hcpx);
                         if (hclph<0) hclph+=2*Math.PI;

-                        if (mergD) aida.cloud1D("Theta of NH Cand Clusters").fill(hclth);
-                        if (mergD) aida.cloud1D("Phi of NH Cand Clusters").fill(hclph);

+                        if (mergD) aida.cloud1D("Theta of H merge Clusters").fill(hclth);
+                        if (mergD) aida.cloud1D("Phi of H merge Clusters").fill(hclph);

                         //  calculate distance in theta phi
                         double dccth = Math.abs(eclth-hclth);
                         double dccph = Math.abs(eclph-hclph);