lcsim/src/org/lcsim/contrib/uiowa

diff -u -r1.34 -r1.35
--- ReclusterDriver.java	15 Aug 2008 17:41:05 -0000	1.34
+++ ReclusterDriver.java	15 Aug 2008 22:15:15 -0000	1.35
@@ -38,7 +38,7 @@

   *
   * This version is PRELIMINARY.
   *

-  * @version $Id: ReclusterDriver.java,v 1.34 2008/08/15 17:41:05 mcharles Exp $

+  * @version $Id: ReclusterDriver.java,v 1.35 2008/08/15 22:15:15 mcharles Exp $

   * @author Mat Charles
   */
 

@@ -1767,8 +1767,8 @@

     }
     protected double quotePurity_P(List<MCParticle> partList, Cluster clus, List<SharedClusterGroup> allSharedClusters) {
 	// Truth info

-	HitMap hitsEcal = ((HitMap)(m_event.get("inputHitMapEcal")));
-	HitMap hitsHcal = ((HitMap)(m_event.get("inputHitMapHcal")));

+	HitMap hitsEcal = ((HitMap)(m_event.get("EcalDigiHitMap")));
+	HitMap hitsHcal = ((HitMap)(m_event.get("HcalDigiHitMap")));

 	List<CalorimeterHit> allHits = new Vector<CalorimeterHit>();
 	allHits.addAll(hitsEcal.values());
 	allHits.addAll(hitsHcal.values());

@@ -1822,8 +1822,8 @@

 	return quoteEfficiency_P(partList, clus, allSharedClusters);
     }
     protected double quoteEfficiency_P(List<MCParticle> partList, Cluster clus, List<SharedClusterGroup> allSharedClusters) {

-	HitMap hitsEcal = ((HitMap)(m_event.get("inputHitMapEcal")));
-	HitMap hitsHcal = ((HitMap)(m_event.get("inputHitMapHcal")));

+	HitMap hitsEcal = ((HitMap)(m_event.get("EcalDigiHitMap")));
+	HitMap hitsHcal = ((HitMap)(m_event.get("HcalDigiHitMap")));

 	List<CalorimeterHit> allHits = new Vector<CalorimeterHit>();
 	allHits.addAll(hitsEcal.values());
 	allHits.addAll(hitsHcal.values());

@@ -1861,8 +1861,8 @@

 	return num/denom;
     }
     protected double quoteEfficiency_T(Collection<Track> trackList, Cluster clus) {

-	HitMap hitsEcal = ((HitMap)(m_event.get("inputHitMapEcal")));
-	HitMap hitsHcal = ((HitMap)(m_event.get("inputHitMapHcal")));

+	HitMap hitsEcal = ((HitMap)(m_event.get("EcalDigiHitMap")));
+	HitMap hitsHcal = ((HitMap)(m_event.get("HcalDigiHitMap")));

 	List<CalorimeterHit> allHits = new Vector<CalorimeterHit>();
 	allHits.addAll(hitsEcal.values());
 	allHits.addAll(hitsHcal.values());

@@ -1879,8 +1879,8 @@

 	return num/denom;
     }
     protected double quoteEfficiency_P(MCParticle part, Cluster clus) {

-	HitMap hitsEcal = ((HitMap)(m_event.get("inputHitMapEcal")));
-	HitMap hitsHcal = ((HitMap)(m_event.get("inputHitMapHcal")));

+	HitMap hitsEcal = ((HitMap)(m_event.get("EcalDigiHitMap")));
+	HitMap hitsHcal = ((HitMap)(m_event.get("HcalDigiHitMap")));

 	List<CalorimeterHit> allHits = new Vector<CalorimeterHit>();
 	allHits.addAll(hitsEcal.values());
 	allHits.addAll(hitsHcal.values());

@@ -3035,7 +3035,7 @@

 		if (point != null) {
 		    printme += " Nearest correct hit is: ";
 		    double minDistSq = -1.0;

-		    HitMap hitsEcal = ((HitMap)(m_event.get("inputHitMapEcal")));

+		    HitMap hitsEcal = ((HitMap)(m_event.get("EcalDigiHitMap")));

 		    for (CalorimeterHit hit : hitsEcal.values()) {
 			boolean truthMatch = false;
 			SimCalorimeterHit simhit = ((SimCalorimeterHit)(hit));

@@ -3067,8 +3067,8 @@

 
     protected void debugPrintHitStatus(List<SharedClusterGroup> allSharedClusters, List<Track> tracksSortedByMomentum, Map<Track, Set<Cluster>> newMapTrackToShowerComponents, Map<Cluster, Track> newMapShowerComponentToTrack, List<Cluster> photons, List<Cluster> neutralClusterCores) {
 	// DEBUG: Check the status of all hits in the event.

-	HitMap hitMapEcal = ((HitMap)(m_event.get("inputHitMapEcal")));
-	HitMap hitMapHcal = ((HitMap)(m_event.get("inputHitMapHcal")));

+	HitMap hitMapEcal = ((HitMap)(m_event.get("EcalDigiHitMap")));
+	HitMap hitMapHcal = ((HitMap)(m_event.get("HcalDigiHitMap")));

 	Set<CalorimeterHit> hitsEcal = new HashSet<CalorimeterHit>(hitMapEcal.values());
 	Set<CalorimeterHit> hitsHcal = new HashSet<CalorimeterHit>(hitMapHcal.values());
 	Set<CalorimeterHit> hitsEcalSharedWithTargets = new HashSet<CalorimeterHit>();

@@ -3398,4 +3398,15 @@

 	    throw new AssertionError("Help! Don't know how to handle barrel geometry of class "+id.getClass().getName());
 	}
     }

+
+    protected void supplyEventToLikelihoodSelectors() {
+	// Handle things that have per-event info:
+        List<StructuralLikelihoodQuantity> quantities = m_eval.getLikelihoodQuantities();
+        for (StructuralLikelihoodQuantity quant : quantities) {
+            if (quant instanceof StructuralLikelihoodQuantityWithEventInfo) {
+                StructuralLikelihoodQuantityWithEventInfo quantTmp = (StructuralLikelihoodQuantityWithEventInfo) (quant);
+		quantTmp.setEventInfo(m_event);
+            }
+        }
+    }

 }