lcsim/src/org/lcsim/recon/cluster/cheat

diff -u -r1.2 -r1.3
--- CheatCluster.java	3 Aug 2005 17:35:20 -0000	1.2
+++ CheatCluster.java	20 Feb 2006 22:36:29 -0000	1.3
@@ -1,21 +1,21 @@

 package org.lcsim.recon.cluster.cheat;
 

-import org.lcsim.event.Cluster;
-import org.lcsim.event.MCParticle;

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

-

+import org.lcsim.event.MCCluster;
+import org.lcsim.event.MCParticle;

 
 /**
  * Add the MCParticle to BasicCluster
  */

-
-public class CheatCluster extends BasicCluster

+public class CheatCluster extends BasicCluster implements MCCluster

 {
    private MCParticle particle;

+

    public CheatCluster(MCParticle particle)
    {
       this.particle = particle;
    }

+

    public MCParticle getMCParticle()
    {
       return particle;

lcsim/src/org/lcsim/recon/cluster/cheat

diff -u -r1.3 -r1.4
--- CheatClusterDriver.java	5 Jan 2006 06:54:09 -0000	1.3
+++ CheatClusterDriver.java	20 Feb 2006 22:36:30 -0000	1.4
@@ -4,7 +4,7 @@

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

-import org.lcsim.event.Cluster;

+import org.lcsim.event.MCCluster;

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

@@ -19,31 +19,35 @@

 public class CheatClusterDriver extends Driver
 {
     CheatClusterer _clusterer;

-    

+

     public CheatClusterDriver()
     {
         _clusterer = new CheatClusterer();
     }

-    

+

     protected void process(EventHeader event)
     {

-        //First look for clusters in individual collections
-        

+        // First look for clusters in individual collections
+

         List<List<SimCalorimeterHit>> collections = event.get(SimCalorimeterHit.class);
         for (List<SimCalorimeterHit> collection : collections)
         {
             Map<MCParticle,CheatCluster> result = _clusterer.findClusters(collection);
             String name = event.getMetaData(collection).getName();

-            if (result.size() > 0) event.put(name+"CheatClusters",new ArrayList(result.values()));

+	    int flag = (1<<31);
+            if (result.size() > 0) event.put(name+"CheatClusters", new ArrayList(result.values()), MCCluster.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) event.put("RefinedCheatClusters",new ArrayList(refined.values()));

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

     }

-    

+

     public String toString()
     {
         return "CheatClusterDriver";