Print

Print


Commit in hps-java/src/main/java/org/lcsim/hps/conditions on MAIN
DatabaseConditionsReader.java+4-471.18 -> 1.19
use ConditionsConverterRegister

hps-java/src/main/java/org/lcsim/hps/conditions
DatabaseConditionsReader.java 1.18 -> 1.19
diff -u -r1.18 -r1.19
--- DatabaseConditionsReader.java	11 Oct 2013 00:07:24 -0000	1.18
+++ DatabaseConditionsReader.java	15 Oct 2013 01:37:26 -0000	1.19
@@ -48,7 +48,7 @@
  * </p>
  * 
  * @author Jeremy McCormick <[log in to unmask]>
- * @version $Id: DatabaseConditionsReader.java,v 1.18 2013/10/11 00:07:24 jeremy Exp $ 
+ * @version $Id: DatabaseConditionsReader.java,v 1.19 2013/10/15 01:37:26 jeremy Exp $ 
  */
 public class DatabaseConditionsReader extends ConditionsReader {
         
@@ -139,8 +139,8 @@
             return false;
         }
         
-        // Register the converters on the manager.  
-        registerConditionsConverters(manager);
+        // Register the converters on the manager.         
+        ConditionsConverterRegister.register(manager);
                 
         // Open a connection to the database.
         connection = ConnectionManager.getConnectionManager().createConnection();
@@ -201,48 +201,5 @@
                 logger.info("set max run: " + maxRun);
             }
         }                        
-    }
-         
-    /**
-     * Register the default conditions converters.
-     * @param manager The ConditionsManager.
-     */
-    private void registerConditionsConverters(ConditionsManager manager) {
-        
-        // ConditionsRecords with validity meta data.
-        manager.registerConditionsConverter(new ConditionsRecordConverter());
-        
-        // SVT channel map.
-        manager.registerConditionsConverter(new SvtChannelMapConverter());
-        
-        // SVT DAQ map.
-        manager.registerConditionsConverter(new SvtDaqMapConverter());
-        
-        // SVT calibrations.
-        manager.registerConditionsConverter(new SvtCalibrationConverter());
-        
-        // SVT gains.
-        manager.registerConditionsConverter(new SvtGainConverter());
-        
-        // SVT and ECAL bad channels.  Same converter can be used.
-        manager.registerConditionsConverter(new BadChannelConverter());
-        
-        // SVT combined conditions.
-        manager.registerConditionsConverter(new SvtConditionsConverter());
-        
-        // ECAL channel map.
-        manager.registerConditionsConverter(new EcalChannelMapConverter());
-        
-        // ECAL gains.
-        manager.registerConditionsConverter(new EcalGainConverter());
-                
-        // ECAL calibrations.
-        manager.registerConditionsConverter(new EcalCalibrationConverter());
-        
-        // ECAL pulse parameters.
-        manager.registerConditionsConverter(new PulseParametersConverter());
-        
-        // ECAL combined conditions.
-        manager.registerConditionsConverter(new EcalConditionsConverter());
-    }
+    }           
 }
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