5 modified files
java/trunk/conditions
--- java/trunk/conditions/pom.xml 2014-09-14 08:03:37 UTC (rev 1022)
+++ java/trunk/conditions/pom.xml 2014-09-15 23:16:12 UTC (rev 1023)
@@ -26,6 +26,8 @@
<exclude>org/hps/conditions/svt/SvtGainInsertTest.java</exclude>
<exclude>org/hps/conditions/svt/SvtDetectorSetupTest.java</exclude>
<exclude>org/hps/conditions/svt/SvtConfigurationTest.java</exclude>
+ <exclude>org/hps/conditions/ConditionsSeriesConverterTest.java</exclude>
+ <exclude>org/hps/conditions/ConditionsObjectTest.java</exclude>
</excludes>
</configuration>
</plugin>
java/trunk/conditions/src/main/java/org/hps/conditions
--- java/trunk/conditions/src/main/java/org/hps/conditions/ConditionsDriver.java 2014-09-14 08:03:37 UTC (rev 1022)
+++ java/trunk/conditions/src/main/java/org/hps/conditions/ConditionsDriver.java 2014-09-15 23:16:12 UTC (rev 1023)
@@ -22,11 +22,10 @@
static DatabaseConditionsManager manager;
// Default conditions system XML config, which is for the Test Run 2012 database.
- String _defaultConfigResource = "/org/hps/conditions/config/conditions_database_testrun_2012.xml";
+ static final String DEFAULT_CONFIG = "/org/hps/conditions/config/conditions_database_testrun_2012.xml";
- // Default database connection parameters, which points to the SLAC development
- // database.
- static String _defaultConnectionResource = "/org/hps/conditions/config/conditions_database_testrun_2012_connection.properties";
+ // Default database connection parameters, which points to the SLAC development database.
+ static final String DEFAULT_CONNECTION = "/org/hps/conditions/config/conditions_database_testrun_2012_connection.properties";
String ecalSubdetectorName = "Ecal";
String svtSubdetectorName = "Tracker";
@@ -40,8 +39,8 @@
*/
public ConditionsDriver() {
manager = new DatabaseConditionsManager();
- manager.setConnectionResource(_defaultConnectionResource);
- manager.configure(_defaultConfigResource);
+ manager.setConnectionResource(DEFAULT_CONNECTION);
+ manager.configure(DEFAULT_CONFIG);
manager.register();
}
@@ -68,25 +67,7 @@
public void setLoadEcalConditions(boolean loadEcaltConditions) {
this.loadEcalConditions = loadSvtConditions;
}
-
- /**
- * Set the class of the conditions reader to use.
- */
- /*
- public void setConditionsReaderClass(String className) {
- try {
- Object object = Class.forName(className).newInstance();
- ConditionsReader reader = (ConditionsReader) object;
- if (reader != null)
- manager.setBaseConditionsReader(reader);
- else
- throw new IllegalArgumentException("The class " + className + " is not a ConditionsReader.");
- } catch (InstantiationException | IllegalAccessException | ClassNotFoundException e) {
- throw new RuntimeException(e);
- }
- }
- */
-
+
public void setEcalSubdetectorName(String ecalSubdetectorName) {
this.ecalSubdetectorName = ecalSubdetectorName;
}
@@ -94,9 +75,7 @@
public void setSvtSubdetectorName(String svtSubdetectorName) {
this.svtSubdetectorName = svtSubdetectorName;
}
-
-
-
+
/**
* This method updates a new detector with SVT and ECal conditions data.
*/
java/trunk/conditions/src/main/java/org/hps/conditions/config
--- java/trunk/conditions/src/main/java/org/hps/conditions/config/TestRunReadOnlyConfiguration.java 2014-09-14 08:03:37 UTC (rev 1022)
+++ java/trunk/conditions/src/main/java/org/hps/conditions/config/TestRunReadOnlyConfiguration.java 2014-09-15 23:16:12 UTC (rev 1023)
@@ -22,6 +22,10 @@
private static final String config = "/org/hps/conditions/config/conditions_database_testrun_2012.xml";
private static final String prop = "/org/hps/conditions/config/conditions_database_testrun_2012_connection.properties";
+ public TestRunReadOnlyConfiguration() {
+ super(config, prop);
+ }
+
/**
* Class constructor.
* @param setup True to setup the conditions manager and the detector.
java/trunk/conditions/src/main/resources/org/hps/conditions/config
--- java/trunk/conditions/src/main/resources/org/hps/conditions/config/conditions_database_testrun_2012.xml 2014-09-14 08:03:37 UTC (rev 1022)
+++ java/trunk/conditions/src/main/resources/org/hps/conditions/config/conditions_database_testrun_2012.xml 2014-09-15 23:16:12 UTC (rev 1023)
@@ -6,14 +6,18 @@
<converter class="org.hps.conditions.ConditionsRecordConverter"/>
<!-- SVT converters -->
+ <!--
<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$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 -->
<converter class="org.hps.conditions.ecal.EcalConditionsConverter"/>
@@ -49,7 +53,8 @@
<field name="collection_id" />
</fields>
</table>
-
+
+<!--
<table key="svt_channels" name="svt_channels">
<classes>
<object class="org.hps.conditions.svt.SvtChannel"/>
@@ -73,10 +78,25 @@
<field name="gain" />
<field name="offset" />
</fields>
- </table>
+ </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>
@@ -88,7 +108,9 @@
<field name="chisq" />
</fields>
</table>
+-->
+<!--
<table key="svt_calibrations" name="svt_calibrations">
<classes>
<object class="org.hps.conditions.svt.SvtCalibration"/>
@@ -100,6 +122,20 @@
<field name="pedestal" />
</fields>
</table>
+-->
+
+<!--
+ <table key="svt_t0_shifts" name="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>
@@ -112,7 +148,9 @@
<field name="time_shift" />
</fields>
</table>
-
+-->
+
+<!--
<table key="svt_bad_channels" name="svt_bad_channels">
<classes>
<object class="org.hps.conditions.svt.SvtBadChannel"/>
@@ -135,6 +173,7 @@
<field name="hybrid" />
</fields>
</table>
+-->
<table key="ecal_bad_channels" name="ecal_bad_channels">
<classes>
java/trunk/conditions/src/test/java/org/hps/conditions
--- java/trunk/conditions/src/test/java/org/hps/conditions/ConditionsTestRunTest.java 2014-09-14 08:03:37 UTC (rev 1022)
+++ java/trunk/conditions/src/test/java/org/hps/conditions/ConditionsTestRunTest.java 2014-09-15 23:16:12 UTC (rev 1023)
@@ -13,14 +13,14 @@
static String config = "/org/hps/conditions/config/conditions_database_testrun_2012.xml";
static String prop = "/org/hps/conditions/config/conditions_database_testrun_2012_connection.properties";
- public void testConditionsDev() {
+ public void testConditionsTestRun() {
DatabaseConditionsManager manager = new DatabaseConditionsManager();
manager.configure(config);
manager.setConnectionResource(prop);
manager.register();
try {
- manager.setDetector("HPS-Proposal2014-v8-6pt6", 0);
+ manager.setDetector("HPS-TestRun-v8-5", 0);
} catch (ConditionsNotFoundException e) {
throw new RuntimeException(e);
}
SVNspam 0.1