Changeset 16533 for trunk/FACT++
- Timestamp:
- 05/31/13 15:25:57 (11 years ago)
- Location:
- trunk/FACT++/scripts
- Files:
-
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/FACT++/scripts/CheckUnderflow.js
r16386 r16533 35 35 [ "AGILENT_CONTROL", [ "VoltageOn" ] ], 36 36 [ "FTM_CONTROL", [ "Idle" ] ], 37 [ "FAD_CONTROL", [ "Connected", " WritingData"] ],37 [ "FAD_CONTROL", [ "Connected", "RunInProgress" ] ], 38 38 [ "BIAS_CONTROL", [ "Disconnected", "VoltageOff" ] ], 39 39 [ "DATA_LOGGER", [ "WaitForRun", "NightlyFileOpen", "Logging" ] ], … … 90 90 // events. Thus there is no real guarantee that we do not receive 91 91 // data of the previous run after we have started a new one. 92 if (dim.state("FAD_CONTROL").name==" WritingData")92 if (dim.state("FAD_CONTROL").name=="RunInProgress") 93 93 { 94 94 dim.send("FAD_CONTROL/CLOSE_OPEN_FILES"); -
trunk/FACT++/scripts/Main.js
r16441 r16533 744 744 [ "DRIVE_CONTROL", drive_states/*[ "Armed", "Tracking", "OnTrack" ]*/ ], 745 745 [ "FTM_CONTROL", [ "Idle", "TriggerOn" ] ], 746 [ "FAD_CONTROL", [ "Connected", " WritingData" ] ],746 [ "FAD_CONTROL", [ "Connected", "RunInProgress" ] ], 747 747 [ "RATE_SCAN", [ "Connected" ] ], 748 748 [ "RATE_CONTROL", [ "Connected", "GlobalThresholdSet", "InProgress" ] ], -
trunk/FACT++/scripts/handleFadConnected.js
r15135 r16533 38 38 return "Connected"; 39 39 40 case "RunInProgress": 41 console.out("RunInProgress detected... closing."); 42 dim.send("FAD_CONTROL/CLOSE_OPEN_FILES"); 43 return "Connected"; 44 40 45 // Final state reached condition 41 46 case "Connected": 42 case "WritingData":43 47 return ""; 44 48 }
Note:
See TracChangeset
for help on using the changeset viewer.