Changeset 16533 for trunk/FACT++


Ignore:
Timestamp:
05/31/13 15:25:57 (11 years ago)
Author:
tbretz
Message:
Renamed WritingData of fadctrl to RunInProgress
Location:
trunk/FACT++/scripts
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • trunk/FACT++/scripts/CheckUnderflow.js

    r16386 r16533  
    3535 [ "AGILENT_CONTROL", [ "VoltageOn" ] ],
    3636 [ "FTM_CONTROL",     [ "Idle"      ] ],
    37  [ "FAD_CONTROL",     [ "Connected",    "WritingData"     ] ],
     37 [ "FAD_CONTROL",     [ "Connected",    "RunInProgress"   ] ],
    3838 [ "BIAS_CONTROL",    [ "Disconnected", "VoltageOff"      ] ],
    3939 [ "DATA_LOGGER",     [ "WaitForRun",   "NightlyFileOpen", "Logging" ] ],
     
    9090    // events. Thus there is no real guarantee that we do not receive
    9191    // 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")
    9393    {
    9494        dim.send("FAD_CONTROL/CLOSE_OPEN_FILES");
  • trunk/FACT++/scripts/Main.js

    r16441 r16533  
    744744         [ "DRIVE_CONTROL",   drive_states/*[ "Armed", "Tracking", "OnTrack" ]*/ ],
    745745         [ "FTM_CONTROL",     [ "Idle", "TriggerOn"        ] ],
    746          [ "FAD_CONTROL",     [ "Connected", "WritingData" ] ],
     746         [ "FAD_CONTROL",     [ "Connected", "RunInProgress" ] ],
    747747         [ "RATE_SCAN",       [ "Connected"                ] ],
    748748         [ "RATE_CONTROL",    [ "Connected", "GlobalThresholdSet", "InProgress"  ] ],
  • trunk/FACT++/scripts/handleFadConnected.js

    r15135 r16533  
    3838        return "Connected";
    3939
     40    case "RunInProgress":
     41        console.out("RunInProgress detected... closing.");
     42        dim.send("FAD_CONTROL/CLOSE_OPEN_FILES");
     43        return "Connected";
     44
    4045    // Final state reached condition
    4146    case "Connected":
    42     case "WritingData":
    4347        return "";
    4448    }
Note: See TracChangeset for help on using the changeset viewer.