hps-java/src/main/java/org/lcsim/hps/conditions/svt

diff -N SvtConditionsConverter.java
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ SvtConditionsConverter.java	9 Oct 2013 21:00:30 -0000	1.1
@@ -0,0 +1,72 @@

+package org.lcsim.hps.conditions.svt;
+
+import static org.lcsim.hps.conditions.ConditionsConstants.SVT_BAD_CHANNELS;
+import static org.lcsim.hps.conditions.ConditionsConstants.SVT_CALIBRATIONS;
+import static org.lcsim.hps.conditions.ConditionsConstants.SVT_CHANNELS;
+import static org.lcsim.hps.conditions.ConditionsConstants.SVT_GAINS;
+import static org.lcsim.hps.conditions.ConditionsConstants.SVT_PULSE_PARAMETERS;
+
+import java.util.Map.Entry;
+
+import org.lcsim.conditions.ConditionsManager;
+import org.lcsim.hps.conditions.ChannelCollection;
+import org.lcsim.hps.conditions.DatabaseConditionsConverter;
+
+/**
+ * This class creates an {@link SvtConditions} object from the database,
+ * based on the current run number known by the conditions manager.
+ */
+public class SvtConditionsConverter extends DatabaseConditionsConverter<SvtConditions> {
+                     
+    /**
+     * Load and return the composite SVT conditions object.  
+     * @param manager The current conditions manager.
+     * @param name The conditions key, which is ignored for now.
+     */
+    public SvtConditions getData(ConditionsManager manager, String name) {
+                        
+        // Get the SVT channel map.
+        SvtChannelMap channels = manager.getCachedConditions(SvtChannelMap.class, SVT_CHANNELS).getCachedData();
+        
+        // Reset the conditions object.
+        SvtConditions conditions = new SvtConditions(channels);
+                                               
+        // Add calibrations by channel.
+        SvtCalibrationCollection calibrations = manager.getCachedConditions(SvtCalibrationCollection.class, SVT_CALIBRATIONS).getCachedData();
+        for (Entry<Integer,SvtCalibration> entry : calibrations.entrySet()) {
+            SvtChannel channel = conditions.getChannelMap().get(entry.getKey());
+            conditions.getChannelConstants(channel).setCalibration(entry.getValue());
+        }  
+        
+        // Add pulse parameters by channel.
+        PulseParametersCollection pulseParameters = manager.getCachedConditions(PulseParametersCollection.class, SVT_PULSE_PARAMETERS).getCachedData();
+        for (Entry<Integer,PulseParameters> entry : pulseParameters.entrySet()) {
+            SvtChannel channel = conditions.getChannelMap().get(entry.getKey());
+            conditions.getChannelConstants(channel).setPulseParameters(entry.getValue());
+        }
+        
+        // Add bad channels.
+        ChannelCollection badChannels = manager.getCachedConditions(ChannelCollection.class, SVT_BAD_CHANNELS).getCachedData();        
+        for (Integer badChannel : badChannels) {
+            SvtChannel channel = conditions.getChannelMap().get(badChannel);
+            conditions.getChannelConstants(channel).setBadChannel(true);
+        }
+        
+        // Add gains by channel.
+        SvtGainCollection gains = manager.getCachedConditions(SvtGainCollection.class, SVT_GAINS).getCachedData();
+        for (Entry<Integer,SvtGain> entry : gains.entrySet()) {
+            SvtChannel channel = conditions.getChannelMap().get(entry.getKey());
+            conditions.getChannelConstants(channel).setGain(entry.getValue());
+        }
+        
+        return conditions;    
+    }
+
+    /**
+     * Get the type handled by this converter.
+     * @return The type handled by this converter.
+     */
+    public Class<SvtConditions> getType() {
+        return SvtConditions.class;
+    }    
+}

hps-java/src/main/java/org/lcsim/hps/conditions/svt

diff -N SvtConditionsLoader.java
--- SvtConditionsLoader.java	4 Oct 2013 06:02:19 -0000	1.8
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,79 +0,0 @@

