Author: [log in to unmask]
Date: Mon Nov 10 17:07:57 2014
New Revision: 1487
Log:
Try to simplify ConditionsDriver config.
Modified:
java/trunk/conditions/src/main/java/org/hps/conditions/AbstractConditionsDriver.java
java/trunk/conditions/src/main/java/org/hps/conditions/ConditionsDriver.java
java/trunk/conditions/src/main/java/org/hps/conditions/TestRunConditionsDriver.java
Modified: java/trunk/conditions/src/main/java/org/hps/conditions/AbstractConditionsDriver.java
=============================================================================
--- java/trunk/conditions/src/main/java/org/hps/conditions/AbstractConditionsDriver.java (original)
+++ java/trunk/conditions/src/main/java/org/hps/conditions/AbstractConditionsDriver.java Mon Nov 10 17:07:57 2014
@@ -10,7 +10,7 @@
/**
* This abstract {@link org.lcsim.util.Driver} contains the general methods used
* to set up {@link DatabaseConditionsManager} and load the conditions onto a
- * detector. The connection parameters are set by subclasses.
+ * detector.
*
* @author Jeremy McCormick <[log in to unmask]>
*/
@@ -24,6 +24,19 @@
boolean loadSvtConditions = true;
boolean loadEcalConditions = true;
+
+ protected AbstractConditionsDriver() {
+ /*
+ if (ConditionsManager.defaultInstance() != null) {
+ if (!(ConditionsManager.defaultInstance() instanceof DatabaseConditionsManager)) {
+ throw new RuntimeException("There is already a ConditionsManager installed and it has the wrong type.");
+ } else {
+ manager = DatabaseConditionsManager.getInstance();
+ }
+ }
+ */
+ manager = new DatabaseConditionsManager();
+ }
public void setLoadSvtConditions(boolean loadSvtConditions) {
this.loadSvtConditions = loadSvtConditions;
@@ -72,4 +85,4 @@
public void endOfData() {
manager.closeConnection();
}
-}
+}
Modified: java/trunk/conditions/src/main/java/org/hps/conditions/ConditionsDriver.java
=============================================================================
--- java/trunk/conditions/src/main/java/org/hps/conditions/ConditionsDriver.java (original)
+++ java/trunk/conditions/src/main/java/org/hps/conditions/ConditionsDriver.java Mon Nov 10 17:07:57 2014
@@ -4,30 +4,28 @@
import org.hps.conditions.svt.SvtConditions;
import org.hps.conditions.svt.SvtDetectorSetup;
-import org.lcsim.conditions.ConditionsManager;
import org.lcsim.geometry.Detector;
/**
* This {@link org.lcsim.util.Driver} is a subclass of
- * {@link AbstractConditionsDriver} and specifies the database connection
- * parameters and configuration for the development database.
+ * {@link AbstractConditionsDriver} which creates the default
+ * {@link DatabaseConditionsManager} for using database conditions
+ * at runtime.
*
* @author Omar Moreno <[log in to unmask]>
* @author Jeremy McCormick <[log in to unmask]>
*/
public class ConditionsDriver extends AbstractConditionsDriver {
+ /**
+ * Default constructor which uses super class constructor for initialization.
+ */
public ConditionsDriver() {
- if (ConditionsManager.defaultInstance() instanceof DatabaseConditionsManager) {
- getLogger().config("ConditionsDriver found existing DatabaseConditionsManager.");
- manager = (DatabaseConditionsManager) ConditionsManager.defaultInstance();
- } else {
- manager = new DatabaseConditionsManager();
- }
+ super();
}
/**
- * Load the {@link SvtConditions} set onto <code>HpsSiSensor</code>.
+ * Load the {@link SvtConditions} set onto the <code>HpsSiSensor</code> objects.
* @param detector The detector to update.
*/
@Override
Modified: java/trunk/conditions/src/main/java/org/hps/conditions/TestRunConditionsDriver.java
=============================================================================
--- java/trunk/conditions/src/main/java/org/hps/conditions/TestRunConditionsDriver.java (original)
+++ java/trunk/conditions/src/main/java/org/hps/conditions/TestRunConditionsDriver.java Mon Nov 10 17:07:57 2014
@@ -1,17 +1,15 @@
package org.hps.conditions;
-import org.lcsim.conditions.ConditionsManager;
-import org.lcsim.geometry.Detector;
+import static org.hps.conditions.TableConstants.SVT_CONDITIONS;
import org.hps.conditions.svt.TestRunSvtConditions;
import org.hps.conditions.svt.TestRunSvtDetectorSetup;
-
-import static org.hps.conditions.TableConstants.SVT_CONDITIONS;
+import org.lcsim.geometry.Detector;
/**
* This {@link org.lcsim.util.Driver} is a subclass of
- * {@link AbstractConditionsDriver} and specifies the database connection
- * parameters and configuration for the test run database.
+ * {@link AbstractConditionsDriver} and specifies the configuration
+ * for the test run database.
*
* @author Omar Moreno <[log in to unmask]>
* @author Jeremy McCormick <[log in to unmask]>
@@ -19,23 +17,15 @@
public class TestRunConditionsDriver extends AbstractConditionsDriver {
// Default constructor used to setup the database connection
- public TestRunConditionsDriver() {
- if (ConditionsManager.defaultInstance() instanceof DatabaseConditionsManager) {
- // System.out.println(this.getName()+": Found existing DatabaseConditionsManager");
- // manager = (DatabaseConditionsManager)
- // ConditionsManager.defaultInstance();
- throw new RuntimeException("ConditionsManager was already setup.");
- } else {
- manager = new DatabaseConditionsManager();
- manager.configure("/org/hps/conditions/config/conditions_database_testrun_2012.xml");
- manager.register();
- }
+ public TestRunConditionsDriver() {
+ super();
+
+ // Override the default configuration with one specific to Test Run conditions.
+ manager.configure("/org/hps/conditions/config/conditions_database_testrun_2012.xml");
}
/**
- * Load the {@link TestRunSvtConditions} set onto
- * <code>HpsTestRunSiSensor</code>.
- *
+ * Load the {@link TestRunSvtConditions} set onto <code>HpsTestRunSiSensor</code>.
* @param detector The detector to update.
*/
@Override
