Print

Print


Commit in lcsim/src/org/lcsim/recon/cheater on MAIN
ReconCheater.java+15-141.1 -> 1.2
Update.

lcsim/src/org/lcsim/recon/cheater
ReconCheater.java 1.1 -> 1.2
diff -u -r1.1 -r1.2
--- ReconCheater.java	26 Sep 2005 22:47:06 -0000	1.1
+++ ReconCheater.java	26 Sep 2005 23:56:57 -0000	1.2
@@ -10,6 +10,9 @@
 package org.lcsim.recon.cheater;
 
 // LCSIM framework packages
+import org.lcsim.conditions.ConditionsEvent;
+import org.lcsim.conditions.ConditionsListener;
+import org.lcsim.conditions.ConditionsSet;
 import org.lcsim.event.EventHeader;
 import org.lcsim.event.MCParticle;
 import org.lcsim.event.Track;
@@ -17,11 +20,7 @@
 import org.lcsim.event.CalorimeterHit;
 import org.lcsim.event.ReconstructedParticle;
 import org.lcsim.event.util.MCParticleClassifier;
-import org.lcsim.conditions.ConditionsEvent;
-import org.lcsim.conditions.ConditionsListener;
-import org.lcsim.conditions.ConditionsSet;
 import org.lcsim.recon.cluster.cheat.CheatCluster;
-import org.lcsim.recon.cluster.cheat.ClusterCheater;
 import org.lcsim.recon.cluster.util.RefinedCluster;
 import org.lcsim.recon.cluster.cheat.CheatClusterDriver;
 import org.lcsim.recon.ztracking.FoundTrack;
@@ -49,7 +48,10 @@
 
 /** ... */
 public class ReconCheater extends Driver
+				  implements ConditionsListener
 {
+    CheatingTables Cheating;
+
     boolean useFullTruth = false; // Use primary MCParticles.
     boolean useTruth = false;     // Use MCParticles energies.
     boolean useECalParameterization = false, useHCalParameterization = true;
@@ -104,14 +106,13 @@
 
         hist = getHistogramLevel() > 0;
 	if (hist) System.err.println(" ReconCheater: hist = "+hist);
-     /*        
-        if (IDEff == null)
-        {
-           ConditionsSet conditions = getConditionsManager().getConditions("IDEfficiency");
+
+        if (Cheating == null) {
+           ConditionsSet conditions = getConditionsManager().getConditions("Cheating");
            conditions.addConditionsListener(this);
-           IDEff = new IDResolutionTables(conditions);
+           Cheating = new CheatingTables(conditions);
         }
-     */
+
 	// Get MCParticle mapping from event.
 	map = getMCParticleMapping(event);
 
@@ -124,13 +125,13 @@
 	first = false;
 	if (nEvt>=3) firstEvents = false;
     }
- /*
+
     public void conditionsChanged(ConditionsEvent event)
     {
-        ConditionsSet conditions = getConditionsManager().getConditions("IDEfficiency");
-        IDEff = new IDResolutionTables(conditions);
+        ConditionsSet conditions = getConditionsManager().getConditions("Cheating");
+        Cheating = new CheatingTables(conditions);
     }
- */
+
 
     Map<MCParticle,CheatTrack> charged = null;    // Tracks from MCParticles
     Map<MCParticle,CheatCluster> neutrals = null; // and clusters.
CVSspam 0.2.8