2 added + 2 removed + 10 modified, total 14 files
lcsim/src/org/lcsim/detector/driver
diff -u -r1.3 -r1.4
--- RawTrackerHitIdentifierReadoutDriver.java 25 Aug 2008 21:43:31 -0000 1.3
+++ RawTrackerHitIdentifierReadoutDriver.java 24 Apr 2009 18:23:59 -0000 1.4
@@ -7,9 +7,9 @@
import org.lcsim.detector.IReadout;
import org.lcsim.detector.identifier.IIdentifier;
import org.lcsim.detector.identifier.Identifier;
-import org.lcsim.detector.tracker.silicon.SiTrackerIdentifierHelper;
import org.lcsim.event.EventHeader;
import org.lcsim.event.RawTrackerHit;
+import org.lcsim.recon.tracking.digitization.sisim.CollectionHandler;
public class RawTrackerHitIdentifierReadoutDriver
extends CollectionHandler
lcsim/src/org/lcsim/detector/driver
diff -u -r1.3 -r1.4
--- ReadoutCleanupDriver.java 16 Dec 2008 00:26:50 -0000 1.3
+++ ReadoutCleanupDriver.java 24 Apr 2009 18:23:59 -0000 1.4
@@ -5,6 +5,7 @@
import org.lcsim.event.EventHeader;
import org.lcsim.geometry.Detector;
import org.lcsim.geometry.compact.Subdetector;
+import org.lcsim.recon.tracking.digitization.sisim.CollectionHandler;
/**
* This Driver clears the DetectorElement Readout
@@ -13,7 +14,7 @@
* others.
*
* @author jeremym
- * @version $Id: ReadoutCleanupDriver.java,v 1.3 2008/12/16 00:26:50 jeremy Exp $
+ * @version $Id: ReadoutCleanupDriver.java,v 1.4 2009/04/24 18:23:59 jeremy Exp $
*/
public class ReadoutCleanupDriver
extends CollectionHandler
lcsim/src/org/lcsim/detector/driver
diff -u -r1.3 -r1.4
--- SimTrackerHitPositionalReadoutDriver.java 7 May 2007 23:42:58 -0000 1.3
+++ SimTrackerHitPositionalReadoutDriver.java 24 Apr 2009 18:23:59 -0000 1.4
@@ -10,6 +10,7 @@
import org.lcsim.detector.IReadout;
import org.lcsim.event.EventHeader;
import org.lcsim.event.SimTrackerHit;
+import org.lcsim.recon.tracking.digitization.sisim.CollectionHandler;
public class SimTrackerHitPositionalReadoutDriver
extends CollectionHandler
lcsim/src/org/lcsim/detector/driver
diff -u -r1.4 -r1.5
--- TrackerHitIdentifierReadoutDriver.java 24 Apr 2009 01:25:10 -0000 1.4
+++ TrackerHitIdentifierReadoutDriver.java 24 Apr 2009 18:23:59 -0000 1.5
@@ -5,6 +5,7 @@
import org.lcsim.detector.IReadout;
import org.lcsim.event.EventHeader;
import org.lcsim.event.TrackerHit;
+import org.lcsim.recon.tracking.digitization.sisim.CollectionHandler;
import org.lcsim.recon.tracking.digitization.sisim.SiTrackerHitPixel;
import org.lcsim.recon.tracking.digitization.sisim.SiTrackerHitStrip1D;
import org.lcsim.recon.tracking.digitization.sisim.TrackerHitType;
lcsim/src/org/lcsim/detector/driver
diff -N CollectionHandler.java
--- CollectionHandler.java 6 Apr 2009 21:53:49 -0000 1.5
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,56 +0,0 @@
-package org.lcsim.detector.driver;
-
-import java.util.Arrays;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Set;
-
-import org.lcsim.util.Driver;
-
-public abstract class CollectionHandler extends Driver
-{
- Set<String> collections = new HashSet<String>();
-
- public CollectionHandler()
- {}
-
- public CollectionHandler(List<String> collectionNames)
- {
- for (String collection : collectionNames)
- {
- this.collections.add(collection);
- }
- }
-
- public CollectionHandler(String[] collectionNames)
- {
- for (String collection : collectionNames)
- {
- this.collections.add(collection);
- }
- }
-
- public void setCollections(String[] collectionNames)
- {
- collections.addAll(Arrays.asList(collectionNames));
- }
-
- public void setCollection(String collection)
- {
- collections.add(collection);
- }
-
- /**
- * Return whether this CollectionHandler can handle the collection called
- * <code>collectionName</code>.
- * @param collectionName
- * @return True if <code>collections</code> is empty or if
- * collections contains </code>collectionName</code>;
- * false if does not contain </code>collectionName</code>.
- */
- public boolean canHandle(String collectionName)
- {
- if (collections.size() == 0) return true;
- return collections.contains(collectionName);
- }
-}
lcsim/src/org/lcsim/detector/driver
diff -N SimTrackerHitIdentifierReadoutDriver.java
--- SimTrackerHitIdentifierReadoutDriver.java 23 Apr 2009 21:47:16 -0000 1.11
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,51 +0,0 @@
-package org.lcsim.detector.driver;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.lcsim.event.EventHeader;
-import org.lcsim.event.SimTrackerHit;
-
-public class SimTrackerHitIdentifierReadoutDriver
-extends CollectionHandler
-{
- boolean needCleanupDriver=true;
-
- public SimTrackerHitIdentifierReadoutDriver()
- {}
-
- public SimTrackerHitIdentifierReadoutDriver(List<String> collectionNames)
- {
- super(collectionNames);
- }
-
- public SimTrackerHitIdentifierReadoutDriver(String[] collectionNames)
- {
- super(collectionNames);
- }
-
- public void startOfData()
- {
- if (needCleanupDriver)
- {
- add(new ReadoutCleanupDriver(new ArrayList<String>(collections)));
- needCleanupDriver=false;
- }
- }
-
- protected void process(EventHeader header)
- {
- super.process(header);
- List<List<SimTrackerHit>> collections = header.get(SimTrackerHit.class);
- for (List<SimTrackerHit> collection : collections)
- {
- if (canHandle(header.getMetaData(collection).getName()))
- {
- for (SimTrackerHit hit : collection)
- {
- hit.getDetectorElement().getReadout().addHit(hit);
- }
- }
- }
- }
-}
\ No newline at end of file
lcsim/src/org/lcsim/recon/tracking/digitization/sisim
diff -N CollectionHandler.java
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ CollectionHandler.java 24 Apr 2009 18:24:01 -0000 1.1
@@ -0,0 +1,56 @@
+package org.lcsim.recon.tracking.digitization.sisim;
+
+import java.util.Arrays;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
+
+import org.lcsim.util.Driver;
+
+public abstract class CollectionHandler extends Driver
+{
+ Set<String> collections = new HashSet<String>();
+
+ public CollectionHandler()
+ {}
+
+ public CollectionHandler(List<String> collectionNames)
+ {
+ for (String collection : collectionNames)
+ {
+ this.collections.add(collection);
+ }
+ }
+
+ public CollectionHandler(String[] collectionNames)
+ {
+ for (String collection : collectionNames)
+ {
+ this.collections.add(collection);
+ }
+ }
+
+ public void setCollections(String[] collectionNames)
+ {
+ collections.addAll(Arrays.asList(collectionNames));
+ }
+
+ public void setCollection(String collection)
+ {
+ collections.add(collection);
+ }
+
+ /**
+ * Return whether this CollectionHandler can handle the collection called
+ * <code>collectionName</code>.
+ * @param collectionName
+ * @return True if <code>collections</code> is empty or if
+ * collections contains </code>collectionName</code>;
+ * false if does not contain </code>collectionName</code>.
+ */
+ public boolean canHandle(String collectionName)
+ {
+ if (collections.size() == 0) return true;
+ return collections.contains(collectionName);
+ }
+}
lcsim/src/org/lcsim/recon/tracking/digitization/sisim
diff -N SimTrackerHitReadoutDriver.java
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ SimTrackerHitReadoutDriver.java 24 Apr 2009 18:24:01 -0000 1.1
@@ -0,0 +1,76 @@
+package org.lcsim.recon.tracking.digitization.sisim;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import org.lcsim.detector.driver.ReadoutCleanupDriver;
+import org.lcsim.event.EventHeader;
+import org.lcsim.event.SimTrackerHit;
+
+/**
+ * Assigns {@link org.lcsim.event.SimTrackerHit} objects to the readouts of their
+ * corresponding {@link org.lcsim.detector.IDetectorElement}.
+ * @author jeremym
+ */
+public class SimTrackerHitReadoutDriver
+extends CollectionHandler
+{
+ boolean needCleanupDriver=true;
+ boolean debug=false;
+
+ public SimTrackerHitReadoutDriver()
+ {}
+
+ public SimTrackerHitReadoutDriver(List<String> collectionNames)
+ {
+ super(collectionNames);
+ }
+
+ public SimTrackerHitReadoutDriver(String[] collectionNames)
+ {
+ super(collectionNames);
+ }
+
+ public void setReadoutCollections(String[] collectionNames)
+ {
+ super.setCollections(collectionNames);
+ }
+
+ public void setDebug(boolean debug)
+ {
+ this.debug = debug;
+ }
+
+ public void startOfData()
+ {
+ if (needCleanupDriver)
+ {
+ add(new ReadoutCleanupDriver(new ArrayList<String>(collections)));
+ needCleanupDriver=false;
+ }
+ }
+
+ protected void process(EventHeader header)
+ {
+ super.process(header);
+ List<List<SimTrackerHit>> collections = header.get(SimTrackerHit.class);
+ for (List<SimTrackerHit> collection : collections)
+ {
+ if (canHandle(header.getMetaData(collection).getName()))
+ {
+ for (SimTrackerHit hit : collection)
+ {
+ hit.getDetectorElement().getReadout().addHit(hit);
+ if (debug)
+ {
+ System.out.println("driver assigned " + hit.getExpandedIdentifier().toString() + " to " + hit.getDetectorElement().getName());
+ if (!hit.getDetectorElement().getReadout().getHits(SimTrackerHit.class).contains(hit))
+ {
+ throw new RuntimeException("Readout is missing a hit.");
+ }
+ }
+ }
+ }
+ }
+ }
+}
\ No newline at end of file
lcsim/src/org/lcsim/recon/tracking/digitization/sisim
diff -u -r1.1 -r1.2
--- TrackerHitDriver.java 24 Apr 2009 01:22:58 -0000 1.1
+++ TrackerHitDriver.java 24 Apr 2009 18:24:01 -0000 1.2
@@ -16,7 +16,6 @@
import java.util.Set;
import org.lcsim.detector.IDetectorElement;
-import org.lcsim.detector.driver.SimTrackerHitIdentifierReadoutDriver;
import org.lcsim.detector.tracker.silicon.SiSensor;
import org.lcsim.detector.tracker.silicon.SiTrackerModule;
import org.lcsim.event.EventHeader;
@@ -197,7 +196,7 @@
if (_readouts.size() != 0)
{
System.out.println("Adding SimTrackerHitIdentifierReadoutDriver with readouts: "+_readouts);
- super.add( new SimTrackerHitIdentifierReadoutDriver( _readouts ) );
+ super.add( new SimTrackerHitReadoutDriver( _readouts ) );
}
// Call this after added above driver, so that subdriver's startOfData() method is called. --JM
lcsim/src/org/lcsim/recon/tracking/seedtracker/digiexample
diff -u -r1.3 -r1.4
--- DigiHitReader.java 24 Apr 2009 01:25:09 -0000 1.3
+++ DigiHitReader.java 24 Apr 2009 18:24:01 -0000 1.4
@@ -8,9 +8,9 @@
import java.util.List;
import java.util.ArrayList;
import org.lcsim.recon.tracking.digitization.sisim.SiTrackerHitStrip1D;
+import org.lcsim.recon.tracking.digitization.sisim.SimTrackerHitReadoutDriver;
import org.lcsim.detector.IDetectorElement;
import org.lcsim.detector.driver.RawTrackerHitIdentifierReadoutDriver;
-import org.lcsim.detector.driver.SimTrackerHitIdentifierReadoutDriver;
import org.lcsim.detector.driver.TrackerHitIdentifierReadoutDriver;
import org.lcsim.detector.tracker.silicon.SiSensor;
import org.lcsim.event.EventHeader;
@@ -33,7 +33,7 @@
private static final String newhits = "Strip1DHits";
public DigiHitReader() {
- add(new SimTrackerHitIdentifierReadoutDriver(simHitNames));
+ add(new SimTrackerHitReadoutDriver(simHitNames));
RawTrackerHitIdentifierReadoutDriver rawHitsDriver = new RawTrackerHitIdentifierReadoutDriver(new String[]{rawHitsName});
rawHitsDriver.setCellIDBitmask(rawBitmask);
add(rawHitsDriver);
lcsim/test/org/lcsim/detector/tracker/readout
diff -u -r1.1 -r1.2
--- SimTrackerHitIdentifierReadoutDriverTest.java 9 Apr 2008 14:04:06 -0000 1.1
+++ SimTrackerHitIdentifierReadoutDriverTest.java 24 Apr 2009 18:24:01 -0000 1.2
@@ -16,16 +16,17 @@
import org.lcsim.detector.IDetectorElement;
import org.lcsim.detector.IReadout;
import org.lcsim.detector.identifier.Identifier;
-import org.lcsim.detector.driver.CollectionHandler;
import org.lcsim.event.EventHeader;
import org.lcsim.event.SimTrackerHit;
import org.lcsim.geometry.compact.Subdetector;
+import org.lcsim.recon.tracking.digitization.sisim.CollectionHandler;
+import org.lcsim.recon.tracking.digitization.sisim.SimTrackerHitReadoutDriver;
import org.lcsim.util.Driver;
import org.lcsim.util.cache.FileCache;
import org.lcsim.util.loop.LCSimLoop;
/**
- * Test the {@link org.lcsim.detector.driver.SimTrackerHitIdentifierReadoutDriver} on the sid01 detector.
+ * Test the {@link org.lcsim.recon.tracking.digitization.sisim.SimTrackerHitReadoutDriver} on the sid01 detector.
*/
public class SimTrackerHitIdentifierReadoutDriverTest extends TestCase
{
@@ -46,7 +47,7 @@
String[] colls = {"TkrBarrHits","TkrEndcapHits"};
- loop.add( new SimTrackerHitIdentifierReadoutDriver(colls));
+ loop.add( new SimTrackerHitReadoutDriver(colls));
loop.add( new TestDriver(colls));
loop.loop(1, null);
loop.dispose();
lcsim/test/org/lcsim/detector/tracker/readout
diff -u -r1.3 -r1.4
--- TrackerBarrelDigitizationDriverTest.java 24 Apr 2009 01:25:09 -0000 1.3
+++ TrackerBarrelDigitizationDriverTest.java 24 Apr 2009 18:24:01 -0000 1.4
@@ -31,6 +31,7 @@
import org.lcsim.recon.tracking.digitization.sisim.ReadoutChip;
import org.lcsim.recon.tracking.digitization.sisim.Kpix;
import org.lcsim.recon.tracking.digitization.sisim.SiElectrodeDataCollection;
+import org.lcsim.recon.tracking.digitization.sisim.SimTrackerHitReadoutDriver;
/**
* Reads single muon events generated in sid01_polyhedra, which uses
@@ -64,7 +65,7 @@
LCSimLoop loop = new LCSimLoop();
loop.setLCIORecordSource(file);
- loop.add( new SimTrackerHitIdentifierReadoutDriver(new String[] {"SiTrackerBarrel_RO"} ) );
+ loop.add( new SimTrackerHitReadoutDriver(new String[] {"SiTrackerBarrel_RO"} ) );
loop.add( new TestDriver() );
loop.loop(10, null);
loop.dispose();
lcsim/test/org/lcsim/detector/tracker/readout
diff -u -r1.3 -r1.4
--- TrackerEndcapDigitizationDriverTest.java 24 Apr 2009 01:25:09 -0000 1.3
+++ TrackerEndcapDigitizationDriverTest.java 24 Apr 2009 18:24:01 -0000 1.4
@@ -31,6 +31,7 @@
import org.lcsim.recon.tracking.digitization.sisim.ReadoutChip;
import org.lcsim.recon.tracking.digitization.sisim.Kpix;
import org.lcsim.recon.tracking.digitization.sisim.SiElectrodeDataCollection;
+import org.lcsim.recon.tracking.digitization.sisim.SimTrackerHitReadoutDriver;
/**
* Reads single muon events generated in sid01_polyhedra, which uses
@@ -65,7 +66,7 @@
LCSimLoop loop = new LCSimLoop();
loop.setLCIORecordSource(file);
- loop.add( new SimTrackerHitIdentifierReadoutDriver(new String[] {"SiTrackerEndcap_RO"} ) );
+ loop.add( new SimTrackerHitReadoutDriver(new String[] {"SiTrackerEndcap_RO"} ) );
loop.add( new TestDriver() );
loop.loop(10, null);
loop.dispose();
lcsim/test/org/lcsim/detector/tracker/readout
diff -u -r1.12 -r1.13
--- TrackerHitDriver_User_Test.java 24 Apr 2009 01:25:09 -0000 1.12
+++ TrackerHitDriver_User_Test.java 24 Apr 2009 18:24:01 -0000 1.13
@@ -8,6 +8,8 @@
import junit.framework.Test;
import junit.framework.TestCase;
import junit.framework.TestSuite;
+
+import org.lcsim.recon.tracking.digitization.sisim.SimTrackerHitReadoutDriver;
import org.lcsim.recon.tracking.digitization.sisim.TrackerHitDriver_User;
import org.lcsim.detector.driver.*;
@@ -57,7 +59,7 @@
List<String> readouts = new ArrayList<String>();
readouts.add("SiTrackerBarrel_RO");
readouts.add("SiTrackerEndcap_RO");
- loop.add( new SimTrackerHitIdentifierReadoutDriver(readouts) );
+ loop.add( new SimTrackerHitReadoutDriver(readouts) );
loop.add( _trackerhitdriver_user );
loop.add( new TestDriver() );
CVSspam 0.2.8
