Changeset 15466 for trunk/FACT++

Timestamp:

05/01/13 10:49:10 (12 years ago)

Author:

tbretz

Message:

Made sure that if we do a re-connect during configure all servers are in the right state before we try to reconnect; fixed an undefined access to 'task' (the object was missing)

File:

• trunk/FACT++/scripts/Main.js (modified) (6 diffs)

trunk/FACT++/scripts/Main.js

@@ -201 +201 @@
     console.out("   ...waiting for 1s");
     v8.sleep(1000);
+    console.out("   ...checking connection");
+    dim.wait("FAD_CONTROL", "Connected", 3000);
     console.out("");
 }
@@ -261 +263 @@
         {
             dim.wait("MCP", "TakingData", 15000);
-break;
+            break;
         }
         catch (e)
@@ -295 +297 @@
             reconnect(list, "configuration");
 
-            /*if (n<2)
-                return false;
-
-                throw e;
-                */
-
             if (n==2)
                 throw e;
+
+            dim.wait("MCP", "Idle", 3000);
         }
     }
@@ -480 +478 @@
 {
     var state = dim.state("BIAS_CONTROL").name;
+
+    if (state=="Disconnected")
+    {
+        console.out("  Voltage off: bias crate disconnected!");
+        return;
+    }
 
     // check of feedback has to be switched on
@@ -657 +661 @@
     console.out("");
     console.out("Shutdown procedure seems to be finished...");
+    console.out("  "+new Date().toUTCString());
     console.out("  Telescope at Zd=%.1fdeg Az=%.1fdeg".$(report.obj['Zd'], report.obj['Az']));
     console.out("  Please make sure the park position was reached");
@@ -927 +932 @@
     }
 
-    if (system_on===false && task!="STARTUP")
+    if (system_on===false && obs[obs].task!="STARTUP")
     {
         v8.sleep(1000);