Changeset 17673


Ignore:
Timestamp:
04/16/14 23:51:35 (11 years ago)
Author:
tbretz
Message:
Adapted to have three agilentctrl running instead of one.
Location:
trunk/FACT++/scripts
Files:
3 edited

Legend:

Unmodified
Added
Removed

  • trunk/FACT++/scripts/CheckUnderflow.js

    r17659 r17673  
    3939var table =
    4040[
    41  [ "MCP",             [ "Idle"      ] ],
    42  [ "AGILENT_CONTROL", [ "VoltageOn" ] ],
    43  [ "FTM_CONTROL",     [ "Valid"     ] ],
    44  [ "FAD_CONTROL",     [ "Connected",    "RunInProgress"   ] ],
    45  [ "BIAS_CONTROL",    [ "Disconnected", "VoltageOff"      ] ],
    46  [ "DATA_LOGGER",     [ "WaitForRun",   "NightlyFileOpen", "Logging" ] ],
     41 [ "MCP",                 [ "Idle"      ] ],
     42 [ "AGILENT_CONTROL_24V", [ "VoltageOn" ] ],
     43 [ "AGILENT_CONTROL_50V", [ "VoltageOn" ] ],
     44 [ "AGILENT_CONTROL_80V", [ "VoltageOn" ] ],
     45 [ "FTM_CONTROL",         [ "Valid"     ] ],
     46 [ "FAD_CONTROL",         [ "Connected",    "RunInProgress"   ] ],
     47 [ "BIAS_CONTROL",        [ "Disconnected", "VoltageOff"      ] ],
     48 [ "DATA_LOGGER",         [ "WaitForRun",   "NightlyFileOpen", "Logging" ] ],
    4749];
    4850
    … …  
    6870//    throw new Error("Could not connect to FAD_CONTROL/DRS_RUNS");
    6971
    70 var power = dim.state("AGILENT_CONTROL").time;
     72var power = dim.state("AGILENT_CONTROL_50V").time;
    7173var now   = new Date();
    7274

  • trunk/FACT++/scripts/Main.js

    r17638 r17673  
    481481    var expected =
    482482        [
     483         "AGILENT_CONTROL_24V/DATA",
     484         "AGILENT_CONTROL_50V/DATA",
     485         "AGILENT_CONTROL_80V/DATA",
    483486         "BIAS_CONTROL/CURRENT",
    484487         "BIAS_CONTROL/DAC",
    … …  
    846849         [ "SMART_FACT"    ],
    847850         [ "TEMPERATURE"   ],
    848          [ "DATA_LOGGER",     [ "NightlyFileOpen", "WaitForRun", "Logging" ] ],
    849          [ "FSC_CONTROL",     [ "Connected"                ] ],
    850          [ "MCP",             [ "Idle"                     ] ],
    851          [ "TIME_CHECK",      [ "Valid"                    ] ],
    852          [ "PWR_CONTROL",     power_states/*[ "SystemOn"                 ]*/ ],
    853          [ "AGILENT_CONTROL", [ "VoltageOn"                ] ],
    854          [ "BIAS_CONTROL",    [ "VoltageOff", "VoltageOn", "Ramping" ] ],
    855          [ "FEEDBACK",        [ "Calibrated", "InProgress" ] ],
    856          [ "LID_CONTROL",     [ "Open", "Closed"           ] ],
    857          [ "DRIVE_CONTROL",   drive_states/*[ "Armed", "Tracking", "OnTrack" ]*/ ],
    858          [ "FTM_CONTROL",     [ "Valid", "TriggerOn"       ] ],
    859          [ "FAD_CONTROL",     [ "Connected", "RunInProgress" ] ],
    860          [ "RATE_SCAN",       [ "Connected"                ] ],
    861          [ "RATE_CONTROL",    [ "Connected", "GlobalThresholdSet", "InProgress"  ] ],
    862          [ "GPS_CONTROL",     [ "Locked"  ] ],
     851         [ "DATA_LOGGER",         [ "NightlyFileOpen", "WaitForRun", "Logging" ] ],
     852         [ "FSC_CONTROL",         [ "Connected"                ] ],
     853         [ "MCP",                 [ "Idle"                     ] ],
     854         [ "TIME_CHECK",          [ "Valid"                    ] ],
     855         [ "PWR_CONTROL",         power_states/*[ "SystemOn"                 ]*/ ],
     856         [ "AGILENT_CONTROL_24V", [ "VoltageOn"                ] ],
     857         [ "AGILENT_CONTROL_50V", [ "VoltageOn"                ] ],
     858         [ "AGILENT_CONTROL_80V", [ "VoltageOn"                ] ],
     859         [ "BIAS_CONTROL",        [ "VoltageOff", "VoltageOn", "Ramping" ] ],
     860         [ "FEEDBACK",            [ "Calibrated", "InProgress" ] ],
     861         [ "LID_CONTROL",         [ "Open", "Closed"           ] ],
     862         [ "DRIVE_CONTROL",       drive_states/*[ "Armed", "Tracking", "OnTrack" ]*/ ],
     863         [ "FTM_CONTROL",         [ "Valid", "TriggerOn"       ] ],
     864         [ "FAD_CONTROL",         [ "Connected", "RunInProgress" ] ],
     865         [ "RATE_SCAN",           [ "Connected"                ] ],
     866         [ "RATE_CONTROL",        [ "Connected", "GlobalThresholdSet", "InProgress"  ] ],
     867         [ "GPS_CONTROL",         [ "Locked"  ] ],
    863868        ];
    864869

  • trunk/FACT++/scripts/Startup.js

    r17349 r17673  
    5454// -----------------------------------------------------------------
    5555
    56 include("scripts/handleAgilentPowerOn.js");
     56include("scripts/handleAgilentPowerOn24V.js");
     57include("scripts/handleAgilentPowerOn50V.js");
     58include("scripts/handleAgilentPowerOn80V.js");
    5759include("scripts/handlePwrCameraOn.js");
    5860
    59 checkSend(["AGILENT_CONTROL","PWR_CONTROL"]);
     61checkSend(["AGILENT_CONTROL_24V","AGILENT_CONTROL_50V","AGILENT_CONTROL_80V","PWR_CONTROL"]);
    6062
    6163loop = new Handler("PowerOn");
    62 //loop.add(handleAgilentPowerOn);
     64//loop.add(handleAgilentPowerOn24V);
     65//loop.add(handleAgilentPowerOn50V);
     66//loop.add(handleAgilentPowerOn80V);
    6367loop.add(handlePwrCameraOn);
    6468loop.run();
    … …  
    296300 [ "SMART_FACT"    ],
    297301 [ "TEMPERATURE"   ],
    298  [ "DATA_LOGGER",     [ "NightlyFileOpen", "WaitForRun", "Logging" ] ],
    299  [ "FSC_CONTROL",     [ "Connected"                       ] ],
    300  [ "MCP",             [ "Idle"                            ] ],
    301  [ "TIME_CHECK",      [ "Valid"                           ] ],
    302  [ "PWR_CONTROL",     [ "SystemOn"                        ] ],
    303  [ "AGILENT_CONTROL", [ "VoltageOn"                       ] ],
    304  [ "BIAS_CONTROL",    [ "VoltageOff"                      ] ],
    305  [ "FEEDBACK",        [ "Calibrated"                      ] ],
    306  [ "RATE_SCAN",       [ "Connected"                       ] ],
    307  [ "RATE_CONTROL",    [ "Connected"                       ] ],
    308  [ "LID_CONTROL",     [ "Open", "Closed"                  ] ],
    309  [ "DRIVE_CONTROL",   [ "Armed", "Tracking", "OnTrack", "Locked" ] ],
    310  [ "FTM_CONTROL",     [ "Valid", "TriggerOn"              ] ],
    311  [ "FAD_CONTROL",     [ "Connected", "WritingData"        ] ],
    312  [ "GPS_CONTROL",     [ "Locked" ] ],
     302 [ "DATA_LOGGER",         [ "NightlyFileOpen", "WaitForRun", "Logging" ] ],
     303 [ "FSC_CONTROL",         [ "Connected"                       ] ],
     304 [ "MCP",                 [ "Idle"                            ] ],
     305 [ "TIME_CHECK",          [ "Valid"                           ] ],
     306 [ "PWR_CONTROL",         [ "SystemOn"                        ] ],
     307 [ "AGILENT_CONTROL_24V", [ "VoltageOn"                       ] ],
     308 [ "AGILENT_CONTROL_50V", [ "VoltageOn"                       ] ],
     309 [ "AGILENT_CONTROL_80V", [ "VoltageOn"                       ] ],
     310 [ "BIAS_CONTROL",        [ "VoltageOff"                      ] ],
     311 [ "FEEDBACK",            [ "Calibrated"                      ] ],
     312 [ "RATE_SCAN",           [ "Connected"                       ] ],
     313 [ "RATE_CONTROL",        [ "Connected"                       ] ],
     314 [ "LID_CONTROL",         [ "Open", "Closed"                  ] ],
     315 [ "DRIVE_CONTROL",       [ "Armed", "Tracking", "OnTrack", "Locked" ] ],
     316 [ "FTM_CONTROL",         [ "Valid", "TriggerOn"              ] ],
     317 [ "FAD_CONTROL",         [ "Connected", "WritingData"        ] ],
     318 [ "GPS_CONTROL",         [ "Locked" ] ],
    313319];
    314320
Note: See TracChangeset for help on using the changeset viewer.