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

diff -u -r1.10 -r1.11
--- SvtUtils.java	21 Nov 2012 08:30:15 -0000	1.10
+++ SvtUtils.java	30 Nov 2012 23:08:19 -0000	1.11
@@ -28,7 +28,7 @@

 /**
  *
  * @author Omar Moreno

- * @version $Id: SvtUtils.java,v 1.10 2012/11/21 08:30:15 omoreno Exp $

+ * @version $Id: SvtUtils.java,v 1.11 2012/11/30 23:08:19 omoreno Exp $

  */
 public class SvtUtils {
 

@@ -266,8 +266,10 @@

                             + ", Hybrid: " + topLayerDaqMap.get(layerNumber).get(listPosition).getSecondElement());
                     sensorToTopLayer.put(sensor, layerNumber);
                     sensorToDaqPair.put(sensor, topLayerDaqMap.get(layerNumber).get(listPosition));

-                    if(!topLayerToSensor.containsKey(layerNumber)) 
-                        topLayerToSensor.put(layerNumber, new ArrayList<SiSensor>());

+//                    if(!topLayerToSensor.containsKey(layerNumber)){
+//                        topLayerToSensor.put(layerNumber, new ArrayList<SiSensor>()); 
+//                        while(topLayerToSensor.get(layerNumber).size() != maxModuleNumber) topLayerToSensor.get(layerNumber).add(null);
+//                    }

                     topLayerToSensor.get(layerNumber).add(listPosition, sensor);
                     daqPairToSensor.put(topLayerDaqMap.get(layerNumber).get(listPosition), sensor);
                     this.printDebug(daqPairToSensor.get(topLayerDaqMap.get(layerNumber).get(listPosition)).getName());

@@ -281,8 +283,10 @@

                             + ", Hybrid: " + bottomLayerDaqMap.get(layerNumber).get(listPosition).getSecondElement());
                     sensorToBottomLayer.put(sensor, layerNumber);
                     sensorToDaqPair.put(sensor, bottomLayerDaqMap.get(layerNumber).get(listPosition));

-                    if(!bottomLayerToSensor.containsKey(layerNumber))
-                        bottomLayerToSensor.put(layerNumber, new ArrayList<SiSensor>());

+//                    if(!bottomLayerToSensor.containsKey(layerNumber)){
+//                        bottomLayerToSensor.put(layerNumber, new ArrayList<SiSensor>());
+//                        while(bottomLayerToSensor.get(layerNumber).size() != maxModuleNumber) bottomLayerToSensor.get(layerNumber).add(null);
+//                    }

                     bottomLayerToSensor.get(layerNumber).add(listPosition, sensor);
                     daqPairToSensor.put(bottomLayerDaqMap.get(layerNumber).get(listPosition), sensor);
                     this.printDebug(daqPairToSensor.get(bottomLayerDaqMap.get(layerNumber).get(listPosition)).getName());

@@ -333,6 +337,9 @@

                                 topLayerDaqMap.put(layer, new ArrayList<Pair<Integer, Integer>>());
                             this.printDebug("Adding FPGA: " + daqPair.getFirstElement() + ", Hybrid: " + daqPair.getSecondElement() + " to position: " + listPosition);
                             topLayerDaqMap.get(layer).add(listPosition, daqPair);

+                            if(!topLayerToSensor.containsKey(layer))
+                                topLayerToSensor.put(layer, new ArrayList<SiSensor>()); 
+                            topLayerToSensor.get(layer).add(null);

                             break;
                         case 1: 
                             listPosition = (module - 1)/2;

@@ -340,6 +347,9 @@

                                 bottomLayerDaqMap.put(layer, new ArrayList<Pair<Integer, Integer>>());
                             this.printDebug("Adding FPGA: " + daqPair.getFirstElement() + ", Hybrid: " + daqPair.getSecondElement() + " to position: " + listPosition);
                             bottomLayerDaqMap.get(layer).add(listPosition, daqPair);

+                            if(!bottomLayerToSensor.containsKey(layer))
+                                bottomLayerToSensor.put(layer, new ArrayList<SiSensor>());
+                            bottomLayerToSensor.get(layer).add(null);

                             break;
                         default: 
                             throw new RuntimeException("Invalid module number: " + module);