4 modified files
lcsim/src/org/lcsim/plugin/web
diff -u -r1.6 -r1.7
--- examples.html 2 Nov 2005 00:40:57 -0000 1.6
+++ examples.html 6 Jan 2006 23:32:32 -0000 1.7
@@ -45,7 +45,7 @@
<p>These examples are written in Jython. They have to be executed from within
mainLoop.py, which is capable of executing Java examples as well. You will have
to provide data samples by modifying mainLoop.py. For a Tutorial visit
-<a href="http://confluence.slac.stanford.edu/display/ilc/Writing+a+Jython+Driver">
+<a target="_external" href="http://confluence.slac.stanford.edu/display/ilc/Writing+a+Jython+Driver">
Writing a Jython Driver</a></p>
<table border="1" cellpadding="2" cellspacing="1" style="border-collapse: collapse" bordercolor="#111111" id="AutoNumber2">
<tr>
lcsim/src/org/lcsim/util/lcio
diff -u -r1.2 -r1.3
--- SIOReconstructedParticle.java 7 Oct 2005 21:11:08 -0000 1.2
+++ SIOReconstructedParticle.java 6 Jan 2006 23:32:33 -0000 1.3
@@ -19,7 +19,7 @@
/**
*
* @author Tony Johnson
- * @version $Id: SIOReconstructedParticle.java,v 1.2 2005/10/07 21:11:08 ngraf Exp $
+ * @version $Id: SIOReconstructedParticle.java,v 1.3 2006/01/06 23:32:33 tonyj Exp $
*/
class SIOReconstructedParticle implements ReconstructedParticle
{
@@ -73,7 +73,7 @@
for (int i=0; i<3; i++) out.writeFloat((float) mom[i]);
out.writeFloat((float) particle.getEnergy());
double[] matrix = particle.getCovMatrix();
- for (int i=0; i<10; i++) out.writeFloat((float)matrix[i]);
+ for (int i=0; i<10; i++) out.writeFloat(matrix == null ? 0f : (float)matrix[i]);
out.writeFloat((float) particle.getMass());
out.writeFloat((float)particle.getCharge());
double[] ref = particle.getReferencePoint().v();
lcsim/test
diff -u -r1.10 -r1.11
--- TestFastMC.java 10 Aug 2005 18:16:08 -0000 1.10
+++ TestFastMC.java 6 Jan 2006 23:32:33 -0000 1.11
@@ -1,11 +1,10 @@
import org.lcsim.util.aida.AIDA;
-import hep.io.stdhep.StdhepReader;
import java.io.File;
-import java.io.IOException;
import java.net.URL;
import junit.framework.Test;
import junit.framework.TestCase;
import junit.framework.TestSuite;
+import org.lcsim.event.util.JetDriver;
import org.lcsim.mc.fast.MCFast;
import org.lcsim.util.Driver;
import org.lcsim.util.cache.FileCache;
@@ -47,6 +46,7 @@
LCSimLoop loop = new LCSimLoop();
loop.setStdhepRecordSource(stdhep,detectorName);
loop.add(fast);
+ loop.add(new JetDriver());
loop.add(writer);
loop.loop(100);
loop.dispose();
lcsim/test
diff -u -r1.9 -r1.10
--- TestFastMCGenerator.java 10 Aug 2005 18:16:08 -0000 1.9
+++ TestFastMCGenerator.java 6 Jan 2006 23:32:33 -0000 1.10
@@ -41,6 +41,7 @@
LCSimLoop loop = new LCSimLoop();
loop.setRecordSource(gen);
+ loop.add(fast);
loop.add(writer);
loop.loop(100);
loop.dispose();
CVSspam 0.2.8