Author: [log in to unmask]
Date: Tue Nov 4 20:54:39 2014
New Revision: 1433
Log:
clean up a little
Modified:
java/trunk/ecal-readout-sim/src/main/java/org/hps/readout/ecal/SSPData.java
java/trunk/ecal-readout-sim/src/main/java/org/hps/readout/ecal/TriggerData.java
Modified: java/trunk/ecal-readout-sim/src/main/java/org/hps/readout/ecal/SSPData.java
=============================================================================
--- java/trunk/ecal-readout-sim/src/main/java/org/hps/readout/ecal/SSPData.java (original)
+++ java/trunk/ecal-readout-sim/src/main/java/org/hps/readout/ecal/SSPData.java Tue Nov 4 20:54:39 2014
@@ -27,7 +27,7 @@
public static final int CLUSTER_TYPE = 0x14;
public static final String TRIG_COLLECTION = "TriggerBank";
- private int[] bank;
+// private int[] bank;
private long trigTime;
private int eventNum;
@@ -113,21 +113,27 @@
return trigTime;
}
-// public int getOrTrig() {
-// return 0;
-// }
-//
-// public int getTopTrig() {
-// return 0;
-// }
-//
-// public int getBotTrig() {
-// return 0;
-// }
-//
-// public int getAndTrig() {
-// return 0;
-// }
+ @Override
+ public int getOrTrig() {
+ return 0;
+ }
+
+ @Override
+ public int getTopTrig() {
+ return 0;
+ }
+
+ @Override
+ public int getBotTrig() {
+ return 0;
+ }
+
+ @Override
+ public int getAndTrig() {
+ return 0;
+ }
+
+ @Override
public int[] getBank() {
return bank;
}
Modified: java/trunk/ecal-readout-sim/src/main/java/org/hps/readout/ecal/TriggerData.java
=============================================================================
--- java/trunk/ecal-readout-sim/src/main/java/org/hps/readout/ecal/TriggerData.java (original)
+++ java/trunk/ecal-readout-sim/src/main/java/org/hps/readout/ecal/TriggerData.java Tue Nov 4 20:54:39 2014
@@ -16,7 +16,7 @@
public static final int TIME = 7;
public static final int TRIG_BANK_SIZE = 8;
public static final String TRIG_COLLECTION = "TriggerBank";
- private int[] bank;
+ protected int[] bank;
public TriggerData(int[] bank) {
this.bank = bank;
|