Changeset 42835

Timestamp:

May 9, 2025, 9:17:20 AM (12 months ago)

Author:

eugene

Message:

removing deprecated addstar modes (stack and staticsky), add support for xcff, some general code cleanup for addstar_run.pl; remove dependency on streakrelease in dist_bundle.pl; add scripts for xcstack/xcsky/xcff stages

Location:

trunk/ippScripts

Files:

• Build.PL (modified) (1 diff)
• scripts/addstar_run.pl (modified) (6 diffs)
• scripts/dist_bundle.pl (modified) (1 diff)
• scripts/stack_skycell.pl (modified) (1 diff)
• scripts/staticsky.pl (modified) (1 diff)
• scripts/xccal.pl (copied) (copied from branches/eam_branches/ipp-20230313/ippScripts/scripts/xccal.pl )
• scripts/xcff_summary.pl (copied) (copied from branches/eam_branches/ipp-20230313/ippScripts/scripts/xcff_summary.pl )
• scripts/xcff_warp.pl (copied) (copied from branches/eam_branches/ipp-20230313/ippScripts/scripts/xcff_warp.pl )
• scripts/xcsky.pl (copied) (copied from branches/eam_branches/ipp-20230313/ippScripts/scripts/xcsky.pl )
• scripts/xcstack_skycell.pl (copied) (copied from branches/eam_branches/ipp-20230313/ippScripts/scripts/xcstack_skycell.pl )

trunk/ippScripts/Build.PL

@@ -156 +156 @@
         scripts/remote_md5sum.pl
         scripts/fpcamera_exp.pl
+        scripts/xcstack_skycell.pl
+        scripts/xcsky.pl
+        scripts/xccal.pl
+        scripts/xcff_warp.pl
+        scripts/xcff_summary.pl
     )],
     dist_abstract => 'Scripts for running the Pan-STARRS IPP',

trunk/ippScripts/scripts/addstar_run.pl

@@ -30 +30 @@
 my $missing_tools;
 my $addtool = can_run('addtool') or (warn "Can't find addtool" and $missing_tools = 1);
-my $camtool = can_run('camtool') or (warn "Can't find camtool" and $missing_tools = 1);
 my $ppConfigDump = can_run('ppConfigDump') or (warn "Can't find ppConfigDump" and $missing_tools = 1);
 my $addstar = can_run('addstar') or (warn "Can't find addstar" and $missing_tools = 1);
-
-# these are only used by addstar_run, not addstar_multi
-my $fftool  = can_run('fftool') or (warn "Can't find fftool" and $missing_tools = 1);
 my $loadgalphot = can_run('loadgalphot') or (warn "Can't find loadgalphot" and $missing_tools = 1);
 
@@ -44 +40 @@
 my $minidvodb_path;
 
