13 modified files
lcsim/test/org/lcsim/fit/helicaltrack
diff -u -r1.2 -r1.3
--- HelicalTrackFitterTest.java 30 Mar 2006 16:05:23 -0000 1.2
+++ HelicalTrackFitterTest.java 22 May 2006 19:55:07 -0000 1.3
@@ -3,7 +3,7 @@
*
* Created on March 27, 2006, 11:02 PM
*
- * $Id: HelicalTrackFitterTest.java,v 1.2 2006/03/30 16:05:23 ngraf Exp $
+ * $Id: HelicalTrackFitterTest.java,v 1.3 2006/05/22 19:55:07 tonyj Exp $
*/
package org.lcsim.fit.helicaltrack;
@@ -80,15 +80,15 @@
boolean success = fitter.fit(x, y, z, rPhiErr, zErr, nmeas);
assertTrue(success);
HelicalTrackFit fit = fitter.getFit();
- System.out.println(fit);
+// System.out.println(fit);
BaseTrack t = new BaseTrack();
t.setTrackParameters(fit.parameters(), bField);
// TODO seeing some oddness in the calculations of pz, need to investigate.
- System.out.println(t);
- System.out.println("track: px="+t.getPX()+" py= "+t.getPY()+" pz= "+t.getPZ());
- System.out.println("track: q= "+t.getCharge());
+// System.out.println(t);
+// System.out.println("track: px="+t.getPX()+" py= "+t.getPY()+" pz= "+t.getPZ());
+// System.out.println("track: q= "+t.getCharge());
double[] trackP = t.getMomentum();
for(int i=0; i<3; ++i)
{
lcsim/test
diff -u -r1.3 -r1.4
--- MokkaTest.java 18 Jan 2006 22:00:29 -0000 1.3
+++ MokkaTest.java 22 May 2006 19:55:07 -0000 1.4
@@ -17,63 +17,60 @@
import junit.framework.TestSuite;
/**
- *
+ *
* @author jeremym
- * @version $Id: MokkaTest.java,v 1.3 2006/01/18 22:00:29 jeremy Exp $
+ * @version $Id: MokkaTest.java,v 1.4 2006/05/22 19:55:07 tonyj Exp $
*/
public class MokkaTest extends TestCase
{
-
- public MokkaTest(String testName)
- {
- super(testName);
- }
-
- public static Test suite()
- {
- return new TestSuite(MokkaTest.class);
- }
-
- public void testMokka() throws Exception
- {
- // URL url = new
- // URL("http://www.lcsim.org/test/lcio/D12_mokka_muons.slcio");
- URL url = new URL(
- "http://www.lcsim.org/test/lcio/hcalFeRPC1_Mokka_muons.slcio");
- FileCache cache = new FileCache();
- File file = cache.getCachedFile(url);
-
- LCSimLoop loop = new LCSimLoop();
- loop.setLCIORecordSource(file);
- loop.add(new MokkaDriver());
- loop.loop(-1);
- loop.dispose();
- }
-
- private class MokkaDriver extends Driver
- {
- protected void process(EventHeader event)
- {
- List<List<CalorimeterHit>> calHitColls = event.get(CalorimeterHit.class);
- for ( List<CalorimeterHit> calHits : calHitColls )
- {
- LCMetaData meta = event.getMetaData(calHits);
- IDDecoder decoder = meta.getIDDecoder();
-
- for ( CalorimeterHit hit : calHits )
- {
- decoder.setID(hit.getCellID());
-
- int M = decoder.getValue("M");
- int S = decoder.getValue("S");
- int I = decoder.getValue("I");
- int J = decoder.getValue("J");
- int layer = decoder.getValue("layer");
-
-// System.out.println("M S I J layer = "
-// + M + " " + S + " " + I + " " + J + " " + layer);
- }
- }
- }
- }
+
+ public MokkaTest(String testName)
+ {
+ super(testName);
+ }
+
+ public static Test suite()
+ {
+ return new TestSuite(MokkaTest.class);
+ }
+
+ public void testMokka() throws Exception
+ {
+ // URL url = new
+ // URL("http://www.lcsim.org/test/lcio/D12_mokka_muons.slcio");
+ URL url = new URL(
+ "http://www.lcsim.org/test/lcio/hcalFeRPC1_Mokka_muons.slcio");
+ FileCache cache = new FileCache();
+ File file = cache.getCachedFile(url);
+
+ LCSimLoop loop = new LCSimLoop();
+ loop.setLCIORecordSource(file);
+ loop.add(new MokkaDriver());
+ loop.loop(-1);
+ loop.dispose();
+ }
+
+ private class MokkaDriver extends Driver
+ {
+ protected void process(EventHeader event)
+ {
+ List<List<CalorimeterHit>> calHitColls = event.get(CalorimeterHit.class);
+ for ( List<CalorimeterHit> calHits : calHitColls )
+ {
+ LCMetaData meta = event.getMetaData(calHits);
+ IDDecoder decoder = meta.getIDDecoder();
+
+ for ( CalorimeterHit hit : calHits )
+ {
+ decoder.setID(hit.getCellID());
+
+ int M = decoder.getValue("M");
+ int S = decoder.getValue("S");
+ int I = decoder.getValue("I");
+ int J = decoder.getValue("J");
+ int layer = decoder.getValue("layer");
+ }
+ }
+ }
+ }
}
lcsim/test
diff -u -r1.6 -r1.7
--- EventHeaderTest.java 5 Apr 2006 11:22:54 -0000 1.6
+++ EventHeaderTest.java 22 May 2006 19:55:07 -0000 1.7
@@ -46,8 +46,6 @@
private void runTestFile(String s) throws Exception
{
- System.out.println("Running EventHeaderTest on file: " + s);
-
URL url = new URL(s);
FileCache cache = new FileCache();
File file = cache.getCachedFile(url);
@@ -76,8 +74,6 @@
for (List<SimTrackerHit> simTrackerHits : simTrackerHitSets)
{
LCMetaData meta = event.getMetaData(simTrackerHits);
-
- //System.out.println("coll name: " + meta.getName() );
IDDecoder decoder = meta.getIDDecoder();
if ( decoder == null )
@@ -90,7 +86,6 @@
for ( SimTrackerHit hit : simTrackerHits )
{
decoder.setID( hit.getCellID() );
- //System.out.println("decoder = " + decoder);
assert(decoder.toString() != null);
assert(decoder.toString().length() > 0);
lcsim/test
diff -u -r1.1 -r1.2
--- NeighbourFindingTest.java 15 Mar 2006 23:47:36 -0000 1.1
+++ NeighbourFindingTest.java 22 May 2006 19:55:07 -0000 1.2
@@ -22,97 +22,96 @@
{
List<String> detNames = DetectorLocator.getDetectorNameList();
- // loop over all cached detectors
- for(String detname : detNames ) {
- Detector det = DetectorLocator.findDetector(detname);
- System.out.println("testing <"+det.getName()+">...");
-
- // loop over all subdetectors
- Map<String, Subdetector> subdetMap = det.getSubdetectors();
- for(String subdetName : subdetMap.keySet()) {
- Subdetector subdet = subdetMap.get(subdetName);
-
- // test all cylindrical barrels and disk-like endcaps
- if(subdet instanceof CylindricalCalorimeter) {
- CylindricalCalorimeter cal = (CylindricalCalorimeter)subdet;
- if(cal==null) continue;
-
- IDDecoder decoder = null;
- try {
- decoder = cal.getIDDecoder();
- }
- catch(Exception x) {
- System.out.println("Note: no decoder for <"+cal.getName()+">: cal type = "+cal);
- continue;
- }
-
- if(cal.isBarrel()) {
- // test neighbour finding at difficut situation: phi=0
- double rmin = cal.getInnerRadius();
- double rmax = cal.getOuterRadius();
- double[] pos = new double[3];
- pos[0] = (rmin+rmax)/2;
- pos[1] = 0;
- pos[2] = 0;
-
- // test cell finding without previously setting a longID into the decoder
- long refid = decoder.findCellContainingXYZ(pos);
- assert refid != 0 : "Error: No refID cell returned. Valid input point?";
-
- if( decoder.supportsNeighbours() ) {
- // test neighbour finding
- decoder.setID(refid);
- long[] neighs = decoder.getNeighbourIDs(1,1,1);
- assert neighs.length == 26 : "Incorrect # neighbors returned: "+neighs.length;
- }
- else {
- System.out.println("Neighbor finding not supported for <"+cal.getName()+">");
- continue;
- }
- }
- else {
- // test neighbour finding at difficut situation: phi=0
- double rmin = cal.getInnerRadius();
- double rmax = cal.getOuterRadius();
- double zmin = cal.getZMin();
- double zmax = cal.getZMax();
-
- double[] pos = new double[3];
- pos[0] = (rmin+rmax)/2;
- pos[1] = 0;
-
- // test cell finding without previously setting a longID into the decoder
-
- // for south
- pos[2] = (zmin+zmax)/2;
- long refidSouth = decoder.findCellContainingXYZ(pos);
- assert refidSouth != 0 : "Error: No refID cell returned. Valid input point?";
-
- // for north
- pos[2] = -(zmin+zmax)/2;
- long refidNorth = decoder.findCellContainingXYZ(pos);
- assert refidNorth != 0 : "Error: No refID cell returned. Valid input point?";
-
- assert refidNorth!=refidSouth : "Same refid for north and south ("+refidNorth+")is wrong!";
-
- if( decoder.supportsNeighbours() ) {
- // test neighbour finding
- long[] neighs;
- decoder.setID(refidSouth);
- neighs = decoder.getNeighbourIDs(1,1,1);
- assert neighs.length == 26 : "Incorrect # neighbors returned: "+neighs.length;
-
- decoder.setID(refidNorth);
- neighs = decoder.getNeighbourIDs(1,1,1);
- assert neighs.length == 26 : "Incorrect # neighbors returned: "+neighs.length;
- }
- else {
- System.out.println("Neighbor finding not supported for <"+cal.getName()+">");
- continue;
- }
- }
- }
- }
- }
+ // loop over all cached detectors
+ for(String detname : detNames ) {
+ Detector det = DetectorLocator.findDetector(detname);
+
+ // loop over all subdetectors
+ Map<String, Subdetector> subdetMap = det.getSubdetectors();
+ for(String subdetName : subdetMap.keySet()) {
+ Subdetector subdet = subdetMap.get(subdetName);
+
+ // test all cylindrical barrels and disk-like endcaps
+ if(subdet instanceof CylindricalCalorimeter) {
+ CylindricalCalorimeter cal = (CylindricalCalorimeter)subdet;
+ if(cal==null) continue;
+
+ IDDecoder decoder = null;
+ try {
+ decoder = cal.getIDDecoder();
+ }
+ catch(Exception x) {
+ System.out.println("Note: no decoder for <"+cal.getName()+">: cal type = "+cal);
+ continue;
+ }
+
+ if(cal.isBarrel()) {
+ // test neighbour finding at difficut situation: phi=0
+ double rmin = cal.getInnerRadius();
+ double rmax = cal.getOuterRadius();
+ double[] pos = new double[3];
+ pos[0] = (rmin+rmax)/2;
+ pos[1] = 0;
+ pos[2] = 0;
+
+ // test cell finding without previously setting a longID into the decoder
+ long refid = decoder.findCellContainingXYZ(pos);
+ assert refid != 0 : "Error: No refID cell returned. Valid input point?";
+
+ if( decoder.supportsNeighbours() ) {
+ // test neighbour finding
+ decoder.setID(refid);
+ long[] neighs = decoder.getNeighbourIDs(1,1,1);
+ assert neighs.length == 26 : "Incorrect # neighbors returned: "+neighs.length;
+ }
+ else {
+ System.out.println("Neighbor finding not supported for <"+cal.getName()+">");
+ continue;
+ }
+ }
+ else {
+ // test neighbour finding at difficut situation: phi=0
+ double rmin = cal.getInnerRadius();
+ double rmax = cal.getOuterRadius();
+ double zmin = cal.getZMin();
+ double zmax = cal.getZMax();
+
+ double[] pos = new double[3];
+ pos[0] = (rmin+rmax)/2;
+ pos[1] = 0;
+
+ // test cell finding without previously setting a longID into the decoder
+
+ // for south
+ pos[2] = (zmin+zmax)/2;
+ long refidSouth = decoder.findCellContainingXYZ(pos);
+ assert refidSouth != 0 : "Error: No refID cell returned. Valid input point?";
+
+ // for north
+ pos[2] = -(zmin+zmax)/2;
+ long refidNorth = decoder.findCellContainingXYZ(pos);
+ assert refidNorth != 0 : "Error: No refID cell returned. Valid input point?";
+
+ assert refidNorth!=refidSouth : "Same refid for north and south ("+refidNorth+")is wrong!";
+
+ if( decoder.supportsNeighbours() ) {
+ // test neighbour finding
+ long[] neighs;
+ decoder.setID(refidSouth);
+ neighs = decoder.getNeighbourIDs(1,1,1);
+ assert neighs.length == 26 : "Incorrect # neighbors returned: "+neighs.length;
+
+ decoder.setID(refidNorth);
+ neighs = decoder.getNeighbourIDs(1,1,1);
+ assert neighs.length == 26 : "Incorrect # neighbors returned: "+neighs.length;
+ }
+ else {
+ System.out.println("Neighbor finding not supported for <"+cal.getName()+">");
+ continue;
+ }
+ }
+ }
+ }
+ }
}
}
lcsim/test
diff -u -r1.15 -r1.16
--- HitPositionTest.java 16 Feb 2006 02:46:00 -0000 1.15
+++ HitPositionTest.java 22 May 2006 19:55:07 -0000 1.16
@@ -53,26 +53,16 @@
private void runTestFile(String s) throws Exception
{
- System.out.println("Running HitPositionTest on file: " + s);
-
- try
- {
- URL url = new URL(s);
- FileCache cache = new FileCache();
- File file = cache.getCachedFile(url);
-
- recordCount = 0;
- LCSimLoop loop = new LCSimLoop();
- loop.setLCIORecordSource(file);
- loop.add(new HitPositionDriver());
- loop.loop(maxEvents);
- loop.dispose();
- }
- catch (Exception e)
- {
- System.err.println("HitPositionTest failed on file " + s);
- throw new RuntimeException(e);
- }
+ URL url = new URL(s);
+ FileCache cache = new FileCache();
+ File file = cache.getCachedFile(url);
+
+ recordCount = 0;
+ LCSimLoop loop = new LCSimLoop();
+ loop.setLCIORecordSource(file);
+ loop.add(new HitPositionDriver());
+ loop.loop(maxEvents);
+ loop.dispose();
}
/** Collections to test. */
@@ -109,12 +99,9 @@
{
public void process(EventHeader event)
{
- // System.out.println("proc event: " + recordCount);
++recordCount;
for (String s : colls)
{
- // System.out.println("coll: " + s);
-
List<SimCalorimeterHit> hits = event.get(SimCalorimeterHit.class, s);
CalorimeterIDDecoder decoder = (CalorimeterIDDecoder) event.getMetaData(hits).getIDDecoder();
lcsim/test/org/lcsim/fit/polynomial
diff -u -r1.2 -r1.3
--- PolynomialFitterTest.java 22 Mar 2006 01:06:51 -0000 1.2
+++ PolynomialFitterTest.java 22 May 2006 19:55:08 -0000 1.3
@@ -53,8 +53,8 @@
PolynomialFit fit = fitter.getFit();
Matrix p = fit.parameters();
Matrix c = fit.covariance();
- System.out.println(p);
- System.out.println(c);
+// System.out.println(p);
+// System.out.println(c);
for(int i=0; i<nparams; ++i)
{
assertEquals(pars[i],p.get(i,0),5*Math.sqrt(c.get(i,i))); // 5 sigma should be robust
lcsim/test/org/lcsim/recon/cluster/fixedcone
diff -u -r1.6 -r1.7
--- FixedConeClustererTest.java 18 Jul 2005 03:07:12 -0000 1.6
+++ FixedConeClustererTest.java 22 May 2006 19:55:08 -0000 1.7
@@ -59,17 +59,16 @@
{
EventHeader event = reader.read();
driver.process(event);
- System.out.println("testing... ");
//if (n == 0)
{
// Look for clusters
List<List<Cluster>> collections = event.get(Cluster.class);
- System.out.println("Found "+collections.size() +" cluster collection"+(collections.size()==1?" ":"s ")+"in the event");
+// System.out.println("Found "+collections.size() +" cluster collection"+(collections.size()==1?" ":"s ")+"in the event");
for(List<Cluster> clusterList : collections)
{
for(Cluster clus : clusterList)
{
- System.out.println(clus);
+// System.out.println(clus);
}
}
// assertEquals(4,collections.size());
@@ -81,7 +80,7 @@
}
catch (EOFException x)
{
- System.out.println("End of file reached");
+// System.out.println("End of file reached");
}
finally
{
lcsim/test/org/lcsim/recon/cluster/nn
diff -u -r1.5 -r1.6
--- NearestNeighborClustererTest.java 8 Feb 2006 00:49:43 -0000 1.5
+++ NearestNeighborClustererTest.java 22 May 2006 19:55:08 -0000 1.6
@@ -45,7 +45,7 @@
LCIOWriter writer = new LCIOWriter("NearestNeighborRecon.slcio");
int minNumberOfCells = 5;
NearestNeighborClusterDriver driver = new NearestNeighborClusterDriver(minNumberOfCells);
- System.out.println("Processing events with " + driver);
+// System.out.println("Processing events with " + driver);
int n = 0;
long start = System.currentTimeMillis();
try
@@ -70,7 +70,7 @@
}
catch (EOFException x)
{
- System.out.println("End of file reached");
+// System.out.println("End of file reached");
}
finally
{
lcsim/test/org/lcsim/recon/vertexing/billoir
diff -u -r1.1 -r1.2
--- VertexFitterTest.java 28 Mar 2006 23:50:28 -0000 1.1
+++ VertexFitterTest.java 22 May 2006 19:55:08 -0000 1.2
@@ -1,7 +1,7 @@
package org.lcsim.recon.vertexing.billoir;
/**
- * @version $Id: VertexFitterTest.java,v 1.1 2006/03/28 23:50:28 jstrube Exp $
+ * @version $Id: VertexFitterTest.java,v 1.2 2006/05/22 19:55:08 tonyj Exp $
*/
@@ -66,32 +66,32 @@
return;
for (Track iTrack : tracks) {
Matrix olderrors = new Matrix(iTrack.getErrorMatrix());
- olderrors.print(21, 20);
+// olderrors.print(21, 20);
double[] params = iTrack.getTrackParameters();
- System.err.println();
+// System.err.println();
Matrix jacobi = new Matrix(getJacobi(params));
- jacobi.print(21, 20);
+// jacobi.print(21, 20);
double theta = PI/2 - atan(params[4]);
double[] newparams = new double[]{params[0], params[3], theta, params[1], params[2]};
trackParams.add(newparams);
double[][] weightArray = jacobi.times(olderrors).times(jacobi.transpose()).getArray();
Matrix nw = new Matrix(weightArray);
- nw.print(31, 30);
- System.err.printf("Old Det: %g\nNew Det: %g\nJacobi Det: %g\n", olderrors.det(), nw.det(), jacobi.det());
+// nw.print(31, 30);
+// System.err.printf("Old Det: %g\nNew Det: %g\nJacobi Det: %g\n", olderrors.det(), nw.det(), jacobi.det());
weights.add(flattenMatrix(weightArray));
}
- System.err.printf("%d tracks\n", trackParams.size());
- System.err.println("fitting");
+// System.err.printf("%d tracks\n", trackParams.size());
+// System.err.println("fitting");
boolean[] inVtx = new boolean[] {true, true};
double[] initialPosition = new double[] {0, 0, 0};
for (double[] x : trackParams) {
- System.err.print("Track Parameters: ");
+// System.err.print("Track Parameters: ");
for (double y : x) {
- System.err.printf("%f\t", y);
+// System.err.printf("%f\t", y);
}
- System.err.println();
+// System.err.println();
}
//System.err.printf("Check: Parameter 4 of track 2: %.3f\n", trackParams.toArray(new double[][]{})[1][3]);
// for (double[] x : trackParams.toArray(new double[][]{})) {
@@ -103,16 +103,16 @@
// }
for (double[] x : weights) {
- System.err.print("Track weights: ");
- for (double y : x) {
- System.err.printf("%f\t", y);
- }
- System.err.println();
+// System.err.print("Track weights: ");
+// for (double y : x) {
+// System.err.printf("%f\t", y);
+// }
+// System.err.println();
}
Matrix newTrackParams = new Matrix(trackParams.toArray(new double[][]{}));
- newTrackParams.print(20, 21);
+// newTrackParams.print(20, 21);
Matrix newWeights = new Matrix(weights.toArray(new double[][]{}));
- newWeights.print(21, 20);
+// newWeights.print(21, 20);
Vertex v = fitter.fit(tracks, new CartesianPoint(initialPosition), true);
aida.cloud1D("vtx_chi2").fill(v._chi2);
}
lcsim/test/org/lcsim/event/base
diff -u -r1.2 -r1.3
--- BaseTrackerHitTest.java 25 Mar 2006 00:48:23 -0000 1.2
+++ BaseTrackerHitTest.java 22 May 2006 19:55:09 -0000 1.3
@@ -4,7 +4,7 @@
*
* Created on March 24, 2006, 1:03 PM
*
- * $Id: BaseTrackerHitTest.java,v 1.2 2006/03/25 00:48:23 ngraf Exp $
+ * $Id: BaseTrackerHitTest.java,v 1.3 2006/05/22 19:55:09 tonyj Exp $
*/
package org.lcsim.event.base;
@@ -21,7 +21,6 @@
public void testBaseTrackerHit()
{
BaseTrackerHit hit = new BaseTrackerHit();
- System.out.println(hit);
double[] pos = {1., 2., 3.};
double[] cov = {1., 2., 3., 4., 5., 6. };
lcsim/src/org/lcsim/conditions
diff -u -r1.4 -r1.5
--- DetectorLocator.java 5 Apr 2006 23:47:27 -0000 1.4
+++ DetectorLocator.java 22 May 2006 19:55:09 -0000 1.5
@@ -108,11 +108,6 @@
for ( String n : names )
{
Detector det = findDetector(n);
-
- if ( det != null )
- {
- System.out.println("Cached detector: " + n);
- }
}
}
lcsim/test/org/lcsim/fit/line
diff -u -r1.1 -r1.2
--- SlopeInterceptLineFitterTest.java 28 Mar 2006 04:51:18 -0000 1.1
+++ SlopeInterceptLineFitterTest.java 22 May 2006 19:55:09 -0000 1.2
@@ -3,7 +3,7 @@
*
* Created on March 27, 2006, 7:35 PM
*
- * $Id: SlopeInterceptLineFitterTest.java,v 1.1 2006/03/28 04:51:18 ngraf Exp $
+ * $Id: SlopeInterceptLineFitterTest.java,v 1.2 2006/05/22 19:55:09 tonyj Exp $
*/
package org.lcsim.fit.line;
@@ -49,7 +49,7 @@
boolean success = fitter.fit(x, y, sigma, npoints);
assertTrue(success);
SlopeInterceptLineFit fit = fitter.getFit();
- System.out.println(fit);
+// System.out.println(fit);
double slope = fit.slope();
double slopeErr = fit.slopeUncertainty();
@@ -57,7 +57,7 @@
double b = fit.intercept();
double bErr = fit.interceptUncertainty();
- System.out.println(b+" +/- "+bErr);
+// System.out.println(b+" +/- "+bErr);
assertEquals(pars[0],b, 5*bErr);
}
}
lcsim/test/org/lcsim/conditions
diff -u -r1.8 -r1.9
--- ConditionsManagerTest.java 26 Sep 2005 22:40:50 -0000 1.8
+++ ConditionsManagerTest.java 22 May 2006 19:55:09 -0000 1.9
@@ -64,8 +64,6 @@
{
for (String detName : testDets )
{
- System.out.println("Checking conditions for detector " + detName + " ...");
-
_mgr.setDetector(detName,0);
// First check we have a compact description
CVSspam 0.2.8