lcsim/src/org/lcsim/recon/pfa/structural

diff -u -r1.1 -r1.2
--- HitBookKeeper.java	5 Jul 2006 00:17:24 -0000	1.1
+++ HitBookKeeper.java	27 Aug 2007 19:29:35 -0000	1.2
@@ -24,7 +24,7 @@

  * second group might be a list of clusters plus a
  * HitMap of left-over hits.
  *

- * @version $Id: HitBookKeeper.java,v 1.1 2006/07/05 00:17:24 mcharles Exp $

+ * @version $Id: HitBookKeeper.java,v 1.2 2007/08/27 19:29:35 mcharles Exp $

  */
 
 public class HitBookKeeper extends Driver

@@ -84,6 +84,15 @@

 		int hitCount = hitCountInList.get(0);
 		for (Integer tmp : hitCountInList) {
 		    if (tmp != hitCount) {

+			System.out.println("ERROR: Mismatch in hit book-keeping. Will print out book-keeping then throw assertion.");
+			for (int i=0; i<hitCountInList.size(); i++) {
+			    List<String> namedListsInGroup = m_namedLists.get(i);
+			    String printme = "  Group "+i+": hit count "+hitCountInList.get(i)+" of which "+uniqueHitCountInList.get(i)+" unique. Lists:";
+			    for (String name : namedListsInGroup) {
+				printme += " "+name+"("+(findHits(event, name).size())+") ";
+			    }
+			    System.out.println(printme);
+			}

 			throw new AssertionError("Total hit count in group is "+tmp+" but hit count at start was "+hitCount+" -- mismatch.");
 		    }
 		}

@@ -91,7 +100,7 @@

 	    } else {
 		if (m_debug) { System.out.println("DEBUG: Ignoring total hit counts."); }
 	    }

-	    if (m_requireAllHitsMatch) {

+	    if (m_requireUniqueHitsMatch) {

 		int uniqueHitCount = uniqueHitCountInList.get(0);
 		for (Integer tmp : uniqueHitCountInList) {
 		    if (tmp != uniqueHitCount) {