Changeset 15117 for trunk/FACT++/scripts

Timestamp:

03/18/13 21:24:41 (12 years ago)

Author:

tbretz

Message:

Moved reading of the schedule to the beginning of the file so that typos get noticed before all the rest of the startup procedure.

File:

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

trunk/FACT++/scripts/Main.js

@@ -7 +7 @@
 //this is just the class implementation of 'Observation'
 include('scripts/Observation_class.js');
+
+// this file just contains the definition of
+// the variable observations, which builds our nightly schedule, hence the filename
+include('scripts/schedule.js');
+
+// make Observation objects from user input and check if 'date' is increasing.
+for (var i=0; i<observations.length; i++)
+{
+    observations[i] = new Observation(observations[i]);
+
+    // check if the start date given by the user is increasing.
+    if (i>0 && observations[i].start <= observations[i-1].start)
+    {
+        throw new Error("Start time '"+ observations[i].start.toUTCString()+
+                        "' in row "+i+" exceeds start time in row "+(i-1));
+    }
+}
+
+// ----------------------------------------------------------------
+// ================================================================
+// ----------------------------------------------------------------
 
 dimctrl.defineState(37, "TimeOutBeforeTakingData", "MCP took more than 5minutes to start TakingData");
@@ -484 +505 @@
 
 // ----------------------------------------------------------------
-// ================================================================
-// ----------------------------------------------------------------
-
-// this file just contains the definition of
-// the variable observations, which builds our nightly schedule, hence the filename
-include('scripts/schedule.js');
-
-// make Observation objects from user input and check if 'date' is increasing.
-for (var i=0; i<observations.length; i++)
-{
-    observations[i] = new Observation(observations[i]);
-
-    // check if the start date given by the user is increasing.
-    if (i>0 && observations[i].start <= observations[i-1].start)
-    {
-        throw new Error("Start time '"+ observations[i].start.toUTCString()+
-                        "' in row "+i+" exceeds start time in row "+(i-1));
-    }
-}
-
-// ----------------------------------------------------------------
 // Bring the system into a well defined state
 // ----------------------------------------------------------------