Print

Print


Commit in lcsim/src/org/lcsim/contrib/uiowa on MAIN
ReclusterDTreeDriver.java+12-61.34 -> 1.35
MJC: (contrib) Don't increase E/p tolerance in PFA for tracks where E>p already

lcsim/src/org/lcsim/contrib/uiowa
ReclusterDTreeDriver.java 1.34 -> 1.35
diff -u -r1.34 -r1.35
--- ReclusterDTreeDriver.java	22 Jul 2008 17:40:22 -0000	1.34
+++ ReclusterDTreeDriver.java	23 Jul 2008 17:41:06 -0000	1.35
@@ -34,7 +34,7 @@
   * in this package, which uses the implementation in
   * org.lcsim.recon.cluster.directedtree developed by NIU).
   *
-  * @version $Id: ReclusterDTreeDriver.java,v 1.34 2008/07/22 17:40:22 tjkim Exp $
+  * @version $Id: ReclusterDTreeDriver.java,v 1.35 2008/07/23 17:41:06 mcharles Exp $
   * @author Mat Charles <[log in to unmask]>
   */
 
@@ -714,11 +714,17 @@
 	    for (Track tr : tracksWithVetoedLinkToUnusedCluster) {
 		boolean ignoreTrackDueToJet = (m_clusterAsJets && mapTrackToJet.get(tr)!=null);
 		if (!ignoreTrackDueToJet) {
-		    Double oldTolerance = newMapTrackToTolerance.get(tr);
-		    double newTolerance = oldTolerance.doubleValue() + 0.25;
-		    if (newTolerance <= maximumAllowedTolerance) {
-			newMapTrackToTolerance.put(tr, newTolerance);
-			stateChange = true;
+		    Set<Cluster> shower = newMapTrackToShowerComponents.get(tr);
+		    double clusterEnergy = energy(shower, allSharedClusters);
+		    boolean notHighEoverP = testEoverP_oneSided(clusterEnergy, tr, 0.5); // not more than 0.5 sigma above nominal
+		    if (notHighEoverP) { 
+			// Only adjust tolerance if E < p + 0.5sigma
+			Double oldTolerance = newMapTrackToTolerance.get(tr);
+			double newTolerance = oldTolerance.doubleValue() + 0.25;
+			if (newTolerance <= maximumAllowedTolerance) {
+			    newMapTrackToTolerance.put(tr, newTolerance);
+			    stateChange = true;
+			}
 		    }
 		}
 	    }
CVSspam 0.2.8