1 removed + 4 modified, total 5 files
lcsim/src/org/lcsim/detector/driver
diff -u -r1.2 -r1.3
--- SimTrackerHitPositionalReadoutDriver.java 6 May 2007 07:20:44 -0000 1.2
+++ SimTrackerHitPositionalReadoutDriver.java 7 May 2007 23:42:58 -0000 1.3
@@ -2,11 +2,12 @@
import hep.physics.vec.BasicHep3Vector;
+import java.util.ArrayList;
import java.util.List;
import org.lcsim.detector.DetectorElement;
import org.lcsim.detector.IDetectorElement;
-import org.lcsim.detector.Readout;
+import org.lcsim.detector.IReadout;
import org.lcsim.event.EventHeader;
import org.lcsim.event.SimTrackerHit;
@@ -29,6 +30,7 @@
{
super.process(header);
List<List<SimTrackerHit>> collections = header.get(SimTrackerHit.class);
+ List<DetectorElement> delist = new ArrayList<DetectorElement>();
for ( List<SimTrackerHit> collection : collections )
{
if ( canHandle( header.getMetaData( collection ).getName() ) )
@@ -39,10 +41,19 @@
DetectorElement deHit =
(DetectorElement)deSubdet.findDetectorElement( new BasicHep3Vector( hit.getPoint() ) );
hit.setDetectorElement( deHit );
- Readout<SimTrackerHit> ro = (Readout<SimTrackerHit>)deHit.getReadout();
+ IReadout ro = deHit.getReadout();
ro.addHit( hit );
+
+ delist.add(deHit);
}
}
- }
+ }
+
+ /*
+ for ( DetectorElement de : delist )
+ {
+ System.out.println( de.getReadout().toString());
+ }
+ */
}
}
lcsim/src/org/lcsim/detector/driver
diff -N SimTrackerHitReadout.java
--- SimTrackerHitReadout.java 1 May 2007 23:36:37 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,8 +0,0 @@
-package org.lcsim.detector.driver;
-
-import org.lcsim.detector.Readout;
-import org.lcsim.event.SimTrackerHit;
-
-public class SimTrackerHitReadout
-extends Readout<SimTrackerHit>
-{}
lcsim/test/org/lcsim/detector/driver
diff -u -r1.1 -r1.2
--- SimTrackerDigitizationTest.java 7 May 2007 21:28:13 -0000 1.1
+++ SimTrackerDigitizationTest.java 7 May 2007 23:42:58 -0000 1.2
@@ -81,8 +81,8 @@
{
for ( IDetectorElement sensor : module.getChildren() )
{
- IReadout<SimTrackerHit> ro = sensor.getReadout();
- List<SimTrackerHit> hits = ro.getHits();
+ IReadout ro = sensor.getReadout();
+ List<SimTrackerHit> hits = ro.getHits(SimTrackerHit.class);
hitsFromRO.addAll( hits );
}
}
lcsim/test/org/lcsim/detector/driver
diff -u -r1.2 -r1.3
--- SimTrackerHitPositionalReadoutDriverTest.java 1 May 2007 23:42:52 -0000 1.2
+++ SimTrackerHitPositionalReadoutDriverTest.java 7 May 2007 23:42:59 -0000 1.3
@@ -71,30 +71,34 @@
{
for ( IDetectorElement sensor : module.getChildren() )
{
- IReadout<SimTrackerHit> ro = sensor.getReadout();
- List<SimTrackerHit> hits = ro.getHits();
- hitsFromRO.addAll( hits );
+ IReadout ro = sensor.getReadout();
+
+ for ( SimTrackerHit rohit : ro.getHits(SimTrackerHit.class) )
+ {
+ hitsFromRO.add( rohit );
+ }
}
}
}
-
+
/*
System.out.println("hitsFromRO.size = " + hitsFromRO.size() );
for ( SimTrackerHit roHit : hitsFromRO )
{
System.out.println("got hit from RO - " + roHit.getCellID());
- }*/
+ }
+ */
List<SimTrackerHit> eventHits = header.get(SimTrackerHit.class, "SiTrackerBarrel_RO");
- assertTrue( "Event and RO hits do not have same size!", eventHits.size() == hitsFromRO.size() );
+ assertEquals( "Collection and detector readout have different number of hits!", eventHits.size(), hitsFromRO.size() );
for ( SimTrackerHit hit : eventHits )
{
IDetectorElement de = hit.getDetectorElement();
//System.out.println("detectorElement="+de.getName());
- IReadout<SimTrackerHit> ro = de.getReadout();
- List<SimTrackerHit> hits = ro.getHits();
+ IReadout ro = de.getReadout();
+ List<SimTrackerHit> hits = ro.getHits( SimTrackerHit.class );
for ( SimTrackerHit deHit : hits )
{
assertEquals( "CellIDs do not match!", hit.getCellID(), deHit.getCellID() );
lcsim/test/org/lcsim/detector/tracker
diff -u -r1.3 -r1.4
--- SimTrackerDigitizationTest.java 3 May 2007 05:42:56 -0000 1.3
+++ SimTrackerDigitizationTest.java 7 May 2007 23:42:59 -0000 1.4
@@ -55,7 +55,13 @@
{
java.lang.Runtime.getRuntime().gc();
}
+
+ public void testBunk()
+ {
+
+ }
+ /*
public void testReadout() throws Exception
{
URL url =
@@ -84,20 +90,13 @@
{
for ( IDetectorElement sensor : module.getChildren() )
{
- IReadout<SimTrackerHit> ro = sensor.getReadout();
- List<SimTrackerHit> hits = ro.getHits();
+ IReadout ro = sensor.getReadout();
+ List<SimTrackerHit> hits = ro.getHits( SimTrackerHit.class );
hitsFromRO.addAll( hits );
}
}
}
-
- /*
- System.out.println("hitsFromRO.size = " + hitsFromRO.size() );
- for ( SimTrackerHit roHit : hitsFromRO )
- {
- System.out.println("got hit from RO - " + roHit.getCellID());
- }*/
-
+
List<SimTrackerHit> eventHits = header.get(SimTrackerHit.class, "SiTrackerBarrel_RO");
System.out.println("Number of SimTrackerHits: " + eventHits.size());
@@ -153,6 +152,6 @@
}
- }
+ }*/
}
CVSspam 0.2.8