Commit in lcsim/src/org/lcsim/contrib/uiowa on MAIN
SteveMIPReassignmentAlgorithm.java+31.2 -> 1.3
ReclusterDTreeDriver.java+4-11.44 -> 1.45
MipQualityDecision.java+4-11.1 -> 1.2
LayerBasedMIPGeometryHandler.java+4-11.1 -> 1.2
+15-3
4 modified files
MJC (contrib): Fix rare crash bug

lcsim/src/org/lcsim/contrib/uiowa
SteveMIPReassignmentAlgorithm.java 1.2 -> 1.3
diff -u -r1.2 -r1.3
--- SteveMIPReassignmentAlgorithm.java	4 Aug 2008 17:38:17 -0000	1.2
+++ SteveMIPReassignmentAlgorithm.java	21 Aug 2008 18:34:31 -0000	1.3
@@ -194,6 +194,9 @@
 	} else if (calName.compareTo("EMEndcap")==0) {
 	    trackPointInLayer_N = m_extrap.extendToECALEndcapLayer(layerN);
 	    trackPointInLayer_NminusOne = m_extrap.extendToECALEndcapLayer(layerN-1);
+	} else if (calName.compareTo("MuonEndcap")==0) {
+	    trackPointInLayer_N = m_extrap.extendToMCALEndcapLayer(layerN);
+	    trackPointInLayer_NminusOne = m_extrap.extendToMCALEndcapLayer(layerN-1);
 	} else {
 	    throw new AssertionError("Calorimeter component "+calName+" not recognized!");
 	}

lcsim/src/org/lcsim/contrib/uiowa
ReclusterDTreeDriver.java 1.44 -> 1.45
diff -u -r1.44 -r1.45
--- ReclusterDTreeDriver.java	18 Aug 2008 21:50:59 -0000	1.44
+++ ReclusterDTreeDriver.java	21 Aug 2008 18:34:31 -0000	1.45
@@ -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.44 2008/08/18 21:50:59 mcharles Exp $
+  * @version $Id: ReclusterDTreeDriver.java,v 1.45 2008/08/21 18:34:31 mcharles Exp $
   * @author Mat Charles <[log in to unmask]>
   */
 
@@ -3912,6 +3912,9 @@
 	    } else if (subdetName.compareTo("HADEndcap")==0) {
 		err_rphi = 10.0 / 3.464;
 		err_z = 3.0 / 3.464; // 1.2 mm gas OR 5.0 mm scint... pick 3mm as a compromise
+	    } else if (subdetName.compareTo("MuonEndcap")==0) {
+		err_rphi = 30.0 / 3.464;// 3x3cm segmentation
+		err_z = 3.0 / 3.464; // 1.2 mm gas
 	    } else {
 		throw new AssertionError("Subdet not recognized: "+subdetName);
 	    }

lcsim/src/org/lcsim/contrib/uiowa
MipQualityDecision.java 1.1 -> 1.2
diff -u -r1.1 -r1.2
--- MipQualityDecision.java	6 Jun 2008 00:07:27 -0000	1.1
+++ MipQualityDecision.java	21 Aug 2008 18:34:31 -0000	1.2
@@ -17,7 +17,7 @@
  * c) chi^2 of helix fit to cluster
  *
  * @author [log in to unmask]
- * @version $Id: MipQualityDecision.java,v 1.1 2008/06/06 00:07:27 mcharles Exp $
+ * @version $Id: MipQualityDecision.java,v 1.2 2008/08/21 18:34:31 mcharles Exp $
  */
  
 
@@ -70,6 +70,9 @@
 	    } else if (subdetName.compareTo("HADEndcap")==0) {
 		err_rphi = 10.0 / 3.464;
 		err_z = 3.0 / 3.464; // 1.2 mm gas OR 5.0 mm scint... pick 3mm as a compromise
+	    } else if (subdetName.compareTo("MuonEndcap")==0) {
+		err_rphi = 30.0 / 3.464;// 3x3cm segmentation
+		err_z = 3.0 / 3.464; // 1.2 mm gas
 	    } else {
 		throw new AssertionError("Subdet not recognized: "+subdetName);
 	    }

lcsim/src/org/lcsim/contrib/uiowa
LayerBasedMIPGeometryHandler.java 1.1 -> 1.2
diff -u -r1.1 -r1.2
--- LayerBasedMIPGeometryHandler.java	15 Aug 2008 17:32:33 -0000	1.1
+++ LayerBasedMIPGeometryHandler.java	21 Aug 2008 18:34:31 -0000	1.2
@@ -23,7 +23,7 @@
  * from the IP, then finding the hits in the outermost layer
  * of that subdetector.
  *
- * @version $Id: LayerBasedMIPGeometryHandler.java,v 1.1 2008/08/15 17:32:33 mcharles Exp $
+ * @version $Id: LayerBasedMIPGeometryHandler.java,v 1.2 2008/08/21 18:34:31 mcharles Exp $
  */
 
 public class LayerBasedMIPGeometryHandler extends MIPGeometryHandler {
@@ -121,6 +121,9 @@
 	} else if (calName.compareTo("EMEndcap")==0) {
 	    trackPointInLayer_N = m_extrap.extendToECALEndcapLayer(layerN);
 	    trackPointInLayer_NminusOne = m_extrap.extendToECALEndcapLayer(layerN-1);
+	} else if (calName.compareTo("MuonEndcap")==0) {
+	    trackPointInLayer_N = m_extrap.extendToMCALEndcapLayer(layerN);
+	    trackPointInLayer_NminusOne = m_extrap.extendToMCALEndcapLayer(layerN-1);
 	} else {
 	    throw new AssertionError("Calorimeter component "+calName+" not recognized!");
 	}
CVSspam 0.2.8