Print

Print


Author: [log in to unmask]
Date: Sun Nov  2 13:29:25 2014
New Revision: 1410

Log:
Make the method loadSvtConditions abstract.

Modified:
    java/branches/hps_java_trunk_HPSJAVA-255/conditions/src/main/java/org/hps/conditions/AbstractConditionsDriver.java

Modified: java/branches/hps_java_trunk_HPSJAVA-255/conditions/src/main/java/org/hps/conditions/AbstractConditionsDriver.java
 =============================================================================
--- java/branches/hps_java_trunk_HPSJAVA-255/conditions/src/main/java/org/hps/conditions/AbstractConditionsDriver.java	(original)
+++ java/branches/hps_java_trunk_HPSJAVA-255/conditions/src/main/java/org/hps/conditions/AbstractConditionsDriver.java	Sun Nov  2 13:29:25 2014
@@ -1,12 +1,9 @@
 package org.hps.conditions;
 
 import static org.hps.conditions.TableConstants.ECAL_CONDITIONS;
-import static org.hps.conditions.TableConstants.SVT_CONDITIONS;
 
 import org.hps.conditions.ecal.EcalConditions;
 import org.hps.conditions.ecal.EcalDetectorSetup;
-import org.hps.conditions.svt.SvtConditions;
-import org.hps.conditions.svt.SvtDetectorSetup;
 import org.lcsim.geometry.Detector;
 import org.lcsim.util.Driver;
 
@@ -24,7 +21,7 @@
     static DatabaseConditionsManager manager;
 
     private String ecalSubdetectorName = "Ecal";
-    private String svtSubdetectorName = "Tracker";
+    protected String svtSubdetectorName = "Tracker";
     
     boolean loadSvtConditions = true;
     boolean loadEcalConditions = true;
@@ -62,11 +59,7 @@
      * Load the SVT conditions onto the <code>Detector</code>.
      * @param detector The detector to update.
      */
-    private void loadSvtConditions(Detector detector) {
-        SvtConditions conditions = manager.getCachedConditions(SvtConditions.class, SVT_CONDITIONS).getCachedData();
-        SvtDetectorSetup loader = new SvtDetectorSetup();
-        loader.load(detector.getSubdetector(svtSubdetectorName), conditions);
-    }
+    protected abstract void loadSvtConditions(Detector detector);
 
     /**
      * Load the ECal conditions onto the <code>Detector</code>.