Print

Print


Commit in lcsim/src/org/lcsim/recon/pfa/structural on MAIN
LayerBasedMIPGeometryHandler.java+4-11.1 -> 1.2
PreShowerMIPReassignmentAlgorithm.java+31.2 -> 1.3
ReclusterDTreeDriver.java+5-21.10 -> 1.11
+12-3
3 modified files
MJC: Fix rare crash bug

lcsim/src/org/lcsim/recon/pfa/structural
LayerBasedMIPGeometryHandler.java 1.1 -> 1.2
diff -u -r1.1 -r1.2
--- LayerBasedMIPGeometryHandler.java	19 Aug 2008 06:33:39 -0000	1.1
+++ LayerBasedMIPGeometryHandler.java	21 Aug 2008 18:36:54 -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/19 06:33:39 mcharles Exp $
+ * @version $Id: LayerBasedMIPGeometryHandler.java,v 1.2 2008/08/21 18:36:54 mcharles Exp $
  */
 
 public class LayerBasedMIPGeometryHandler extends MIPGeometryHandler {
@@ -122,6 +122,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/recon/pfa/structural
PreShowerMIPReassignmentAlgorithm.java 1.2 -> 1.3
diff -u -r1.2 -r1.3
--- PreShowerMIPReassignmentAlgorithm.java	19 Aug 2008 06:30:43 -0000	1.2
+++ PreShowerMIPReassignmentAlgorithm.java	21 Aug 2008 18:36:54 -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/recon/pfa/structural
ReclusterDTreeDriver.java 1.10 -> 1.11
diff -u -r1.10 -r1.11
--- ReclusterDTreeDriver.java	19 Aug 2008 06:30:43 -0000	1.10
+++ ReclusterDTreeDriver.java	21 Aug 2008 18:36:54 -0000	1.11
@@ -35,7 +35,7 @@
   * in this package, which uses the implementation in
   * org.lcsim.recon.cluster.directedtree developed by NIU).
   *
-  * @version $Id: ReclusterDTreeDriver.java,v 1.10 2008/08/19 06:30:43 mcharles Exp $
+  * @version $Id: ReclusterDTreeDriver.java,v 1.11 2008/08/21 18:36:54 mcharles Exp $
   * @author Mat Charles <[log in to unmask]>
   */
 
@@ -102,7 +102,7 @@
     }
 
     public ReclusterDTreeDriver(String dTreeClusterList, String trackList, String mcList) {
-	System.out.println("ReclusterDTreeDriver version 0.4");
+	System.out.println("ReclusterDTreeDriver version 0.41");
 	initTrackMatch();
 	initCalibration();
 	initPlots();
@@ -3758,6 +3758,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);
 	    }
CVSspam 0.2.8