Author: [log in to unmask]
Date: Fri Apr 24 16:52:20 2015
New Revision: 2813
Log:
Minor modifications to fix compilation problems from changes to conditions API.
Modified:
java/branches/HPSJAVA-488/ecal-recon/src/main/java/org/hps/recon/ecal/EcalCalibrationsDriver.java
Modified: java/branches/HPSJAVA-488/ecal-recon/src/main/java/org/hps/recon/ecal/EcalCalibrationsDriver.java
=============================================================================
--- java/branches/HPSJAVA-488/ecal-recon/src/main/java/org/hps/recon/ecal/EcalCalibrationsDriver.java (original)
+++ java/branches/HPSJAVA-488/ecal-recon/src/main/java/org/hps/recon/ecal/EcalCalibrationsDriver.java Fri Apr 24 16:52:20 2015
@@ -20,9 +20,10 @@
import org.hps.conditions.api.ConditionsObjectException;
import org.hps.conditions.api.ConditionsRecord;
-import org.hps.conditions.api.FieldValueMap;
+import org.hps.conditions.api.DatabaseObjectException;
+import org.hps.conditions.api.FieldValues;
+import org.hps.conditions.api.TableMetaData;
import org.hps.conditions.database.DatabaseConditionsManager;
-import org.hps.conditions.database.TableMetaData;
import org.hps.conditions.ecal.EcalCalibration;
import org.hps.conditions.ecal.EcalCalibration.EcalCalibrationCollection;
import org.hps.conditions.ecal.EcalChannel;
@@ -220,7 +221,11 @@
// Create a new calibration object and add it to the collection, using mean for pedestal
// and sigma for noise.
- calibrations.add(new EcalCalibration(channelId, mean, sigma));
+ try {
+ calibrations.add(new EcalCalibration(channelId, mean, sigma));
+ } catch (ConditionsObjectException e) {
+ throw new RuntimeException("Error adding new calibration object.", e);
+ }
}
// Get the list of field names for the header.
@@ -259,9 +264,9 @@
StringBuffer buff = new StringBuffer(fieldNames);
buff.append('\n');
for (EcalCalibration calibration : calibrations) {
- FieldValueMap fieldValues = calibration.getFieldValues();
- for (String field : fieldValues.keySet()) {
- buff.append(fieldValues.get(field) + " ");
+ FieldValues fieldValues = calibration.getFieldValues();
+ for (String field : fieldValues.getFieldNames()) {
+ buff.append(fieldValues.getValue(field) + " ");
}
buff.setLength(buff.length() - 1);
buff.append('\n');
@@ -304,7 +309,7 @@
"Generated by EcalCalibrationsDriver.",
"eng_run");
conditionsRecord.insert();
- } catch (ConditionsObjectException | SQLException e) {
+ } catch (DatabaseObjectException | SQLException e) {
throw new RuntimeException(e);
}
}
|