hps-java/src/main/java/org/lcsim/hps/recon/tracking
diff -u -r1.2 -r1.3
--- SvtUtils.java 11 Jun 2012 19:00:57 -0000 1.2
+++ SvtUtils.java 12 Jul 2012 20:19:37 -0000 1.3
@@ -22,7 +22,7 @@
/**
*
* @author Omar Moreno
- * @version $Id: SvtUtils.java,v 1.2 2012/06/11 19:00:57 meeg Exp $
+ * @version $Id: SvtUtils.java,v 1.3 2012/07/12 20:19:37 omoreno Exp $
*/
public class SvtUtils {
@@ -55,6 +55,10 @@
// Map sensor to an SVT bottom layer
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 SiSensor[][] sensorArray = new SiSensor[2][10];
@@ -156,6 +160,13 @@
/**
*
*/
+ public String getDescription(SiSensor sensor){
+ return this.sensorToDescriptor.get(sensor);
+ }
+
+ /**
+ *
+ */
protected void setupDaqMaps(Detector detector){
if (subdetectorName == null)
@@ -192,6 +203,7 @@
IIdentifier sensorIdent;
SiTrackerIdentifierHelper sensorHelper;
+ String description;
// Create the maps
for(SiSensor sensor : sensors){
@@ -205,15 +217,19 @@
int layerNumber = sensorHelper.getLayerValue(sensorIdent);
int moduleNumber = sensorHelper.getModuleValue(sensorIdent);
sensorArray[moduleNumber][layerNumber - 1] = sensor;
-
+
if (moduleNumber == 0) {
sensorToTopLayer.put(sensor, layerNumber);
sensorToDAQPair.put(sensor, this.topLayerToDAQ.get(layerNumber));
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));
daqPairToSensor.put(bottomLayerToDAQ.get(layerNumber), sensor);
+ description = "Bottom Layer " + layerNumber;
+ sensorToDescriptor.put(sensor, description);
} else throw new RuntimeException("Invalid Module Number: " + sensorHelper.getModuleValue(sensorIdent));
}