Changeset 40483 for branches/czw_branch/20170908/ippScripts

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/Build.PL (modified) (1 diff)
• ippScripts/scripts/camera_exp.pl (modified) (1 diff)
• ippScripts/scripts/chip_imfile.pl (modified) (3 diffs)
• ippScripts/scripts/ipp_cleanup.pl (modified) (1 diff)
• ippScripts/scripts/ipp_filename.pl (modified) (2 diffs)
• ippScripts/scripts/night_report.pl (copied) (copied from trunk/ippScripts/scripts/night_report.pl )
• ippScripts/scripts/nightly_science.pl (modified) (5 diffs)
• ippScripts/scripts/rawcheck_mddb.pl (copied) (copied from trunk/ippScripts/scripts/rawcheck_mddb.pl )

branches/czw_branch/20170908/ippScripts/Build.PL

@@ -115 +115 @@
         scripts/automate_stacks.pl
         scripts/nightly_science.pl
+        scripts/night_report.pl
         scripts/lossy_compress_imfile.pl
         scripts/rawcheck.pl

branches/czw_branch/20170908/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) {

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

@@ -632 +632 @@
                 if ($gone) {
                     carp "WARNING: photometry sources storage object exists but all instances are permanently gone";
+                    $ipprc->file_rename($outputSources,$outputSources . ".gone");
                     $make_sources = 1;
                 }
@@ -657 +658 @@
             if ($gone) {
                 carp "WARNING: PSF storage object exists but all instances are permanently gone";
+                $ipprc->file_rename($outputPsf,$outputPsf . ".gone");
                 $make_psf = 1;
             }
@@ -742 +744 @@
             print STDERR "$file is on $volume which is gone\n";
             $numGone++;
+        } elsif ($answer eq 'permanently') {
+            $numGone++;
         } elsif ($answer eq 'available') {
             $numNotGone++;

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

@@ -27 +27 @@
 # turn this on the set the state to error_state when errors occur cleaning up individual components
 # We may stop doing this
-my $set_error_state_for_run = 1;
+my $set_error_state_for_run = 0;
 
 # this gets set to 1 the first time we set the corresponding destreak run to be cleaned

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

@@ -10 +10 @@
 #print "$ENV{'PATH'}\n";
 #print "$ENV{'PERL5LIB'}\n";
+#print "NEB_SERVER: $ENV{'NEB_SERVER'}<br>\n";
 
-# CZW: This is a horrible hack, but I don't want to have to debug all of ippMonitor to figure out why it's not working.
+# EAM: check for missing NEB_SERVER and exit with an error
 unless (defined($ENV{'NEB_SERVER'})) {
-    $ENV{'NEB_SERVER'} = 'http://nebserver.ipp.ifa.hawaii.edu:80/nebulous';
+    print "NEB_SERVER not defined in ipp_filename.pl\n";
+    exit (5);
 }
-
+if ($ENV{'NEB_SERVER'} eq "") {
+    print "NEB_SERVER not set in ipp_filename.pl\n";
+    exit (6);
+}
 
 use PS::IPP::Config;
@@ -52 +57 @@
 
 my $realname = $ipprc->file_resolve( $filename, $touch );
+if (not defined $realname) {
+    print "nebulous file $filename not found\n";
+    exit (1);
+}
+
 print "$realname\n";
 

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");
     }