Commit in hps-java/src/main/java/org/lcsim/hps/conditions/svt on MAIN | |||
SvtCalibrationConverter.java | +3 | -3 | 1.9 -> 1.10 |
rename field svt_calibrations.channel_id to svt_channel_id to make it clear this is referencing the svt_channels table
diff -u -r1.9 -r1.10 --- SvtCalibrationConverter.java 24 Sep 2013 02:51:35 -0000 1.9 +++ SvtCalibrationConverter.java 24 Sep 2013 23:21:40 -0000 1.10 @@ -14,7 +14,7 @@
* Read SVT calibration data from the conditions database. * @author Omar Moreno <[log in to unmask]> * @author Jeremy McCormick <[log in to unmask]>
- * @version $Id: SvtCalibrationConverter.java,v 1.9 2013/09/24 02:51:35 jeremy Exp $
+ * @version $Id: SvtCalibrationConverter.java,v 1.10 2013/09/24 23:21:40 jeremy Exp $
*/ public class SvtCalibrationConverter extends DatabaseConditionsConverter<ChannelConstantsCollection> {
@@ -61,12 +61,12 @@
String database = ConnectionManager.getConnectionParameters().getDatabase(); // Construct the query to find matching calibration records using the ID field.
- String query = "SELECT channel_id, fpga, hybrid, channel, noise, pedestal FROM "
+ String query = "SELECT svt_channel_id, fpga, hybrid, channel, noise, pedestal FROM "
+ database + "." + tableName + ", " + database + "." + CHANNEL_TABLE + " WHERE " + fieldName + " = " + fieldValue
- + " AND svt_channels.id = " + tableName + ".channel_id "
+ + " AND svt_channels.id = " + tableName + ".svt_channel_id "
+ "ORDER BY svt_channels.id ASC"; // Execute the query and get the results.
Use REPLY-ALL to reply to list
To unsubscribe from the LCD-CVS list, click the following link:
https://listserv.slac.stanford.edu/cgi-bin/wa?SUBED1=LCD-CVS&A=1