Changeset 23342 for trunk/ippScripts/scripts

Timestamp:

Mar 17, 2009, 10:36:05 AM (17 years ago)

Author:

eugene

Message:

verify vs master: verify needs to use the detNormalizedImfile entry / master uses detStackedImfile; verify should not block on detNormalizedExp; verify does not select normalization values

File:

• trunk/ippScripts/scripts/detrend_resid_exp.pl (modified) (8 diffs)

trunk/ippScripts/scripts/detrend_resid_exp.pl

@@ -45 +45 @@
 
 # parse the command-line options
-my ( $det_id, $iter, $exp_id, $exp_tag, $det_type, $camera, $filter, $reject, $outroot, $dbname, $reduction,
+my ( $det_id, $iter, $exp_id, $exp_tag, $det_mode, $det_type, $camera, $filter, $reject, $outroot, $dbname, $reduction,
      $verbose, $no_update, $no_op, $save_temps, $redirect );
 GetOptions(
@@ -53 +53 @@
            'exp_tag|=s'        => \$exp_tag,
            'det_type|t=s'      => \$det_type,
+           'det_mode=s'        => \$det_mode,
            'camera=s'          => \$camera,
            'outroot|w=s'       => \$outroot,   # output file base name
@@ -74 +75 @@
     defined $exp_tag  and
     defined $det_type and
+    defined $det_mode and
     defined $camera   and
     defined $outroot;
@@ -93 +95 @@
 # Get list of normalizations by class_id : stored as $norms; save to temp file for ppImage runs below
 my (%norms, $normsName);
-{
+if ($det_mode eq 'master') {
     # dettool command to select imfile data for this exp_id
     $command  = "$dettool -normalizedstat";
@@ -164 +166 @@
     my ($statFile, $statName) = tempfile( "/tmp/$exp_tag.detresid.$det_id.$iter.stats.XXXX", UNLINK => !$save_temps );
 
+    print $statFile "rawResidImfile MULTI\n";
+
     # parse the file info in the metadata
     # as we parse the list of files and their stats, apply the normalization to the relevant fields
@@ -188 +192 @@
         # modify and save the data in this block:
         foreach my $data (@$mdComponents) {
-            my $norm = $norms{$class_id};
+            my $norm = 1.0;
+            if ($det_mode eq "master") {
+                $norm = $norms{$class_id};
+            }
 
             # fields to modify by the normalization:
@@ -252 +259 @@
     $command .= " -recipe PPIMAGE PPIMAGE_J1";
     $command .= " -recipe JPEG $recipe";
-    $command .= " -normlist $normsName";
+    $command .= " -normlist $normsName" if defined $normsName;
     $command .= " -dbname $dbname" if defined $dbname;
     ( $success, $error_code, $full_buf, $stdout_buf, $stderr_buf ) =
@@ -267 +274 @@
     $command .= " -recipe PPIMAGE PPIMAGE_J2";
     $command .= " -recipe JPEG $recipe";
-    $command .= " -normlist $normsName";
+    $command .= " -normlist $normsName" if defined $normsName;
     $command .= " -dbname $dbname" if defined $dbname;
     ( $success, $error_code, $full_buf, $stdout_buf, $stderr_buf ) =