Changeset 18172 for trunk/FACT++

Timestamp:

04/20/15 08:02:37 (10 years ago)

Author:

dneise

Message:

Also this file has been changed by Daniela Dorner in February, while introducing the new CUSTOM run feature. It has been tested now since quite a while, so I take the liberty to check it in.

File:

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

trunk/FACT++/scripts/Observation_class.js

@@ -43 +43 @@
         ret[i].zd     = parseFloat(obs.zd);
         ret[i].az     = parseFloat(obs.az);
+        ret[i].time   = parseInt(obs.time);
+        ret[i].threshold = parseInt(obs.threshold);
         ret[i].lidclosed = obs.lidclosed;
+        ret[i].biason = obs.biason;
         ret[i].rstype = obs.rstype ? obs.rstype : "default";
         ret[i].sub    = i;
@@ -57 +60 @@
             return rc;
         }
-    
+
         switch (ret[i].task)
         {
@@ -99 +102 @@
             break;
 
+        case 'CUSTOM':
+
+            if (isNaN(ret[i].az) || isNaN(ret[i].az) || isNaN(ret[i].time) || isNaN(ret[i].threshold))
+                throw new Error("Observation must have 'zd' & 'az', 'time' and 'threshold' " +
+                                "if 'task' == 'custom' ");
+            break;
+
         case 'SINGLEPE':
         case 'OVTEST':