Changeset 22430

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.

Location:

trunk/ippScripts/scripts

Files:

• camera_exp.pl (modified) (6 diffs)
• chip_imfile.pl (modified) (5 diffs)
• detrend_correct_imfile.pl (modified) (9 diffs)
• detrend_norm_apply.pl (modified) (7 diffs)
• detrend_norm_calc.pl (modified) (9 diffs)
• detrend_norm_exp.pl (modified) (3 diffs)
• detrend_process_exp.pl (modified) (3 diffs)
• detrend_process_imfile.pl (modified) (4 diffs)
• detrend_reject_exp.pl (modified) (4 diffs)
• detrend_resid_exp.pl (modified) (3 diffs)
• detrend_resid_imfile.pl (modified) (5 diffs)
• detrend_stack.pl (modified) (5 diffs)
• diff_skycell.pl (modified) (13 diffs)
• fake_imfile.pl (modified) (3 diffs)
• magic_destreak.pl (modified) (6 diffs)
• magic_mask.pl (modified) (3 diffs)
• magic_process.pl (modified) (6 diffs)
• magic_tree.pl (modified) (6 diffs)
• register_exp.pl (modified) (5 diffs)
• stack_skycell.pl (modified) (6 diffs)
• warp_overlap.pl (modified) (2 diffs)
• warp_skycell.pl (modified) (3 diffs)

trunk/ippScripts/scripts/camera_exp.pl

@@ -27 +27 @@
 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 $camtool = can_run('camtool') or (warn "Can't find camtool" and $missing_tools = 1);
+my $ppImage = can_run('ppImage') or (warn "Can't find ppImage" and $missing_tools = 1);
+my $ppConfigDump = can_run('ppConfigDump') or (warn "Can't find ppConfigDump" and $missing_tools = 1);
+my $ppStatsFromMetadata = can_run('ppStatsFromMetadata') or (warn "Can't find ppStatsFromMetadata" and $missing_tools = 1);
+my $psastro = can_run('psastro') or (warn "Can't find psastro" and $missing_tools = 1);
+my $addstar = can_run('addstar') or (warn "Can't find addstar" and $missing_tools = 1);
+if ($missing_tools) {
+    warn("Can't find required tools.");
+    exit($PS_EXIT_CONFIG_ERROR);
+}
 
 my ( $exp_tag, $cam_id, $camera, $outroot, $recipe, $dbname, $reduction, $dvodb, $verbose, $no_update,
@@ -57 +70 @@
     defined $camera;
 
+# 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], $cam_id, $PS_EXIT_UNKNOWN_ERROR ); };
+
 $ipprc->define_camera($camera);
 
@@ -84 +101 @@
 my $recipe_addstar = $ipprc->reduction($reduction, 'ADDSTAR'); # Recipe to use
 &my_die("Unrecognised ADDSTAR recipe", $cam_id, $PS_EXIT_CONFIG_ERROR) unless defined $recipe1;
-
-# Look for programs we need
-my $missing_tools;
-my $camtool = can_run('camtool') or (warn "Can't find camtool" and $missing_tools = 1);
-my $ppImage = can_run('ppImage') or (warn "Can't find ppImage" and $missing_tools = 1);
-my $ppConfigDump = can_run('ppConfigDump') or (warn "Can't find ppConfigDump" and $missing_tools = 1);
-my $ppStatsFromMetadata = can_run('ppStatsFromMetadata') or (warn "Can't find ppStatsFromMetadata" and $missing_tools = 1);
-
-# test for addstar and psastro:
-my $psastro = can_run('psastro') or (warn "Can't find psastro" and $missing_tools = 1);
-my $addstar = can_run('addstar') or (warn "Can't find addstar" and $missing_tools = 1);
-
-if ($missing_tools) {
-    warn("Can't find required tools.");
-    exit($PS_EXIT_CONFIG_ERROR);
-}
 
 my $mdcParser = PS::IPP::Metadata::Config->new; # Parser for metadata config files
@@ -272 +273 @@
 
         if ($do_stats) {
-            my $fpaStatsReal = $ipprc->file_resolve($fpaStats);
-            &my_die("Couldn't find expected output file: $fpaStats", $cam_id, $PS_EXIT_SYS_ERROR) unless -f $fpaStatsReal;
-
-            # parse stats from metadata
-            $command = "$ppStatsFromMetadata $fpaStatsReal - CAMERA_EXP_FPA";
-            ( $success, $error_code, $full_buf, $stdout_buf, $stderr_buf ) =
-                run(command => $command, verbose => $verbose);
-            unless ($success) {
-                $error_code = (($error_code >> 8) or $PS_EXIT_PROG_ERROR);
-                &my_die("Unable to perform ppStatsFromMetadata: $error_code", $cam_id, $error_code);
-            }
-            foreach my $line (@$stdout_buf) {
-                $cmdflags .= " $line";
-            }
-            chomp $cmdflags;
+            my $fpaStatsReal = $ipprc->file_resolve($fpaStats);
+            &my_die("Couldn't find expected output file: $fpaStats", $cam_id, $PS_EXIT_SYS_ERROR) unless -f $fpaStatsReal;
+
+            # parse stats from metadata
+            $command = "$ppStatsFromMetadata $fpaStatsReal - CAMERA_EXP_FPA";
+            ( $success, $error_code, $full_buf, $stdout_buf, $stderr_buf ) =
+                run(command => $command, verbose => $verbose);
+            unless ($success) {
+                $error_code = (($error_code >> 8) or $PS_EXIT_PROG_ERROR);
+                &my_die("Unable to perform ppStatsFromMetadata: $error_code", $cam_id, $error_code);
+            }
+            foreach my $line (@$stdout_buf) {
+                $cmdflags .= " $line";
+            }
+            chomp $cmdflags;
         }
 
@@ -323 +324 @@
             $command .= " $realFile";
 
-            my $mjd_addstar_start = DateTime->now->mjd;   # MJD of starting script
+            my $mjd_addstar_start = DateTime->now->mjd;   # MJD of starting script
 
             my ( $success, $error_code, $full_buf, $stdout_buf, $stderr_buf ) =
@@ -331 +332 @@
                 &my_die("Unable to perform addstar: $error_code", $cam_id, $error_code);
             }
-            $dtime_addstar = 86400.0*(DateTime->now->mjd - $mjd_addstar_start);   # MJD of starting script
+            $dtime_addstar = 86400.0*(DateTime->now->mjd - $mjd_addstar_start);   # MJD of starting script
         }
     }

trunk/ippScripts/scripts/chip_imfile.pl

@@ -25 +25 @@
 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 $chiptool = can_run('chiptool') or (warn "Can't find chiptool" and $missing_tools = 1);
+my $ppImage = can_run('ppImage') or (warn "Can't find ppImage" and $missing_tools = 1);
+my $ppConfigDump = can_run('ppConfigDump') or (warn "Can't find ppConfigDump" 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 arguments
@@ -53 +64 @@
     defined $chip_id and
     defined $class_id and
-    defined $chip_imfile_id and 
+    defined $chip_imfile_id and
     defined $uri and
     defined $camera and
     defined $outroot and
     defined $run_state;
+
+# 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], $exp_id, $chip_id, $class_id, $PS_EXIT_UNKNOWN_ERROR ); };
 
 $ipprc->define_camera($camera);
@@ -69 +84 @@
     print STDOUT "Starting script $0 on $host\n\n";
     print STDOUT "COMMAND IS: @ARGV\n\n";
-}
-
-# Look for programs we need
-my $missing_tools;
-my $chiptool = can_run('chiptool') or (warn "Can't find chiptool" and $missing_tools = 1);
-my $ppImage = can_run('ppImage') or (warn "Can't find ppImage" and $missing_tools = 1);
-my $ppConfigDump = can_run('ppConfigDump') or (warn "Can't find ppConfigDump" 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);
 }
 
@@ -132 +136 @@
         $command .= " -threads $threads" if defined $threads;
         $command .= " -dbname $dbname" if defined $dbname;
-        $command .= " -image_id $chip_imfile_id" if defined $chip_imfile_id;
-        $command .= " -source_id $source_id" if defined $source_id;
+        $command .= " -image_id $chip_imfile_id" if defined $chip_imfile_id;
+        $command .= " -source_id $source_id" if defined $source_id;
         $command .= " -dumpconfig $configuration";
         $command .= " -tracedest $traceDest -log $logDest";
