Author: [log in to unmask]
Date: Sun Nov 16 15:02:46 2014
New Revision: 1531
Log:
some update on the new conditions system
Modified:
java/trunk/monitoring-drivers/src/main/java/org/hps/monitoring/ecal/plots/EcalDaqPlots.java
java/trunk/monitoring-drivers/src/main/java/org/hps/monitoring/ecal/plots/EcalHitPlots.java
Modified: java/trunk/monitoring-drivers/src/main/java/org/hps/monitoring/ecal/plots/EcalDaqPlots.java
=============================================================================
--- java/trunk/monitoring-drivers/src/main/java/org/hps/monitoring/ecal/plots/EcalDaqPlots.java (original)
+++ java/trunk/monitoring-drivers/src/main/java/org/hps/monitoring/ecal/plots/EcalDaqPlots.java Sun Nov 16 15:02:46 2014
@@ -20,7 +20,7 @@
import org.lcsim.util.Driver;
import org.lcsim.util.aida.AIDA;
/*Conditions system imports*/
-//import org.hps.conditions.DatabaseConditionsManager;
+import org.hps.conditions.DatabaseConditionsManager;
/**
@@ -47,11 +47,11 @@
private EcalConditions conditions;
private EcalChannel.EcalChannelCollection channels;
- //private DatabaseConditionsManager manager;
- private ConditionsManager manager;
+ private DatabaseConditionsManager manager;
+ //private ConditionsManager manager;
public EcalDaqPlots() {
- //manager = DatabaseConditionsManager.getInstance();
- manager = ConditionsManager.defaultInstance();
+ manager = DatabaseConditionsManager.getInstance();
+ //manager = ConditionsManager.defaultInstance();
}
public void setSubdetectorName(String subdetectorName) {
Modified: java/trunk/monitoring-drivers/src/main/java/org/hps/monitoring/ecal/plots/EcalHitPlots.java
=============================================================================
--- java/trunk/monitoring-drivers/src/main/java/org/hps/monitoring/ecal/plots/EcalHitPlots.java (original)
+++ java/trunk/monitoring-drivers/src/main/java/org/hps/monitoring/ecal/plots/EcalHitPlots.java Sun Nov 16 15:02:46 2014
@@ -9,7 +9,7 @@
import java.util.ArrayList;
import java.util.List;
-import org.hps.readout.ecal.TriggerData;
+import org.hps.readout.ecal.SSPData;
import org.hps.recon.ecal.ECalUtils;
import org.hps.util.Resettable;
import org.lcsim.event.CalorimeterHit;
@@ -196,9 +196,9 @@
if (event.hasCollection(GenericObject.class, "TriggerBank")) {
List<GenericObject> triggerList = event.get(GenericObject.class, "TriggerBank");
if (!triggerList.isEmpty()) {
- GenericObject triggerData = triggerList.get(0);
-
- int orTrig = TriggerData.getOrTrig(triggerData);
+ GenericObject sspData = triggerList.get(0);
+
+ int orTrig = SSPData.getOrTrig(sspData);
if (orTrig != 0) {
for (int i = 0; i < 32; i++) {
if ((1 << (31 - i) & orTrig) != 0) {
@@ -208,7 +208,7 @@
}
}
}
- int topTrig = TriggerData.getTopTrig(triggerData);
+ int topTrig = SSPData.getTopTrig(sspData);
if (topTrig != 0) {
for (int i = 0; i < 32; i++) {
if ((1 << (31 - i) & topTrig) != 0) {
@@ -218,7 +218,7 @@
}
}
}
- int botTrig = TriggerData.getBotTrig(triggerData);
+ int botTrig = SSPData.getBotTrig(sspData);
if (botTrig != 0) {
for (int i = 0; i < 32; i++) {
if ((1 << (31 - i) & botTrig) != 0) {
