hps-java/src/main/java/org/lcsim/hps/recon/tracking
diff -u -r1.3 -r1.4
--- SvtTrackExtrapolator.java 31 May 2012 06:56:08 -0000 1.3
+++ SvtTrackExtrapolator.java 30 Aug 2012 03:31:13 -0000 1.4
@@ -3,12 +3,11 @@
//--- org.lcsim ---//
import hep.physics.vec.BasicHep3Vector;
import hep.physics.vec.Hep3Vector;
-
-import org.lcsim.recon.tracking.seedtracker.SeedTrack;
+import org.lcsim.event.Track;
public class SvtTrackExtrapolator {
- SeedTrack track;
+ Track track;
TrackUtils trackUtils;
public static final double ECAL_FACE = 1524; // mm
@@ -26,7 +25,7 @@
/**
*
*/
- public void setTrack(SeedTrack track){
+ public void setTrack(Track track){
this.track = track;
trackUtils.setTrack(track);
}
hps-java/src/main/java/org/lcsim/hps/recon/tracking
diff -u -r1.5 -r1.6
--- SvtUtils.java 30 Aug 2012 00:08:44 -0000 1.5
+++ SvtUtils.java 30 Aug 2012 03:31:13 -0000 1.6
@@ -22,7 +22,7 @@
/**
*
* @author Omar Moreno
- * @version $Id: SvtUtils.java,v 1.5 2012/08/30 00:08:44 mgraham Exp $
+ * @version $Id: SvtUtils.java,v 1.6 2012/08/30 03:31:13 omoreno Exp $
*/
public class SvtUtils {
@@ -44,6 +44,9 @@
private Map<SiSensor /* Sensor */, Integer /* Layer */> sensorToBottomLayer = new HashMap<SiSensor, Integer>();
// Map sensor to descriptor
private Map<SiSensor /* Sensor */, String /* Description */> sensorToDescriptor = new HashMap<SiSensor, String>();
+ private Map<Integer /* Layer */, SiSensor /* Sensor */> topLayerToSensor = new HashMap<Integer, SiSensor>();
+ private Map<Integer /* Layer */, SiSensor /* Sensor */> bottomLayerToSensor = new HashMap<Integer, SiSensor>();
+
private SiSensor[][] sensorArray = new SiSensor[2][12];
private IIdentifierHelper helper;
private boolean isSetup = false;
@@ -123,6 +126,20 @@
public SiSensor getSensor(Pair<Integer, Integer> daqPair) {
return this.daqPairToSensor.get(daqPair);
}
+
+ /**
+ *
+ */
+ public SiSensor getTopSensor(int layer){
+ return this.topLayerToSensor.get(layer);
+ }
+
+ /**
+ *
+ */
+ public SiSensor getBottomSensor(int layer){
+ return this.bottomLayerToSensor.get(layer);
+ }
/**
*
@@ -224,12 +241,14 @@
if (moduleNumber == 0) {
sensorToTopLayer.put(sensor, layerNumber);
sensorToDAQPair.put(sensor, this.topLayerToDAQ.get(layerNumber));
+ topLayerToSensor.put(layerNumber, sensor);
daqPairToSensor.put(topLayerToDAQ.get(layerNumber), sensor);
description = "Top Layer " + layerNumber;
sensorToDescriptor.put(sensor, description);
} else if (moduleNumber == 1) {
sensorToBottomLayer.put(sensor, layerNumber);
sensorToDAQPair.put(sensor, this.bottomLayerToDAQ.get(layerNumber));
+ bottomLayerToSensor.put(layerNumber, sensor);
daqPairToSensor.put(bottomLayerToDAQ.get(layerNumber), sensor);
description = "Bottom Layer " + layerNumber;
sensorToDescriptor.put(sensor, description);
hps-java/src/main/java/org/lcsim/hps/recon/tracking
diff -u -r1.3 -r1.4
--- DataProcessingModule.java 28 Aug 2012 07:12:33 -0000 1.3
+++ DataProcessingModule.java 30 Aug 2012 03:31:13 -0000 1.4
@@ -5,18 +5,21 @@
import java.util.List;
import java.util.Map;
+import org.lcsim.detector.tracker.silicon.ChargeCarrier;
import org.lcsim.detector.tracker.silicon.SiSensor;
import org.lcsim.event.EventHeader;
import org.lcsim.event.RawTrackerHit;
+import org.lcsim.event.SimTrackerHit;
import org.lcsim.event.base.BaseRawTrackerHit;
import org.lcsim.geometry.Detector;
import org.lcsim.hps.recon.tracking.apv25.Apv25DigitalData;
import org.lcsim.util.Driver;
+
/**
*
* @author Omar Moreno <[log in to unmask]>
- * @version $Id: DataProcessingModule.java,v 1.3 2012/08/28 07:12:33 omoreno Exp $
+ * @version $Id: DataProcessingModule.java,v 1.4 2012/08/30 03:31:13 omoreno Exp $
*/
public class DataProcessingModule extends Driver {
@@ -101,9 +104,15 @@
if(enableTailCut && !this.tailCut(samples)) continue;
// Create a RawTrackerHit
+ int sideNumber;
int time = 0;
- long cellID = sensor.getKey().makeStripId(channel, 1).getValue();
- rawHits.add(new BaseRawTrackerHit(time, cellID, samples, null, sensor.getKey()));
+ if(sensor.getKey().hasElectrodesOnSide(ChargeCarrier.HOLE)){
+ sideNumber = ChargeCarrier.HOLE.charge();
+ } else {
+ sideNumber = ChargeCarrier.ELECTRON.charge();
+ }
+ long cellID = sensor.getKey().makeStripId(channel, sideNumber).getValue();
+ rawHits.add(new BaseRawTrackerHit(time, cellID, samples, new ArrayList<SimTrackerHit>(), sensor.getKey()));
}
}