-package org.lcsim.hps.conditions.svt;
-
-import static org.lcsim.hps.conditions.ConditionsConstants.SVT_BAD_CHANNELS;
-import static org.lcsim.hps.conditions.ConditionsConstants.SVT_CALIBRATIONS;
-import static org.lcsim.hps.conditions.ConditionsConstants.SVT_CHANNELS;
-import static org.lcsim.hps.conditions.ConditionsConstants.SVT_GAINS;
-import static org.lcsim.hps.conditions.ConditionsConstants.SVT_PULSE_PARAMETERS;
-
-import java.util.Map.Entry;
-
-import org.lcsim.conditions.ConditionsManager;
-import org.lcsim.hps.conditions.AbstractConditionsLoader;
-import org.lcsim.hps.conditions.ChannelCollection;
-
-/**
- * This class creates an {@link SvtConditions} object from the conditions database,
- * based on the current run number known by the conditions manager.
- */
-public class SvtConditionsLoader extends AbstractConditionsLoader {
-        
-    // Object to be returned to caller.
-    private SvtConditions conditions = null;
-    
-    /**
-     * Class constructor.
-     * @param manager The current conditions manager.
-     */
-    public SvtConditionsLoader(ConditionsManager manager) {
-    	super(manager);
-    }
-             
-    /**
-     * Load the SVT conditions.
-     */
-    public void load() {
-                        
-        // Get the SVT channel map.
-        SvtChannelMap channels = manager.getCachedConditions(SvtChannelMap.class, SVT_CHANNELS).getCachedData();
-        
-        // Reset the conditions object.
-        conditions = new SvtConditions(channels);
-                                       
-        // Add calibrations by channel.
-        SvtCalibrationCollection calibrations = manager.getCachedConditions(SvtCalibrationCollection.class, SVT_CALIBRATIONS).getCachedData();
-        for (Entry<Integer,SvtCalibration> entry : calibrations.entrySet()) {
-            SvtChannel channel = conditions.getChannelMap().get(entry.getKey());
-            conditions.getChannelConstants(channel).setCalibration(entry.getValue());
-        }  
-        
-        // Add pulse parameters by channel.
-        PulseParametersCollection pulseParameters = manager.getCachedConditions(PulseParametersCollection.class, SVT_PULSE_PARAMETERS).getCachedData();
-        for (Entry<Integer,PulseParameters> entry : pulseParameters.entrySet()) {
-            SvtChannel channel = conditions.getChannelMap().get(entry.getKey());
-            conditions.getChannelConstants(channel).setPulseParameters(entry.getValue());
-        }
-        
-        // Add bad channels.
-        ChannelCollection badChannels = manager.getCachedConditions(ChannelCollection.class, SVT_BAD_CHANNELS).getCachedData();        
-        for (Integer badChannel : badChannels) {
-            SvtChannel channel = conditions.getChannelMap().get(badChannel);
-            conditions.getChannelConstants(channel).setBadChannel(true);
-        }
-        
-        // Add gains by channel.
-        SvtGainCollection gains = manager.getCachedConditions(SvtGainCollection.class, SVT_GAINS).getCachedData();
-        for (Entry<Integer,SvtGain> entry : gains.entrySet()) {
-            SvtChannel channel = conditions.getChannelMap().get(entry.getKey());
-            conditions.getChannelConstants(channel).setGain(entry.getValue());
-        }
-    }
-    
-    /**
-     * Get the SVT conditions.
-     * @return The SVT conditions or null if not loaded yet.
-     */
-    public SvtConditions getSvtConditions() {
-        return conditions;
-    }
-}

hps-java/src/test/java/org/lcsim/hps/conditions/ecal

diff -N EcalConditionsConverterTest.java
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ EcalConditionsConverterTest.java	9 Oct 2013 21:00:30 -0000	1.1
@@ -0,0 +1,34 @@

+package org.lcsim.hps.conditions.ecal;
+
+import junit.framework.TestCase;
+
+import org.lcsim.conditions.ConditionsManager;
+import org.lcsim.conditions.ConditionsManager.ConditionsNotFoundException;
+import org.lcsim.util.loop.LCSimConditionsManagerImplementation;
+
+public class EcalConditionsConverterTest extends TestCase {
+    
+    /** An example detector from hps-detectors. */
+    private static final String detectorName = "HPS-conditions-test";
+    
+    /** The run number of the conditions set in the database. */
+    private static final int runNumber = 777;
+        
+    public void test() {
+        
+        // Setup the conditions manager.        
+        ConditionsManager.setDefaultConditionsManager(new LCSimConditionsManagerImplementation());
+        ConditionsManager manager = ConditionsManager.defaultInstance();
+        try {
+            manager.setDetector(detectorName, runNumber);
+        } catch (ConditionsNotFoundException e) {
+            throw new RuntimeException(e);
+        }
+                                        
+        // Test that the manager gets ECAL conditions.
+        EcalConditions conditions = manager.getCachedConditions(EcalConditions.class, null).getCachedData();        
+        assertNotNull(conditions);
+        System.out.println("Printing ECAL conditions ...");
+        System.out.println(conditions);
+    }    
+}

\ No newline at end of file

hps-java/src/test/java/org/lcsim/hps/conditions/ecal

diff -N EcalConditionsLoaderTest.java
--- EcalConditionsLoaderTest.java	4 Oct 2013 06:02:19 -0000	1.4
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,36 +0,0 @@

-package org.lcsim.hps.conditions.ecal;
-
-import junit.framework.TestCase;
-
-import org.lcsim.conditions.ConditionsManager;
-import org.lcsim.conditions.ConditionsManager.ConditionsNotFoundException;
-import org.lcsim.util.loop.LCSimConditionsManagerImplementation;
-
-public class EcalConditionsLoaderTest extends TestCase {
-    
-    /** An example detector from hps-detectors. */
-    private static final String detectorName = "HPS-conditions-test";
-    
-    /** The run number of the conditions set in the database. */
-    private static final int runNumber = 777;
-        
-    public void test() {
-        
-        // Setup the conditions manager.        
-        ConditionsManager.setDefaultConditionsManager(new LCSimConditionsManagerImplementation());
-        ConditionsManager manager = ConditionsManager.defaultInstance();
-        try {
-            manager.setDetector(detectorName, runNumber);
-        } catch (ConditionsNotFoundException e) {
-            throw new RuntimeException(e);
-        }
-                                        
-        // Test that the loader returns valid conditions.
-        EcalConditionsLoader loader = new EcalConditionsLoader(manager);
-        loader.load();
-        EcalConditions conditions = loader.getEcalConditions();
-        assertNotNull(conditions);
-        System.out.println(conditions);
-        System.out.println("ECal conditions loaded successfully.");
-    }    
-}