Author: omoreno
Date: Mon Oct 27 12:08:12 2014
New Revision: 1319
Log:
Add the SVT conditions back into the test run database configuration. All but the bad channels have been added back to the configuration file.
Modified:
java/branches/hps_java_trunk_HPSJAVA-255/conditions/src/main/resources/org/hps/conditions/config/conditions_database_testrun_2012.xml
Modified: java/branches/hps_java_trunk_HPSJAVA-255/conditions/src/main/resources/org/hps/conditions/config/conditions_database_testrun_2012.xml
=============================================================================
--- java/branches/hps_java_trunk_HPSJAVA-255/conditions/src/main/resources/org/hps/conditions/config/conditions_database_testrun_2012.xml (original)
+++ java/branches/hps_java_trunk_HPSJAVA-255/conditions/src/main/resources/org/hps/conditions/config/conditions_database_testrun_2012.xml Mon Oct 27 12:08:12 2014
@@ -6,17 +6,15 @@
<converter class="org.hps.conditions.ConditionsRecordConverter"/>
<!-- SVT converters -->
+ <converter class="org.hps.conditions.svt.TestRunSvtConditionsConverter"/>
+ <converter class="org.hps.conditions.svt.SvtConverterRegistry$TestRunSvtChannelConverter"/>
+ <converter class="org.hps.conditions.svt.SvtConverterRegistry$TestRunSvtDaqMappingConverter"/>
+ <converter class="org.hps.conditions.svt.SvtConverterRegistry$SvtCalibrationConverter"/>
+ <converter class="org.hps.conditions.svt.SvtConverterRegistry$SvtShapeFitParametersConverter"/>
+ <converter class="org.hps.conditions.svt.SvtConverterRegistry$SvtGainConverter"/>
+ <converter class="org.hps.conditions.svt.SvtConverterRegistry$SvtT0ShiftConverter"/>
<!--
- <converter class="org.hps.conditions.svt.SvtConditionsConverter"/>
<converter class="org.hps.conditions.svt.SvtConverterRegistry$SvtBadChannelConverter"/>
- <converter class="org.hps.conditions.svt.SvtConverterRegistry$SvtCalibrationConverter"/>
- <converter class="org.hps.conditions.svt.SvtConverterRegistry$SvtChannelConverter"/>
- <converter class="org.hps.conditions.svt.SvtConverterRegistry$SvtDaqMappingConverter"/>
- <converter class="org.hps.conditions.svt.SvtConverterRegistry$SvtGainConverter"/>
- <converter class="org.hps.conditions.svt.SvtConverterRegistry$SvtPulseParametersConverter"/>
- <converter class="org.hps.conditions.svt.SvtConverterRegistry$SvtShapeFitParametersConverter"/>
- <converter class="org.hps.conditions.svt.SvtConverterRegistry$SvtTimeShiftConverter"/>
- <converter class="org.hps.conditions.svt.SvtConverterRegistry$SvtT0ShiftConverter"/>
-->
<!-- ECal converters -->
@@ -33,7 +31,7 @@
<tables>
- <table key="conditions_records" name="conditions_dev">
+ <table key="conditions_records" name="conditions">
<classes>
<object class="org.hps.conditions.ConditionsRecord"/>
<collection class="org.hps.conditions.ConditionsRecord$ConditionsRecordCollection"/>
@@ -54,11 +52,10 @@
</fields>
</table>
-<!--
- <table key="svt_channels" name="svt_channels">
- <classes>
- <object class="org.hps.conditions.svt.SvtChannel"/>
- <collection class="org.hps.conditions.svt.SvtChannel$SvtChannelCollection"/>
+ <table key="test_run_svt_channels" name="test_run_svt_channels">
+ <classes>
+ <object class="org.hps.conditions.svt.TestRunSvtChannel"/>
+ <collection class="org.hps.conditions.svt.TestRunSvtChannel$TestRunSvtChannelCollection"/>
</classes>
<fields>
<field name="channel_id" />
@@ -68,7 +65,42 @@
</fields>
</table>
- <table key="svt_gains" name="svt_gains">
+ <table key="test_run_svt_calibrations" name="test_run_svt_calibrations">
+ <classes>
+ <object class="org.hps.conditions.svt.SvtCalibration"/>
+ <collection class="org.hps.conditions.svt.SvtCalibration$SvtCalibrationCollection"/>
+ </classes>
+ <fields>
+ <field name="svt_channel_id" />
+ <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="test_run_svt_shape_fit_parameters" name="test_run_svt_shape_fit_parameters">
+ <classes>
+ <object class="org.hps.conditions.svt.SvtShapeFitParameters"/>
+ <collection class="org.hps.conditions.svt.SvtShapeFitParameters$SvtShapeFitParametersCollection"/>
+ </classes>
+ <fields>
+ <field name="svt_channel_id" />
+ <field name="amplitude" />
+ <field name="t0" />
+ <field name="tp" />
+ </fields>
+ </table>
+
+ <table key="test_run_svt_gains" name="test_run_svt_gains">
<classes>
<object class="org.hps.conditions.svt.SvtGain"/>
<collection class="org.hps.conditions.svt.SvtGain$SvtGainCollection"/>
@@ -78,102 +110,46 @@
<field name="gain" />
<field name="offset" />
</fields>
- </table>
-
- <table key="svt_pulse_parameters" name="svt_pulse_parameters">
- <classes>
- <object class="org.hps.conditions.svt.SvtShapeFitParameters"/>
- <collection class="org.hps.conditions.svt.SvtShapeFitParameters$SvtShapeFitParametersCollection"/>
- </classes>
- <fields>
- <field name="svt_channel_id" />
- <field name="amplitude" />
- <field name="t0" />
- <field name="tp" />
- </fields>
- </table>
--->
-
-<!--
- <table key="svt_pulse_parameters" name="svt_pulse_parameters">
- <classes>
- <object class="org.hps.conditions.svt.SvtPulseParameters"/>
- <collection class="org.hps.conditions.svt.SvtPulseParameters$SvtPulseParametersCollection"/>
- </classes>
- <fields>
- <field name="svt_channel_id" />
- <field name="amplitude" />
- <field name="t0" />
- <field name="tp" />
- <field name="chisq" />
- </fields>
- </table>
--->
-
-<!--
- <table key="svt_calibrations" name="svt_calibrations">
- <classes>
- <object class="org.hps.conditions.svt.SvtCalibration"/>
- <collection class="org.hps.conditions.svt.SvtCalibration$SvtCalibrationCollection"/>
- </classes>
- <fields>
- <field name="svt_channel_id" />
- <field name="noise" />
- <field name="pedestal" />
- </fields>
- </table>
--->
-
-<!--
- <table key="svt_t0_shifts" name="svt_t0_shifts">
+ </table>
+
+ <table key="test_run_svt_t0_shifts" name="test_run_svt_t0_shifts">
<classes>
<object class="org.hps.conditions.svt.SvtT0Shift"/>
<collection class="org.hps.conditions.svt.SvtT0Shift$SvtT0ShiftCollection"/>
</classes>
<fields>
- <field name="feb_id" />
- <field name="feb_hybrid_id" />
- <field name="t0_shift" />
- </fields>
- </table>
-
- <table key="svt_time_shifts" name="svt_time_shifts">
- <classes>
- <object class="org.hps.conditions.svt.SvtTimeShift"/>
- <collection class="org.hps.conditions.svt.SvtTimeShift$SvtTimeShiftCollection"/>
+ <field name="fpga" />
+ <field name="hybrid" />
+ <field name="t0_shift" />
+ </fields>
+ </table>
+
+<!--
+ <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"/>
+ </classes>
+ <fields>
+ <field name="svt_channel_id" />
+ </fields>
+ </table>
+
+
+-->
+ <table key="test_run_svt_daq_map" name="test_run_svt_daq_map">
+ <classes>
+ <object class="org.hps.conditions.svt.TestRunSvtDaqMapping"/>
+ <collection class="org.hps.conditions.svt.TestRunSvtDaqMapping$TestRunSvtDaqMappingCollection"/>
</classes>
<fields>
<field name="fpga" />
<field name="hybrid" />
- <field name="time_shift" />
- </fields>
- </table>
--->
-
-<!--
- <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"/>
- </classes>
- <fields>
- <field name="svt_channel_id" />
- </fields>
- </table>
-
- <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"/>
- </classes>
- <fields>
- <field name="half" />
+ <field name="svt_half" />
<field name="layer" />
- <field name="fpga" />
- <field name="hybrid" />
- </fields>
- </table>
--->
+ <field name="orientation" />
+ </fields>
+ </table>
<table key="ecal_bad_channels" name="ecal_bad_channels">
<classes>
