Changeset 19583

Timestamp:

09/01/19 11:21:50 (5 years ago)

Author:

tbretz

Message:

Added some comments in the code and minor changes to the output.

File:

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

trunk/FACT++/src/scheduler.cc

@@ -751 +751 @@
         }
 
+        // `Reschedule`:  Start time before            end time of ToO (type==data)
+        // `Following`:   Start time after             end time of ToO (type==any)
+        // `Delete`:      Start time between start and end time of ToO (type==data)
+
         vector<string> list;
 
-        int32_t firstdata  = -1;
-        int32_t reschedule = -1;
-        int32_t following  = -1;
-        int32_t last_resch = -1;
+        int32_t firstdata  = -1;  // First observation with type==data
+        int32_t reschedule = -1;  // Last  observation with: Start time before end time of ToO (type==data)
+        int32_t following  = -1;  // First observation with: Start time after  end time of ToO (type==any)
+        int32_t last_resch = -1;  // Last  observation with: Start time before end time of ToO (type=data) and start time not between start and end time of ToO (type==any)
         for (size_t i=0; i<resS.num_rows(); i++)
         {
@@ -1103 +1107 @@
         const CheckVisibility check(conditions, grb.ra, grb.dec);
 
-        Info("Sun altitude:  "+Tools::Form("%5.1f\u00b0 ", check.solarobj.fSunHrz.alt)+(check.valid_sun?"OK    ":"failed")+Tools::Form(" [alt < %5.1f\u00b0]", conditions[kSunMax]));
+        Info("Sun altitude:  "+Tools::Form("%5.1f\u00b0   ", check.solarobj.fSunHrz.alt)+(check.valid_sun?"OK    ":"failed")+Tools::Form(" [alt < %5.1f\u00b0]", conditions[kSunMax]));
         if (check.valid_sun)
         {
-            Info("Moon distance: "+Tools::Form("%5.1f\u00b0 ", check.moon_dist)  +(check.valid_moon   ?"OK    ":"failed")+Tools::Form(" [%5.1f\u00b0 < d < %5.1f\u00b0]", conditions[kMoonMin], conditions[kMoonMax]));
-            Info("Zenith angle:  "+Tools::Form("%5.1f\u00b0 ", check.position.zd)+(check.valid_zd     ?"OK    ":"failed")+Tools::Form(" [zd < %5.1f\u00b0]", conditions[kZenithMax]));
-            Info("Current:       "+Tools::Form("%5.1f\u00b5A", check.current)    +(check.valid_current?"OK    ":"failed")+Tools::Form(" [I < %5.1f\u00b5A]", conditions[kCurrentMax]));
+            Info("Moon distance: "+Tools::Form("%5.1f\u00b0   ", check.moon_dist)  +(check.valid_moon   ?"OK    ":"failed")+Tools::Form(" [%5.1f\u00b0 < d < %5.1f\u00b0]", conditions[kMoonMin], conditions[kMoonMax]));
+            Info("Zenith angle:  "+Tools::Form("%5.1f\u00b0   ", check.position.zd)+(check.valid_zd     ?"OK    ":"failed")+Tools::Form(" [zd < %5.1f\u00b0]", conditions[kZenithMax]));
+            Info("Current:       "+Tools::Form("%5.1f\u00b5A  ", check.current)    +(check.valid_current?"OK    ":"failed")+Tools::Form(" [I < %5.1f\u00b5A]", conditions[kCurrentMax]));
             //Info(string("Rel. threshold: ")+(check.valid_threshold?"OK    ":"failed")+" ["+Tools::Form("%5.1f", check.threshold)+"]");
         }