Changeset 40483 for branches/czw_branch/20170908/ippScripts/scripts/nightly_science.pl

Timestamp:

Jun 27, 2018, 3:31:55 PM (8 years ago)

Author:

eugene

Message:

merge changes from trunk

Location:

branches/czw_branch/20170908

Files:

• . (modified) (1 prop)
• ippScripts/scripts/nightly_science.pl (modified) (5 diffs)

branches/czw_branch/20170908/ippScripts/scripts/nightly_science.pl

@@ -46 +46 @@
 
 # Grab options
-my ( $date, $datetime, $camera, $dbname, $logfile, $verbose, $manual);
+my ( $date, $datetime, $now, $camera, $dbname, $logfile, $verbose, $manual);
 my ( $help, $isburning, $force_stack_count, $force_diff_count, $force_registration, $test_mode, $this_target_only, $this_filter_only, $this_mode_only, $check_mode);
 my ( $registration_status, $burntool_status, $observing_status, $old_date);
@@ -95 +95 @@
            --verbose
            --force_stack_count    Force the chip/warp counts.
-           --force_diff_count    Force the chip/warp counts.
+           --force_diff_count     Force the chip/warp counts.
+           --force_registration   Force registration counts.
            --this_target_only     Process only a single target.
            --this_filter_only     Process only a single filter.
@@ -255 +256 @@
     $date = $datetime->ymd();
 }
+$now = DateTime->now(time_zone => 'UTC');
 
 if (defined($this_target_only)) {
@@ -2117 +2119 @@
                                 month  => $datetime->month,
                                 day    => $datetime->day,
-                                hour   => 6,
+                                hour   => 17, # 7,
                                 minute => 30,
                                 second => 0,
-                                time_zone => 'Pacific/Honolulu');
+                                time_zone => 'UTC');
     
     foreach my $eon (keys %eon_config) {
@@ -2142 +2144 @@
         }
     }   
-#    print "$datetime $eon_dt\n";
-    if (DateTime->compare($datetime,$eon_dt) < 1) {
+    if ($force_registration) {
+        return("END_OF_NIGHT");
+    }
+#    print "$now $eon_dt " . DateTime->compare($now,$eon_dt) . "\n";
+    if (DateTime->compare($now,$eon_dt) < 1) {
         return("OBSERVING");
     }