Commit in hps-java/src/main/java/org/lcsim/hps/recon/tracking on MAIN | |||
HPSSVTSensorSetup.java | +5 | -4 | 1.12 -> 1.13 |
SvtUtils.java | +19 | -1 | 1.16 -> 1.17 |
+24 | -5 |
reset SvtUtils maps every time Detector changes
diff -u -r1.12 -r1.13 --- HPSSVTSensorSetup.java 27 Jul 2013 01:52:49 -0000 1.12 +++ HPSSVTSensorSetup.java 29 Oct 2013 23:28:53 -0000 1.13 @@ -22,7 +22,7 @@
* @author Mathew Graham <[log in to unmask]> * @author Omar Moreno <[log in to unmask]> * @author Jeremy McCormick <[log in to unmask]>
- * @version $Id: HPSSVTSensorSetup.java,v 1.12 2013/07/27 01:52:49 omoreno Exp $
+ * @version $Id: HPSSVTSensorSetup.java,v 1.13 2013/10/29 23:28:53 jeremy Exp $
*/ public class HPSSVTSensorSetup extends Driver {
@@ -78,9 +78,10 @@
configureSensors(sensors); // Create DAQ Maps
- if (!SvtUtils.getInstance().isSetup()) { - SvtUtils.getInstance().setup(detector); - }
+ //if (!SvtUtils.getInstance().isSetup()) { + SvtUtils.getInstance().reset(); // Hard reset of SvtUtils to clear previous detector state. + SvtUtils.getInstance().setup(detector); + //}
} /**
diff -u -r1.16 -r1.17 --- SvtUtils.java 3 Oct 2013 20:34:21 -0000 1.16 +++ SvtUtils.java 29 Oct 2013 23:28:53 -0000 1.17 @@ -26,7 +26,7 @@
* A class providing various utilities related to the HPS SVT. * * @author Omar Moreno <[log in to unmask]>
- * @version $Id: SvtUtils.java,v 1.16 2013/10/03 20:34:21 meeg Exp $
+ * @version $Id: SvtUtils.java,v 1.17 2013/10/29 23:28:53 jeremy Exp $
*/ public class SvtUtils {
@@ -293,6 +293,8 @@
this.printDebug("Method: setupMaps: \n\tDetector: " + detector.getDetectorName());
+ reset(); +
// Load the DAQ Map from the conditions database this.loadSvtDaqMap();
@@ -507,4 +509,20 @@
System.out.println(this.getClass().getSimpleName() + ": " + debugMessage); } }
+ + public void reset() { + sensors = new HashSet<SiSensor>(); + stereoPairs = new HashSet<StereoPair>(); + sensorToDaqPair = new HashMap<SiSensor, Pair<Integer, Integer>>(); + daqPairToSensor = new HashMap<Pair<Integer, Integer>, SiSensor>(); + topLayerDaqMap = new HashMap<Integer, List<Pair<Integer, Integer>>>(); + bottomLayerDaqMap = new HashMap<Integer, List<Pair<Integer, Integer>>>(); + sensorToTopLayer = new HashMap<SiSensor, Integer>(); + sensorToBottomLayer = new HashMap<SiSensor, Integer>(); + sensorToDescriptor = new HashMap<SiSensor, String>(); + topLayerToSensor = new HashMap<Integer, List<SiSensor>>(); + bottomLayerToSensor = new HashMap<Integer, List<SiSensor>>(); + sensorArray= null; + fpgaNumbers = new HashSet<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