diff -u -r1.2 -r1.3
--- CheatClusterer.java	7 Dec 2005 17:12:25 -0000	1.2
+++ CheatClusterer.java	21 Feb 2006 20:32:52 -0000	1.3
@@ -1,14 +1,10 @@

 package org.lcsim.recon.cluster.cheat;
 

-import java.util.ArrayList;

 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;

-import org.lcsim.event.Cluster;

 import org.lcsim.event.MCParticle;
 import org.lcsim.event.SimCalorimeterHit;

-import org.lcsim.recon.cluster.util.BasicCluster;
-

 
 /**
  * The Cluster cheater works by finding perfectly reconstructed clusters

diff -u -r1.4 -r1.5
--- CheatClusterDriver.java	20 Feb 2006 22:36:30 -0000	1.4
+++ CheatClusterDriver.java	21 Feb 2006 20:32:52 -0000	1.5
@@ -1,15 +1,13 @@

 package org.lcsim.recon.cluster.cheat;
 
 import java.util.ArrayList;

-import java.util.HashMap;

 import java.util.List;
 import java.util.Map;

-import org.lcsim.event.MCCluster;

 import org.lcsim.event.EventHeader;
 import org.lcsim.event.MCParticle;
 import org.lcsim.event.SimCalorimeterHit;

-import org.lcsim.recon.cluster.util.BasicCluster;

 import org.lcsim.util.Driver;

+import org.lcsim.util.lcio.LCIOConstants;

 
 
 /**

@@ -18,7 +16,7 @@

 
 public class CheatClusterDriver extends Driver
 {

-    CheatClusterer _clusterer;

+    private final CheatClusterer _clusterer;

 
     public CheatClusterDriver()
     {

@@ -34,17 +32,18 @@

         {
             Map<MCParticle,CheatCluster> result = _clusterer.findClusters(collection);
             String name = event.getMetaData(collection).getName();

-	    int flag = (1<<31);
-            if (result.size() > 0) event.put(name+"CheatClusters", new ArrayList(result.values()), MCCluster.class, flag);

+	    int flag = (1<<LCIOConstants.CLBIT_HITS);
+            if (result.size() > 0) event.put(name+"CheatClusters", new ArrayList(result.values()), CheatCluster.class, flag);

         }
 
         // Then look for refined clusters combining hits from all collections
 
         List<List<CheatCluster>> clusters = event.get(CheatCluster.class);
         Map<MCParticle, CheatCluster> refined = _clusterer.findRefinedClusters(clusters);

-        if (refined.size() > 0) {
-	    int flag = 1<<31;
-	    event.put("RefinedCheatClusters", new ArrayList(refined.values()), MCCluster.class, flag );

+        if (refined.size() > 0) 
+        {
+	    int flag = 1<<LCIOConstants.CLBIT_HITS;
+	    event.put("RefinedCheatClusters", new ArrayList(refined.values()), CheatCluster.class, flag );

 	}
     }
 

diff -u -r1.3 -r1.4
--- CheatCluster.java	20 Feb 2006 22:36:29 -0000	1.3
+++ CheatCluster.java	21 Feb 2006 20:32:52 -0000	1.4
@@ -9,7 +9,7 @@

  */
 public class CheatCluster extends BasicCluster implements MCCluster
 {

-   private MCParticle particle;

+   private final MCParticle particle;

 
    public CheatCluster(MCParticle particle)
    {