Author: [log in to unmask]
Date: Tue Apr 21 19:40:25 2015
New Revision: 2780

Log:
Use new method for generating conditions collection IDs.

Modified:
    java/trunk/ecal-recon/src/main/java/org/hps/recon/ecal/EcalCalibrationsDriver.java
    java/trunk/ecal-recon/src/main/java/org/hps/recon/ecal/EcalPedestalCalculator.java
    java/trunk/monitoring-drivers/src/main/java/org/hps/monitoring/ecal/plots/EcalLedSequenceMonitor.java

Modified: java/trunk/ecal-recon/src/main/java/org/hps/recon/ecal/EcalCalibrationsDriver.java
 =============================================================================
--- java/trunk/ecal-recon/src/main/java/org/hps/recon/ecal/EcalCalibrationsDriver.java	(original)
+++ java/trunk/ecal-recon/src/main/java/org/hps/recon/ecal/EcalCalibrationsDriver.java	Tue Apr 21 19:40:25 2015
@@ -286,7 +286,12 @@
      * @param calibrations The collection of calibration objects.
      */
     private void loadCalibrations(EcalCalibrationCollection calibrations) {
-        int collectionId = conditionsManager.getNextCollectionID(ECAL_CALIBRATIONS);
+        int collectionId = -1;
+        try {
+            conditionsManager.addCollection(ECAL_CALIBRATIONS, "EcalCalibrationsDriver added by " + System.getProperty("user.name"), null);
+        } catch (Exception e) {
+            throw new RuntimeException(e);
+        }
         try {
             calibrations.setCollectionId(collectionId);
             calibrations.insert();

Modified: java/trunk/ecal-recon/src/main/java/org/hps/recon/ecal/EcalPedestalCalculator.java
 =============================================================================
--- java/trunk/ecal-recon/src/main/java/org/hps/recon/ecal/EcalPedestalCalculator.java	(original)
+++ java/trunk/ecal-recon/src/main/java/org/hps/recon/ecal/EcalPedestalCalculator.java	Tue Apr 21 19:40:25 2015
@@ -161,7 +161,12 @@
                     Double.valueOf(dbNumberFormat.format(hh.rms()))));
         }
 
-        int collectionId = conditionsManager.getNextCollectionID(dbTableName);
+        int collectionId = -1;
+        try {
+            collectionId = conditionsManager.addCollection(dbTableName, "EcalPedestalCalculator added by " + System.getProperty("user.name"), null);
+        } catch (Exception e) {
+            throw new RuntimeException(e);
+        }
         try {
             calibrations.setCollectionId(collectionId);
             

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	Tue Apr 21 19:40:25 2015
@@ -678,7 +678,13 @@
             led_calibrations.add(new EcalLedCalibration(cid,mean,rms));
         }
 
-        int collectionId = conditionsManager.getNextCollectionID(dbTableName);
+        int collectionId = -1;
+
+        try {
+            collectionId = conditionsManager.addCollection(dbTableName, "EcalLedSequenceMonitor generated by " + System.getProperty("user.name"), null);
+        } catch (Exception e) {
+            throw new RuntimeException(e);
+        }
         try {
             led_calibrations.setCollectionId(collectionId);
             System.err.println("CollectionID:  "+collectionId);
@@ -832,4 +838,4 @@
         System.out.println("askUploadDB done");
     }
     
-}
+}