 |
 |
| Commit in hps-java/src/main/java/org/lcsim/hps/recon/tracking on MAIN | |||
| HPSSVTDAQMaps.java | +24 | -24 | 1.3 -> 1.4 |
Fixed typo, specified pair type
diff -u -r1.3 -r1.4 --- HPSSVTDAQMaps.java 11 Apr 2012 23:45:15 -0000 1.3 +++ HPSSVTDAQMaps.java 11 Apr 2012 23:53:50 -0000 1.4 @@ -22,7 +22,7 @@
* Creates maps between SVT sensors to FPGA and Hybrid pairs and vice versa * * @author Omar Moreno
- * @version $Id: HPSSVTDAQMaps.java,v 1.3 2012/04/11 23:45:15 meeg Exp $
+ * @version $Id: HPSSVTDAQMaps.java,v 1.4 2012/04/11 23:53:50 omoreno Exp $
*/
public class HPSSVTDAQMaps extends Driver {
@@ -38,7 +38,7 @@
public static Map<Pair<Integer /* Hybrid */, Integer /* FPGA */>, SiSensor /* Sensor */> daqPairToSensor;
// Map from SVT Layer to Hybrid/FPGA pair
- private Map<Integer /* Layer # */, Pair<Integer /* Hybrid */, Integer /* FPGA */>> layerToDAQ;
+ public Map<Integer /* Layer # */, Pair<Integer /* Hybrid */, Integer /* FPGA */>> layerToDAQ;
/**
* Default Constructor.
@@ -53,30 +53,30 @@
// NOTE: that the layer numbering is as follows: Top: 1-10, Bottom: 11-20
- // Layer # Hybrid # FPGA# - //----------------------------------------------------------------------
+ // Layer # Hybrid # FPGA# + //-----------------------------------------------------------------------------------
// Top
- layerToDAQ.put( 1, new Pair( 0, 0 )); - layerToDAQ.put( 2, new Pair( 1, 0 )); - layerToDAQ.put( 3, new Pair( 2, 0 )); - layerToDAQ.put( 4, new Pair( 0, 1 )); - layerToDAQ.put( 5, new Pair( 1, 1 )); - layerToDAQ.put( 6, new Pair( 2, 1 )); - layerToDAQ.put( 7, new Pair( 0, 2 )); - layerToDAQ.put( 8, new Pair( 1, 2 )); - layerToDAQ.put( 9, new Pair( 2, 2 )); - layerToDAQ.put( 10, new Pair( 0, 6 ));
+ layerToDAQ.put( 1, new Pair<Integer, Integer>( 0, 0 )); + layerToDAQ.put( 2, new Pair<Integer, Integer>( 1, 0 )); + layerToDAQ.put( 3, new Pair<Integer, Integer>( 2, 0 )); + layerToDAQ.put( 4, new Pair<Integer, Integer>( 0, 1 )); + layerToDAQ.put( 5, new Pair<Integer, Integer>( 1, 1 )); + layerToDAQ.put( 6, new Pair<Integer, Integer>( 2, 1 )); + layerToDAQ.put( 7, new Pair<Integer, Integer>( 0, 2 )); + layerToDAQ.put( 8, new Pair<Integer, Integer>( 1, 2 )); + layerToDAQ.put( 9, new Pair<Integer, Integer>( 2, 2 )); + layerToDAQ.put( 10, new Pair<Integer, Integer>( 0, 6 ));
// Bottom
- layerToDAQ.put( 11, new Pair( 0, 3 )); - layerToDAQ.put( 12, new Pair( 1, 3 )); - layerToDAQ.put( 13, new Pair( 2, 3 )); - layerToDAQ.put( 14, new Pair( 0, 4 )); - layerToDAQ.put( 15, new Pair( 1, 4 )); - layerToDAQ.put( 16, new Pair( 2, 4 )); - layerToDAQ.put( 17, new Pair( 0, 5 )); - layerToDAQ.put( 18, new Pair( 1, 5 )); - layerToDAQ.put( 19, new Pair( 2, 5 )); - layerToDAQ.put( 20, new Pair( 1, 6 ));
+ layerToDAQ.put( 11, new Pair<Integer, Integer>( 0, 3 )); + layerToDAQ.put( 12, new Pair<Integer, Integer>( 1, 3 )); + layerToDAQ.put( 13, new Pair<Integer, Integer>( 2, 3 )); + layerToDAQ.put( 14, new Pair<Integer, Integer>( 0, 4 )); + layerToDAQ.put( 15, new Pair<Integer, Integer>( 1, 4 )); + layerToDAQ.put( 16, new Pair<Integer, Integer>( 2, 4 )); + layerToDAQ.put( 17, new Pair<Integer, Integer>( 0, 5 )); + layerToDAQ.put( 18, new Pair<Integer, Integer>( 1, 5 )); + layerToDAQ.put( 19, new Pair<Integer, Integer>( 2, 5 )); + layerToDAQ.put( 20, new Pair<Integer, Integer>( 1, 6 ));
sensorToDAQPair = new HashMap<SiSensor, Pair<Integer, Integer>>();
Use REPLY-ALL to reply to list
To unsubscribe from the LCD-CVS list, click the following link:
https://listserv.slac.stanford.edu/cgi-bin/wa?SUBED1=LCD-CVS&A=1