@@ -142 +146 @@
         $command .= " -threads $threads" if defined $threads;
         $command .= " -dbname $dbname" if defined $dbname;
-        $command .= " -image_id $chip_imfile_id" if defined $chip_imfile_id;
-        $command .= " -source_id $source_id" if defined $source_id;
+        $command .= " -image_id $chip_imfile_id" if defined $chip_imfile_id;
+        $command .= " -source_id $source_id" if defined $source_id;
         $command .= " -tracedest $traceDest -log $logDest";
         $command .= " -Db PPIMAGE:PHOTOM FALSE";

trunk/ippScripts/scripts/detrend_correct_imfile.pl

@@ -24 +24 @@
 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 $dvoApplyCorr = can_run('dvoApplyCorr') or (warn "Can't find dvoApplyCorr" and $missing_tools = 1);
+if ($missing_tools) {
+    warn("Can't find required tools.");
+    exit($PS_EXIT_CONFIG_ERROR);
+}
+
 my ( $det_id, $class_id, $det_type, $input_uri, $camera, $dbname,
      $verbose, $no_update, $no_op, $outroot, $redirect, $corr_uri );
@@ -43 +52 @@
 pod2usage( -msg => "Unknown option: @ARGV", -exitval => 2 ) if @ARGV;
 pod2usage( -msg => "Required options: --det_id --class_id --det_type --input_uri --camera --outroot",
-           -exitval => 3)
+           -exitval => 3)
     unless defined $det_id
     and defined $class_id
@@ -50 +59 @@
     and defined $outroot
     and defined $camera;
+
+# 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, $class_id, $PS_EXIT_UNKNOWN_ERROR ); };
 
 # XXX this exits with status = 0 on failure
@@ -60 +73 @@
 }
 
-# Recipes to use as a function of detrend type 
-# XXX there are no recipe options for dvoApplyCorr... 
+# Recipes to use as a function of detrend type
+# XXX there are no recipe options for dvoApplyCorr...
 # XXX in the future, we may define corrections other than the flat-field correction
 # $reduction = "DETREND" unless defined $reduction;
@@ -69 +82 @@
 # det_type is type of the CORRECTED (output) file
 if ($det_type ne "FLAT") { warn ("unexpected input detrend type: correcting data of type $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 $dvoApplyCorr = can_run('dvoApplyCorr') or (warn "Can't find dvoApplyCorr" 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, $class_id, $PS_EXIT_SYS_ERROR) unless $ipprc->file_exists($input_uri);
@@ -91 +95 @@
 
     my ( $success, $error_code, $full_buf, $stdout_buf, $stderr_buf ) =
-        run(command => $command, verbose => $verbose);
+        run(command => $command, verbose => $verbose);
     unless ($success) {
-        $error_code = (($error_code >> 8) or $PS_EXIT_PROG_ERROR);
-        &my_die("Unable to perform ppImage: $error_code", $det_id, $class_id, $error_code);
+        $error_code = (($error_code >> 8) or $PS_EXIT_PROG_ERROR);
+        &my_die("Unable to perform ppImage: $error_code", $det_id, $class_id, $error_code);
     }
 
@@ -111 +115 @@
 unless ($no_update) {
     my ( $success, $error_code, $full_buf, $stdout_buf, $stderr_buf ) =
-        run(command => $command, verbose => $verbose);
+        run(command => $command, verbose => $verbose);
     unless ($success) {
-        $error_code = (($error_code >> 8) or $PS_EXIT_PROG_ERROR);
-        warn("Unable to perform dettool -addcorrectimfile: $error_code\n");
-        exit($error_code);
+        $error_code = (($error_code >> 8) or $PS_EXIT_PROG_ERROR);
+        warn("Unable to perform dettool -addcorrectimfile: $error_code\n");
+        exit($error_code);
     }
 } else {
@@ -124 +128 @@
 {
     my $msg = shift; # Warning message on die
-    my $det_id = shift;         # Detrend identifier
+    my $det_id = shift;         # Detrend identifier
     my $class_id = shift; # Class identifier
     my $exit_code = shift; # Exit code to add
@@ -130 +134 @@
     carp($msg);
     if (defined $det_id and defined $class_id and not $no_update) {
-        my $command = "$dettool -addcorrectimfile";
-        $command .= " -det_id $det_id";
-        $command .= " -class_id $class_id";
-        $command .= " -path_base $outroot";
-        $command .= " -code $exit_code";
-        $command .= " -dbname $dbname" if defined $dbname;
+        my $command = "$dettool -addcorrectimfile";
+        $command .= " -det_id $det_id";
+        $command .= " -class_id $class_id";
+        $command .= " -path_base $outroot";
+        $command .= " -code $exit_code";
+        $command .= " -dbname $dbname" if defined $dbname;
         system ($command);
     }

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;

trunk/ippScripts/scripts/detrend_norm_calc.pl

@@ -25 +25 @@
 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 $ppNormCalc = can_run('ppNormCalc') or (warn "Can't find ppNormCalc" and $missing_tools = 1);
+if ($missing_tools) {
+    warn("Can't find required tools.");
+    exit($PS_EXIT_CONFIG_ERROR);
+}
+
 # Parse command-line arguments
 my ($det_id, $iter, $detType, $outroot, $dbname, $verbose, $no_update, $no_op, $redirect );
 GetOptions(
-    'det_id|d=s'        => \$det_id,    # Detrend id                         
-    'iteration|i=s'     => \$iter,      # Iteration                          
-    'det_type|t=s'      => \$detType,   # Detrend type                       
-    'outroot|w=s'       => \$outroot,   # output file base name
-    'dbname|d=s'        => \$dbname,    # Database name                      
-    'verbose'           => \$verbose,   # Print to stdout
-    'no-update'         => \$no_update, # Don't update the database?         
-    'no-op'             => \$no_op,     # Don't do operations                
+    'det_id|d=s'        => \$det_id,    # Detrend id
+    'iteration|i=s'     => \$iter,      # Iteration
+    'det_type|t=s'      => \$detType,   # Detrend type
+    'outroot|w=s'       => \$outroot,   # output file base name
+    'dbname|d=s'        => \$dbname,    # Database name
+    'verbose'           => \$verbose,   # Print to stdout
+    'no-update'         => \$no_update, # Don't update the database?
+    'no-op'             => \$no_op,     # Don't do operations
     'redirect-output'   => \$redirect,
     ) or pod2usage( 2 );
@@ -41 +50 @@
 pod2usage( -msg => "Unknown option: @ARGV", -exitval => 2 ) if @ARGV;
 pod2usage( -msg => "Required options --det_id --iteration --det_type --outroot",
-           -exitval => 3,
-           ) unless 
-    defined $det_id  and 
-    defined $iter    and 
+           -exitval => 3,
+           ) unless
+    defined $det_id  and
+    defined $iter    and
     defined $detType and
     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, $PS_EXIT_UNKNOWN_ERROR ); };
+
 my $logfile = $outroot . ".log";
 
@@ -56 +69 @@
 # Define which detrend types we normalise
 use constant NORMALIZE => {
-    'bias'             => 0,
-    'dark'             => 0,   
+    'bias'             => 0,
+    'dark'             => 0,
     'dark_premask'     => 0,
-    'shutter'          => 0,
+    'shutter'          => 0,
     'flat_premask'     => 1,
     'domeflat_premask' => 1,
@@ -66 +79 @@
     'domeflat_raw'     => 1,
     'skyflat_raw'      => 1,
-    'flat'             => 1,
-    'domeflat'         => 1,
-    'skyflat'          => 1,   
-    'fringe'           => 0,   
-    'mask'             => 0,
-    'darkmask'         => 0,
-    'flatmask'         => 0,
-    }; 
-
-# Look for programs we need
-my $missing_tools;
-my $dettool = can_run('dettool') or (warn "Can't find dettool" and $missing_tools = 1);
-my $ppNormCalc = can_run('ppNormCalc') or (warn "Can't find ppNormCalc" and $missing_tools = 1);
-if ($missing_tools) { 
-    warn("Can't find required tools.");
-    exit($PS_EXIT_CONFIG_ERROR); 
-}
+    'flat'             => 1,
+    'domeflat'         => 1,
+    'skyflat'          => 1,
+    'fringe'           => 0,
+    'mask'             => 0,
+    'darkmask'         => 0,
+    'flatmask'         => 0,
+    };
 
 &my_die("Unrecognised detrend type: $detType", $det_id, $iter, $PS_EXIT_PROG_ERROR) unless exists NORMALIZE()->{lc($detType)};
