Print

Print


Commit in hps-java/src/main/java/org/lcsim/hps/conditions on MAIN
ConditionsConstants.java+2-11.7 -> 1.8
ConditionsRecord.java-11.4 -> 1.5
ConditionsRecordConverter.java+1-21.4 -> 1.5
DatabaseConditionsConverter.java-21.6 -> 1.7
DatabaseConditionsReader.java+1-111.19 -> 1.20
package-info.java+41.4 -> 1.5
ecal/EcalBadChannelCollection.java+31.4 -> 1.5
    /EcalChannelMap.java+3-61.4 -> 1.5
    /EcalChannelMapConverter.java-11.3 -> 1.4
    /EcalConditionsConverter.java+1-11.1 -> 1.2
    /EcalGain.java+1-11.4 -> 1.5
    /EcalGainConverter.java-11.6 -> 1.7
svt/PulseParametersCollection.java+1-11.2 -> 1.3
   /SvtBadChannelCollection.java+1-11.4 -> 1.5
   /SvtBadChannelConverter.java+2-31.3 -> 1.4
   /SvtCalibrationConverter.java-51.15 -> 1.16
   /SvtChannelMap.java+2-21.3 -> 1.4
   /SvtChannelMapConverter.java+1-21.4 -> 1.5
+23-41
18 modified files
minor cleanup

hps-java/src/main/java/org/lcsim/hps/conditions
ConditionsConstants.java 1.7 -> 1.8
diff -u -r1.7 -r1.8
--- ConditionsConstants.java	15 Oct 2013 23:14:47 -0000	1.7
+++ ConditionsConstants.java	15 Oct 2013 23:24:47 -0000	1.8
@@ -5,6 +5,7 @@
  */
 public final class ConditionsConstants {
     
+    /** Prevent instantiation of this class, which is only a holder of static constant values. */
     private ConditionsConstants() {}
 
     /** Table with ECal channel data. */
@@ -37,6 +38,6 @@
     /** Conditions key for SVT gain data. */
     public static final String SVT_GAINS = "svt_gains";
     
-    /** Conditions key fo SVT time shifts by sensor. */
+    /** Conditions key for SVT time shifts by sensor. */
     public static final String SVT_TIME_SHIFTS = "svt_time_shifts";
 }

hps-java/src/main/java/org/lcsim/hps/conditions
ConditionsRecord.java 1.4 -> 1.5
diff -u -r1.4 -r1.5
--- ConditionsRecord.java	11 Oct 2013 00:06:36 -0000	1.4
+++ ConditionsRecord.java	15 Oct 2013 23:24:47 -0000	1.5
@@ -1,7 +1,6 @@
 package org.lcsim.hps.conditions;
 
 import java.sql.Blob;
-import java.sql.Connection;
 import java.sql.ResultSet;
 import java.sql.SQLException;
 import java.util.Date;

hps-java/src/main/java/org/lcsim/hps/conditions
ConditionsRecordConverter.java 1.4 -> 1.5
diff -u -r1.4 -r1.5
--- ConditionsRecordConverter.java	11 Oct 2013 00:07:24 -0000	1.4
+++ ConditionsRecordConverter.java	15 Oct 2013 23:24:47 -0000	1.5
@@ -1,6 +1,5 @@
 package org.lcsim.hps.conditions;
 
-import java.sql.Connection;
 import java.sql.ResultSet;
 import java.sql.SQLException;
 
