Changeset 18046 for trunk/FACT++

Timestamp:

01/03/15 05:32:49 (10 years ago)

Author:

Daniela Dorner

Message:

added checks for new options, fixed bug in ra/dec check

File:

• trunk/FACT++/scripts/Observation_class.js (modified) (3 diffs)

trunk/FACT++/scripts/Observation_class.js

@@ -41 +41 @@
         ret[i].ra     = parseFloat(obs.ra);
         ret[i].dec    = parseFloat(obs.dec);
+        ret[i].zd     = parseFloat(obs.zd);
+        ret[i].az     = parseFloat(obs.az);
+        ret[i].lidclosed = obs.lidclosed;
+        ret[i].rstype = obs.rstype ? obs.rstype : "default";
         ret[i].sub    = i;
         ret[i].start  = utc;
@@ -62 +66 @@
                 throw new Error("Observation must have either 'source' or 'task' " +
                                 "if 'task' == 'data' it must have also have 'source' ");
+            if (ret[i].lidclosed == true)
+                throw new Error("Observation must not have 'lidclosed'== true " +
+                                "if 'task' == 'data' ");
             break;
 
@@ -75 +82 @@
 
         case 'RATESCAN':
-            if (ret[i].source == undefined && (ret[i].ra == undefined || ret[i].dec == undefined))
+            if (ret[i].source == undefined && (isNaN(ret[i].ra) || isNaN(ret[i].dec)))
                 throw new Error("Observation must have either 'source' or 'ra' & 'dec' " +
                                 "if 'task' == 'ratescan'");
+            if (ret[i].lidclosed == true)
+                throw new Error("Observation must not have 'lidclosed'== true " +
+                                "if 'task' == 'ratescan' ");
+            break;
+
+        case 'RATESCAN2':
+            if ((ret[i].lidclosed != true) && ret[i].source == undefined && (isNaN(ret[i].ra) || isNaN(ret[i].dec)))
+                throw new Error("Observation must have either 'source' or 'ra' & 'dec' " +
+                                "if 'task' == 'ratescan2' and lidclosed==false or not given");
+            if (ret[i].lidclosed == true && (isNaN(ret[i].az) || isNaN(ret[i].az)))
+                throw new Error("Observation must have 'zd' & 'az' " +
+                                "if 'task' == 'ratescan2' and option 'lidclosed'=='true'");
             break;