Changeset 16533

Timestamp:

05/31/13 15:25:57 (12 years ago)

Author:

tbretz

Message:

Renamed WritingData of fadctrl to RunInProgress

Location:

trunk/FACT++/scripts

Files:

• CheckUnderflow.js (modified) (2 diffs)
• Main.js (modified) (1 diff)
• handleFadConnected.js (modified) (1 diff)

trunk/FACT++/scripts/CheckUnderflow.js

@@ -35 +35 @@
  [ "AGILENT_CONTROL", [ "VoltageOn" ] ],
  [ "FTM_CONTROL",     [ "Idle"      ] ],
- [ "FAD_CONTROL",     [ "Connected",    "WritingData"     ] ],
+ [ "FAD_CONTROL",     [ "Connected",    "RunInProgress"   ] ],
  [ "BIAS_CONTROL",    [ "Disconnected", "VoltageOff"      ] ],
  [ "DATA_LOGGER",     [ "WaitForRun",   "NightlyFileOpen", "Logging" ] ],
@@ -90 +90 @@
     // events. Thus there is no real guarantee that we do not receive
     // data of the previous run after we have started a new one.
-    if (dim.state("FAD_CONTROL").name=="WritingData")
+    if (dim.state("FAD_CONTROL").name=="RunInProgress")
     {
         dim.send("FAD_CONTROL/CLOSE_OPEN_FILES");

trunk/FACT++/scripts/Main.js

@@ -744 +744 @@
          [ "DRIVE_CONTROL",   drive_states/*[ "Armed", "Tracking", "OnTrack" ]*/ ],
          [ "FTM_CONTROL",     [ "Idle", "TriggerOn"        ] ],
-         [ "FAD_CONTROL",     [ "Connected", "WritingData" ] ],
+         [ "FAD_CONTROL",     [ "Connected", "RunInProgress" ] ],
          [ "RATE_SCAN",       [ "Connected"                ] ],
          [ "RATE_CONTROL",    [ "Connected", "GlobalThresholdSet", "InProgress"  ] ],

trunk/FACT++/scripts/handleFadConnected.js

@@ -38 +38 @@
         return "Connected";
 
+    case "RunInProgress":
+        console.out("RunInProgress detected... closing.");
+        dim.send("FAD_CONTROL/CLOSE_OPEN_FILES");
+        return "Connected";
+
     // Final state reached condition
     case "Connected":
-    case "WritingData":
         return "";
     }