-my ( $add_id, $camera, $stage, $stage_id, $stage_extra1, $outroot, $stageroot, $dbname, $reduction,
+my ( $add_id, $camera, $stage, $stage_id, $outroot, $stageroot, $dbname, $reduction,
      $dvodb, $minidvodb, $minidvodb_name, $minidvodb_group, $image_only, $verbose,
      $no_update, $no_op, $redirect, $save_temps, $addrun_host);
@@ -52 +48 @@
     'stage|s=s'        => \$stage, # Camera
     'stage_id|w=s'   => \$stage_id,
-    'stage_extra1|w=s'    => \$stage_extra1, # the number for a staticskymulti (for finding cmf), or stack_id
     'dbname|d=s'        => \$dbname, # Database name
     'outroot|w=s'       => \$outroot, # output file base name
@@ -83 +78 @@
     defined $addrun_host and
     defined $camera;
-if ($stage =~ /cam/ && !defined $stage_id) {
-    my_die("cam stage requires -stage_id", $add_id, 3);
-
-}
-if ($minidvodb && !defined($minidvodb_group)) {
-                my_die( "missing minidvodb_group", $add_id, 3 );
-            }
+
+my $dtime_addstar = 0;
+my $mjd_addstar_start = DateTime->now->mjd;   # MJD of starting script
+
+# XXX EAM : 20240204 : not sure this is needed anymore:
+if ($stage =~ /cam/ && !defined $stage_id) { my_die("cam stage requires -stage_id", $add_id, 3); }
+if ($minidvodb && !defined($minidvodb_group)) { my_die( "missing minidvodb_group", $add_id, 3 ); }
+
 my $ipprc = PS::IPP::Config->new( $camera ) or my_die( "Unable to set up", $add_id, $PS_EXIT_CONFIG_ERROR ); # IPP configuration
 
-my $logDest = $ipprc->filename("LOG.EXP", $outroot) or &my_die("Missing entry from camera config", $add_id, $PS_EXIT_CONFIG_ERROR);
+my $logDest    = $ipprc->filename("LOG.EXP",   $outroot) or &my_die("Missing entry from camera config", $add_id, $PS_EXIT_CONFIG_ERROR);
+my $traceDest  = $ipprc->filename("TRACE.EXP", $outroot) or &my_die("Missing entry from camera config", $add_id, $PS_EXIT_CONFIG_ERROR);
 
 if ($redirect) {
@@ -106 +103 @@
 $ipprc->outroot_prepare($outroot);
 
-
-#
 # Step 1: sort out reductions / recipes
-#
-
 
 # Recipes to use based on reduction class
 $reduction = 'DEFAULT' unless defined $reduction;
-#if ($stage =~/diff/) {
-#    $reduction = 'ADDSTAR';
-#} 
-#if ($stage =~/fullforce/) {
-#    $reduction = 'ADDSTAR';
-#} 
-
-if ($stage eq 'fullforce') {
-    $reduction='DEFAULT';
-    #hardwired because why not
-}
-elsif ($stage eq 'fullforce_summary') {
-    $reduction = 'DEFAULT';
-}
-elsif ($stage eq 'diff') {
-    $reduction='DEFAULT';
-    #hardwired because why not
-}
-
-my $recipe_addstar = $ipprc->reduction($reduction, 'ADDSTAR');
-# XXX This is now not used: do we still need it?
-if ($stage eq 'cam') {
-  $recipe_addstar = $ipprc->reduction($reduction, 'ADDSTAR'); # Recipe to use
-}
-elsif ($stage eq 'stack') {
-  $recipe_addstar = $ipprc->reduction($reduction, 'ADDSTAR_STACK'); # Recipe to use
-}
-elsif ($stage eq 'skycal') {
-    $recipe_addstar = $ipprc->reduction($reduction, 'ADDSTAR'); # Recipe to use                                                              
-}
-#if ($stage =~/staticsky/) {
-#  $recipe_addstar = $ipprc->reduction($reduction, 'ADDSTAR_STATICSKY'); # Recipe to use
-#}
-
-
+
+my $recipe_addstar;
+
+# choose the recipe based on the stage:
+# this probably should have different recipes for each possible stage
+if ($stage eq 'cam')               { $recipe_addstar = $ipprc->reduction($reduction, 'ADDSTAR'); } 
+if ($stage eq 'skycal')            { $recipe_addstar = $ipprc->reduction($reduction, 'ADDSTAR'); } # Recipe to use 
+if ($stage eq 'diff')              { $recipe_addstar = $ipprc->reduction($reduction, 'ADDSTAR'); } # Recipe to use 
+if ($stage eq 'fullforce')         { $recipe_addstar = $ipprc->reduction($reduction, 'ADDSTAR'); } # Recipe to use 
+if ($stage eq 'fullforce_summary') { $recipe_addstar = $ipprc->reduction($reduction, 'ADDSTAR'); } # Recipe to use 
+if ($stage eq 'xcff')              { $recipe_addstar = $ipprc->reduction($reduction, 'ADDSTAR'); } # Recipe to use 
+if ($stage eq 'xcff_summary')      { $recipe_addstar = $ipprc->reduction($reduction, 'ADDSTAR'); } # Recipe to use 
+
+# XXX stack and staticsky are no longer allowed stages: need to use 'skycal' outputs
+# if ($stage eq 'stack')  { $recipe_addstar = $ipprc->reduction($reduction, 'ADDSTAR_STACK'); } # Recipe to use 
+# if ($stage =~/staticsky/) { $recipe_addstar = $ipprc->reduction($reduction, 'ADDSTAR_STATICSKY'); }
 
 &my_die("Unrecognised ADDSTAR recipe", $add_id, $PS_EXIT_CONFIG_ERROR) unless defined $recipe_addstar;
 
-
 # the camera configurations should define the psastro output to be a single file (MEF), regardless of the inputs
 
-#
 # Step 2: Determine where sources should come from, modify them as needed.
-#
-
 
 # it was PSASTRO.OUTPUT
 
 my $fpaObjects = $ipprc->filename("PSASTRO.OUTPUT", $stageroot) or &my_die("Missing entry from camera config", $add_id, $PS_EXIT_CONFIG_ERROR);
-my $fpaObjectsAlt = $fpaObjects;
-
-if ($stage eq 'skycal') {
-    #should be ok for skycal?
-    print "using $fpaObjects for $stage\n";
-}
-elsif ($stage eq 'diff') {
-    print "using $fpaObjects for $stage\n";
-}
-elsif ($stage eq 'fullforce')  {
-    print "using $fpaObjects for $stage\n";
-} 
-
-if ($stage eq 'cam') {
-    # if it is cam stage we need to be careful when grabbing the filename. 
-    # This breaks down into a few steps: 
-    
-    #get info about the cam_id 
-    my $magicked;
-    {
-        my $mdcParser = PS::IPP::Metadata::Config->new;
-        my $command = "$camtool -processedexp -cam_id " . $stage_id;
-        $command .= " -dbname $dbname" if defined $dbname;
-        my ( $success, $error_code, $full_buf, $stdout_buf, $stderr_buf ) =
-            run(command => $command, verbose => $verbose);
-        &my_die( "Unable to get info on camRun", $add_id, $PS_EXIT_SYS_ERROR) unless $success;
-        if (scalar @$stdout_buf == 0 ) { #it lists nothing if it is the first
-            &my_die( "empty camRun", $add_id, $PS_EXIT_SYS_ERROR);
-            print "listing nothing\n";
-        } else {
-            my $metadata = $mdcParser->parse(join "", @$stdout_buf) or
-                &my_die("Unable to parse metadata config", $add_id, $PS_EXIT_PROG_ERROR);
-            #this fails if there is nothing listed. I checked.
-            my $components = parse_md_list($metadata) or
-                &my_die("Unable to parse metadata list", $add_id, $PS_EXIT_PROG_ERROR);
-            my $comp = $$components[0];
-            my  $mparsed = $comp->{magicked};
-            
-            if (!defined($mparsed)) {
-                &my_die("Unable to parse magicked", $add_id, $PS_EXIT_PROG_ERROR);
-            } #but just to make sure, have it grab a minidvodb_name, to make sure it's not junk.
-            print "found a value for magicked:$mparsed\n";
-            $magicked = $mparsed;
-        }
-        
-        #is this cam_id magicked or not?
-        if ($magicked) {
-            $stage_extra1 = $magicked;
-            $fpaObjects = $ipprc->destreaked_filename("$fpaObjects") or &my_die("Missing entry from camera config", $add_id, $PS_EXIT_CONFIG_ERROR);
-            print "cam_id is magicked, using $fpaObjects for the cam smf\n";
-        } else {
-            print "cam_id is NOT magicked, using $fpaObjects for the cam smf\n";
-        }
-    }
-}
-
-if (($stage eq 'stack') || 
-    ($stage eq 'skycal') || 
-    ($stage eq 'diff') || 
-    ($stage eq 'fullforce')||
-    ($stage eq 'fullforce_summary')) {
-    $fpaObjects =~ s/smf$/cmf/;
-    $fpaObjectsAlt =~ s/smf$/cmf/;
-}
-
-my $fpaObjects1;
-my $fpaObjects2;
-my $checkalt = 0;
-if ($stage eq 'staticsky') {
-    $checkalt = 1;
-    my $sources   = $ipprc->filename("PSPHOT.OUT.CMF.MEF", $stageroot); #this is mostly rigtht except the .cmf needs either
-    # .000.cmf or .stk.xxxxx.cmf
-    print "$sources\n\n\n";
-    &my_die( "can't find the filter_num for staticsky_multi, giving up.", $add_id, $PS_EXIT_SYS_ERROR) unless (defined $stage_extra1);
-
-    
-    $fpaObjects1 = $sources;
-    $fpaObjects2 = $sources;
-    $fpaObjects = $sources;
-
-    my $nice_num = sprintf ("%03d", $stage_extra1);
-
-    $fpaObjects1 =~ s/cmf$/stk.$stage_extra1.cmf/;
-    $fpaObjects2 =~ s/cmf$/$nice_num.cmf/;  #this make it look for .001.cmf, etc
- # we have 3 of them to try
-    my $realFile = $ipprc->file_resolve($fpaObjects);
-    my $realFile1 = $ipprc->file_resolve($fpaObjects1);
-    my $realFile2 = $ipprc->file_resolve($fpaObjects2);
-    if (!defined($realFile1)) {
-        if (!defined($realFile2)) {
-            print "using $fpaObjects\n";
-            
-        } else {
-            print "using $fpaObjects2\n";
-            $fpaObjects = $fpaObjects2;
-        }
-        
-    } else {
-        print "using $fpaObjects1\n";
-        $fpaObjects = $fpaObjects1;
-    }
-}
-
-
-#
+
+# XXX EAM 2024.02.04 : I am stripping out support for magic here:
+
+# the following stages generate files with extension 'cmf' not 'smf':
+if ($stage eq 'skycal')            { $fpaObjects =~ s/smf$/cmf/; }
+if ($stage eq 'diff')              { $fpaObjects =~ s/smf$/cmf/; }
+if ($stage eq 'fullforce')         { $fpaObjects =~ s/smf$/cmf/; }
+if ($stage eq 'fullforce_summary') { $fpaObjects =~ s/smf$/cmf/; }
+
+# XXX EAM 2024.02.04 : I am stripping out support for staticsky output here:
+
 # Step 3 Set up addtool/loadgalphot commands.
-#
-
-my $traceDest  = $ipprc->filename("TRACE.EXP",          $outroot) or &my_die("Missing entry from camera config", $add_id, $PS_EXIT_CONFIG_ERROR);
-        
+
 # convert supplied DVO database name to UNIX filename
 my $dvodbReal;
-if (defined $dvodb) {
-    $dvodbReal = $ipprc->dvo_catdir( $dvodb ); # catdir for DVO
-    $dvodbReal = $ipprc->convert_filename_absolute( $dvodbReal ) or &my_die("can't get path for dvodb", $add_id, $PS_EXIT_CONFIG_ERROR);
-}
-
-my $dtime_addstar = 0;
-if (defined $dvodbReal) {
-    if ($minidvodb) {
-        my $command = "$addtool -listminidvodbrun ";
-        $command .= " -minidvodb_group $minidvodb_group" if defined $minidvodb_group;
-        $command .= " -minidvodb_name $minidvodb_name" if defined $minidvodb_name;
-        $command .= " -state 'active' -limit 1";
-        $command .= " -dbname $dbname" if defined $dbname;
-        print $command;
-        my ( $success, $error_code, $full_buf, $stdout_buf, $stderr_buf ) =
-            run(command => $command, verbose => $verbose);
-        &my_die( "Unable to get active minidvodb_name", $add_id, $PS_EXIT_SYS_ERROR) unless $success;
-        my $metadata = $mdcParser->parse(join "", @$stdout_buf) or
-            &my_die("Unable to parse metadata config", $add_id, $PS_EXIT_PROG_ERROR);
-
-        my $components = parse_md_list($metadata) or
-            &my_die("Unable to parse metadata list", $add_id, $PS_EXIT_PROG_ERROR);
-        my $comp = $$components[0];
-        $minidvodb_path = $comp->{minidvodb_path};
-        $minidvodb_name = $comp->{minidvodb_name};
-        $addrun_host = $comp->{addrun_host};
-
-        if (!defined($minidvodb_path)) {
-            &my_die("Unable to parse minidvodb_path", $add_id, $PS_EXIT_PROG_ERROR);
+$dvodbReal = $ipprc->dvo_catdir( $dvodb ); # catdir for DVO
+$dvodbReal = $ipprc->convert_filename_absolute( $dvodbReal ) or &my_die("can't get path for dvodb", $add_id, $PS_EXIT_CONFIG_ERROR);
+unless (defined $dvodbReal) { &my_die("dvodbReal not defined", $add_id, $PS_EXIT_CONFIG_ERROR); } ## XXX probably redundant with previous line
+
+# the supplied dvodb entry is not the real target if a minidvodb is supplied
+if ($minidvodb) {
+    my $command = "$addtool -listminidvodbrun ";
+    $command .= " -minidvodb_group $minidvodb_group" if defined $minidvodb_group;
+    $command .= " -minidvodb_name $minidvodb_name" if defined $minidvodb_name;
+    $command .= " -state 'active' -limit 1";
+    $command .= " -dbname $dbname" if defined $dbname;
+    print $command;
+    my ( $success, $error_msg, $full_buf, $stdout_buf, $stderr_buf ) = run(command => $command, verbose => $verbose);
+    my $error_code = &parse_error_message ($success, $error_msg, $command);
+    unless ($success) {
+        &my_die("Unable to get active minidvodb_name", $add_id, $PS_EXIT_SYS_ERROR);
+    }
+
+    my $metadata = $mdcParser->parse(join "", @$stdout_buf) or &my_die("Unable to parse metadata config", $add_id, $PS_EXIT_PROG_ERROR);
+
+    my $components = parse_md_list($metadata) or &my_die("Unable to parse metadata list", $add_id, $PS_EXIT_PROG_ERROR);
+
+    my $comp = $$components[0];
+    $minidvodb_path = $comp->{minidvodb_path};
+    $minidvodb_name = $comp->{minidvodb_name};
+    $addrun_host = $comp->{addrun_host};
+
+    if (!defined($minidvodb_path)) { &my_die("Unable to parse minidvodb_path", $add_id, $PS_EXIT_PROG_ERROR); }
+    if (!defined($minidvodb_name)) { &my_die("Unable to parse minidvodb_name", $add_id, $PS_EXIT_PROG_ERROR); }
+} else {
+    $minidvodb_path = $dvodbReal;
+}
+
+if ($no_op) { &update_database; exit 0; }
+
+print "target CATDIR: $dvodbReal\n";
+## addstar can either save the full set of detections, or just
+## the image metadata, in the dvodb.  this is set in the
+## database table addRun
+
+# addstar requires the user to have a valid .ptolemyrc which
+# in turn points at ippconfig/dvo.site
+
+# get the names for the camera and the real input file
+my $camdir = $ipprc->dvo_cameradir(); # Camera directory for addstar
+
+my $realFile = $ipprc->file_resolve($fpaObjects) or  &my_die("Unable to resolve $fpaObjects", $add_id, $PS_EXIT_SYS_ERROR);
+
+# most cameras use CHIP_HEADER.  other exceptions:
+# gpc1 @ camera : PHU_HEADER
+# gpc1 @ staticsky : NOMINAL (is uncalibrated)
+
+# temporary hard-wired info
+my $zeroPointOption = "CHIP_HEADER";
+my $zeroPointKeyword = "ZPT_OBS";
+
+if (($camdir =~ /gpc1/) && ($stage =~ /cam/)) {    $zeroPointOption = "PHU_HEADER"; }           
+if ($stage eq "diff")         { $zeroPointKeyword = "FPA.ZP"; }
+if ($stage eq "xcff")         { $zeroPointKeyword = "FPA.ZP"; }
+if ($stage eq "xcff_summary") { $zeroPointKeyword = "FPA.ZP"; }
+
+my $command;
+
+if (($stage ne 'fullforce_summary') && ($stage ne 'xcff_summary')) {
+    print "Using command ADDSTAR\n";
+    # require a defined output dvo database to run addstar (ie, refuse to use the .ptolemyrc default)
+    $command  = "$addstar -update"; # XXX optionally set -update?
+    $command .= " -D CAMERA $camdir";
+    $command .= " -D CATDIR $minidvodb_path";
+    $command .= " -D ZERO_POINT_OPTION $zeroPointOption";
+    $command .= " -D ZERO_POINT_KEYWORD $zeroPointKeyword";
+    $command .= " $realFile";
+    $command .= " -use-name $fpaObjects"; # DVO wants the neb-name as a file reference
+    $command .= " -image" if $image_only;
+
+    # some stages require alternate options:
+    if ($stage eq "skycal")    { $command .= " -quick-airmass"; }
+    if ($stage eq "diff")      { $command .= " -accept-astrom"; }
+    if ($stage eq "fullforce") { $command .= " -accept-astrom -xrad"; }
+    if ($stage eq "xcff")      { $command .= " -accept-astrom -xrad"; }
+
+    # if ($stage =~ /staticsky/) { $command .= " -accept-astrom -quick-airmass"; }
+
+} else { # Full force summary case
+    print "Using command LOADGALPHOT\n";
+
+    $command =  "$loadgalphot -v ";
+    $command .= " -D CAMERA $camdir ";
+    $command .= " -D CATDIR $minidvodb_path ";
+    $command .= " $realFile ";
+    $command .= " -image-id $stage_id ";
+}
+
+### actually run the addstar (or loadgalphot) command here:
+my ( $success, $error_msg, $full_buf, $stdout_buf, $stderr_buf ) = run(command => $command, verbose => $verbose);
+my $error_code = &parse_error_message ($success, $error_msg, $command);
+unless ($success) { &my_die("Unable to perform addstar: $error_code", $add_id, $error_code); }
+
+$dtime_addstar = 86400.0*(DateTime->now->mjd - $mjd_addstar_start);   # MJD of starting script
+
+&update_database;
+exit 0;
+
+sub update_database {
+    # This needs to be updated when addtool is written. BROKEN
+    my $fpaCommand = "$addtool -addprocessedexp";
+    $fpaCommand .= " -add_id $add_id";
+    $fpaCommand .= " -dtime_addstar $dtime_addstar";
+
+    $fpaCommand .= " -path_base $outroot";
+    $fpaCommand .= " -dvodb_path $minidvodb_path" if defined $minidvodb_path;
+    $fpaCommand .= " -minidvodb_name $minidvodb_name" if defined $minidvodb_name;
+    $fpaCommand .= " -addrun_host $addrun_host" if defined $addrun_host;
+    $fpaCommand .= " -dbname $dbname" if defined $dbname;
+
+    print $fpaCommand;
+
+    # Add the result into the database
+    unless ($no_update) {
+        my ( $success, $error_msg, $full_buf, $stdout_buf, $stderr_buf ) = run(command => $fpaCommand, verbose => $verbose);
+        my $error_code = &parse_error_message ($success, $error_msg, $command);
+        unless ($success) {
+            warn("Unable to add result to database: $error_code\n");
+            exit($error_code);
         }
-        if (!defined($minidvodb_name)) {
-            &my_die("Unable to parse minidvodb_name", $add_id, $PS_EXIT_PROG_ERROR);
-        }
+    } else {
+        print "skipping command: $fpaCommand\n";
     }
-    else {
-        $minidvodb_path = $dvodbReal;
-    }
-    
-    unless ($no_op) {
-            print "$dvodbReal\n";
-            ## addstar can either save the full set of detections, or just
-            ## the image metadata, in the dvodb.  this is set in the
-            ## database table addRun
-
-            # addstar requires the user to have a valid .ptolemyrc which
-            # in turn points at ippconfig/dvo.site
-
-            # get the names for the camera and the real input file
-            my $camdir = $ipprc->dvo_cameradir(); # Camera directory for addstar
-           
-            my $realFile = $ipprc->file_resolve($fpaObjects) or  &my_die("Unable to resolve $fpaObjects", $add_id, $PS_EXIT_SYS_ERROR);
-
-            # most cameras use CHIP_HEADER.  other exceptions:
-            # gpc1 @ camera : PHU_HEADER
-            # gpc1 @ staticsky : NOMINAL (is uncalibrated)
-
-            # temporary hard-wired info
-            my $zeroPointOption = "CHIP_HEADER";
-            my $zeroPointKeyword = "ZPT_OBS";
-            if (($camdir =~ /gpc1/) && ($stage =~ /staticsky/)) {
-                $zeroPointOption = "NOMINAL";
-            }           
-            if (($camdir =~ /gpc1/) && ($stage =~ /cam/)) {
-                $zeroPointOption = "PHU_HEADER";
-            }           
-            if ($stage eq "diff") {
-                $zeroPointKeyword = "FPA.ZP";
-            }           
-
-            my $command;
-
-            if ($stage ne 'fullforce_summary') {
-#               print "IN ADDSTAR VERSION\n";
-                # require a defined output dvo database to run addstar (ie, refuse to use the .ptolemyrc default)
-                $command  = "$addstar -update"; # XXX optionally set -update?
-                $command .= " -force-single-time"; # IPP-676 time difference for chips causes dvo mosaic issue
-                $command .= " -D CAMERA $camdir";
-                $command .= " -D CATDIR $minidvodb_path";
-                $command .= " -D ZERO_POINT_OPTION $zeroPointOption";
-                $command .= " -D ZERO_POINT_KEYWORD $zeroPointKeyword";
-                $command .= " $realFile";
-                $command .= " -use-name $fpaObjects"; # DVO wants the neb-name as a file reference
-                $command .= " -image" if $image_only;
-                if ($stage =~ /staticsky/) {
-                    $command .= " -accept-astrom -quick-airmass";
-                }  #careful here - this matches staticsky and staticsky_multi
-                if ($stage =~ /skycal/) {
-                    $command .= " -quick-airmass";
-                }  #careful here - this matches staticsky and staticsky_multi
-                if ($stage =~ /diff/) {
-                    $command .= " -accept-astrom";
-                }
-                if ($stage =~ /fullforce/) {
-                    $command .= " -accept-astrom -xrad"; 
-                }
-            }
-            else { # Full force summary case
-#               print "IN LOADGALPHOT VERSION\n";
-                # We need to know the filter to set up the photcode, as the summaries do not include that in the header.
-                # We /could/ set up the addtool stuff to pass that in to the script when needed, but that would require adding 
-                # a lot of extra hooks and option handlers.  Therefore, call out to fftool, and get the filter that way, and
-                # construct the correct photcode.
-
-                my $photcode = '';
-                {
-                    my $ff_command = "$fftool -dbname ${dbname} -summary -ff_id ${stage_id}";
-                    print "$ff_command\n";
-                    my ( $success, $error_code, $full_buf, $stdout_buf, $stderr_buf ) =
-                        run(command => $ff_command, verbose => $verbose);
-                    unless ($success) {
-                        $error_code = (($error_code >> 8) or $PS_EXIT_PROG_ERROR);
-                        &my_die("Unable to fetch filter via fftool: $error_code", $add_id, $error_code);
-                    }
-                    my $MDlist = $mdcParser->parse(join "", @$stdout_buf) or
-                        &my_die("Unable to determine ff summary information.", $add_id, $error_code);
-                    my $metadata = parse_md_list($MDlist);
-                    my $ffSummary = $metadata->[0];
-                    my $filter = $ffSummary->{filter};
-                    my $stack_id = $ffSummary->{stack_id};
-                    
-                    $filter =~ s/\.00000//;
-                    $photcode = "GPC1.${filter}.ForcedWarp";
-                }
-
-                $command =  "$loadgalphot -v ";
-                $command .= " -D CAMERA $camdir ";
-                $command .= " -D CATDIR $minidvodb_path ";
-                $command .= " $realFile ";
-                $command .= " -p $photcode ";
-                $command .= " -image-id $stage_id ";
-            }
-                    
-            my $mjd_addstar_start = DateTime->now->mjd;   # MJD of starting script
-            
-            my ( $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 addstar: $error_code", $add_id, $error_code);
-            }
-            $dtime_addstar = 86400.0*(DateTime->now->mjd - $mjd_addstar_start);   # MJD of starting script
-    }
-}
-
-# This needs to be updated when addtool is written. BROKEN
-my $fpaCommand = "$addtool -addprocessedexp";
-$fpaCommand .= " -add_id $add_id";
-$fpaCommand .= " -dtime_addstar $dtime_addstar";
-
-$fpaCommand .= " -path_base $outroot";
-$fpaCommand .= " -dvodb_path $minidvodb_path" if defined $minidvodb_path;
-$fpaCommand .= " -minidvodb_name $minidvodb_name" if defined $minidvodb_name;
-$fpaCommand .= " -addrun_host $addrun_host" if defined $addrun_host;
-$fpaCommand .= " -dbname $dbname" if defined $dbname;
-
-$fpaCommand .= " -stage_extra1 $stage_extra1" if defined $stage_extra1;
-
-print $fpaCommand;
-
-# Add the result into the database
-unless ($no_update) {
-    my ( $success, $error_code, $full_buf, $stdout_buf, $stderr_buf ) =
-        run(command => $fpaCommand, verbose => $verbose);
-    unless ($success) {
-        $error_code = (($error_code >> 8) or $PS_EXIT_PROG_ERROR);
-        warn("Unable to add result to database: $error_code\n");
-        exit($error_code);
-    }
-} else {
-    print "skipping command: $fpaCommand\n";
-}
-
+}
 
 sub my_die
@@ -474 +304 @@
 }
 
+# if the program exited normally, the exit value is returned
+# if the program exited with a signal (abort, crash, etc), PS_EXIT_PROG_ERROR (4) is returned
+# if the program failed to run, -PS_EXIT_PROG_ERROR (-4) is returned
+sub parse_error_message {
+    my $success = shift;
+    my $error_msg = shift;
+    my $command = shift;
+
+    if ($success) { return 0; }
+
+    print "raw error_msg: $error_msg\n";
+    print "full command: $command\n";
+
+    if (&looks_like_number($error_msg)) { return (($error_msg >> 8) or ($PS_EXIT_PROG_ERROR)); }
+        
+    # which of these match?
+    my ($error_code) = $error_msg =~ m/exited with value (\d+)/;
+    if (defined $error_code) { return $error_code; }
+    
+    ($error_code) = $error_msg =~ m/died with signal (\d+)/;
+#   if (defined $error_code) { return (128 + $error_code); }
+    if (defined $error_code) { return ($PS_EXIT_PROG_ERROR); }
+    
+    # probably failed to execute:
+    return (-1*$PS_EXIT_PROG_ERROR);
+}
+
 END {
     my $status = $?;

trunk/ippScripts/scripts/dist_bundle.pl

@@ -73 +73 @@
 my %empty_cleaned = ();
 
+# no longer needed: magic is no longer used
+# my $streaksrelease   = can_run('streaksrelease') or (warn "Can't find streaksrelease" and $missing_tools = 1);
+
 # Look for programs we need
 my $missing_tools;
-my $streaksrelease   = can_run('streaksrelease') or (warn "Can't find streaksrelease" and $missing_tools = 1);
+my $streaksrelease = '/bin/false';
 my $bgtool   = can_run('bgtool') or (warn "Can't find bgtool" and $missing_tools = 1);
 my $staticskytool   = can_run('staticskytool') or (warn "Can't find staticskytool" and $missing_tools = 1);

trunk/ippScripts/scripts/stack_skycell.pl

@@ -185 +185 @@
 my $recipe_psphot  = $ipprc->reduction($reduction, 'STACK_PSPHOT'); # Recipe to use for psphot
 my $recipe_ppstats = 'STACKSTATS';
-if ($
-run_state eq 'update') {
+if ($run_state eq 'update') {
      $recipe_ppstats = 'WARPSTATS';
 }

trunk/ippScripts/scripts/staticsky.pl

@@ -162 +162 @@
             print "input: $path_base\n";
             my $stack_id = $file->{stack_id};
+            print "stack_id: $stack_id\n";
 
             my ($imageCnv, $maskCnv, $weightCnv, $expnumCnv);