3 modified files
lcsim/src/org/lcsim/mc/CCDSim
diff -u -r1.3 -r1.4
--- FullCCDSimulation.java 4 Oct 2005 18:53:41 -0000 1.3
+++ FullCCDSimulation.java 3 Feb 2006 21:29:37 -0000 1.4
@@ -13,7 +13,7 @@
import org.lcsim.event.EventHeader.LCMetaData;
import org.lcsim.util.*;
import org.lcsim.geometry.Detector;
-import org.lcsim.geometry.TrackerIDDecoder;
+import org.lcsim.geometry.IDDecoder;
import java.io.*;
import java.util.*;
@@ -28,7 +28,7 @@
* objects, which emplement SimTrackerHit interface, so can be used instead
* of original Simulated Tracker Hits generated by Geant4.
* @author sinev U of Oregon; SLAC x2970; [log in to unmask]
- * @version $Id: FullCCDSimulation.java,v 1.3 2005/10/04 18:53:41 sinev Exp $
+ * @version $Id: FullCCDSimulation.java,v 1.4 2006/02/03 21:29:37 jeremy Exp $
*/
public class FullCCDSimulation extends Driver
{
@@ -96,7 +96,7 @@
double dxy = 0.;
double dz = 0.;
LCMetaData meta = event.getMetaData(hits);
- TrackerIDDecoder decoder = (TrackerIDDecoder) meta.getIDDecoder();
+ IDDecoder decoder = meta.getIDDecoder();
for (SimTrackerHit th : hits )
{
double point[] = th.getPoint();
lcsim/src/org/lcsim/plugin/browser
diff -u -r1.6 -r1.7
--- SimTrackerHitTableModel.java 22 Sep 2005 15:39:58 -0000 1.6
+++ SimTrackerHitTableModel.java 3 Feb 2006 21:29:38 -0000 1.7
@@ -5,7 +5,7 @@
import java.util.List;
import org.lcsim.event.EventHeader.LCMetaData;
import org.lcsim.event.SimTrackerHit;
-import org.lcsim.geometry.TrackerIDDecoder;
+import org.lcsim.geometry.IDDecoder;
import org.lcsim.event.EventHeader.LCMetaData;
import java.util.ArrayList;
@@ -18,7 +18,7 @@
private List hits;
private static final String[] defaultColumns = {"x (mm)","y (mm)","z (mm)","dEdx (GeV)","time (ns)","px (GeV)","py (GeV)","pz (GeV)"};
private List<String> columns;
- private TrackerIDDecoder decoder;
+ private IDDecoder decoder;
private LCMetaData meta;
public boolean canDisplay(Class c)
@@ -30,7 +30,7 @@
{
this.hits = hits;
this.meta = meta;
- this.decoder = (TrackerIDDecoder) meta.getIDDecoder();
+ this.decoder = meta.getIDDecoder();
List oldColumns = columns;
columns = new ArrayList<String>();
lcsim/test
diff -u -r1.12 -r1.13
--- HitPositionTest.java 20 Jul 2005 19:12:22 -0000 1.12
+++ HitPositionTest.java 3 Feb 2006 21:29:38 -0000 1.13
@@ -1,18 +1,17 @@
import java.io.File;
import java.net.URL;
import java.util.List;
-import java.util.ArrayList;
+
import org.lcsim.event.EventHeader;
import org.lcsim.event.SimCalorimeterHit;
+import org.lcsim.geometry.CalorimeterIDDecoder;
+import org.lcsim.geometry.Subdetector;
+import org.lcsim.geometry.util.BaseIDDecoder;
import org.lcsim.util.Driver;
import org.lcsim.util.cache.FileCache;
import org.lcsim.util.loop.LCSimLoop;
-import org.lcsim.geometry.CalorimeterIDDecoder;
-import org.lcsim.geometry.Subdetector;
-import junit.framework.Test;
-import junit.framework.TestCase;
-import junit.framework.TestSuite;
+import junit.framework.*;
/**
*
@@ -138,15 +137,16 @@
}
/* subdetector and decoder should agree on basic flags... */
- if ( subdet.isBarrel() )
- {
- assertTrue(decoder.isBarrel());
- }
+// BaseIDDecoder = (BaseIDDecoder) bdec;
+// if ( subdet.isBarrel() )
+// {
+// assertTrue(bdec.getBarrelEndcapFlag().isBarrel());
+// }
- if ( subdet.isEndcap())
- {
- assertTrue(decoder.isEndcap());
- }
+// if ( subdet.isEndcap())
+// {
+// assertTrue(bdec.getBarrelEndcapFlag().isEndcap());
+// }
}
}
}
CVSspam 0.2.8