Changeset 35154 for trunk/ippScripts/scripts/background_warp.pl

Timestamp:

Feb 12, 2013, 4:24:02 PM (13 years ago)

Author:

bills

Message:

Further changes to background spur in the pipeline.

1. Add chipBackgroundRun.cam_id
2. Use camera stage mask instead of chip stage mask
3. Drop warpBackgroundRun.alt_cam_label use chipBackgroundRun.cam_id to find the astrometry
4. Fix broken processing of chipBackground stats output

File:

• trunk/ippScripts/scripts/background_warp.pl (modified) (5 diffs)

trunk/ippScripts/scripts/background_warp.pl

@@ -39 +39 @@
 
 my ($warp_bg_id, $skycell_id, $tess_dir, $reduction, $camera, $dbname, $outroot, $threads, $verbose, $no_update, $no_op, $redirect, $save_temps);
-my ($astrometry, $imageName, $maskName, $weightName, $magicked, $exp_tag, $alternate_astrometry_label);
+my ($astrometry, $imageName, $maskName, $weightName, $magicked);
 GetOptions(
     'warp_bg_id|i=s'      => \$warp_bg_id, # Warp identifier
     'skycell_id|s=s'      => \$skycell_id, # Skycell identifier
     'tess_dir|s=s'        => \$tess_dir, # Tesselation identifier
-    'exp_tag|=s'          => \$exp_tag, # exposure tag
     'camera|c=s'          => \$camera, # Camera name
     'dbname|d=s'          => \$dbname, # Database name
@@ -52 +51 @@
     'mask-list=s'         => \$maskName, # list of input mask files
     'astrometry=s'        => \$astrometry,
-    'alt_cam_label=s'     => \$alternate_astrometry_label,  # camRun.label for alternate astrometry
     'magicked=s'          => \$magicked,
     'threads=s'           => \$threads,   # Number of threads to use for pswarp
@@ -86 +84 @@
 }
 
-if ($alternate_astrometry_label) {
-    my_die( "--exp_tag is required when using alternate astrometry", $warp_bg_id, $skycell_id, $PS_EXIT_PROG_ERROR )
-        unless defined $exp_tag;
-}
-
 my $ipprc = PS::IPP::Config->new( $camera ) or 
 my_die( "Unable to set up", $warp_bg_id, $skycell_id, $PS_EXIT_CONFIG_ERROR ); # IPP configuration
@@ -128 +121 @@
 if (!defined $imageName) {
     # go find our inputs
-    my $astrom_path_base;
-    if (defined $alternate_astrometry_label) {
-        my $command = "$camtool -processedexp -exp_tag $exp_tag -label $alternate_astrometry_label";
-        $command .= " -dbname $dbname" if $dbname;
-        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 camtool -processedexp: $error_code", $warp_bg_id, $error_code);
-        }
-        my $entries = $mdcParser->parse_list(join "", @$stdout_buf) or
-            &my_die("Unable to parse metadata config doc", $warp_bg_id, $PS_EXIT_PROG_ERROR);
-        my $entry = $entries->[0];
-        $astrom_path_base = $entry->{path_base};
-    }
-
     my ($imageFile, $maskFile, $weightFile);
     ($imageFile, $imageName) = tempfile( "$tempOutRoot.image.list.XXXX",  UNLINK => !$save_temps);
@@ -176 +153 @@
         $magicked = $file->{magicked};
 
-        if (!$astrom_path_base) {
-            my $cam_path = $file->{cam_path_base};
-            my $astrom = $ipprc->filename($astromSource, $cam_path);
-            &my_die("Astrometry files don't match: $astrom vs $astrometry", $warp_bg_id, $skycell_id, $PS_EXIT_PROG_ERROR) if defined $astrometry and $astrom ne $astrometry;
-            $astrometry = $astrom;
-        } elsif (!$astrometry) {
-            # using alternate astrometry
-            $astrometry = $ipprc->filename($astromSource, $astrom_path_base);
-        }
+        my $cam_path = $file->{cam_path_base};
+        my $astrom = $ipprc->filename($astromSource, $cam_path);
+        &my_die("Astrometry files don't match: $astrom vs $astrometry", $warp_bg_id, $skycell_id, $PS_EXIT_PROG_ERROR) if defined $astrometry and $astrom ne $astrometry;
+        $astrometry = $astrom;
     }
     close $imageFile;