Changeset 22430 for trunk/ippScripts/scripts/detrend_norm_apply.pl

Timestamp:

Feb 24, 2009, 12:00:25 PM (17 years ago)

Author:

Paul Price

Message:

Adding handling for missed exceptions, similar to register_imfile.pl --- the idea is to have exceptions trigger the my_die functions so that errors are recorded in the database, and don't go on forever.

File:

• trunk/ippScripts/scripts/detrend_norm_apply.pl (modified) (7 diffs)

trunk/ippScripts/scripts/detrend_norm_apply.pl

@@ -22 +22 @@
 use Getopt::Long qw( GetOptions :config auto_help auto_version gnu_getopt );
 use Pod::Usage qw( pod2usage );
+
+# Look for programs we need
+my $missing_tools;
+my $dettool = can_run('dettool') or (warn "Can't find dettool" and $missing_tools = 1);
+my $ppImage = can_run('ppImage') or (warn "Can't find ppImage" and $missing_tools = 1);
+my $ppStatsFromMetadata = can_run('ppStatsFromMetadata') or (warn "Can't find ppStatsFromMetadata" and $missing_tools = 1);
+if ($missing_tools) {
+    warn("Can't find required tools.");
+    exit($PS_EXIT_CONFIG_ERROR);
+}
 
 # Parse the command-line
@@ -54 +64 @@
     defined $outroot;
 
+# Unhandled exceptions should be passed on to my_die so they get pushed into the database
+$SIG{__DIE__} = sub { die @_ if $^S;
+                      my_die( $_[0], $det_id, $iter, $class_id, $PS_EXIT_UNKNOWN_ERROR ); };
+
 $ipprc->define_camera($camera);
 
-my $logDest = $ipprc->filename("LOG.IMFILE", $outroot, $class_id) 
+my $logDest = $ipprc->filename("LOG.IMFILE", $outroot, $class_id)
         or &my_die("Missing entry from camera config", $det_id, $iter, $class_id, $PS_EXIT_CONFIG_ERROR);
 $ipprc->redirect_output($logDest) if $redirect;
@@ -64 +78 @@
 # Define which detrend types we normalise
 use constant DETTYPE => {
-    'bias'             => 'bias',
-    'dark'             => 'dark',   
+    'bias'             => 'bias',
+    'dark'             => 'dark',
     'dark_premask'     => 'dark',
-    'shutter'          => 'shutter',
+    'shutter'          => 'shutter',
     'flat_premask'     => 'flat',
     'domeflat_premask' => 'flat',
@@ -73 +87 @@
     'flat_raw'         => 'flat',
     'domeflat_raw'     => 'flat',
-    'skyflat_raw'      => 'flat',   
-    'flat'             => 'flat',
-    'domeflat'         => 'flat',
-    'skyflat'          => 'flat',   
-    'fringe'           => 'fringe',   
-    'mask'             => 'mask',
-    'darkmask'         => 'mask',
-    'flatmask'         => 'mask',
-    }; 
+    'skyflat_raw'      => 'flat',
+    'flat'             => 'flat',
+    'domeflat'         => 'flat',
+    'skyflat'          => 'flat',
+    'fringe'           => 'fringe',
+    'mask'             => 'mask',
+    'darkmask'         => 'mask',
+    'flatmask'         => 'mask',
+    };
 
 # convert supplied detrend type to a controlled namespace
 &my_die("Unrecognised detrend type: $det_type", $det_id, $iter, $class_id, $PS_EXIT_PROG_ERROR) unless exists DETTYPE()->{lc($det_type)};
 my $det_type_real = DETTYPE()->{lc($det_type)};
-
-# Look for programs we need
-my $missing_tools;
-my $dettool = can_run('dettool') or (warn "Can't find dettool" and $missing_tools = 1);
-my $ppImage = can_run('ppImage') or (warn "Can't find ppImage" and $missing_tools = 1);
-my $ppStatsFromMetadata = can_run('ppStatsFromMetadata') or (warn "Can't find ppStatsFromMetadata" and $missing_tools = 1);
-if ($missing_tools) {
-    warn("Can't find required tools.");
-    exit($PS_EXIT_CONFIG_ERROR);
-}
 
 &my_die("Couldn't find input file: $input_uri\n", $det_id, $iter, $class_id, $PS_EXIT_SYS_ERROR) unless $ipprc->file_exists($input_uri);
@@ -124 +128 @@
     # we cannot use ppImage to load a normalized mask : just copy it and build the jpeg images
     if ($det_type_real eq 'mask') {
-        $RECIPE_PPIMAGE = 'PPIMAGE_BIN';
-        my $input_real = $ipprc->file_resolve($input_uri, 0);
-        my $output_real = $ipprc->file_resolve($output, 1);
-        system ("cp $input_real $output_real");
+        $RECIPE_PPIMAGE = 'PPIMAGE_BIN';
+        my $input_real = $ipprc->file_resolve($input_uri, 0);
+        my $output_real = $ipprc->file_resolve($output, 1);
+        system ("cp $input_real $output_real");
     }
 
@@ -162 +166 @@
     }
     foreach my $line (@$stdout_buf) {
-        $cmdflags .= " $line";
+        $cmdflags .= " $line";
     }
     chomp $cmdflags;
@@ -204 +208 @@
         $command .= " -iteration $iter";
         $command .= " -class_id $class_id";
-        $command .= " -path_base $outroot";
+        $command .= " -path_base $outroot";
         $command .= " -code $exit_code";
         $command .= " -dbname $dbname" if defined $dbname;