Changeset 19621 for trunk/ippScripts/scripts

Timestamp:

Sep 19, 2008, 2:11:37 PM (18 years ago)

Author:

eugene

Message:

changing detrend verify mode to behave just like master mode in terms of processing and residual generation; adding ref_det_id, ref_iter to detRun and detResidImfile, modifying the foreign constraint; adding a simtest suite to test the detrend verify mode

File:

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

trunk/ippScripts/scripts/detrend_resid_imfile.pl

@@ -24 +24 @@
 use Pod::Usage qw( pod2usage );
 
-my ( $det_id, $iter, $exp_id, $exp_tag, $class_id, $det_type, $detrend, $input_uri, $camera, $mode, $outroot,
+my ( $det_id, $iter, $ref_det_id, $ref_iter, $exp_id, $exp_tag, $class_id, $det_type, $detrend, $input_uri, $camera, $mode, $outroot,
      $dbname, $reduction, $threads, $verbose, $no_update, $no_op, $redirect );
 GetOptions(
     'det_id|d=s'        => \$det_id,
     'iteration=s'       => \$iter,
+    'ref_det_id=s'      => \$ref_det_id,
+    'ref_iter=s'        => \$ref_iter,
     'exp_id|e=s'        => \$exp_id,
     'exp_tag|=s'        => \$exp_tag,
@@ -48 +50 @@
 
 pod2usage( -msg => "Unknown option: @ARGV", -exitval => 2 ) if @ARGV;
-pod2usage( -msg => "Required options: --det_id --iteration --exp_id --exp_tag --class_id --det_type --camera --input_uri --mode --detrend --outroot (not for 'verify' mode)",
+pod2usage( -msg => "Required options: --det_id --iteration --ref_det_id --ref_iter --exp_id --exp_tag --class_id --det_type --camera --input_uri --mode --detrend --outroot (not for 'verify' mode)",
            -exitval => 3) unless
-    defined $det_id    and
-    defined $iter      and
-    defined $exp_id    and
-    defined $exp_tag   and
-    defined $class_id  and
-    defined $det_type  and
-    defined $input_uri and
-    defined $camera    and
-    defined $mode      and
-    defined $outroot   and
-    (defined $detrend or lc($mode) eq 'verify');
+    defined $det_id     and
+    defined $iter       and
+    defined $ref_det_id and
+    defined $ref_iter   and
+    defined $exp_id     and
+    defined $exp_tag    and
+    defined $class_id   and
+    defined $det_type   and
+    defined $input_uri  and
+    defined $camera     and
+    defined $mode       and
+    defined $outroot    and
+    defined $detrend;
 
 $ipprc->define_camera($camera);
@@ -69 +73 @@
 
 # Recipes to use as a function of detrend type and mode
+# XXX probably can drop the distinct 'verify' recipes
 $reduction = 'DETREND' unless defined $reduction;
 my $recipe;                     # Name of recipe to use
@@ -78 +83 @@
     &my_die("Unrecognised mode: $mode", $det_id, $iter, $exp_id, $class_id, $PS_EXIT_PROG_ERROR);
 }
+
+print "raw recipe: $recipe\n";
 $recipe = $ipprc->reduction($reduction, $recipe);
+print "real recipe: $recipe\n";
 
 # values to extract from output metadata and the stats to calculate
@@ -166 +174 @@
 
     # Detrend to use in processing
-    if (lc($mode) ne 'verify') {
-        my $detFlag = DETRENDS->{lc($det_type)};
-        &my_die("Unrecognised detrend type: $det_type", $det_id, $iter, $exp_id, $class_id, $PS_EXIT_PROG_ERROR) unless defined $detFlag;
-        $command .= " $detFlag $detrend";
-    }
+    my $detFlag = DETRENDS->{lc($det_type)};
+    &my_die("Unrecognised detrend type: $det_type", $det_id, $iter, $exp_id, $class_id, $PS_EXIT_PROG_ERROR) unless defined $detFlag;
+    $command .= " $detFlag $detrend";
 
     my ( $success, $error_code, $full_buf, $stdout_buf, $stderr_buf ) =
@@ -216 +222 @@
 $command .= " -det_id $det_id";
 $command .= " -iteration $iter";
+$command .= " -ref_det_id $ref_det_id";
+$command .= " -ref_iter $ref_iter";
 $command .= " -exp_id $exp_id";
 $command .= " -class_id $class_id";
@@ -252 +260 @@
         $command .= " -det_id $det_id";
         $command .= " -iteration $iter";
+        $command .= " -ref_det_id $ref_det_id";
+        $command .= " -ref_iter $ref_iter";
         $command .= " -exp_id $exp_id";
         $command .= " -class_id $class_id";