Changeset 19716 for trunk

Timestamp:

10/04/19 20:47:00 (5 years ago)

Author:

tbretz

Message:

Use a new flag from the DB to decice if this source followws sattelite pointings.

File:

• trunk/FACT++/src/scheduler.cc (modified) (4 diffs)

trunk/FACT++/src/scheduler.cc

@@ -426 +426 @@
         int16_t key { -1 };
         bool isToO { false };
+        bool satellite; { false };
     };
 
@@ -458 +459 @@
             " fSourceName,\n"
             " ADIST(fDeclination, fRightAscension*15, "+to_string(dec)+", "+to_string(ra)+") AS Dist,\n"
-            " fIsToO\n"
+            " fIsToO,\n"
+            " fFollowSatellite\n"
             "FROM Source\n"
             "WHERE fSourceTypeKEY=1\n"
@@ -482 +484 @@
                 source.key   = res1[0]["fSourceKey"];
                 source.isToO = res1[0]["fIsToO"];
+                source.satellite= res1[0]["fFollowSatellite"];
 
                 Warn("Sources closer than "+Tools::Form("%.2f", check_dist)+"\u00b0 detected.");
@@ -672 +675 @@
             // For non prioritized sources we require a threshold <3
             // and for prioritized sources a threshold <10
-            const set<uint16_t> prioritized_sources = { 1, 2, 7 };
-
-            const bool prio = prioritized_sources.find(source.key)!=prioritized_sources.end();
 
             // Special check for the threshold. Threshold condition atm only
             // applies for pointings and is different for prioritized sources
-            if ((check.threshold>3 && !prio) || !check.valid_threshold)
+            if ((check.threshold>3 && !source.satellite) || !check.valid_threshold)
             {
                 Warn(Tools::Form("Relative threshold [%6.2f] too high... skipping.", check.threshold));