@@ -89 +93 @@
 
 # Get the list of inputs
-my @files;                      # The input files
+my @files;                      # The input files
 {
     my $command = "$dettool -processedimfile";
@@ -99 +103 @@
     print "Running [$command]...\n" if $verbose;
     if (not run(\@command, \$stdin, \$stdout, \$stderr)) {
-        &my_die("Unable to perform dettool -processedimfile on detrend $det_id/$iter: $?",
-                $det_id, $iter, $PS_EXIT_SYS_ERROR);
+        &my_die("Unable to perform dettool -processedimfile on detrend $det_id/$iter: $?",
+                $det_id, $iter, $PS_EXIT_SYS_ERROR);
     }
     print $stdout . "\n" if $verbose;
-    
+
     # Because of the length, need to split into individual metadatas --- it parses SO much quicker!
     my @whole = split /\n/, $stdout;
     my @single = ();
     while ( scalar @whole > 0 ) {
-        my $value = shift @whole;
-        push @single, $value;
-        if ($value =~ /^\s*END\s*$/) {
-            push @single, "\n";
-
-            my $list = parse_md_list( $mdcParser->parse( join( "\n", @single ) ) );
-            &my_die("Unable to parse output from dettool", $det_id, $iter, $PS_EXIT_PROG_ERROR) unless
-                defined $list;
-            push @files, @$list;
-            @single = ();
-        }
-    }
-}
-
-my $norms;                      # MDC with normalisations
+        my $value = shift @whole;
+        push @single, $value;
+        if ($value =~ /^\s*END\s*$/) {
+            push @single, "\n";
+
+            my $list = parse_md_list( $mdcParser->parse( join( "\n", @single ) ) );
+            &my_die("Unable to parse output from dettool", $det_id, $iter, $PS_EXIT_PROG_ERROR) unless
+                defined $list;
+            push @files, @$list;
+            @single = ();
+        }
+    }
+}
+
+my $norms;                      # MDC with normalisations
 if (NORMALIZE()->{lc($detType)} and not $no_op) {
 
     my %matrix; # Matrix of statistics as a function of exposures and classes
     foreach my $file (@files) {
-        my $exp_id = $file->{'exp_id'}; # Exposure ID
-        my $class_id = $file->{'class_id'}; # Class ID
-        my $stat = $file->{STATISTIC()}; # Statistic of interest
-        
-        # Create matrix elements
-        $matrix{$exp_id} = {} if not defined $matrix{$exp_id};
-        $matrix{$exp_id}->{$class_id} = $stat;
-    }
-    
+        my $exp_id = $file->{'exp_id'}; # Exposure ID
+        my $class_id = $file->{'class_id'}; # Class ID
+        my $stat = $file->{STATISTIC()}; # Statistic of interest
+
+        # Create matrix elements
+        $matrix{$exp_id} = {} if not defined $matrix{$exp_id};
+        $matrix{$exp_id}->{$class_id} = $stat;
+    }
+
     # Generate the input for ppNormCalc
-    my $normData;                       # Normalisation data
+    my $normData;                       # Normalisation data
     foreach my $exp_id (keys %matrix) {
-        $normData .= "$exp_id\tMETADATA\n";
-        foreach my $class_id (keys %{$matrix{$exp_id}}) {
-            $normData .= "\t" . $class_id . "\tF32\t" . $matrix{$exp_id}->{$class_id} . "\n";
-        }
-        $normData .= "END\n\n";
+        $normData .= "$exp_id\tMETADATA\n";
+        foreach my $class_id (keys %{$matrix{$exp_id}}) {
+            $normData .= "\t" . $class_id . "\tF32\t" . $matrix{$exp_id}->{$class_id} . "\n";
+        }
+        $normData .= "END\n\n";
     }
 
     # Run ppNormCalc
     {
-        my ( $stdout, $stderr ); # Buffers for running program
-        my @command = split /\s+/, $ppNormCalc;
-        print "Running [$ppNormCalc]...\n" if $verbose;
-        if (not run(\@command, \$normData, \$stdout, \$stderr)) {
-            &my_die("Unable to perform ppNormCalc: $?", $det_id, $iter, $PS_EXIT_SYS_ERROR);
-        }
-        print $stdout . "\n" if $verbose;
-        
-        # Parse the output
-        $norms = $mdcParser->parse($stdout);
-        &my_die("Unable to parse metadata config doc", $det_id, $iter, $PS_EXIT_PROG_ERROR) unless $norms;
+        my ( $stdout, $stderr ); # Buffers for running program
+        my @command = split /\s+/, $ppNormCalc;
+        print "Running [$ppNormCalc]...\n" if $verbose;
+        if (not run(\@command, \$normData, \$stdout, \$stderr)) {
+            &my_die("Unable to perform ppNormCalc: $?", $det_id, $iter, $PS_EXIT_SYS_ERROR);
+        }
+        print $stdout . "\n" if $verbose;
+
+        # Parse the output
+        $norms = $mdcParser->parse($stdout);
+        &my_die("Unable to parse metadata config doc", $det_id, $iter, $PS_EXIT_PROG_ERROR) unless $norms;
     }
 
 } else {
     # It's something that doesn't need normalisation --- just push in a normalisation of 1
-    my %classes;                # List of unique classes
+    my %classes;                # List of unique classes
     foreach my $file (@files) {
-        my $class_id = $file->{'class_id'}; # Class Id
-        $classes{$class_id} = 1;
-    }
-    
+        my $class_id = $file->{'class_id'}; # Class Id
+        $classes{$class_id} = 1;
+    }
+
     foreach my $class_id (keys %classes) {
-        my %mdValue;    # Metadata value for this class id
-        $mdValue{name} = $class_id;
-        $mdValue{value} = 1.0;
-        push @$norms, \%mdValue;
+        my %mdValue;    # Metadata value for this class id
+        $mdValue{name} = $class_id;
+        $mdValue{value} = 1.0;
+        push @$norms, \%mdValue;
     }
 }
@@ -186 +190 @@
     foreach my $normItem (@$norms) {
 
-        my $className = $normItem->{name}; # Name of component
-        my $normalisation = $normItem->{value}; # Normalisation for component
-
-        if ($normalisation == 0.0 or lc($normalisation) eq 'nan') {
-            warn("Class $className has bad normalisation: $normalisation");
-            exit($PS_EXIT_SYS_ERROR);
-        }
-
-        my $command = $commandBase;
-        $command .= " -class_id $className";
-        $command .= " -norm $normalisation";
-
-        my @command = split /\s+/, $command;
-
-        my ( $stdin, $stdout, $stderr ); # Buffers for running program
-        print "Running [$command]...\n" if $verbose;
-        if (not run \@command, \$stdin, \$stdout, \$stderr) {
-            warn("Unable to perform dettool -addnormstat for $className: $?");
-            exit($PS_EXIT_SYS_ERROR);
-        }
-        print $stdout . "\n" if $verbose;
+        my $className = $normItem->{name}; # Name of component
+        my $normalisation = $normItem->{value}; # Normalisation for component
+
+        if ($normalisation == 0.0 or lc($normalisation) eq 'nan') {
+            warn("Class $className has bad normalisation: $normalisation");
+            exit($PS_EXIT_SYS_ERROR);
+        }
+
+        my $command = $commandBase;
+        $command .= " -class_id $className";
+        $command .= " -norm $normalisation";
+
+        my @command = split /\s+/, $command;
+
+        my ( $stdin, $stdout, $stderr ); # Buffers for running program
+        print "Running [$command]...\n" if $verbose;
+        if (not run \@command, \$stdin, \$stdout, \$stderr) {
+            warn("Unable to perform dettool -addnormstat for $className: $?");
+            exit($PS_EXIT_SYS_ERROR);
+        }
+        print $stdout . "\n" if $verbose;
     }
 } else {
@@ -212 +216 @@
     foreach my $normItem (@$norms) {
 
-        my $className = $normItem->{name}; # Name of component
-        my $normalisation = $normItem->{value}; # Normalisation for component
-
-        if ($normalisation == 0.0 or lc($normalisation) eq 'nan') {
-            warn("Class $className has bad normalisation: $normalisation");
-            exit($PS_EXIT_SYS_ERROR);
-        }
-        print "$className : $normalisation\n";
+        my $className = $normItem->{name}; # Name of component
+        my $normalisation = $normItem->{value}; # Normalisation for component
+
+        if ($normalisation == 0.0 or lc($normalisation) eq 'nan') {
+            warn("Class $className has bad normalisation: $normalisation");
+            exit($PS_EXIT_SYS_ERROR);
+        }
+        print "$className : $normalisation\n";
     }
 }
