lcsim/src/org/lcsim/contrib/uiowa

diff -u -r1.33 -r1.34
--- ReclusterDriver.java	12 Aug 2008 23:42:52 -0000	1.33
+++ ReclusterDriver.java	15 Aug 2008 17:41:05 -0000	1.34
@@ -38,7 +38,7 @@

   *
   * This version is PRELIMINARY.
   *

-  * @version $Id: ReclusterDriver.java,v 1.33 2008/08/12 23:42:52 mcharles Exp $

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

   * @author Mat Charles
   */
 

@@ -56,6 +56,7 @@

     boolean m_useAnalogHcalCalibration = false;
     boolean m_useSteveMipsForChargedCalibration = false;
     boolean m_useSteveMipsForConeScoring = false;

+    boolean m_useOldReassignmentAlgorithmForConeScore = false;

 
     boolean m_megaDebug = false;
     boolean m_debug = false;

@@ -83,7 +84,7 @@

     protected int m_punchThroughLayers = 5;
     protected int m_punchThroughHitMinimum = 4;
     protected boolean m_checkSharedHitsForPunchThrough = true;

-    protected boolean m_allowLateralPunchThrough = false;

+    protected boolean m_allowLateralPunchThrough = false; // Set to FALSE for mucal enabled

 
     protected boolean m_debugLinkPlots = false;
 

@@ -1039,16 +1040,28 @@

     // Special!
     // May over-ride some previous links, giving them a better score
     protected void initPotentialLinks_Cone(Collection<Cluster> seeds, Collection<Cluster> linkableClusters, Set<CalorimeterHit> allHits, Map<Track,Cluster> tracksMatchedToClusters, Map<Cluster, Track> clustersMatchedToTweakedTracks, double scaleOK, double scaleMin) {

+	// For the cone angle calculation, we'll need to know the showering point.

 	String mapName;
 	if (m_useSteveMipsForConeScoring) {
 	    mapName = "TrackMipMap";
 	} else {
 	    mapName = "ShowerFinderMapTrackToMip";
 	}

-	Map<Track, BasicCluster> MapTrkToMIP = (Map<Track, BasicCluster>) (m_event.get(mapName));
-        LocalHelixExtrapolator findCluster = new LocalHelixExtrapolator();
-        findCluster.process(m_event); // picks up geometry
-        MIPReassignmentAlgorithm mipAlg = new MIPReassignmentAlgorithm(3.14, findCluster, MapTrkToMIP, 7); 

+
+	// Set up the algorithm which will calculate the cone angle
+ 	ReassignClustersAlgorithm mipAlg = null;
+ 	if (m_useOldReassignmentAlgorithmForConeScore) {
+	    mipAlg = new SteveMIPReassignmentAlgorithm(m_event, 1.0, mapName);
+	} else {
+	    Map<Track, BasicCluster> mapTrackToMIP = (Map<Track, BasicCluster>) (m_event.get(mapName));
+	    LocalHelixExtrapolator findCluster = new LocalHelixExtrapolator();
+	    findCluster.process(m_event); // picks up geometry
+	    MIPGeometryHandler geomHandler = new LayerBasedMIPGeometryHandler(mapTrackToMIP, findCluster);
+	    //MIPGeometryHandler geomHandler = new HelixTangentMIPGeometryHandler(mapTrackToMIP, findCluster);
+	    mipAlg = new ConeMIPReassignmentAlgorithm(geomHandler, 800.0, 3.14);
+	}
+
+	// Loop over possible links and calculate scores

 	for (Cluster seed : seeds) {
 	    // Setup: Find what track the seed is connected to.
 	    Track tr = clustersMatchedToTweakedTracks.get(seed);