Changeset 18418 for trunk

Timestamp:

01/26/16 14:12:42 (9 years ago)

Author:

tbretz

Message:

Fixed a bug which was introduced with the simplification of the code, the threshold wasn't calculated anymore at all.

File:

• trunk/FACT++/src/makeschedule.cc (modified) (3 diffs)

trunk/FACT++/src/makeschedule.cc

@@ -216 +216 @@
         return penalty*ratio*pow(current/6.2, 0.394);
     }
+
+    bool calcThreshold(const SolarObjects &so)
+    {
+        const HrzPosn hrz     = GetHrzFromEqu(equ, so.fJD);
+        const double  current = FACT::PredictI(so, equ);
+
+        if (current>max_current)
+            return false;
+
+        if (hrz.alt<=0 || 90-hrz.alt>max_zd)
+            return false;
+
+        if (maxzd.valid && 90-hrz.alt>maxzd.val)
+            return false;
+
+        if (maxcurrent.valid && current>maxcurrent.val)
+            return false;
+
+        const double ratio = pow(cos((90-hrz.alt)*M_PI/180), -2.664);
+        threshold = penalty*ratio*pow(current/6.2, 0.394);
+
+        return true;
+    }
 };
 
@@ -565 +588 @@
         for (auto& src: sources)
         {
-            if (src.valid(so))
+            if (src.calcThreshold(so))
                 vis.emplace_back(src);
         }
@@ -608 +631 @@
     // ---------------------------------------------------------------------
 
+    cout << endl;
     Print(obs, startup_offset);
     cout << endl;