@@ -225 +229 @@
 sub my_die
 {
-    my $msg = shift;            # Warning message on die
-    my $det_id = shift;         # Detrend identifier
-    my $iter = shift;           # Iteration
-    my $exit_code = shift;      # Exit code to add
+    my $msg = shift;            # Warning message on die
+    my $det_id = shift;         # Detrend identifier
+    my $iter = shift;           # Iteration
+    my $exit_code = shift;      # Exit code to add
 
     carp($msg);
     if (defined $det_id and defined $iter and not $no_update) {
-        my $command = "$dettool -addnormalizedstat";
-        $command .= " -det_id $det_id";
-        $command .= " -iteration $iter";
-        # XXX EAM : we should add this to the db : $command .= " -path_base $outroot";
-        $command .= " -code $exit_code";
-        $command .= " -dbname $dbname" if defined $dbname;
+        my $command = "$dettool -addnormalizedstat";
+        $command .= " -det_id $det_id";
+        $command .= " -iteration $iter";
+        # XXX EAM : we should add this to the db : $command .= " -path_base $outroot";
+        $command .= " -code $exit_code";
+        $command .= " -dbname $dbname" if defined $dbname;
         system ($command);
     }

trunk/ippScripts/scripts/detrend_norm_exp.pl

@@ -24 +24 @@
 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);
+}
 
 my ($det_id, $iter, $det_type, $camera, $outroot, $dbname, $reduction, $verbose, $no_update, $no_op, $redirect, $save_temps);
@@ -50 +60 @@
     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, $PS_EXIT_UNKNOWN_ERROR ); };
+
 my $logfile = $outroot . ".log";
 
@@ -60 +74 @@
 my $recipe = $ipprc->reduction($reduction, uc($det_type) . '_JPEG_IMAGE');
 &my_die("Unrecognised detrend type: $det_type", $det_id, $iter, $PS_EXIT_PROG_ERROR) unless defined $recipe;
-
-# 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);
-}
 
 # Get list of component files

trunk/ippScripts/scripts/detrend_process_exp.pl

@@ -24 +24 @@
 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);
+}
 
 my ( $det_id, $exp_id, $det_type, $exp_tag, $camera, $outroot, $dbname, $reduction, $verbose, $no_update,
@@ -53 +63 @@
     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, $exp_id, $PS_EXIT_UNKNOWN_ERROR ); };
+
 $ipprc->define_camera($camera);
 
@@ -66 +80 @@
 my $recipe = $ipprc->reduction($reduction, uc($det_type) . '_JPEG_IMAGE'); # Recipe to use
 &my_die("Unrecognised detrend type: $det_type", $det_id, $exp_id, $PS_EXIT_PROG_ERROR) unless defined $recipe;
-
-# 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 $cmdflags;

trunk/ippScripts/scripts/detrend_process_imfile.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);
+}
 
 my ( $det_id, $exp_id, $class_id, $det_type, $exp_tag, $input_uri, $camera, $outroot, $dbname, $reduction,
@@ -55 +65 @@
     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, $exp_id, $class_id, $PS_EXIT_UNKNOWN_ERROR ); };
+
 # XXX this exits with status = 0 on failure
 $ipprc->define_camera($camera);
@@ -66 +80 @@
 my $ppimage_recipe = $ipprc->reduction($reduction, uc($det_type) . '_PROCESS'); # Recipe name for ppImage
 my $jpeg_recipe = $ipprc->reduction($reduction, uc($det_type) . '_JPEG_IMAGE'); # Recipe name for JPEG
-
-# 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, $exp_id, $class_id, $PS_EXIT_SYS_ERROR) unless $ipprc->file_exists($input_uri);
@@ -128 +132 @@
     }
     foreach my $line (@$stdout_buf) {
-        $cmdflags .= " $line";
+        $cmdflags .= " $line";
     }
     chomp $cmdflags;

trunk/ippScripts/scripts/detrend_reject_exp.pl

@@ -27 +27 @@
 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);
+if ($missing_tools) {
+    warn("Can't find required tools.");
+    exit($PS_EXIT_CONFIG_ERROR);
+}
 
 my ($det_id, $iter, $det_type, $camera, $outroot, $filter, $dbname, $verbose, $no_update, $no_op, $redirect);
@@ -52 +60 @@
     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, $PS_EXIT_UNKNOWN_ERROR ); };
+
 # check for existing directory, generate if needed
 $ipprc->outroot_prepare($outroot);
@@ -89 +101 @@
 my $rejstats = PS::IPP::Metadata::Stats->new($REJSTATS); # Stats parser
 
-# Look for programs we need
-my $missing_tools;
-my $dettool = can_run('dettool') or (warn "Can't find dettool" and $missing_tools = 1);
-if ($missing_tools) {
-    warn("Can't find required tools.");
-    exit($PS_EXIT_CONFIG_ERROR);
-}
-
 # Get list of component files
 my ($exposures, $command, $success, $error_code, $full_buf, $stdout_buf, $stderr_buf);
@@ -345 +349 @@
         $command .= " -det_id $det_id";
         $command .= " -iteration $iter";
-        # XXX EAM : we should add this to the db : $command .= " -path_base $outroot";
+        # XXX EAM : we should add this to the db : $command .= " -path_base $outroot";
         $command .= " -code $exit_code";
         $command .= " -dbname $dbname" if defined $dbname;

trunk/ippScripts/scripts/detrend_resid_exp.pl

@@ -35 +35 @@
 use Getopt::Long qw( GetOptions :config auto_help auto_version gnu_getopt ); # option parsing
 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 options
@@ -69 +79 @@
     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, $exp_id, $PS_EXIT_UNKNOWN_ERROR ); };
+
 # load IPP config information for the specified camera
 $ipprc->define_camera($camera);
@@ -81 +95 @@
 my $recipe = $ipprc->reduction($reduction, uc($det_type) . '_JPEG_RESID'); # Recipe to use
 &my_die("Unrecognised detrend type: $det_type", $det_id, $iter, $PS_EXIT_PROG_ERROR) unless defined $recipe;
-
-# 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);
-}
 
 # Get list of imfile files

trunk/ippScripts/scripts/detrend_resid_imfile.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 $ppStats = can_run('ppStats') or (warn "Can't find ppStats" 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 ( $det_id, $iter, $ref_det_id, $ref_iter, $exp_id, $exp_tag, $class_id, $det_type, $detrend, $input_uri, $camera, $mode, $outroot,
@@ -65 +76 @@
     defined $detrend;
 
+# 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, $exp_id, $class_id, $PS_EXIT_UNKNOWN_ERROR ); };
+
 $ipprc->define_camera($camera);
 my $logDest     = $ipprc->filename("LOG.IMFILE", $outroot, $class_id);
@@ -109 +124 @@
 };
 
-# 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 $ppStats = can_run('ppStats') or (warn "Can't find ppStats" 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);
-}
-
 # outroot examples (HOST components must be set)
 # file://data/ipp004.0/gpc1/20080130
@@ -179 +183 @@
     }
     foreach my $line (@$stdout_buf) {
-        $cmdflags .= " $line";
+        $cmdflags .= " $line";
     }
     chomp $cmdflags;
@@ -192 +196 @@
     }
     foreach my $line (@$stdout_buf) {
-        $cmdflags .= " $line";
+        $cmdflags .= " $line";
     }
     chomp $cmdflags;

