Changeset 15016 for trunk

Timestamp:

03/10/13 14:42:39 (12 years ago)

Author:

tbretz

Message:

Improved output.

File:

• trunk/FACT++/scripts/Main.js (modified) (6 diffs)

trunk/FACT++/scripts/Main.js

@@ -530 +530 @@
 
     for (var i=0; i<observations.length; i++)
-        if ( now<observations[i].start )
+        if (now<observations[i].start)
             return i-1;
-    
+
     return observations.length-1;
 }
@@ -645 +645 @@
         else
             dim.send("DRIVE_CONTROL/TRACK", obs.ra, obs.dec);
-        
+
         //OpenLid();    
         dim.wait("DRIVE_CONTROL", "OnTrack", 300000);
@@ -664 +664 @@
         dim.wait("BIAS_CONTROL", "VoltageOn", -100);
         dim.wait("FAD_CONTROL", "Connected", -100);
-        
+
         dim.wait("RATE_SCAN","Connected", 5000);
         dim.send("RATE_SCAN/START_THRESHOLD_SCAN", 50, 1000, -10);
@@ -676 +676 @@
         // So I decided to put this line here as a kind of patchwork....
         dim.send("FAD_CONTROL/SET_FILE_FORMAT", 2);
-        
+
         console.out("Ratescan done.");
         run = -1;
@@ -746 +746 @@
 
     if (valid)
-        console.out("  Last DRS calib: "+diff+"min ago");
+        console.out("  Last DRS calib: %.1fmin ago".$(diff));
     else
         console.out("  No valid drs calibration");
@@ -826 +826 @@
     {
         var time = new Date();
-        if (!takeRun("data", -1, len)) // Take data (5min)
-            len -= parseInt((new Date()-time)/1000);
-        else
+        if (takeRun("data", -1, len)) // Take data (5min)
             break;
+
+        len -= parseInt((new Date()-time)/1000);
     }