Author: [log in to unmask]
Date: Mon Dec 8 18:23:29 2014
New Revision: 1657
Log:
quick fix for bug reported by Kyle
Modified:
java/trunk/evio/src/main/java/org/hps/evio/SVTHitWriter.java
Modified: java/trunk/evio/src/main/java/org/hps/evio/SVTHitWriter.java
=============================================================================
--- java/trunk/evio/src/main/java/org/hps/evio/SVTHitWriter.java (original)
+++ java/trunk/evio/src/main/java/org/hps/evio/SVTHitWriter.java Mon Dec 8 18:23:29 2014
@@ -65,17 +65,18 @@
}
Map<Integer, FpgaData> fpgaData = new HashMap<Integer, FpgaData>();
- List<HpsSiSensor> sensors = subdetector.getDetectorElement().findDescendants(HpsSiSensor.class);
-
- for(HpsSiSensor sensor : sensors){
- if(!fpgaNumbers.contains(((HpsTestRunSiSensor) sensor).getFpgaID())){
- fpgaNumbers.add(((HpsTestRunSiSensor) sensor).getFpgaID());
- }
- }
- //===> for (Integer fpgaNumber : SvtUtils.getInstance().getFpgaNumbers()) {
- for (Integer fpgaNumber : fpgaNumbers) {
- fpgaData.put(fpgaNumber, new FpgaData(fpgaNumber, temps, 0));
- }
+// List<HpsSiSensor> sensors = subdetector.getDetectorElement().findDescendants(HpsSiSensor.class);
+//
+// for(HpsSiSensor sensor : sensors){
+// if(!fpgaNumbers.contains(((HpsTestRunSiSensor) sensor).getFpgaID())){
+// fpgaNumbers.add(((HpsTestRunSiSensor) sensor).getFpgaID());
+// }
+// }
+// //===> for (Integer fpgaNumber : SvtUtils.getInstance().getFpgaNumbers()) {
+// for (Integer fpgaNumber : fpgaNumbers) {
+// fpgaData.put(fpgaNumber, new FpgaData(fpgaNumber, temps, 0));
+// }
+ //FIXME: commented this out for compatibility between new and old data formats/conditions
return fpgaData;
}
|