trunk/ippScripts/scripts/detrend_stack.pl

@@ -23 +23 @@
 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 $ppMerge = can_run('ppMerge') or (warn "Can't find ppMerge" 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 ( $det_id, $iter, $class_id, $det_type, $camera, $outroot, $dbname, $reduction, $threads, $verbose, $save_temps,
@@ -59 +69 @@
     or &my_die("Missing entry in file rules", $det_id, $iter, $class_id, $PS_EXIT_CONFIG_ERROR);
 
+# 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 ); };
+
 # optionally redirect the outputs from this script to LOG.IMFILE
 $ipprc->redirect_output($logDest) if $redirect;
@@ -65 +79 @@
 $reduction = "DETREND" unless defined $reduction;
 my $recipe = $ipprc->reduction($reduction, $det_type . '_STACK'); # Recipe name to use
-
-# Look for programs we need
-my $missing_tools;
-my $dettool = can_run('dettool') or (warn "Can't find dettool" and $missing_tools = 1);
-my $ppMerge = can_run('ppMerge') or (warn "Can't find ppMerge" 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);
-}
 
 # The output file rule name depends on the detrend type
@@ -219 +223 @@
     }
     foreach my $line (@$stdout_buf) {
-        $cmdflags .= " $line";
+        $cmdflags .= " $line";
     }
     chomp $cmdflags;
@@ -261 +265 @@
         $command .= " -iteration $iter";
         $command .= " -class_id $class_id";
-        # XXX EAM : we should add this to the db : $command .= " -path_base $outroot";
+        # XXX EAM : we should add this to the db : $command .= " -path_base $outroot";
         $command .= " -code $exit_code";
         $command .= " -dbname $dbname" if defined $dbname;

trunk/ippScripts/scripts/diff_skycell.pl

@@ -27 +27 @@
 use Pod::Usage qw( pod2usage );
 
+# Look for programs we need
+my $missing_tools;
+my $difftool = can_run('difftool') or (warn "Can't find difftool" and $missing_tools = 1);
+my $ppSub = can_run('ppSub') or (warn "Can't find ppSub" 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 ($diff_id, $dbname, $threads, $outroot, $reduction, $verbose, $no_update, $no_op, $redirect);
 my ($skycell_id, $diff_skyfile_id);
 GetOptions(
     'diff_id=s'         => \$diff_id, # Diff identifier
-    'skycell_id=s'      => \$skycell_id, # Diff identifier
+    'skycell_id=s'      => \$skycell_id, # Skycell identifier
     'diff_skyfile_id=s' => \$diff_skyfile_id, # Diff identifier
     'dbname|d=s'        => \$dbname, # Database name
@@ -52 +62 @@
     and 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], $diff_id, $skycell_id, $PS_EXIT_UNKNOWN_ERROR ); };
+
 # XXX camera is not known here; cannot use filerules...
 # my $logDest = $ipprc->filename("LOG.EXP", $outroot);
-
 my $logDest = "$outroot.log";
 $ipprc->redirect_output($logDest) if $redirect;
 
 my $source_id = $ipprc->source_id($dbname, $PS_TABLE_ID_DIFF);
-
-# Look for programs we need
-my $missing_tools;
-my $difftool = can_run('difftool') or (warn "Can't find difftool" and $missing_tools = 1);
-my $ppSub = can_run('ppSub') or (warn "Can't find ppSub" 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);
-}
 
 # Get list of components for subtraction
@@ -80 +83 @@
     unless ($success) {
         $error_code = (($error_code >> 8) or $PS_EXIT_PROG_ERROR);
-        &my_die("Unable to perform difftool -inputskyfile: $error_code", $diff_id, $error_code);
+        &my_die("Unable to perform difftool -inputskyfile: $error_code", $diff_id, $skycell_id, $error_code);
     }
 
     my $metadata = $mdcParser->parse(join "", @$stdout_buf) or
-        &my_die("Unable to parse metadata config doc", $diff_id, $PS_EXIT_PROG_ERROR);
+        &my_die("Unable to parse metadata config doc", $diff_id, $skycell_id, $PS_EXIT_PROG_ERROR);
     $files = parse_md_list($metadata) or
-        &my_die("Unable to parse metadata list", $diff_id, $PS_EXIT_PROG_ERROR);
-}
-
-&my_die("Subtraction list does not contain exactly two elements", $diff_id, $PS_EXIT_SYS_ERROR) unless
-    scalar @$files == 2;
+        &my_die("Unable to parse metadata list", $diff_id, $skycell_id, $PS_EXIT_PROG_ERROR);
+}
+
+&my_die("Subtraction list does not contain exactly two elements", $diff_id, $skycell_id, $PS_EXIT_SYS_ERROR) unless scalar @$files == 2;
 
 # Identify the input and the template
@@ -123 +125 @@
     }
     if (defined $tess_id) {
-        &my_die("Tesselation identifiers don't match", $diff_id, $PS_EXIT_SYS_ERROR) unless
+        &my_die("Tesselation identifiers don't match", $diff_id, $skycell_id, $PS_EXIT_SYS_ERROR) unless
             $file->{tess_id} eq $tess_id;
     } else {
@@ -129 +131 @@
     }
     if (defined $skycell_id) {
-        &my_die("Skycell identifiers don't match", $diff_id, $PS_EXIT_SYS_ERROR) unless
+        &my_die("Skycell identifiers don't match", $diff_id, $skycell_id, $PS_EXIT_SYS_ERROR) unless
             $file->{skycell_id} eq $skycell_id;
     } else {
@@ -135 +137 @@
     }
     if (defined $camera) {
-        &my_die("Cameras don't match", $diff_id, $PS_EXIT_SYS_ERROR) unless $file->{camera} eq $camera;
+        &my_die("Cameras don't match", $diff_id, $skycell_id, $PS_EXIT_SYS_ERROR) unless $file->{camera} eq $camera;
     } else {
         $camera = $file->{camera};
@@ -142 +144 @@
 }
 
-&my_die("Unable to identify template", $diff_id, $PS_EXIT_SYS_ERROR) unless defined $template;
-&my_die("Unable to identify input", $diff_id, $PS_EXIT_SYS_ERROR) unless defined $input;
-&my_die("Unable to identify camera", $diff_id, $PS_EXIT_SYS_ERROR) unless defined $camera;
+&my_die("Unable to identify template", $diff_id, $skycell_id, $PS_EXIT_SYS_ERROR) unless defined $template;
+&my_die("Unable to identify input", $diff_id, $skycell_id, $PS_EXIT_SYS_ERROR) unless defined $input;
+&my_die("Unable to identify camera", $diff_id, $skycell_id, $PS_EXIT_SYS_ERROR) unless defined $camera;
 $ipprc->define_camera($camera);
 
@@ -152 +154 @@
 my $recipe_psphot  = $ipprc->reduction($reduction, 'DIFF_PSPHOT'); # Recipe to use for psphot
 unless ($recipe_ppSub and $recipe_psphot) {
-    &my_die("Couldn't find selected reduction for DIFF_PPSUB and DIFF_PSPHOT: $reduction\n", $diff_id, $PS_EXIT_CONFIG_ERROR);
+    &my_die("Couldn't find selected reduction for DIFF_PPSUB and DIFF_PSPHOT: $reduction\n", $diff_id, $skycell_id, $PS_EXIT_CONFIG_ERROR);
 }
 
@@ -177 +179 @@
 print "templateSources: $templateSources\n";
 
