Print

---

Author: [log in to unmask]
Date: Wed Oct 28 18:35:24 2015
New Revision: 3909

Log:
[HPSJAVA-632] Add color field to ECal LED calibration condition.

Modified:
    java/trunk/conditions/src/main/java/org/hps/conditions/ecal/EcalLedCalibration.java
    java/trunk/monitoring-drivers/src/main/java/org/hps/monitoring/ecal/plots/EcalLedSequenceMonitor.java

Modified: java/trunk/conditions/src/main/java/org/hps/conditions/ecal/EcalLedCalibration.java
 =============================================================================
--- java/trunk/conditions/src/main/java/org/hps/conditions/ecal/EcalLedCalibration.java	(original)
+++ java/trunk/conditions/src/main/java/org/hps/conditions/ecal/EcalLedCalibration.java	Wed Oct 28 18:35:24 2015
@@ -13,6 +13,15 @@
 @Table(names = "ecal_led_calibrations")
 public final class EcalLedCalibration extends BaseConditionsObject {
 
+    /**
+     * Color of LED measurement.
+     */
+    public enum LedColor {
+        UNKNOWN,
+        BLUE,
+        RED
+    }
+    
     /**
      * Generic collection class for these objects.
      */
@@ -32,10 +41,11 @@
      * @param ledResponse the mean of the LED response
      * @param rms the RMS of the LED response
      */
-    public EcalLedCalibration(final int channelId, final double ledResponse, final double rms) {
+    public EcalLedCalibration(final int channelId, final double ledResponse, final double rms, LedColor color) {
         this.setFieldValue("ecal_channel_id", channelId);
         this.setFieldValue("led_response", ledResponse);
         this.setFieldValue("rms", rms);
+        this.setFieldValue("color", color.ordinal());
     }
 
     /**
@@ -67,4 +77,14 @@
     public Integer getRms() {
         return this.getFieldValue("rms");
     }
+    
+    /**
+     * Get the LED color.
+     * 
+     * @return the LED color
+     */
+    @Field(names = {"color"})
+    public LedColor getColor() {
+        return LedColor.values()[(int) this.getFieldValue("color")];
+    }
 }

Modified: java/trunk/monitoring-drivers/src/main/java/org/hps/monitoring/ecal/plots/EcalLedSequenceMonitor.java
 =============================================================================
--- java/trunk/monitoring-drivers/src/main/java/org/hps/monitoring/ecal/plots/EcalLedSequenceMonitor.java	(original)
+++ java/trunk/monitoring-drivers/src/main/java/org/hps/monitoring/ecal/plots/EcalLedSequenceMonitor.java	Wed Oct 28 18:35:24 2015
@@ -1,8 +1,4 @@
 package org.hps.monitoring.ecal.plots;
-
-import java.io.FileNotFoundException;
-import java.io.IOException;
-import java.io.PrintWriter;
 
 import hep.aida.IEvaluator;
 import hep.aida.IFitResult;
@@ -20,6 +16,9 @@
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
 import java.io.File;
+import java.io.FileNotFoundException;
+import java.io.IOException;
+import java.io.PrintWriter;
 import java.sql.SQLException;
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -46,6 +45,8 @@
 import org.hps.conditions.ecal.EcalLed.EcalLedCollection;
 import org.hps.conditions.ecal.EcalLedCalibration;
 import org.hps.conditions.ecal.EcalLedCalibration.EcalLedCalibrationCollection;
+import org.hps.conditions.ecal.EcalLedCalibration.LedColor;
+import org.hps.conditions.ecal.EcalLedCalibration.LedColor;
 import org.hps.recon.ecal.EcalUtils;
 import org.lcsim.event.CalorimeterHit;
 import org.lcsim.event.EventHeader;
@@ -711,7 +712,7 @@
             id=EcalMonitoringUtilities.getHistoIDFromRowColumn(y,x);
             mean=mMean[id];
             rms=mRMS[id];
-            led_calibrations.add(new EcalLedCalibration(cid,mean,rms));
+            led_calibrations.add(new EcalLedCalibration(cid,mean,rms,LedColor.UNKNOWN));
         }
 
         int collectionId = -1;