lcsim-contrib/src/main/java/org/lcsim/contrib/SteveMagill

diff -u -r1.1.1.1 -r1.2
--- TrackMipClusterDriver.java	10 Dec 2008 22:03:06 -0000	1.1.1.1
+++ TrackMipClusterDriver.java	5 Jan 2009 23:04:49 -0000	1.2
@@ -9,15 +9,12 @@

 import org.lcsim.event.EventHeader;
 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.*;
 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.mc.fast.tracking.*;

 import hep.aida.*;
 import org.lcsim.spacegeom.*;
 import org.lcsim.geometry.util.CalorimeterIDDecoder;

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

             List<CalorimeterHit> chits = event.get(CalorimeterHit.class,_hitcollnames[i]);
             CalorimeterIDDecoder caldecoder = (CalorimeterIDDecoder) event.getMetaData(chits).getIDDecoder();                  
 //            System.out.println("Collection is " +_hitcollnames[i]);

-            if (_hitcollnames[i] == "EcalBarrDigiHits")

+            if (_hitcollnames[i].equals("EcalBarrDigiHits"))

             {
                 for (CalorimeterHit chit : chits)
                 {

@@ -178,7 +175,7 @@

                     nhitsEMB++;
                     nhitsBTotCAL++;
                 }

-            } else if (_hitcollnames[i] == "HcalBarrDigiHits")

+            } else if (_hitcollnames[i].equals("HcalBarrDigiHits"))

             {
                 for (CalorimeterHit chit : chits)
                 {

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

                     nhitsHADB++;
                     nhitsBTotCAL++;
                 }

-            } else if (_hitcollnames[i] == "EcalEndcapDigiHits")

+            } else if (_hitcollnames[i].equals("EcalEndcapDigiHits"))

             {
                 for (CalorimeterHit chit : chits)
                 {

@@ -220,7 +217,7 @@

                     nhitsEMEC++;
                     nhitsECTotCAL++;
                 }

-            } else if (_hitcollnames[i] == "HcalEndcapDigiHits")

+            } else if (_hitcollnames[i].equals("HcalEndcapDigiHits"))

             {
                 for (CalorimeterHit chit : chits)
                 {