Print

---

Author: [log in to unmask]
Date: Thu Oct 30 13:12:33 2014
New Revision: 1350

Log:
Retrieve the collection of t0 shifts from the subclasses instead of the abstract implementation. 

Modified:
    java/branches/hps_java_trunk_HPSJAVA-255/conditions/src/main/java/org/hps/conditions/svt/SvtConditionsConverter.java
    java/branches/hps_java_trunk_HPSJAVA-255/conditions/src/main/java/org/hps/conditions/svt/TestRunSvtConditionsConverter.java

Modified: java/branches/hps_java_trunk_HPSJAVA-255/conditions/src/main/java/org/hps/conditions/svt/SvtConditionsConverter.java
 =============================================================================
--- java/branches/hps_java_trunk_HPSJAVA-255/conditions/src/main/java/org/hps/conditions/svt/SvtConditionsConverter.java	(original)
+++ java/branches/hps_java_trunk_HPSJAVA-255/conditions/src/main/java/org/hps/conditions/svt/SvtConditionsConverter.java	Thu Oct 30 13:12:33 2014
@@ -4,6 +4,7 @@
 import org.hps.conditions.DatabaseConditionsManager;
 import org.hps.conditions.svt.SvtChannel.SvtChannelCollection;
 import org.hps.conditions.svt.SvtDaqMapping.SvtDaqMappingCollection;
+import org.hps.conditions.svt.SvtT0Shift.SvtT0ShiftCollection;
 
 /**
  * This class creates an {@link SvtConditions} object from the database, based on the
@@ -39,6 +40,10 @@
     	SvtDaqMappingCollection daqMap= this.getCollection(SvtDaqMappingCollection.class, dbConditionsManager);
         conditions.setDaqMap(daqMap);
         
+        // Get the collection of T0 shifts from the conditions database
+        SvtT0ShiftCollection t0Shifts = this.getCollection(SvtT0ShiftCollection.class, dbConditionsManager);
+        conditions.setT0Shifts(t0Shifts);
+        
         conditions = super.getData(manager, name);
         
         return conditions;

Modified: java/branches/hps_java_trunk_HPSJAVA-255/conditions/src/main/java/org/hps/conditions/svt/TestRunSvtConditionsConverter.java
 =============================================================================
--- java/branches/hps_java_trunk_HPSJAVA-255/conditions/src/main/java/org/hps/conditions/svt/TestRunSvtConditionsConverter.java	(original)
+++ java/branches/hps_java_trunk_HPSJAVA-255/conditions/src/main/java/org/hps/conditions/svt/TestRunSvtConditionsConverter.java	Thu Oct 30 13:12:33 2014
@@ -4,6 +4,7 @@
 import org.hps.conditions.DatabaseConditionsManager;
 import org.hps.conditions.svt.TestRunSvtChannel.TestRunSvtChannelCollection;
 import org.hps.conditions.svt.TestRunSvtDaqMapping.TestRunSvtDaqMappingCollection;
+import org.hps.conditions.svt.TestRunSvtT0Shift.TestRunSvtT0ShiftCollection;
 
 public final class TestRunSvtConditionsConverter extends AbstractSvtConditionsConverter<TestRunSvtConditions> {
 
@@ -35,6 +36,10 @@
         TestRunSvtDaqMappingCollection daqMap = this.getCollection(TestRunSvtDaqMappingCollection.class, dbConditionsManager);
         conditions.setDaqMap(daqMap);
         
+        // Get the collection of T0 shifts from the conditions database
+        TestRunSvtT0ShiftCollection t0Shifts = this.getCollection(TestRunSvtT0ShiftCollection.class, dbConditionsManager);
+        conditions.setT0Shifts(t0Shifts);
+
         conditions = super.getData(manager, name);
 
         return conditions;