Author: mccaky
Date: Sun Dec 14 11:02:48 2014
New Revision: 1722
Log:
Updated the database checking utility and fixed a mapping error in the multi-gradient color map for the event display.
Modified:
java/trunk/ecal-event-display/src/main/java/org/hps/monitoring/ecal/eventdisplay/util/DatabaseCheck.java
java/trunk/ecal-event-display/src/main/java/org/hps/monitoring/ecal/eventdisplay/util/MultiGradientScale.java
Modified: java/trunk/ecal-event-display/src/main/java/org/hps/monitoring/ecal/eventdisplay/util/DatabaseCheck.java
=============================================================================
--- java/trunk/ecal-event-display/src/main/java/org/hps/monitoring/ecal/eventdisplay/util/DatabaseCheck.java (original)
+++ java/trunk/ecal-event-display/src/main/java/org/hps/monitoring/ecal/eventdisplay/util/DatabaseCheck.java Sun Dec 14 11:02:48 2014
@@ -44,8 +44,8 @@
conditionsManager.setDetector(detectorName, runNumber);
// Get ECAL conditions.
- EcalConditions ecalConditions = ConditionsManager.defaultInstance().getCachedConditions(EcalConditions.class, TableConstants.ECAL_CONDITIONS).getCachedData();
-
+ EcalConditions ecalConditions = ConditionsManager.defaultInstance().getCachedConditions(EcalConditions.class, TableConstants.ECAL_CONDITIONS).getCachedData();
+
// Get the list of EcalChannel objects.
EcalChannelCollection channels = ecalConditions.getChannelCollection();
EcalLedCollection leds = conditionsManager.getConditionsData(EcalLedCollection.class, TableConstants.ECAL_LEDS);
@@ -137,5 +137,4 @@
System.out.printf("Channel Collection :: %d%n", channels.getCollectionId());
System.out.printf("LED Collection :: %d%n", leds.getCollectionId());
}
-
}
Modified: java/trunk/ecal-event-display/src/main/java/org/hps/monitoring/ecal/eventdisplay/util/MultiGradientScale.java
=============================================================================
--- java/trunk/ecal-event-display/src/main/java/org/hps/monitoring/ecal/eventdisplay/util/MultiGradientScale.java (original)
+++ java/trunk/ecal-event-display/src/main/java/org/hps/monitoring/ecal/eventdisplay/util/MultiGradientScale.java Sun Dec 14 11:02:48 2014
@@ -46,6 +46,10 @@
double sValue;
if (linear) { sValue = value; }
else { sValue = Math.log10(scale * value); }
+
+ if(value < 1 && (Double.isNaN(sValue) || Double.isInfinite(sValue))) {
+ return scaleList.get(0).getColor(0.0);
+ }
// Otherwise, determine which scale should get the value.
for (GradientScale s : scaleList) {
