lcsim/src/org/lcsim/contrib/uiowa
diff -u -r1.5 -r1.6
--- MIPReassignmentAlgorithm.java 11 Jul 2008 16:41:52 -0000 1.5
+++ MIPReassignmentAlgorithm.java 11 Jul 2008 19:00:56 -0000 1.6
@@ -62,6 +62,12 @@
m_histo_trans_longi = histo4;
}
+ public MIPReassignmentAlgorithm(double limit, LocalHelixExtrapolator findCluster, Map<Track, BasicCluster> MapTrkToMIP) {
+ m_limit = limit;
+ m_findCluster = findCluster;
+ m_newMapMIP = MapTrkToMIP;
+ }
+
public Double computeFigureOfMerit(Track tr, Cluster clus) {
@@ -115,10 +121,10 @@
m_trans = displacement.magnitude()*Math.sin(m_angle);
m_costheta = VecOp.dot(tangentUnit, displacementUnit);
- m_histo_radian_distance.fill(m_angle,m_distance);
- m_histo_degree_distance.fill(m_degree,m_distance);
- m_histo_costheta_distance.fill(m_costheta,m_distance);
- m_histo_trans_longi.fill(m_trans, m_distance);
+ if (m_histo_radian_distance != null) { m_histo_radian_distance.fill(m_angle,m_distance); }
+ if (m_histo_degree_distance != null) { m_histo_degree_distance.fill(m_degree,m_distance); }
+ if (m_histo_costheta_distance != null) { m_histo_costheta_distance.fill(m_costheta,m_distance); }
+ if (m_histo_trans_longi != null) { m_histo_trans_longi.fill(m_trans, m_distance); }
if(debug){
System.out.print(" Angle= " + m_angle);