Author: [log in to unmask]
Date: Mon Apr 27 12:29:09 2015
New Revision: 2823
Log:
Minor fixes to Driver on the trunk conditions branch.
Modified:
java/branches/HPSJAVA-488/monitoring-drivers/src/main/java/org/hps/monitoring/ecal/plots/EcalLedSequenceMonitor.java
Modified: java/branches/HPSJAVA-488/monitoring-drivers/src/main/java/org/hps/monitoring/ecal/plots/EcalLedSequenceMonitor.java
=============================================================================
--- java/branches/HPSJAVA-488/monitoring-drivers/src/main/java/org/hps/monitoring/ecal/plots/EcalLedSequenceMonitor.java (original)
+++ java/branches/HPSJAVA-488/monitoring-drivers/src/main/java/org/hps/monitoring/ecal/plots/EcalLedSequenceMonitor.java Mon Apr 27 12:29:09 2015
@@ -1,68 +1,49 @@
package org.hps.monitoring.ecal.plots;
+import hep.aida.IEvaluator;
+import hep.aida.IFitResult;
+import hep.aida.IFitter;
+import hep.aida.IFunction;
+import hep.aida.IFunctionFactory;
import hep.aida.IHistogram1D;
import hep.aida.IHistogram2D;
+import hep.aida.IPlotter;
+import hep.aida.IPlotterFactory;
+import hep.aida.IPlotterStyle;
import hep.aida.IProfile1D;
import hep.aida.ITuple;
-import hep.aida.IFunction;
-import hep.aida.IPlotter;
-import hep.aida.IFitter;
-import hep.aida.IFitResult;
-import hep.aida.IFunctionFactory;
-import hep.aida.IPlotterStyle;
-import hep.aida.IPlotterFactory;
-import hep.aida.ICloud1D;
-import hep.aida.ICloud2D;
-import hep.aida.IEvaluator;
-import hep.aida.ITreeFactory;
-import hep.aida.ITupleFactory;
-
-import javax.swing.JFrame;
-import javax.swing.JButton;
-import javax.swing.JPanel;
-import javax.swing.JLabel;
-import javax.swing.JDialog;
-import javax.swing.JOptionPane;
-import javax.swing.JTextArea;
-import javax.swing.UIManager;
-import javax.swing.Icon;
-import javax.swing.WindowConstants;
-
-import java.awt.Dimension;
-import java.awt.FlowLayout;
-import java.awt.EventQueue;
+
+import java.awt.event.ActionEvent;
import java.awt.event.ActionListener;
-import java.awt.event.ActionEvent;
-import java.beans.PropertyChangeListener;
-import java.beans.PropertyChangeEvent;
-import java.lang.InterruptedException;
-import java.util.Arrays;
-import java.io.Console;
import java.io.File;
import java.sql.SQLException;
import java.util.ArrayList;
+import java.util.Arrays;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
+import javax.swing.JButton;
+import javax.swing.JDialog;
+import javax.swing.JFrame;
+import javax.swing.JLabel;
+import javax.swing.JPanel;
+
import org.hps.conditions.api.ConditionsObjectException;
import org.hps.conditions.api.ConditionsRecord;
+import org.hps.conditions.api.DatabaseObjectException;
+import org.hps.conditions.api.TableMetaData;
import org.hps.conditions.database.DatabaseConditionsManager;
-import org.hps.conditions.database.TableMetaData;
import org.hps.conditions.ecal.EcalChannel;
-import org.hps.conditions.ecal.EcalCalibration.EcalCalibrationCollection;
import org.hps.conditions.ecal.EcalChannel.EcalChannelCollection;
-import org.hps.conditions.ecal.EcalChannel.GeometryId;
+import org.hps.conditions.ecal.EcalChannelConstants;
+import org.hps.conditions.ecal.EcalConditions;
import org.hps.conditions.ecal.EcalLed;
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.EcalCalibration;
-import org.hps.conditions.ecal.EcalConditions;
-import org.hps.conditions.ecal.EcalChannelConstants;
import org.hps.recon.ecal.EcalUtils;
-import org.hps.monitoring.ecal.plots.EcalMonitoringUtilities;
import org.lcsim.event.CalorimeterHit;
import org.lcsim.event.EventHeader;
import org.lcsim.geometry.Detector;
@@ -614,7 +595,11 @@
}
if (m_ret==1){
System.out.println("OK, upload to DB");
- uploadToDB();
+ try {
+ uploadToDB();
+ } catch (SQLException | DatabaseObjectException | ConditionsObjectException error) {
+ throw new RuntimeException("Error uploading to the database.", error);
+ }
if (isMonitoringApp){
System.out.println("Save an Elog too");
uploadToElog();
@@ -657,7 +642,7 @@
}
- private void uploadToDB() {
+ private void uploadToDB() throws DatabaseObjectException, ConditionsObjectException, SQLException {
int x,y,id;
double mean,rms;
System.out.println(String.format("Uploading new led data to the database, runMin=%d, runMax=%d, tag=%s ....",
@@ -685,18 +670,14 @@
} catch (Exception e) {
throw new RuntimeException(e);
}
- try {
- led_calibrations.setCollectionId(collectionId);
- System.err.println("CollectionID: "+collectionId);
- led_calibrations.insert();
- ConditionsRecord conditionsRecord = new ConditionsRecord(
- led_calibrations.getCollectionId(), runNumber, runNumberMax, dbTableName, dbTableName,
- "Generated by LedAnalysis from Run #"+runNumber, dbTag);
- conditionsRecord.insert();
-
- } catch (ConditionsObjectException | SQLException e) {
- throw new RuntimeException(e);
- }
+
+ led_calibrations.setCollectionId(collectionId);
+ System.err.println("CollectionID: "+collectionId);
+ led_calibrations.insert();
+ ConditionsRecord conditionsRecord = new ConditionsRecord(
+ led_calibrations.getCollectionId(), runNumber, runNumberMax, dbTableName, dbTableName,
+ "Generated by LedAnalysis from Run #"+runNumber, dbTag);
+ conditionsRecord.insert();
System.out.println("Upload to DB done");
}
|