Author: [log in to unmask]
Date: Fri Jul 31 13:20:11 2015
New Revision: 3316

Log:
Change SvtBiasConstant to use long timestamps in ms instead of SQL timestamp.

Modified:
    java/trunk/conditions/src/main/java/org/hps/conditions/svt/SvtBiasConstant.java
    java/trunk/users/src/main/java/org/hps/users/meeg/BiasTimeDemo.java

Modified: java/trunk/conditions/src/main/java/org/hps/conditions/svt/SvtBiasConstant.java
 =============================================================================
--- java/trunk/conditions/src/main/java/org/hps/conditions/svt/SvtBiasConstant.java	(original)
+++ java/trunk/conditions/src/main/java/org/hps/conditions/svt/SvtBiasConstant.java	Fri Jul 31 13:20:11 2015
@@ -13,7 +13,7 @@
  * 
  * Encapsulates an SVT bias constant, which is range in time where bias was ON.
  * 
- * @author Per Hansson Adrian <[log in to unmask]>
+ * @author Per Hansson Adrian, SLAC
  */
 @Table(names  = "svt_bias_constants")
 @Converter(multipleCollectionsAction = MultipleCollectionsAction.LAST_CREATED)
@@ -34,7 +34,7 @@
          */
         public SvtBiasConstant find(Date date) {
             for (SvtBiasConstant constant : this) {
-                if(date.after(constant.getStart()) && date.before(constant.getEnd())) {
+                if(date.getTime() >= constant.getStart() && date.getTime() <= constant.getEnd()) {
                     return constant;
                 }
             }
@@ -44,22 +44,22 @@
     
     
     /**
-     * The start date. 
+     * The start date as a Unix timestamp in milliseconds (GMT). 
      * 
-     * @return the start date
+     * @return the start date as a Unix timestamp
      */
     @Field(names = {"start"})
-    public Date getStart() {
+    public Long getStart() {
         return getFieldValue("start");
     }
 
     /**
-     * The end date. 
+     * The end date as a Unix timestamp in milliseconds (GMT). 
      * 
-     * @return the end date
+     * @return the end date as a Unix timestamp
      */
     @Field(names = {"end"})
-    public Date getEnd() {
+    public Long getEnd() {
         return getFieldValue("end");
     }
 

Modified: java/trunk/users/src/main/java/org/hps/users/meeg/BiasTimeDemo.java
 =============================================================================
--- java/trunk/users/src/main/java/org/hps/users/meeg/BiasTimeDemo.java	(original)
+++ java/trunk/users/src/main/java/org/hps/users/meeg/BiasTimeDemo.java	Fri Jul 31 13:20:11 2015
@@ -1,4 +1,6 @@
 package org.hps.users.meeg;
+
+import java.util.Date;
 
 import org.hps.conditions.database.DatabaseConditionsManager;
 import org.hps.conditions.svt.SvtBiasConstant;
@@ -19,7 +21,7 @@
         svtBiasConstants = DatabaseConditionsManager.getInstance().getCachedConditions(SvtBiasConstant.SvtBiasConstantCollection.class, "svt_bias_constants").getCachedData();
         System.out.println("there are " + svtBiasConstants.size() + " constants to search");
         for (SvtBiasConstant constant : svtBiasConstants) {
-            System.out.format("start %d (%s), end %d (%s), value %f\n", constant.getStart().getTime(), constant.getStart().toString(), constant.getEnd().getTime(), constant.getEnd().toString(), constant.getValue());
+            System.out.format("start %d (%s), end %d (%s), value %f\n", new Date(constant.getStart()), constant.getStart().toString(), new Date(constant.getEnd()), constant.getEnd().toString(), constant.getValue());
         }
     }
 }