-&my_die("Couldn't find input: $template", $diff_id, $PS_EXIT_SYS_ERROR) unless $ipprc->file_exists($template);
-&my_die("Couldn't find input: $templateMask", $diff_id, $PS_EXIT_SYS_ERROR) unless $ipprc->file_exists($templateMask);
-&my_die("Couldn't find input: $templateVariance", $diff_id, $PS_EXIT_SYS_ERROR) unless $ipprc->file_exists($templateVariance);
-&my_die("Couldn't find input: $input", $diff_id, $PS_EXIT_SYS_ERROR) unless $ipprc->file_exists($input);
-&my_die("Couldn't find input: $inputMask", $diff_id, $PS_EXIT_SYS_ERROR) unless $ipprc->file_exists($inputMask);
-&my_die("Couldn't find input: $inputVariance", $diff_id, $PS_EXIT_SYS_ERROR) unless $ipprc->file_exists($inputVariance);
-&my_die("Couldn't find input: $templateSources", $diff_id, $PS_EXIT_SYS_ERROR) unless $ipprc->file_exists($templateSources);
+&my_die("Couldn't find input: $template", $diff_id, $skycell_id, $PS_EXIT_SYS_ERROR) unless $ipprc->file_exists($template);
+&my_die("Couldn't find input: $templateMask", $diff_id, $skycell_id, $PS_EXIT_SYS_ERROR) unless $ipprc->file_exists($templateMask);
+&my_die("Couldn't find input: $templateVariance", $diff_id, $skycell_id, $PS_EXIT_SYS_ERROR) unless $ipprc->file_exists($templateVariance);
+&my_die("Couldn't find input: $input", $diff_id, $skycell_id, $PS_EXIT_SYS_ERROR) unless $ipprc->file_exists($input);
+&my_die("Couldn't find input: $inputMask", $diff_id, $skycell_id, $PS_EXIT_SYS_ERROR) unless $ipprc->file_exists($inputMask);
+&my_die("Couldn't find input: $inputVariance", $diff_id, $skycell_id, $PS_EXIT_SYS_ERROR) unless $ipprc->file_exists($inputVariance);
+&my_die("Couldn't find input: $templateSources", $diff_id, $skycell_id, $PS_EXIT_SYS_ERROR) unless $ipprc->file_exists($templateSources);
 
 # Get the output filenames
@@ -223 +225 @@
     unless ($success) {
         $error_code = (($error_code >> 8) or $PS_EXIT_PROG_ERROR);
-        &my_die("Unable to perform ppSub: $error_code", $diff_id, $error_code);
-    }
-    &my_die("Couldn't find expected output file: $outputName", $diff_id, $PS_EXIT_SYS_ERROR) unless $ipprc->file_exists($outputName);
-    &my_die("Couldn't find expected output file: $outputMask", $diff_id, $PS_EXIT_SYS_ERROR) unless $ipprc->file_exists($outputMask);
-    &my_die("Couldn't find expected output file: $outputVariance", $diff_id, $PS_EXIT_SYS_ERROR) unless $ipprc->file_exists($outputVariance);
-#    &my_die("Couldn't find expected output file: $outputSources", $diff_id, $PS_EXIT_SYS_ERROR) unless $ipprc->file_exists($outputSources);
-#    &my_die("Couldn't find expected output file: $bin1Name",    $diff_id, $PS_EXIT_SYS_ERROR) unless $ipprc->file_exists($bin1Name);
-#    &my_die("Couldn't find expected output file: $bin2Name",    $diff_id, $PS_EXIT_SYS_ERROR) unless $ipprc->file_exists($bin2Name);
+        &my_die("Unable to perform ppSub: $error_code", $diff_id, $skycell_id, $error_code);
+    }
+    &my_die("Couldn't find expected output file: $outputName", $diff_id, $skycell_id, $PS_EXIT_SYS_ERROR) unless $ipprc->file_exists($outputName);
+    &my_die("Couldn't find expected output file: $outputMask", $diff_id, $skycell_id, $PS_EXIT_SYS_ERROR) unless $ipprc->file_exists($outputMask);
+    &my_die("Couldn't find expected output file: $outputVariance", $diff_id, $skycell_id, $PS_EXIT_SYS_ERROR) unless $ipprc->file_exists($outputVariance);
+#    &my_die("Couldn't find expected output file: $outputSources", $diff_id, $skycell_id, $PS_EXIT_SYS_ERROR) unless $ipprc->file_exists($outputSources);
+#    &my_die("Couldn't find expected output file: $bin1Name",    $diff_id, $skycell_id, $PS_EXIT_SYS_ERROR) unless $ipprc->file_exists($bin1Name);
+#    &my_die("Couldn't find expected output file: $bin2Name",    $diff_id, $skycell_id, $PS_EXIT_SYS_ERROR) unless $ipprc->file_exists($bin2Name);
 
     my $outputStatsReal = $ipprc->file_resolve($outputStats);
-    &my_die("Couldn't find expected output file: $outputStats", $diff_id, $PS_EXIT_SYS_ERROR) unless -f $outputStatsReal;
+    &my_die("Couldn't find expected output file: $outputStats", $diff_id, $skycell_id, $PS_EXIT_SYS_ERROR) unless -f $outputStatsReal;
 
     # measure chip stats
@@ -241 +243 @@
     unless ($success) {
         $error_code = (($error_code >> 8) or $PS_EXIT_PROG_ERROR);
-        &my_die("Unable to perform ppStatsFromMetadata: $error_code", $diff_id, $error_code);
+        &my_die("Unable to perform ppStatsFromMetadata: $error_code", $diff_id, $skycell_id, $error_code);
     }
     foreach my $line (@$stdout_buf) {
@@ -263 +265 @@
         unless ($success) {
             $error_code = (($error_code >> 8) or $PS_EXIT_PROG_ERROR);
-            &my_die("Unable to perform difftool -adddiffskyfile: $error_code", $diff_id, $error_code);
+            &my_die("Unable to perform difftool -adddiffskyfile: $error_code", $diff_id, $skycell_id, $error_code);
         }
     }
@@ -273 +275 @@
     my $msg = shift;            # Warning message on die
     my $diff_id = shift;        # Diff identifier
+    my $skycell_id = shift;     # Skycell identifier
     my $exit_code = shift;      # Exit code to add
 
     warn($msg);
-    if (defined $diff_id and not $no_update) {
+    if (defined $diff_id and defined $skycell_id and not $no_update) {
         my $command = "$difftool -adddiffskyfile -diff_id $diff_id -skycell_id $skycell_id -code $exit_code";
         $command .= (" -dtime_script " . ((DateTime->now->mjd - $mjd_start) * 86400));

trunk/ippScripts/scripts/fake_imfile.pl

@@ -41 +41 @@
 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 $faketool = can_run('faketool') or (warn "Can't find faketool" and $missing_tools = 1);
+my $ppSim = can_run('ppSim') or (warn "Can't find ppSim" and $missing_tools = 1);
+my $ppConfigDump = can_run('ppConfigDump') or (warn "Can't find ppConfigDump" and $missing_tools = 1);
+if ($missing_tools) {
+    warn("Can't find required tools.");
+    exit($PS_EXIT_CONFIG_ERROR);
+}
 
 # Parse the command-line arguments
@@ -72 +82 @@
     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], $exp_id, $fake_id, $class_id, $PS_EXIT_UNKNOWN_ERROR ); };
+
 $ipprc->define_camera($camera);
 
@@ -83 +97 @@
 unless ($recipe) {
     &my_die("Couldn't find selected reduction for FAKE: $reduction\n", $exp_id, $fake_id, $class_id, $PS_EXIT_CONFIG_ERROR);
-}
-
-# Look for programs we need
-my $missing_tools;
-my $faketool = can_run('faketool') or (warn "Can't find faketool" and $missing_tools = 1);
-my $ppSim = can_run('ppSim') or (warn "Can't find ppSim" and $missing_tools = 1);
-my $ppConfigDump = can_run('ppConfigDump') or (warn "Can't find ppConfigDump" and $missing_tools = 1);
-if ($missing_tools) {
-    warn("Can't find required tools.");
-    exit($PS_EXIT_CONFIG_ERROR);
 }
 

trunk/ippScripts/scripts/magic_destreak.pl

@@ -26 +26 @@
 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 $magicdstool   = can_run('magicdstool') or (warn "Can't find magicdstool" and $missing_tools = 1);
+my $streaksremove = can_run('streaksremove') or (warn "Can't find streaksremove" and $missing_tools = 1);
+if ($missing_tools) {
+    warn("Can't find required tools.");
+    exit($PS_EXIT_CONFIG_ERROR);
+}
 
 # Parse the command-line arguments
@@ -66 +75 @@
     defined $component and
     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], $magic_ds_id, $component, $PS_EXIT_UNKNOWN_ERROR ); };
+
 
 my ($skycell_args, $class_id, $skycell_id);
