Author: [log in to unmask]
Date: Thu Nov 13 21:53:57 2014
New Revision: 1516
Log:
Rewrite constructor initialization of manager so that it actually makes sense.
Modified:
java/trunk/conditions/src/main/java/org/hps/conditions/AbstractConditionsDriver.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 Thu Nov 13 21:53:57 2014
@@ -4,6 +4,7 @@
import org.hps.conditions.ecal.EcalConditions;
import org.hps.conditions.ecal.EcalDetectorSetup;
+import org.lcsim.conditions.ConditionsManager;
import org.lcsim.geometry.Detector;
import org.lcsim.util.Driver;
@@ -26,16 +27,12 @@
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();
+ ConditionsManager currentManager = ConditionsManager.defaultInstance();
+ if (currentManager instanceof DatabaseConditionsManager) {
+ manager = DatabaseConditionsManager.getInstance();
+ } else {
+ manager = new DatabaseConditionsManager();
+ }
}
public void setLoadSvtConditions(boolean loadSvtConditions) {
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 Thu Nov 13 21:53:57 2014
@@ -8,20 +8,20 @@
/**
* This {@link org.lcsim.util.Driver} is a subclass of
- * {@link AbstractConditionsDriver} and specifies the configuration
- * for the test run database.
+ * {@link AbstractConditionsDriver} and specifies the XML configuration
+ * for the Test Run database.
*
* @author Omar Moreno <[log in to unmask]>
* @author Jeremy McCormick <[log in to unmask]>
*/
public class TestRunConditionsDriver extends AbstractConditionsDriver {
- // Default constructor used to setup the database connection
+
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");
+ manager.setXmlConfig("/org/hps/conditions/config/conditions_database_testrun_2012.xml");
}
/**
|