4 modified files
lcsim/src/org/lcsim/event/base
diff -u -r1.2 -r1.3
--- BaseReconstructedParticle.java 25 Mar 2006 20:45:56 -0000 1.2
+++ BaseReconstructedParticle.java 28 Mar 2006 19:51:37 -0000 1.3
@@ -3,7 +3,7 @@
*
* Created on March 24, 2006, 9:30 AM
*
- * $Id: BaseReconstructedParticle.java,v 1.2 2006/03/25 20:45:56 ngraf Exp $
+ * $Id: BaseReconstructedParticle.java,v 1.3 2006/03/28 19:51:37 ngraf Exp $
*/
package org.lcsim.event.base;
@@ -222,10 +222,13 @@
return _fourVec;
}
-
+ // TODO finish this...
public String toString()
- {
- StringBuffer sb = new StringBuffer(this.getClass().getName()+": \n");
+ {
+ String className = getClass().getName();
+ int lastDot = className.lastIndexOf('.');
+ if(lastDot!=-1)className = className.substring(lastDot+1);
+ StringBuffer sb = new StringBuffer(className+": Type: "+_type+" pdgID: "+_particleIdUsed.getPDG()+" \n");
sb.append("E: "+getEnergy());
return sb.toString();
}
lcsim/src/org/lcsim/event/base
diff -u -r1.2 -r1.3
--- BaseTrackerHit.java 25 Mar 2006 20:45:56 -0000 1.2
+++ BaseTrackerHit.java 28 Mar 2006 19:51:37 -0000 1.3
@@ -3,7 +3,7 @@
*
* Created on March 24, 2006, 9:22 AM
*
- * $Id: BaseTrackerHit.java,v 1.2 2006/03/25 20:45:56 ngraf Exp $
+ * $Id: BaseTrackerHit.java,v 1.3 2006/03/28 19:51:37 ngraf Exp $
*/
package org.lcsim.event.base;
@@ -99,12 +99,16 @@
}
+ // TODO consider customizing based on hit type.
public String toString()
{
String className = getClass().getName();
int lastDot = className.lastIndexOf('.');
if(lastDot!=-1)className = className.substring(lastDot+1);
- StringBuffer sb = new StringBuffer(className+": \n");
+ StringBuffer sb = new StringBuffer(className+": Type: "+_type+"\n");
+ sb.append("(x,y,z): "+_pos[0]+" "+_pos[1]+" "+_pos[2]+"\n");
+ // TODO add in covariance matrix
+ sb.append("dEdx: "+_dedx+" t: "+_time+"\n");
return sb.toString();
}
lcsim/src/org/lcsim/event/base
diff -u -r1.3 -r1.4
--- BaseTrack.java 28 Mar 2006 06:55:24 -0000 1.3
+++ BaseTrack.java 28 Mar 2006 19:51:37 -0000 1.4
@@ -3,7 +3,7 @@
*
* Created on March 24, 2006, 9:18 PM
*
- * $Id: BaseTrack.java,v 1.3 2006/03/28 06:55:24 ngraf Exp $
+ * $Id: BaseTrack.java,v 1.4 2006/03/28 19:51:37 ngraf Exp $
*/
package org.lcsim.event.base;
@@ -170,6 +170,22 @@
}
}
+ // TODO finish this...
+ public String toString()
+ {
+ String className = getClass().getName();
+ int lastDot = className.lastIndexOf('.');
+ if(lastDot!=-1)className = className.substring(lastDot+1);
+ StringBuffer sb = new StringBuffer(className+": Type: "+_type+" charge: "+ _charge+"\n");
+ sb.append("d0= "+_parameters[0]+"\n");
+ sb.append("phi0= "+_parameters[1]+"\n");
+ sb.append("curvature: "+_parameters[2]+"\n");
+ sb.append("z0= "+_parameters[3]+"\n");
+ sb.append("tanLambda= "+_parameters[4]+"\n");
+ return sb.toString();
+ }
+
+
// TODO add convenience methods to replace clunky interface
// Track interface
lcsim/src/org/lcsim/event/base
diff -u -r1.1 -r1.2
--- BaseTrackerHitMC.java 25 Mar 2006 00:37:04 -0000 1.1
+++ BaseTrackerHitMC.java 28 Mar 2006 19:51:37 -0000 1.2
@@ -3,7 +3,7 @@
*
* Created on March 24, 2006, 9:46 AM
*
- * $Id: BaseTrackerHitMC.java,v 1.1 2006/03/25 00:37:04 ngraf Exp $
+ * $Id: BaseTrackerHitMC.java,v 1.2 2006/03/28 19:51:37 ngraf Exp $
*/
package org.lcsim.event.base;
@@ -43,4 +43,12 @@
return _mcparticles;
}
+ public String toString()
+ {
+ StringBuffer sb = new StringBuffer(super.toString());
+ sb.append(" with "+_mcparticles.size()+" MCParticle"+(_mcparticles.size()==1?"":"s"));
+ // TODO decide how to handle listing of MCParticles.
+ return sb.toString();
+ }
+
}
CVSspam 0.2.8