@@ -87 +100 @@
 
 
-# Look for programs we need
-my $missing_tools;
-my $magicdstool   = can_run('magicdstool') or (warn "Can't find magicdstool" and $missing_tools = 1);
-my $streaksremove = can_run('streaksremove') or (warn "Can't find streaksremove" and $missing_tools = 1);
-if ($missing_tools) {
-    warn("Can't find required tools.");
-    exit($PS_EXIT_CONFIG_ERROR);
-}
-
 my $mdcParser = PS::IPP::Metadata::Config->new; # Parser for metadata config files
 
@@ -128 +132 @@
     if (! -e $outroot ) {
         my $code = system "mkdir -p $outroot";
-        &my_die("cannot create output directory $outroot", $magic_ds_id, $component, 
+        &my_die("cannot create output directory $outroot", $magic_ds_id, $component,
                 $code >> 8) if $code;
     }
@@ -143 +147 @@
         if (! -e $recoveryroot ) {
             my $code = system "mkdir -p $recoveryroot";
-            &my_die("cannot create output directory $outroot", $magic_ds_id, $component, 
+            &my_die("cannot create output directory $outroot", $magic_ds_id, $component,
                     $code >> 8) if $code;
         }
@@ -151 +155 @@
 
 # get skycell list if needed
-my ($sfh, $skycell_list);          
+my ($sfh, $skycell_list);
 if ($skycell_args) {
     my $command = "$magicdstool -magic_ds_id $magic_ds_id -getskycells $skycell_args";

trunk/ippScripts/scripts/magic_mask.pl

@@ -28 +28 @@
 use Pod::Usage qw( pod2usage );
 
+# Look for programs we need
+my $missing_tools;
+my $magictool = can_run('magictool') or (warn "Can't find magictool" and $missing_tools = 1);
+my $streaksremove = can_run('streaksremove') or (warn "Can't find streaksremove" and $missing_tools = 1);
+if ($missing_tools) {
+    warn("Can't find required tools.");
+    exit($PS_EXIT_CONFIG_ERROR);
+}
+
 # Parse the command-line arguments
 my ($magic_id, $camera, $dbname, $outroot, $save_temps, $verbose, $no_update, $no_op, $logfile);
@@ -49 +58 @@
     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], $magic_id, $PS_EXIT_UNKNOWN_ERROR ); };
+
 $ipprc->define_camera($camera);
 
 $ipprc->redirect_output($logfile) if $logfile;
-
-# Look for programs we need
-my $missing_tools;
-my $magictool = can_run('magictool') or (warn "Can't find magictool" and $missing_tools = 1);
-my $streaksremove = can_run('streaksremove') or (warn "Can't find streaksremove" and $missing_tools = 1);
-if ($missing_tools) {
-    warn("Can't find required tools.");
-    exit($PS_EXIT_CONFIG_ERROR);
-}
 
 my $mdcParser = PS::IPP::Metadata::Config->new; # Parser for metadata config files
@@ -85 +89 @@
 ### Do the heavy lifting
 {
-    my $command = "$streaks --streaks"; # Command to execute
+    my $command = "$streaksremove --streaks"; # Command to execute
     my @basenames;              # List of base names
 

trunk/ippScripts/scripts/magic_process.pl

@@ -28 +28 @@
 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 $magictool      = can_run('magictool') or (warn "Can't find magictool" and $missing_tools = 1);
+my $removestreaks = can_run('RemoveStreaks') or (warn "Can't find RemoveStreaks" and $missing_tools = 1);
+if ($missing_tools) {
+    warn("Can't find required tools.");
+    exit($PS_EXIT_CONFIG_ERROR);
+}
 
 # Parse the command-line arguments
@@ -53 +62 @@
     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], $magic_id, $node, $PS_EXIT_UNKNOWN_ERROR ); };
+
 $ipprc->define_camera($camera);
 
@@ -66 +79 @@
 # resolve any path:// or file:// in outroot
 $outroot = $ipprc->file_resolve($outroot);
-    
+
 $ipprc->redirect_output($logfile) if $logfile;
-
-# Look for programs we need
-my $missing_tools;
-my $magictool      = can_run('magictool') or (warn "Can't find magictool" and $missing_tools = 1);
-my $removestreaks = can_run('RemoveStreaks') or (warn "Can't find RemoveStreaks" and $missing_tools = 1);
-if ($missing_tools) {
-    warn("Can't find required tools.");
-    exit($PS_EXIT_CONFIG_ERROR);
-}
 
 my $mdcParser = PS::IPP::Metadata::Config->new; # Parser for metadata config files
@@ -145 +149 @@
         # this causes major file pollution, but avoids multi-level queries
         # at higher level nodes.
-        
+
         my ($in_fh, $input_list)  = open_list_file($outroot, "input.list");
         print $in_fh "$outroot\n";
@@ -252 +256 @@
 
     my $fh;
-    open $fh, "<$resolved" or 
+    open $fh, "<$resolved" or
         &my_die("failed to open streaks file $streaks_file", $magic_id, $node, $PS_EXIT_UNKNOWN_ERROR);
     # the first line in the streaks file contains the number of streaks found
@@ -259 +263 @@
     close $fh;
     print "$num_streaks streaks found on magicRun $magic_id\n" if $verbose;
-    
+
     my $command = "$magictool -addmask";
     $command   .= " -magic_id $magic_id";

trunk/ippScripts/scripts/magic_tree.pl

@@ -31 +31 @@
 
 use constant MAX_FIELDS => 4;   # Maximum number of fields to be in a node
+
+# Look for programs we need
+my $missing_tools;
+my $magictool = can_run('magictool') or (warn "Can't find magictool" and $missing_tools = 1);
+my $warptool = can_run('warptool') or (warn "Can't find warptool" and $missing_tools = 1);
+if ($missing_tools) {
+    warn("Can't find required tools.");
+    exit($PS_EXIT_CONFIG_ERROR);
+}
 
 # Parse the command-line arguments
@@ -61 +70 @@
     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], $magic_id, $PS_EXIT_UNKNOWN_ERROR ); };
+
 $ipprc->define_camera($camera);
 
 $ipprc->redirect_output($logfile) if $logfile;
-
-# Look for programs we need
-my $missing_tools;
-my $magictool = can_run('magictool') or (warn "Can't find magictool" and $missing_tools = 1);
-my $warptool = can_run('warptool') or (warn "Can't find warptool" and $missing_tools = 1);
-if ($missing_tools) {
-    warn("Can't find required tools.");
-    exit($PS_EXIT_CONFIG_ERROR);
-}
 
 my $mdcParser = PS::IPP::Metadata::Config->new; # Parser for metadata config files
@@ -96 +100 @@
         &my_die("Unable to parse metadata list", $magic_id, $PS_EXIT_PROG_ERROR);
 
-    # make a hash indexed by skycell_id 
+    # make a hash indexed by skycell_id
     foreach my $warp ( @$warps ) {
         my $skycell_id = $warp->{skycell_id};
@@ -156 +160 @@
 
     my ($header, $status) = (undef, 0);
-    my $fits =  Astro::FITS::CFITSIO::open_file( $skyfileResolved, READONLY, $status ); 
+    my $fits =  Astro::FITS::CFITSIO::open_file( $skyfileResolved, READONLY, $status );
     &my_die("failed to open skycell file: $skyfileResolved: $status", $magic_id, $PS_EXIT_SYS_ERROR) if $status;
 
     ($header, $status) = Astro::FITS::CFITSIO::fits_read_header( $fits );
-    
+
     &my_die("Unable to read skycell header: $status", $magic_id, $PS_EXIT_SYS_ERROR) if $status;
 
@@ -171 +175 @@
         $naxis2 = $$header{'NAXIS2'} or &my_die("Can't find NAXIS2", $magic_id, $PS_EXIT_SYS_ERROR);
     } else {
-        # if the skyfile is compressed then the WCS won't be in the primary header, move to the 
+        # if the skyfile is compressed then the WCS won't be in the primary header, move to the
         # extension
         my $hdutype;
@@ -257 +261 @@
     my $node = shift @tasks;
     divide_node($node, \@tasks);
-} 
+}
 
 ### Format tree for magictool

trunk/ippScripts/scripts/register_exp.pl

@@ -27 +27 @@
 my $ipprc = PS::IPP::Config->new();
 
