lcsim-contrib/src/main/java/org/lcsim/contrib/CosminDeaconu
diff -u -r1.1.1.1 -r1.2
--- SiTrackerHit2DMakerDriver.java 10 Dec 2008 22:03:06 -0000 1.1.1.1
+++ SiTrackerHit2DMakerDriver.java 24 Apr 2009 01:54:03 -0000 1.2
@@ -7,12 +7,12 @@
import java.util.ArrayList;
import java.util.List;
-import org.lcsim.recon.tracking.digitization.sistripsim.SiTrackerHitStrip1D;
-import org.lcsim.recon.tracking.digitization.sistripsim.SiTrackerHitStrip2D;
import org.lcsim.event.EventHeader;
import org.lcsim.util.Driver;
-import org.lcsim.recon.tracking.digitization.sistripsim.StripHit2DMaker;
import org.lcsim.event.TrackerHit;
+import org.lcsim.recon.tracking.digitization.sisim.SiTrackerHitStrip1D;
+import org.lcsim.recon.tracking.digitization.sisim.SiTrackerHitStrip2D;
+import org.lcsim.recon.tracking.digitization.sisim.StripHit2DMaker;
/**
*
lcsim-contrib/src/main/java/org/lcsim/contrib/RobKutschke/TKNHits
diff -u -r1.1.1.1 -r1.2
--- TKNRawHitsDriverV1.java 10 Dec 2008 22:03:06 -0000 1.1.1.1
+++ TKNRawHitsDriverV1.java 24 Apr 2009 01:54:03 -0000 1.2
@@ -18,11 +18,11 @@
import org.lcsim.detector.tracker.silicon.SiSensor;
import org.lcsim.detector.tracker.silicon.ChargeCarrier;
-import org.lcsim.recon.tracking.digitization.sistripsim.SiSensorSim;
-import org.lcsim.recon.tracking.digitization.sistripsim.CDFSiSensorSim;
-import org.lcsim.recon.tracking.digitization.sistripsim.ReadoutChip;
-import org.lcsim.recon.tracking.digitization.sistripsim.Kpix;
-import org.lcsim.recon.tracking.digitization.sistripsim.SiElectrodeDataCollection;
+import org.lcsim.recon.tracking.digitization.sisim.CDFSiSensorSim;
+import org.lcsim.recon.tracking.digitization.sisim.Kpix;
+import org.lcsim.recon.tracking.digitization.sisim.ReadoutChip;
+import org.lcsim.recon.tracking.digitization.sisim.SiElectrodeDataCollection;
+import org.lcsim.recon.tracking.digitization.sisim.SiSensorSim;
/**
*
@@ -35,10 +35,10 @@
*
* The driver SimTrackerHitIdentifierReadoutDriver must be called before this code is run.
*
- *@author $Author: jeremy $
- *@version $Id: TKNRawHitsDriverV1.java,v 1.1.1.1 2008/12/10 22:03:06 jeremy Exp $
+ *@author $Author: tknelson $
+ *@version $Id: TKNRawHitsDriverV1.java,v 1.2 2009/04/24 01:54:03 tknelson Exp $
*
- * Date $Date: 2008/12/10 22:03:06 $
+ * Date $Date: 2009/04/24 01:54:03 $
*
*/
lcsim-contrib/src/main/java/org/lcsim/contrib/RobKutschke/TKNHits
diff -u -r1.1.1.1 -r1.2
--- TKNClusterMakerDriverV1.java 10 Dec 2008 22:03:06 -0000 1.1.1.1
+++ TKNClusterMakerDriverV1.java 24 Apr 2009 01:54:03 -0000 1.2
@@ -1,7 +1,6 @@
package org.lcsim.contrib.RobKutschke.TKNHits;
import java.util.List;
-import org.lcsim.recon.tracking.digitization.sistripsim.CDFSiSensorSim;
import org.lcsim.util.Driver;
@@ -9,21 +8,23 @@
import org.lcsim.event.RawTrackerHit;
import org.lcsim.event.TrackerHit;
-import org.lcsim.recon.tracking.digitization.sistripsim.ClusterMaker;
-import org.lcsim.recon.tracking.digitization.sistripsim.Kpix;
-import org.lcsim.recon.tracking.digitization.sistripsim.ReadoutChip;
-import org.lcsim.recon.tracking.digitization.sistripsim.SiSensorSim;
-import org.lcsim.recon.tracking.digitization.sistripsim.StripClusterMaker;
+import org.lcsim.recon.tracking.digitization.sisim.CDFSiSensorSim;
+import org.lcsim.recon.tracking.digitization.sisim.Clusterer;
+import org.lcsim.recon.tracking.digitization.sisim.Kpix;
+import org.lcsim.recon.tracking.digitization.sisim.ReadoutChip;
+import org.lcsim.recon.tracking.digitization.sisim.SiSensorSim;
+import org.lcsim.recon.tracking.digitization.sisim.StripHitMaker;
+
/**
*
* Driver to run Tim's cluster maker code and add clusters (as TrackerHits)
* to the event.
*
- *@author $Author: jeremy $
- *@version $Id: TKNClusterMakerDriverV1.java,v 1.1.1.1 2008/12/10 22:03:06 jeremy Exp $
+ *@author $Author: tknelson $
+ *@version $Id: TKNClusterMakerDriverV1.java,v 1.2 2009/04/24 01:54:03 tknelson Exp $
*
- * Date $Date: 2008/12/10 22:03:06 $
+ * Date $Date: 2009/04/24 01:54:03 $
*
*/
@@ -41,7 +42,7 @@
SiSensorSim simulation = new CDFSiSensorSim();
// Code to make clusters from Raw hits.
- ClusterMaker cluster_maker = new StripClusterMaker(readout,simulation);
+ Clusterer cluster_maker = new StripHitMaker(simulation,readout);
/**
* Constructor:
@@ -75,12 +76,14 @@
// Get the list of RawTrackerHits from the event.
List<RawTrackerHit> rawhits = header.get(RawTrackerHit.class, input[i] );
-
+
+ // FIXME: This pattern for making tracker hits was deprecated in April 2008.
+
// Make clusters.
- List<TrackerHit> trkhits = cluster_maker.makeClusters(rawhits);
+// List<TrackerHit> trkhits = cluster_maker.makeClusters(rawhits);
// Add the clusters to the event.
- header.put(output[i], trkhits, TrackerHit.class, 0, "Kpix");
+// header.put(output[i], trkhits, TrackerHit.class, 0, "Kpix");
}
}
lcsim-contrib/src/main/java/org/lcsim/contrib/Partridge/sATLASDigi
diff -u -r1.2 -r1.3
--- TrackerHitDriver_sATLAS.java 6 Mar 2009 23:52:59 -0000 1.2
+++ TrackerHitDriver_sATLAS.java 24 Apr 2009 01:54:03 -0000 1.3
@@ -8,7 +8,7 @@
*/
package org.lcsim.contrib.Partridge.sATLASDigi;
-import org.lcsim.recon.tracking.digitization.sistripsim.TrackerHitDriver;
+import org.lcsim.recon.tracking.digitization.sisim.TrackerHitDriver;
import org.lcsim.util.Driver;
lcsim-contrib/src/main/java/org/lcsim/contrib/mgraham/sATLASDigi
diff -u -r1.1 -r1.2
--- TrackerHitDriver_sATLAS.java 20 Apr 2009 21:19:43 -0000 1.1
+++ TrackerHitDriver_sATLAS.java 24 Apr 2009 01:54:03 -0000 1.2
@@ -8,7 +8,7 @@
*/
package org.lcsim.contrib.mgraham.sATLASDigi;
-import org.lcsim.recon.tracking.digitization.sistripsim.TrackerHitDriver;
+import org.lcsim.recon.tracking.digitization.sisim.TrackerHitDriver;
import org.lcsim.util.Driver;
