Changeset 18128 for trunk

Timestamp:

02/13/15 12:52:51 (10 years ago)

Author:

tbretz

Message:

Added the possibility to start a custom run.

File:

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

trunk/FACT++/scripts/takeRun.js

@@ -133 +133 @@
         time = -1;
 
+    var custom = typeof(type)=="function";
+
     var nextrun = sub_startrun.get().obj['next'];
-    dim.log("Take run %3d".$(nextrun)+": N="+count+" T="+time+"s ["+type+"]");
+    dim.log("Take run %3d".$(nextrun)+": N="+count+" T="+time+"s ["+(custom?"custom":type)+"]");
 
     // FIXME: Replace by callback?
@@ -206 +208 @@
     {
         if (start)
-            dim.send("MCP/START", time, count, type);
+        {
+            dim.send("MCP/START", time, count, custom?"custom":type);
+            if (custom)
+                type();
+        }
 
         try
         {
-            dim.wait("MCP", "TakingData", 15000);
+            dim.wait("MCP", custom?"TriggerOn":"TakingData", 15000);
             break;
         }