Changeset 18731 for trunk/FACT++/scripts/takeRun.js

Timestamp:

01/11/17 13:37:20 (8 years ago)

Author:

tbretz

Message:

Implemented the possibility to define a custom setup in a callback function.

File:

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

trunk/FACT++/scripts/takeRun.js

@@ -126 +126 @@
 }
 
-function takeRun(type, count, time)
+function takeRun(type, count, time, func)
 {
     if (!count)
@@ -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 ["+(custom?"custom":type)+"]");
+    dim.log("Take run %3d".$(nextrun)+": N="+count+" T="+time+"s ["+type+"]");
 
     // FIXME: Replace by callback?
@@ -209 +207 @@
         if (start)
         {
-            dim.send("MCP/START", time, count, custom?"custom":type);
-            if (custom)
-                type();
+            dim.send("MCP/START", time, count, type);
+            if (typeof(func)=="function")
+                func();
         }