hps-java/src/main/java/org/lcsim/hps/recon/tracking

diff -u -r1.6 -r1.7
--- HPSSVTDAQMaps.java	21 Apr 2012 07:34:07 -0000	1.6
+++ HPSSVTDAQMaps.java	5 May 2012 02:04:16 -0000	1.7
@@ -26,7 +26,7 @@

  * Creates maps between SVT sensors to FPGA and Hybrid pairs and vice versa
  *
  * @author Omar Moreno

- * @version $Id: HPSSVTDAQMaps.java,v 1.6 2012/04/21 07:34:07 omoreno Exp $ 

+ * @version $Id: HPSSVTDAQMaps.java,v 1.7 2012/05/05 02:04:16 omoreno Exp $ 

  */
 public class HPSSVTDAQMaps extends Driver {
     

@@ -50,15 +50,23 @@

     // Map from SVT bottom layer to Hybrid/FPGA pair
     private Map<Integer /* Layer # */, Pair<Integer /*Hybrid */, Integer /* FPGA */ >> bottomLayerToDAQ;
 

+    // Map sensor to an SVT top layer
+    public static Map<SiSensor /* Sensor */, Integer /* Layer */> sensorToTopLayer;
+    
+    // Map sensor to an SVT bottom layer
+    public static Map<SiSensor /* Sensor */, Integer /* Layer */> sensorToBottomLayer;
+    

     /**
      *  Default Constructor. 
      */
     public HPSSVTDAQMaps()
     {

-        sensorToDAQPair = new HashMap<SiSensor, Pair<Integer, Integer>>(); 
-        daqPairToSensor = new HashMap<Pair<Integer, Integer>, SiSensor>();
-        topLayerToDAQ = new HashMap<Integer, Pair<Integer, Integer>>();
-        bottomLayerToDAQ = new HashMap<Integer, Pair<Integer, Integer>>();

+        sensorToDAQPair     = new HashMap<SiSensor, Pair<Integer, Integer>>(); 
+        daqPairToSensor     = new HashMap<Pair<Integer, Integer>, SiSensor>();
+        topLayerToDAQ       = new HashMap<Integer,  Pair<Integer, Integer>>();
+        bottomLayerToDAQ    = new HashMap<Integer,  Pair<Integer, Integer>>();
+        sensorToTopLayer    = new HashMap<SiSensor, Integer>();
+        sensorToBottomLayer = new HashMap<SiSensor, Integer>();      

         
     }
     

@@ -141,9 +149,14 @@

             sensorHelper = (SiTrackerIdentifierHelper) sensor.getIdentifierHelper();
             
             // Get the DAQ pair

+            int layerNumber = sensorHelper.getLayerValue(sensorIdent);

             if(sensorHelper.getModuleValue(sensorIdent) == 0){

-                daqPair = topLayerToDAQ.get(sensorHelper.getLayerValue(sensorIdent));
-            } else daqPair = bottomLayerToDAQ.get(sensorHelper.getLayerValue(sensorIdent));

+                daqPair = topLayerToDAQ.get(layerNumber);
+                sensorToTopLayer.put(sensor, layerNumber);
+            } else {
+            	daqPair = bottomLayerToDAQ.get(layerNumber);
+            	sensorToBottomLayer.put(sensor, layerNumber);
+            }

         
             sensorToDAQPair.put(sensor, daqPair);
             daqPairToSensor.put(daqPair, sensor);