Changeset 16793

Timestamp:

06/10/13 12:01:19 (12 years ago)

Author:

tbretz

Message:

Fixed a problem with the 32bit shift operator when evaluating the 40bit incomplete flag; wait for ftmctrl to be in Valid rather than Idle.

File:

• trunk/FACT++/scripts/takeRun.js (modified) (2 diffs)

trunk/FACT++/scripts/takeRun.js

@@ -209 +209 @@
             dim.send("MCP/RESET");
 
-            dim.wait("FTM_CONTROL", "Idle",      3000);
+            dim.wait("FTM_CONTROL", "Valid",     3000);
             dim.wait("FAD_CONTROL", "Connected", 3000);
             dim.wait("MCP",         "Idle",      3000);
@@ -236 +236 @@
         console.out(" - FTM_CONTROL: "+dim.state("FTM_CONTROL").name);
 
-        dim.wait("FTM_CONTROL", "Idle",      3000);
+        dim.wait("FTM_CONTROL", "Valid",     3000);
         dim.wait("FAD_CONTROL", "Connected", 3000);
         dim.wait("MCP",         "Idle",      3000);
 
+        var str = incomplete.toString(2);
+        var len = str.length;
+
         var list = [];
-        for (var i=0; i<40; i++)
-            if (incomplete&(1<<i))
+        for (var i=0; i<str.length; i++)
+            if (str[str.length-i-1]=='1')
                 list.push(i);