@@ -9,7 +8,7 @@
 /**
  * Read ConditionsRecord objects from the conditions database.  
  * @author Jeremy McCormick <[log in to unmask]>
- * @version $Id: ConditionsRecordConverter.java,v 1.4 2013/10/11 00:07:24 jeremy Exp $
+ * @version $Id: ConditionsRecordConverter.java,v 1.5 2013/10/15 23:24:47 jeremy Exp $
  */
 public class ConditionsRecordConverter extends DatabaseConditionsConverter<ConditionsRecordCollection> {
            

hps-java/src/main/java/org/lcsim/hps/conditions
DatabaseConditionsConverter.java 1.6 -> 1.7
diff -u -r1.6 -r1.7
--- DatabaseConditionsConverter.java	4 Oct 2013 06:02:19 -0000	1.6
+++ DatabaseConditionsConverter.java	15 Oct 2013 23:24:47 -0000	1.7
@@ -1,7 +1,5 @@
 package org.lcsim.hps.conditions;
 
-import java.sql.Connection;
-
 import org.lcsim.conditions.ConditionsConverter;
 
 /**

hps-java/src/main/java/org/lcsim/hps/conditions
DatabaseConditionsReader.java 1.19 -> 1.20
diff -u -r1.19 -r1.20
--- DatabaseConditionsReader.java	15 Oct 2013 01:37:26 -0000	1.19
+++ DatabaseConditionsReader.java	15 Oct 2013 23:24:47 -0000	1.20
@@ -12,16 +12,6 @@
 
 import org.lcsim.conditions.ConditionsManager;
 import org.lcsim.conditions.ConditionsReader;
-import org.lcsim.hps.conditions.ecal.EcalCalibrationConverter;
-import org.lcsim.hps.conditions.ecal.EcalChannelMapConverter;
-import org.lcsim.hps.conditions.ecal.EcalConditionsConverter;
-import org.lcsim.hps.conditions.ecal.EcalGainConverter;
-import org.lcsim.hps.conditions.svt.PulseParametersConverter;
-import org.lcsim.hps.conditions.svt.SvtCalibrationConverter;
-import org.lcsim.hps.conditions.svt.SvtChannelMapConverter;
-import org.lcsim.hps.conditions.svt.SvtConditionsConverter;
-import org.lcsim.hps.conditions.svt.SvtDaqMapConverter;
-import org.lcsim.hps.conditions.svt.SvtGainConverter;
 
 /**
  * <p>
@@ -48,7 +38,7 @@
  * </p>
  * 
  * @author Jeremy McCormick <[log in to unmask]>
- * @version $Id: DatabaseConditionsReader.java,v 1.19 2013/10/15 01:37:26 jeremy Exp $ 
+ * @version $Id: DatabaseConditionsReader.java,v 1.20 2013/10/15 23:24:47 jeremy Exp $ 
  */
 public class DatabaseConditionsReader extends ConditionsReader {
         

hps-java/src/main/java/org/lcsim/hps/conditions
package-info.java 1.4 -> 1.5
diff -u -r1.4 -r1.5
--- package-info.java	11 Oct 2013 00:04:26 -0000	1.4
+++ package-info.java	15 Oct 2013 23:24:47 -0000	1.5
@@ -5,5 +5,9 @@
  * The {@link DatabaseConditionsReader} has a set of converters for reading data from
  * tables using SQL queries and creating appropriate, typed objects for them.
  * </p>
+ * 
+ * <p>
+ * @author Jeremy McCormick <[log in to unmask]>
+ * </p>
  */
 package org.lcsim.hps.conditions;
\ No newline at end of file

hps-java/src/main/java/org/lcsim/hps/conditions/ecal
EcalBadChannelCollection.java 1.4 -> 1.5
diff -u -r1.4 -r1.5
--- EcalBadChannelCollection.java	15 Oct 2013 23:14:47 -0000	1.4
+++ EcalBadChannelCollection.java	15 Oct 2013 23:24:47 -0000	1.5
@@ -2,5 +2,8 @@
 
 import org.lcsim.hps.conditions.ChannelCollection;
 
+/**
+ * A collection of bad channel IDs in the ECAL.
+ */
 public class EcalBadChannelCollection extends ChannelCollection {
 }

hps-java/src/main/java/org/lcsim/hps/conditions/ecal
EcalChannelMap.java 1.4 -> 1.5
diff -u -r1.4 -r1.5
--- EcalChannelMap.java	4 Oct 2013 06:02:19 -0000	1.4
+++ EcalChannelMap.java	15 Oct 2013 23:24:47 -0000	1.5
@@ -6,13 +6,12 @@
  * This class maps ID values from the database to detailed ECal channel information.
  * There should really only be one of these data structures per job, as the EcalChannel 
  * objects are used as unique identifiers in the {@link EcalConditions} class.
- * 
- * FIXME: When adding new channels, there should be data structures setup for lookup using
- *        using x, y or crate, slot, channel.  See Sho's bit packing routines in original
- *        EcalConditions class for ideas on how to make keys for them.
  */
 public class EcalChannelMap extends HashMap<Integer, EcalChannel> {
     
+    /**
+     * Class constructor.
+     */
     EcalChannelMap() {        
     }
     
@@ -22,8 +21,6 @@
      * @param slot The slot number.
      * @param channelNumber The channel number.
      * @return The matching channel or null if does not exist.
-     * 
-     * FIXME: Improve performance of this method from O(N). 
      */
     public EcalChannel find(int crate, int slot, int channelNumber) {
         for (EcalChannel channel : values()) {

hps-java/src/main/java/org/lcsim/hps/conditions/ecal
EcalChannelMapConverter.java 1.3 -> 1.4
diff -u -r1.3 -r1.4
--- EcalChannelMapConverter.java	11 Oct 2013 00:05:36 -0000	1.3
+++ EcalChannelMapConverter.java	15 Oct 2013 23:24:47 -0000	1.4
@@ -2,7 +2,6 @@
 
 import static org.lcsim.hps.conditions.ConditionsConstants.ECAL_CHANNELS;
 
-import java.sql.Connection;
 import java.sql.ResultSet;
 import java.sql.SQLException;
 

hps-java/src/main/java/org/lcsim/hps/conditions/ecal
EcalConditionsConverter.java 1.1 -> 1.2
diff -u -r1.1 -r1.2
--- EcalConditionsConverter.java	9 Oct 2013 21:00:30 -0000	1.1
+++ EcalConditionsConverter.java	15 Oct 2013 23:24:47 -0000	1.2
@@ -19,7 +19,7 @@
 public class EcalConditionsConverter extends DatabaseConditionsConverter<EcalConditions> {
        
     /**
-     * Load ECal conditions into the <code>conditions</code> instance variable.
+     * Create ECAL conditions object containing all data for the current run.
      */
     public EcalConditions getData(ConditionsManager manager, String name) {
         

hps-java/src/main/java/org/lcsim/hps/conditions/ecal
EcalGain.java 1.4 -> 1.5
diff -u -r1.4 -r1.5
--- EcalGain.java	4 Oct 2013 06:02:19 -0000	1.4
+++ EcalGain.java	15 Oct 2013 23:24:47 -0000	1.5
@@ -1,7 +1,7 @@
 package org.lcsim.hps.conditions.ecal;
 
 /**
- * This class is a simplistic representation of gain values from the ecal
+ * This class is a simplistic representation of gain values from the ECAL
  * conditions database.    
  * 
  * @author Jeremy McCormick <[log in to unmask]>

hps-java/src/main/java/org/lcsim/hps/conditions/ecal
EcalGainConverter.java 1.6 -> 1.7
diff -u -r1.6 -r1.7
--- EcalGainConverter.java	11 Oct 2013 00:05:36 -0000	1.6
+++ EcalGainConverter.java	15 Oct 2013 23:24:47 -0000	1.7
@@ -1,6 +1,5 @@
 package org.lcsim.hps.conditions.ecal;
 
-import java.sql.Connection;
 import java.sql.ResultSet;
 import java.sql.SQLException;
 

hps-java/src/main/java/org/lcsim/hps/conditions/svt
PulseParametersCollection.java 1.2 -> 1.3
diff -u -r1.2 -r1.3
--- PulseParametersCollection.java	4 Oct 2013 02:03:33 -0000	1.2
+++ PulseParametersCollection.java	15 Oct 2013 23:24:47 -0000	1.3
@@ -3,7 +3,7 @@
 import java.util.LinkedHashMap;
 
 /**
- * A collection of {@link PulseParameters} objects stored by SVT channel key.
+ * A collection of {@link PulseParameters} objects stored by SVT channel ID.
  * @author Jeremy McCormick <[log in to unmask]>
  */
 public class PulseParametersCollection extends LinkedHashMap<Integer,PulseParameters> {

hps-java/src/main/java/org/lcsim/hps/conditions/svt
SvtBadChannelCollection.java 1.4 -> 1.5
diff -u -r1.4 -r1.5
--- SvtBadChannelCollection.java	15 Oct 2013 23:14:47 -0000	1.4
+++ SvtBadChannelCollection.java	15 Oct 2013 23:24:47 -0000	1.5
@@ -3,7 +3,7 @@
 import org.lcsim.hps.conditions.ChannelCollection;
 
 /**
- * This class represents a set of bad channels in the ECAL by their channel IDs
+ * This class represents a set of bad channels in the SVT by their channel IDs
  * from the conditions database.
  * @author Jeremy McCormick <[log in to unmask]>
  */

hps-java/src/main/java/org/lcsim/hps/conditions/svt
SvtBadChannelConverter.java 1.3 -> 1.4
diff -u -r1.3 -r1.4
--- SvtBadChannelConverter.java	15 Oct 2013 00:56:09 -0000	1.3
+++ SvtBadChannelConverter.java	15 Oct 2013 23:24:47 -0000	1.4
@@ -4,14 +4,14 @@
 import java.sql.SQLException;
 
 import org.lcsim.conditions.ConditionsManager;
-import org.lcsim.hps.conditions.ChannelCollection;
 import org.lcsim.hps.conditions.ConditionsRecord;
 import org.lcsim.hps.conditions.ConditionsRecordCollection;
 import org.lcsim.hps.conditions.ConnectionManager;
 import org.lcsim.hps.conditions.DatabaseConditionsConverter;
 
 /**
- * This class creates a {@link ChannelCollection} representing bad readout channels.
+ * This class creates an {@link SvtBadChannelCollection} representing bad readout channels
+ * in the SVT.
  * @author Jeremy McCormick <[log in to unmask]>
  */
 public class SvtBadChannelConverter extends DatabaseConditionsConverter<SvtBadChannelCollection> {
@@ -61,7 +61,6 @@
 
     /**
      * Get the type handled by this converter.
-     * 
      * @return The type handled by this converter.
      */
     public Class<SvtBadChannelCollection> getType() {

hps-java/src/main/java/org/lcsim/hps/conditions/svt
SvtCalibrationConverter.java 1.15 -> 1.16
diff -u -r1.15 -r1.16
--- SvtCalibrationConverter.java	11 Oct 2013 00:05:36 -0000	1.15
+++ SvtCalibrationConverter.java	15 Oct 2013 23:24:47 -0000	1.16
@@ -1,6 +1,5 @@
 package org.lcsim.hps.conditions.svt;
 
-import java.sql.Connection;
 import java.sql.ResultSet;
 import java.sql.SQLException;
 
@@ -12,11 +11,7 @@
 /**
  * This class creates a {@link SvtCalibrationCollection} from the conditions
  * database.
- * 
- * @author Omar Moreno <[log in to unmask]>
  * @author Jeremy McCormick <[log in to unmask]>
- * @version $Id: SvtCalibrationConverter.java,v 1.13 2013/10/04 01:43:48 jeremy
- *          Exp $
  */
 public class SvtCalibrationConverter extends DatabaseConditionsConverter<SvtCalibrationCollection> {
 

hps-java/src/main/java/org/lcsim/hps/conditions/svt
SvtChannelMap.java 1.3 -> 1.4
diff -u -r1.3 -r1.4
--- SvtChannelMap.java	11 Oct 2013 01:01:42 -0000	1.3
+++ SvtChannelMap.java	15 Oct 2013 23:24:47 -0000	1.4
@@ -8,8 +8,8 @@
 import org.lcsim.hps.util.Pair;
 
 /**
- * This class represents a map between channels and their database IDs from the channels table.
- * It can be used to lookup information in the {@link SvtConditions} object.
+ * This class represents a map between SVT channels and their IDs from the channels table
+ * in the conditions database.  It can be used to lookup information stored in the {@link SvtConditions} object.
  * @author Jeremy McCormick <[log in to unmask]>
  */
 public class SvtChannelMap extends HashMap<Integer,SvtChannel> {

hps-java/src/main/java/org/lcsim/hps/conditions/svt
SvtChannelMapConverter.java 1.4 -> 1.5
diff -u -r1.4 -r1.5
--- SvtChannelMapConverter.java	11 Oct 2013 00:07:24 -0000	1.4
+++ SvtChannelMapConverter.java	15 Oct 2013 23:24:48 -0000	1.5
@@ -2,7 +2,6 @@
 
 import static org.lcsim.hps.conditions.ConditionsConstants.SVT_CHANNELS;
 
-import java.sql.Connection;
 import java.sql.ResultSet;
 import java.sql.SQLException;
 
@@ -17,7 +16,7 @@
 public class SvtChannelMapConverter extends DatabaseConditionsConverter<SvtChannelMap> {
 
     /**
-     * Create the objects from the database.
+     * Create the channel map from the conditions database.
      * @param manager The current conditions manager.
      * @param name The name of the conditions set.
      */
CVSspam 0.2.12


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