Author: [log in to unmask]
Date: Sat May 16 22:04:17 2015
New Revision: 2990
Log:
Removed deprecation of TOP, BOTTOM, AND, and OR triggers from TestRunTriggerData at Sho's request. These ethods are valid for test run data, but should be noted as undefined for new data.
Modified:
java/trunk/ecal-recon/src/main/java/org/hps/recon/ecal/triggerbank/TestRunTriggerData.java
Modified: java/trunk/ecal-recon/src/main/java/org/hps/recon/ecal/triggerbank/TestRunTriggerData.java
=============================================================================
--- java/trunk/ecal-recon/src/main/java/org/hps/recon/ecal/triggerbank/TestRunTriggerData.java (original)
+++ java/trunk/ecal-recon/src/main/java/org/hps/recon/ecal/triggerbank/TestRunTriggerData.java Sat May 16 22:04:17 2015
@@ -33,22 +33,18 @@
return bank[TIME] & 0xffffffffL;
}
- @Deprecated
public int getOrTrig() {
return bank[OR_TRIG];
}
- @Deprecated
public int getTopTrig() {
return bank[TOP_TRIG];
}
- @Deprecated
public int getBotTrig() {
return bank[BOT_TRIG];
}
- @Deprecated
public int getAndTrig() {
return bank[AND_TRIG];
}
@@ -57,22 +53,18 @@
return AbstractIntData.getBankInt(object, TIME) & 0xffffffffL;
}
- @Deprecated
public static int getOrTrig(GenericObject object) {
return AbstractIntData.getBankInt(object, OR_TRIG);
}
- @Deprecated
public static int getTopTrig(GenericObject object) {
return AbstractIntData.getBankInt(object, TOP_TRIG);
}
- @Deprecated
public static int getBotTrig(GenericObject object) {
return AbstractIntData.getBankInt(object, BOT_TRIG);
}
- @Deprecated
public static int getAndTrig(GenericObject object) {
return AbstractIntData.getBankInt(object, AND_TRIG);
}
|