Changeset 20678

Timestamp:

Nov 10, 2008, 5:02:57 PM (17 years ago)

Author:

bills

Message:

remove mask hack

File:

• trunk/ippScripts/scripts/magic_process.pl (modified) (4 diffs)

trunk/ippScripts/scripts/magic_process.pl

@@ -31 +31 @@
 # Parse the command-line arguments
 my ($magic_id, $node, $camera, $dbname, $outroot, $save_temps, $verbose, $no_update, $no_op, $logfile);
-my $hack_mask;
 
 GetOptions(
@@ -44 +43 @@
            'no-op'           => \$no_op,      # Don't do any operations?
            'logfile=s'       => \$logfile,
-           'hack-mask'       => \$hack_mask   # enable extra special mask substitution
            ) or pod2usage( 2 );
 
@@ -123 +121 @@
 
         my $diff_id;
-        $diff_id = $innode->{diff_id} if $hack_mask;
-        my ($image, $mask, $weight) = resolve_inputs($innode, $diff_id);
+        my ($image, $mask, $weight) = resolve_inputs($innode);
 
         $command .= " --detect --image $image --mask $mask --weight $weight";
@@ -269 +266 @@
 
 sub resolve_inputs {
-    my %substitute_mask = (
-        30 => "/data/ipp036.0/price/MD_Nov2008/masking/diff_30_mask_extra.fits",
-        31 => "/data/ipp036.0/price/MD_Nov2008/masking/diff_31_mask_extra.fits",
-        34 => "/data/ipp036.0/price/MD_Nov2008/masking/diff_34_mask_extra.fits",
-        35 => "/data/ipp036.0/price/MD_Nov2008/masking/diff_35_mask_extra.fits",
-        36 => "/data/ipp036.0/price/MD_Nov2008/masking/diff_36_mask_extra.fits",
-        39 => "/data/ipp036.0/price/MD_Nov2008/masking/diff_39_mask_extra.fits",
-        40 => "/data/ipp036.0/price/MD_Nov2008/masking/diff_40_mask_extra.fits",
-        41 => "/data/ipp036.0/price/MD_Nov2008/masking/diff_41_mask_extra.fits",
-        44 => "/data/ipp036.0/price/MD_Nov2008/masking/diff_44_mask_extra.fits",
-        45 => "/data/ipp036.0/price/MD_Nov2008/masking/diff_45_mask_extra.fits",
-        49 => "/data/ipp036.0/price/MD_Nov2008/masking/diff_49_mask_extra.fits",
-        77 => "/data/ipp036.0/price/MD_Nov2008/masking/diff_77_mask_extra.fits",
-        81 => "/data/ipp036.0/price/MD_Nov2008/masking/diff_81_mask_extra.fits",
-        86 => "/data/ipp036.0/price/MD_Nov2008/masking/diff_86_mask_extra.fits",
-        89 => "/data/ipp036.0/price/MD_Nov2008/masking/diff_89_mask_extra.fits",
-        90 => "/data/ipp036.0/price/MD_Nov2008/masking/diff_90_mask_extra.fits",
-        94 => "/data/ipp036.0/price/MD_Nov2008/masking/diff_94_mask_extra.fits",
-        95 => "/data/ipp036.0/price/MD_Nov2008/masking/diff_95_mask_extra.fits"
-    );
 
     my $node = shift;
     my $input_base = $node->{path_base};
 
-    my $diff_id = shift;
-
     my $image = $ipprc->file_resolve($ipprc->filename("PPSUB.OUTPUT", $input_base));
-    my $mask;
-
-    # if a diff_id is provided look up the extra special difference image mask from the table
-    # XXX: perhaps if the mask doesn't exist, we should fall through and use the original
-    if ($diff_id) {
-        $mask = $substitute_mask{$diff_id};
-        &my_die("substitute mask not found for $diff_id", $magic_id, $node->{node}, $PS_EXIT_SYS_ERROR) unless $mask;
-    } else {
-        $mask = $ipprc->file_resolve($ipprc->filename("PPSUB.OUTPUT.MASK", $input_base));
-    }
+    my $mask = $ipprc->file_resolve($ipprc->filename("PPSUB.OUTPUT.MASK", $input_base));
     my $weight= $ipprc->file_resolve($ipprc->filename("PPSUB.OUTPUT.WEIGHT", $input_base));