Print

---

Author: [log in to unmask]
Date: Mon Aug  3 18:57:28 2015
New Revision: 3330

Log:
read millis from mya dumps, silence debug

Modified:
    java/trunk/conditions/src/main/java/org/hps/conditions/svt/SvtBiasConditionsLoader.java
    java/trunk/conditions/src/main/java/org/hps/conditions/svt/SvtBiasMyaDataReader.java
    java/trunk/conditions/src/main/java/org/hps/conditions/svt/SvtMotorMyaDataReader.java
    java/trunk/evio/src/main/java/org/hps/evio/SvtEventFlagger.java

Modified: java/trunk/conditions/src/main/java/org/hps/conditions/svt/SvtBiasConditionsLoader.java
 =============================================================================
--- java/trunk/conditions/src/main/java/org/hps/conditions/svt/SvtBiasConditionsLoader.java	(original)
+++ java/trunk/conditions/src/main/java/org/hps/conditions/svt/SvtBiasConditionsLoader.java	Mon Aug  3 18:57:28 2015
@@ -203,7 +203,7 @@
         }
 
         if (cl.hasOption("p")) {
-            List<SvtPositionMyaRange> positionRanges = SvtMotorMyaDataReader.readMyaData(new File(cl.getOptionValue("p")), 1000, 10000);
+            List<SvtPositionMyaRange> positionRanges = SvtMotorMyaDataReader.readMyaData(new File(cl.getOptionValue("p")), 200, 10000);
             logger.info("Got " + positionRanges.size() + " position ranges");
             positionRunRanges = SvtMotorMyaDataReader.findOverlappingRanges(runList, positionRanges);
         }

Modified: java/trunk/conditions/src/main/java/org/hps/conditions/svt/SvtBiasMyaDataReader.java
 =============================================================================
--- java/trunk/conditions/src/main/java/org/hps/conditions/svt/SvtBiasMyaDataReader.java	(original)
+++ java/trunk/conditions/src/main/java/org/hps/conditions/svt/SvtBiasMyaDataReader.java	Mon Aug  3 18:57:28 2015
@@ -76,7 +76,7 @@
     }
 
     public static List<SvtBiasMyaRange> readMyaData(File file, double biasValueOn, int endMargin, boolean discardHeader) {
-        SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+        SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss.SSS");
         dateFormat.setTimeZone(TimeZone.getTimeZone("America/New_York"));
 
         List<SvtBiasMyaRange> ranges = new ArrayList<SvtBiasMyaRange>();

Modified: java/trunk/conditions/src/main/java/org/hps/conditions/svt/SvtMotorMyaDataReader.java
 =============================================================================
--- java/trunk/conditions/src/main/java/org/hps/conditions/svt/SvtMotorMyaDataReader.java	(original)
+++ java/trunk/conditions/src/main/java/org/hps/conditions/svt/SvtMotorMyaDataReader.java	Mon Aug  3 18:57:28 2015
@@ -57,7 +57,7 @@
     }
 
     public static List<SvtPositionMyaRange> readMyaData(File file, int endMargin, double minDwellTime) {
-        SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+        SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss.SSS");
         dateFormat.setTimeZone(TimeZone.getTimeZone("America/New_York"));
 
         List<SvtPositionMyaRange> ranges = new ArrayList<SvtPositionMyaRange>();

Modified: java/trunk/evio/src/main/java/org/hps/evio/SvtEventFlagger.java
 =============================================================================
--- java/trunk/evio/src/main/java/org/hps/evio/SvtEventFlagger.java	(original)
+++ java/trunk/evio/src/main/java/org/hps/evio/SvtEventFlagger.java	Mon Aug  3 18:57:28 2015
@@ -85,11 +85,11 @@
         for (final SvtAlignmentConstant constant : alignmentConstants) {
             switch (constant.getParameter()) {
                 case 13100:
-                    System.out.format("nominal top angle: %f\n", constant.getValue());
+//                    System.out.format("nominal top angle: %f\n", constant.getValue());
                     nominalAngleTop = constant.getValue();
                     break;
                 case 23100:
-                    System.out.format("nominal bottom angle: %f\n", constant.getValue());
+//                    System.out.format("nominal bottom angle: %f\n", constant.getValue());
                     nominalAngleBottom = -constant.getValue();
                     break;
             }