java/trunk/conditions/src/main/resources/org/hps/conditions/config

--- java/trunk/conditions/src/main/resources/org/hps/conditions/config/conditions_dev.xml	2014-09-10 20:31:54 UTC (rev 984)
+++ java/trunk/conditions/src/main/resources/org/hps/conditions/config/conditions_dev.xml	2014-09-11 00:37:11 UTC (rev 985)
@@ -53,6 +53,10 @@

                 <field name="collection_id" />
             </fields>
         </table>

+       
+       <!--
+            SVT Tables  
+        -->

         
         <table key="svt_alignments" name="svt_alignments">
             <classes>

@@ -72,8 +76,8 @@

             </classes>
             <fields>
                 <field name="channel_id" />

-                <field name="fpga" />
-                <field name="hybrid" />

+                <field name="feb_id" />
+                <field name="feb_hybrid_id" />

                 <field name="channel" />
             </fields>
         </table>

@@ -102,7 +106,7 @@

             </fields>
         </table>
         

-        <table key="svt_pulse_parameters" name="svt_pulse_parameters">

+        <table key="svt_shape_fit_parameters" name="svt_shape_fit_parameters">

             <classes>
                 <object class="org.hps.conditions.svt.SvtPulseParameters"/>
                 <collection class="org.hps.conditions.svt.SvtPulseParameters$SvtPulseParametersCollection"/>

@@ -112,7 +116,6 @@

                 <field name="amplitude" />
                 <field name="t0" />
                 <field name="tp" />

-                <field name="chisq" />

             </fields>        
         </table>
         

@@ -123,24 +126,34 @@

             </classes>
             <fields>
                 <field name="svt_channel_id" />

-                <field name="noise" />
-                <field name="pedestal" />

+                <field name="pedestal_0" />
+                <field name="pedestal_1" />
+                <field name="pedestal_2" />
+                <field name="pedestal_3" />
+                <field name="pedestal_4" />
+                <field name="pedestal_5" />
+                <field name="noise_0" />
+                <field name="noise_1" />
+                <field name="noise_2" />
+                <field name="noise_3" />
+                <field name="noise_4" />
+                <field name="noise_5" />

             </fields>        
         </table>
         

-        <table key="svt_time_shifts" name="svt_time_shifts">

+        <table key="svt_t0_shifts" name="svt_t0_shifts">

             <classes>
                 <object class="org.hps.conditions.svt.SvtTimeShift"/>
                 <collection class="org.hps.conditions.svt.SvtTimeShift$SvtTimeShiftCollection"/>
             </classes>
             <fields>

-                <field name="fpga" />
-                <field name="hybrid" />
-                <field name="time_shift" />

+                <field name="feb_id" />
+                <field name="feb_hybrid_id" />
+                <field name="t0_shift" />

             </fields>        
         </table>
         

-        <table key="eng_run_svt_bad_channels" name="eng_run_svt_bad_channels">

+        <table key="svt_bad_channels" name="svt_bad_channels">

             <classes>
                 <object class="org.hps.conditions.svt.SvtBadChannel"/>
                 <collection class="org.hps.conditions.svt.SvtBadChannel$SvtBadChannelCollection"/>

@@ -150,7 +163,7 @@

             </fields>        
         </table>
         

-		<table key="eng_run_svt_daq_map" name="eng_run_svt_daq_map">

+		<table key="svt_daq_map" name="svt_daq_map">

 			<classes>
 				<object class="org.hps.conditions.svt.SvtDaqMapping"/> 
 				<collection class="org.hps.conditions.svt.SvtDaqMapping$SvtDaqMappingCollection"/>

@@ -164,7 +177,11 @@

                 <field name="orientation" />
             </fields>  
         </table>

-        

+
+       <!--
+            ECal Tables 
+        -->
+

         <table key="ecal_bad_channels" name="ecal_bad_channels">
             <classes>
                 <object class="org.hps.conditions.ecal.EcalBadChannel"/>