Changeset 14765

Timestamp:

01/09/13 15:53:11 (12 years ago)

Author:

neise

Message:

introduced new class to generate the schedule - called Observation. Now the list of observations can be filled with Ratescans loocking on source-names as well as ratescans looking at specific ra-dec-coordinates.

Location:

trunk/FACT++/scripts

Files:

• Main.js (modified) (6 diffs)
• Observation_class.js (added)

trunk/FACT++/scripts/Main.js

@@ -358 +358 @@
 // ----------------------------------------------------------------
 
-// All times are in UTC
-// NEW SYNTAX:   "date", "MODE", "SOURCENAME"
-// STARTUP and SHUTDOWN have no sourcename, but need an empty "" 
-var observations =
-[
- [ "2013-01-08 23:05", "STARTUP",  "" ],
- [ "2013-01-08 23:13", "RATESCAN_SOURCENAME", "Dark Patch 3"],
-// [ "2013-01-08 23:32", "DATA", "Dark Patch 3"],
- [ "2013-01-08 23:30", "DATA", "Crab" ],
- [ "2013-01-09 04:45", "DATA",     "Mrk 421" ],
-// [ "2013-01-08 18:58", "RATESCAN_SOURCENAME", "Dark Patch 3"],
-// [ "2013-01-08 06:00", "RATESCAN_COORDINATES", 3.1415, 3.1415 ], -- not yet implemented
- [ "2013-01-09 07:00", "SHUTDOWN", ""],
-];
-
-//observations[-1] = { start:now, source:"END", toString:function(){ return "END ["+this.start+"]" } };
-
-//
-// Convert time given in UTC to correct Date object (be aware
-// the Date object will be in local time!)
-//
-// FIXME: Check transisiton from summer- and winter-time!!
-//
+var observations = [
+    { date:"2013-01-09 21:05 UTC", task:'startup' },
+    { date:"2013-01-09 21:20 UTC", task:'ratescan', source:'Dark Patch 3' },
+    { date:"2013-01-09 21:21 UTC", source:'Crab'},
+    { date:"2013-01-10 04:44 UTC", task:'ratescan', source:'Dark Patch 3'},
+    { date:"2013-01-10 04:45 UTC", task:'data', source:'Mrk 421'},
+    { date:"2013-01-10 04:44 UTC", task:'ratescan', ra:3.1415, dec:3.1415},
+    { date:"2013-01-10 04:44 UTC", task:'shutdown'} ];
+    
+    
+// make Observation objects from user input and check if 'date' is increasing.
 for (var i=0; i<observations.length; i++)
 {
-    var utc = new Date(observations[i][0]+" UTC");
-    if (isNaN(utc.valueOf()))
-        throw new Error("Not a valid date '"+observations[i][0]+"' in row "+i);
-    if (i>0 && utc<=observations[i-1][0])
-        throw new Error("Start time '"+utc.toUTCString()+"' in row "+i+" exceeds start time in row "+(i-1));
-    //observations[i][0] = utc;
-    //observations[i] = { start:utc, source:observations[i][1], toString:function(){ return this.source+" ["+this.start+"]" } };
-    observations[i] = { start:utc, 
-                        source:observations[i][2], 
-                        mode:observations[i][1], 
-                        toString:function(){ return this.source+" ["+this.start+"]" } };
-}
-
-// Get the observation scheduled for 'now' from the table and
-// retunr its index
-function getObservation(now)
-{
-    if (now==undefined)
-        now = new Date();
-
-    if (isNaN(now.valueOf()))
-        throw new Error("Date argument in getObservation invalid.");
-
-    for (var i=0; i<observations.length; i++)
-        if (now<observations[i].start)
-            return i-1;
-
-    return observations.length-1;
-}
+    observations[i] = new Observation(observations[i]);
+    
+    // check if the start date given by the user is increasing.
+    if (i>0 && observations[i].utc <= observations[i-1].utc)
+    {
+        throw new Error("Start time '"+utc.toUTCString()+
+                        "' in row "+i+" exceeds start time in row "+(i-1));
+    }
+}
+
+
 
 // ----------------------------------------------------------------
@@ -448 +418 @@
 }
 
+// Get the observation scheduled for 'now' from the table and
+// return its index
+function getObservation(now)
+{
+    if (now==undefined)
+        now = new Date();
+    
+    if (isNaN(now.valueOf()))
+        throw new Error("Date argument in getObservation invalid.");
+
+    for (var i=0; i<observations.length; i++)
+        if ( now<observations[i].start )
+            return i-1;
+    
+    return observations.length-1;
+}
 var run = -2;
 var lastObs;
@@ -497 +483 @@
     }
 
-    // Check (once) if startup of shutdown is scheduled
-    switch (obs.mode)
+    // Check if obs.task is one of the one-time-tasks
+    switch (obs.task)
     {
     case "STARTUP":
@@ -529 +515 @@
         continue;
 
-    case "RATESCAN_SOURCENAME":
+    case "RATESCAN":
         console.out("  RATESCAN  ");
        
@@ -535 +521 @@
         dim.wait("DRIVE_CONTROL", "Armed", 3000);
         
-        dim.send("DRIVE_CONTROL/TRACK_SOURCE", 0, 0, obs.source);
+        if (obs.source != undefined)
+            dim.send("DRIVE_CONTROL/TRACK_ON", obs.source);
+        else
+            dim.send("DRIVE_CONTROL/TRACK", obs.ra, obs.dec);
+            
         dim.wait("DRIVE_CONTROL", "OnTrack", 300000);
 
@@ -554 +544 @@
         dim.wait("RATE_SCAN", "InProgress", 10000);
         dim.wait("RATE_SCAN", "Connected", 2700000);
-        console.out("Ratescan done.")        
-
+
+        console.out("Ratescan done.");
+        run = -1;
         continue;
     }