Changeset 40403 for trunk

Timestamp:

Apr 23, 2018, 4:52:59 PM (8 years ago)

Author:

watersc1

Message:

Fixed end-of-night date calculation. Should now trigger automatically at 7:30AM HST

Location:

trunk/ippScripts/scripts

Files:

• camera_exp.pl (modified) (1 diff)
• detrend_norm_calc.pl (modified) (2 diffs)
• nightly_science.pl (modified) (4 diffs)

trunk/ippScripts/scripts/camera_exp.pl

@@ -404 +404 @@
 
     # Construct FPA continuity corrected background images
-    if (($camera =~ /ISP/)||($camera =~ /HSC/)) {
+    if (($camera =~ /ISP/)||($camera =~ /HSC/)||($camera =~ /gpc2/i)) {
         print "Skipping FPA continuity corrected background images for ISP\n";
     } elsif ($do_bkg) {

trunk/ippScripts/scripts/detrend_norm_calc.pl

@@ -199 +199 @@
         if ($normalisation == 0.0 or lc($normalisation) eq 'nan') {
             warn("Class $className has bad normalisation: $normalisation");
-            exit($PS_EXIT_SYS_ERROR);
+            $normalisation = 1.0;
+#            exit($PS_EXIT_SYS_ERROR);
         }
 
@@ -225 +226 @@
         if ($normalisation == 0.0 or lc($normalisation) eq 'nan') {
             warn("Class $className has bad normalisation: $normalisation");
-            exit($PS_EXIT_SYS_ERROR);
+            $normalisation = 1.0;
+#            exit($PS_EXIT_SYS_ERROR);
         }
         print "$className : $normalisation\n";

trunk/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);
@@ -256 +256 @@
     $date = $datetime->ymd();
 }
+$now = DateTime->now(time_zone => 'UTC');
 
 if (defined($this_target_only)) {
@@ -2118 +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) {
@@ -2146 +2147 @@
         return("END_OF_NIGHT");
     }
-#    print "$datetime $eon_dt\n";
-    if (DateTime->compare($datetime,$eon_dt) < 1) {
+#    print "$now $eon_dt " . DateTime->compare($now,$eon_dt) . "\n";
+    if (DateTime->compare($now,$eon_dt) < 1) {
         return("OBSERVING");
     }