+# Look for commands we need
+my $missing_tools;
+my $regtool = can_run('regtool') or (warn "can't find regtool" 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 ($cache, $exp_id, $exp_tag, $label, $dvodb, $end_stage, $tess_id, $dbname, $verbose, $no_update, $no_op, $save_temps, $logfile);
 GetOptions(
@@ -33 +42 @@
     'exp_tag|t=s'   => \$exp_tag,
     'dbname|d=s'    => \$dbname, # Database name
-    'label=s'       => \$label,   
-    'dvodb=s'       => \$dvodb,   
-    'end_stage=s'   => \$end_stage, 
-    'tess_id=s'     => \$tess_id,   
+    'label=s'       => \$label,
+    'dvodb=s'       => \$dvodb,
+    'end_stage=s'   => \$end_stage,
+    'tess_id=s'     => \$tess_id,
     'verbose'       => \$verbose,   # Print to stdout
     'no-update'     => \$no_update,
@@ -44 +53 @@
 ) or pod2usage( 2 );
 
+# 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], $exp_id, $PS_EXIT_UNKNOWN_ERROR ); };
+
 $ipprc->redirect_output($logfile) if $logfile;
 
@@ -55 +68 @@
 my @SCIENCE = ( "object", "science", "light" ); # Observation types to NOT mark as detrend
 my $DETREND_FLAG = "-end_stage reg"; # Flag to use to mark detrend exposure
-
-# Look for commands we need
-my $missing_tools;
-my $regtool = can_run('regtool') or (warn "can't find regtool" 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);
-}
 
 # setup cache interface
@@ -123 +126 @@
 $command .= " -exp_tag $exp_tag";
 $command .= " -hostname  $host"      if defined $host;
-$command .= " -dbname    $dbname"    if defined $dbname;
-$command .= " -label     $label"     if defined $label;
-$command .= " -dvodb     $dvodb"     if defined $dvodb;
+$command .= " -dbname    $dbname"    if defined $dbname;
+$command .= " -label     $label"     if defined $label;
+$command .= " -dvodb     $dvodb"     if defined $dvodb;
 $command .= " -end_stage $end_stage" if defined $end_stage;
 $command .= " -tess_id   $tess_id"   if defined $tess_id;

trunk/ippScripts/scripts/stack_skycell.pl

@@ -29 +29 @@
 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 $stacktool = can_run('stacktool') or (warn "Can't find stacktool" and $missing_tools = 1);
+my $ppStack = can_run('ppStack') or (warn "Can't find ppStack" and $missing_tools = 1);
+my $ppConfigDump = can_run('ppConfigDump') or (warn "Can't find ppConfigDump" 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 ($stack_id, $dbname, $outroot, $debug, $run_state, $threads, $reduction, $verbose, $no_update, $no_op, $redirect, $save_temps);
@@ -55 +66 @@
     and defined $run_state;
 
+# 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], $stack_id, $PS_EXIT_UNKNOWN_ERROR ); };
+
 # XXX camera is not known here; cannot use filerules...
 # my $logDest = $ipprc->filename("LOG.EXP", $outroot);
-
 my $logDest = "$outroot.log";
 
@@ -72 +86 @@
 my $image_id = $stack_id;
 my $source_id = $ipprc->source_id($dbname, $PS_TABLE_ID_STACK);
-
-# Look for programs we need
-my $missing_tools;
-my $stacktool = can_run('stacktool') or (warn "Can't find stacktool" and $missing_tools = 1);
-my $ppStack = can_run('ppStack') or (warn "Can't find ppStack" and $missing_tools = 1);
-my $ppConfigDump = can_run('ppConfigDump') or (warn "Can't find ppConfigDump" 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);
-}
 
 # Get list of components for stacking
@@ -300 +303 @@
 
     unless ($my_die_called) {
-        $my_die_called = 1;
-        delete_temps() unless ($save_temps);
+        $my_die_called = 1;
+        delete_temps() unless ($save_temps);
     }
 
@@ -324 +327 @@
 {
     unless ($temp_images_exist) {
-        print "No temporary images yet generated\n";
-        return 1;
+        print "No temporary images yet generated\n";
+        return 1;
     }
 
@@ -334 +337 @@
     unless ($success) {
         $error_code = (($error_code >> 8) or $PS_EXIT_PROG_ERROR);
-        &my_die("Unable to perform ppConfigDump: $error_code", $stack_id, $error_code);
+        &my_die("Unable to perform ppConfigDump: $error_code", $stack_id, $error_code);
     }
     my $md = $mdcParser->parse(join "", @$stdout_buf) or
-        &my_die("Unable to parse metadata config doc", $stack_id, $PS_EXIT_PROG_ERROR);
+        &my_die("Unable to parse metadata config doc", $stack_id, $PS_EXIT_PROG_ERROR);
 
     my $temp_delete = metadataLookupBool($md, 'TEMP.DELETE'); # Delete temporary files?

trunk/ippScripts/scripts/warp_overlap.pl

@@ -25 +25 @@
 
 my $ipprc = PS::IPP::Config->new(); # IPP configuration
+
+# Look for programs we need
+my $missing_tools;
+my $warptool = can_run('warptool') or (warn "Can't find warptool" and $missing_tools = 1);
+my $dvoImageOverlaps = can_run('dvoImageOverlaps') or (warn "Can't find dvoImageOverlaps" and $missing_tools = 1);
+my $ppConfigDump = can_run('ppConfigDump') or (warn "Can't find ppConfigDump" and $missing_tools = 1);
+if ($missing_tools) {
+    warn("Can't find required tools.");
+    exit($PS_EXIT_CONFIG_ERROR);
+}
 
 my ($warp_id, $camera, $tess_dir, $dbname, $verbose, $no_update, $no_op, $logfile, $save_temps);
@@ -49 +59 @@
     and defined $tess_dir;
 
+# 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], $warp_id, $PS_EXIT_UNKNOWN_ERROR ); };
+
 $ipprc->define_camera($camera);
-
-# Look for programs we need
-my $missing_tools;
-my $warptool = can_run('warptool') or (warn "Can't find warptool" and $missing_tools = 1);
-my $dvoImageOverlaps = can_run('dvoImageOverlaps') or (warn "Can't find dvoImageOverlaps" and $missing_tools = 1);
-my $ppConfigDump = can_run('ppConfigDump') or (warn "Can't find ppConfigDump" and $missing_tools = 1);
-if ($missing_tools) {
-    warn("Can't find required tools.");
-    exit($PS_EXIT_CONFIG_ERROR);
-}
 
 &my_die("Tessellation identifier not provided: $tess_dir", $warp_id, $PS_EXIT_SYS_ERROR) unless $tess_dir ne "NULL";

trunk/ippScripts/scripts/warp_skycell.pl

@@ -26 +26 @@
 
 my $ipprc = PS::IPP::Config->new(); # IPP configuration
+
+# Look for programs we need
+my $missing_tools;
+my $warptool = can_run('warptool') or (warn "Can't find warptool" and $missing_tools = 1);
+my $pswarp = can_run('pswarp') or (warn "Can't find pswarp" and $missing_tools = 1);
+my $ppConfigDump = can_run('ppConfigDump') or (warn "Can't find ppConfigDump" 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 ($warp_id, $skycell_id, $warp_skyfile_id, $tess_dir, $camera, $dbname, $outroot, $threads, $run_state, $verbose, $no_update, $no_op, $redirect, $save_temps);
@@ -57 +68 @@
     and defined $run_state;
 
+# 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], $warp_id, $skycell_id, $tess_dir, $PS_EXIT_UNKNOWN_ERROR ); };
+
 $ipprc->define_camera($camera);
 
@@ -65 +80 @@
 
 my $source_id = $ipprc->source_id($dbname, $PS_TABLE_ID_WARP);
-
-# Look for programs we need
-my $missing_tools;
-my $warptool = can_run('warptool') or (warn "Can't find warptool" and $missing_tools = 1);
-my $pswarp = can_run('pswarp') or (warn "Can't find pswarp" and $missing_tools = 1);
-my $ppConfigDump = can_run('ppConfigDump') or (warn "Can't find ppConfigDump" 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);
-}
 
 # Get list of component imfiles for exposure