Author: [log in to unmask]
Date: Sat May 16 22:38:22 2015
New Revision: 2991
Log:
Removed SSPData references to TOP, BOTTOM, and OR triggers. These are test-run only parameters and are not supported by SSPData for the current run.
Modified:
java/trunk/analysis/src/main/java/org/hps/analysis/ecal/EcalHitPlots.java
Modified: java/trunk/analysis/src/main/java/org/hps/analysis/ecal/EcalHitPlots.java
=============================================================================
--- java/trunk/analysis/src/main/java/org/hps/analysis/ecal/EcalHitPlots.java (original)
+++ java/trunk/analysis/src/main/java/org/hps/analysis/ecal/EcalHitPlots.java Sat May 16 22:38:22 2015
@@ -157,7 +157,11 @@
for (GenericObject data : triggerList) {
if (AbstractIntData.getTag(data) == TestRunTriggerData.BANK_TAG) {
TestRunTriggerData triggerData = new TestRunTriggerData(data);
-
+
+ // TODO: TOP, BOTTOM, AND, and OR triggers are test
+ // run specific parameters and are only retained
+ // for legacy purposes. They are not meaningful
+ // for anything newer and should not be used.
int orTrig = triggerData.getOrTrig();
if (orTrig != 0) {
for (int i = 0; i < 32; i++) {
@@ -190,10 +194,12 @@
}
break;
} else if (AbstractIntData.getTag(data) == SSPData.BANK_TAG) {
- SSPData triggerData = new SSPData(data);
-
- int orTrig = triggerData.getOrTrig();
- if (orTrig != 0) {
+ //SSPData triggerData = new SSPData(data);
+ // TODO: TOP, BOTTOM, AND, and OR trigger are test
+ // run-specific parameters and are not supported by
+ // SSPData.
+ int orTrig = 0; //triggerData.getOrTrig();
+ if(orTrig != 0) {
for (int i = 0; i < 32; i++) {
if ((1 << (31 - i) & orTrig) != 0) {
orTrigTime = i;
@@ -202,7 +208,7 @@
}
}
}
- int topTrig = triggerData.getTopTrig();
+ int topTrig = 1; //triggerData.getTopTrig();
if (topTrig != 0) {
for (int i = 0; i < 32; i++) {
if ((1 << (31 - i) & topTrig) != 0) {
@@ -212,7 +218,7 @@
}
}
}
- int botTrig = triggerData.getBotTrig();
+ int botTrig = 0; //triggerData.getBotTrig();
if (botTrig != 0) {
for (int i = 0; i < 32; i++) {
if ((1 << (31 - i) & botTrig) != 0) {
@@ -235,13 +241,15 @@
double botTime = Double.POSITIVE_INFINITY;
double orTime = Double.POSITIVE_INFINITY;
for (CalorimeterHit hit : hits) {
-// if (hit.getIdentifierFieldValue("iy") > 0) {
-// topX.fill(hit.getIdentifierFieldValue("ix"),hit.getPosition()[0]);
-// topY.fill(hit.getIdentifierFieldValue("iy"),hit.getPosition()[1]);
-// } else {
-// botX.fill(hit.getIdentifierFieldValue("ix"),hit.getPosition()[0]);
-// botY.fill(hit.getIdentifierFieldValue("iy"),hit.getPosition()[1]);
-// }
+ /*
+ if (hit.getIdentifierFieldValue("iy") > 0) {
+ topX.fill(hit.getIdentifierFieldValue("ix"),hit.getPosition()[0]);
+ topY.fill(hit.getIdentifierFieldValue("iy"),hit.getPosition()[1]);
+ } else {
+ botX.fill(hit.getIdentifierFieldValue("ix"),hit.getPosition()[0]);
+ botY.fill(hit.getIdentifierFieldValue("iy"),hit.getPosition()[1]);
+ }
+ */
hitEnergyPlot.fill(hit.getRawEnergy());
hitTimePlot.fill(hit.getTime());
if (hit.getTime() < orTime) {
|