Changeset 11837 for trunk/ippScripts/scripts/detrend_norm_apply.pl

Timestamp:

Feb 15, 2007, 2:23:33 PM (19 years ago)

Author:

Paul Price

Message:

Adding --no-op option which turns off processing (so one can track only the database work flow) for everything except the phase 0 scripts (need to have some real data in the database in order to track it).

File:

• trunk/ippScripts/scripts/detrend_norm_apply.pl (modified) (6 diffs)

trunk/ippScripts/scripts/detrend_norm_apply.pl

@@ -39 +39 @@
     $dbname,                    # Database name
     $workdir,                   # Working directory, for output files
-    $no_update                  # Don't update the database
+    $no_update,                 # Don't update the database
+    $no_op,                     # Don't do any operations
     );
 GetOptions(
@@ -51 +52 @@
     'dbname|d=s'        => \$dbname,
     'workdir|w=s'       => \$workdir, # Working directory, for output files
-    'no-update'         => \$no_update
+    'no-update'         => \$no_update,
+    'no-op'             => \$no_op,
     ) or pod2usage( 2 );
     
@@ -100 +102 @@
 
 # Run normalisation
-{
+my $stats = PS::IPP::Metadata::Stats->new(); # Stats parser
+unless ($no_op) {
     my $command = "$ppImage -file $input $outputRoot -norm $value -stat $statsName -recipe PPIMAGE " . RECIPE(); # Command to run
     $command .= ' -isfringe' if lc($det_type) eq 'fringe';
@@ -113 +116 @@
     &my_die("Can't find expected output file: $b2name", $det_id, $iter, $class_id, $PS_EXIT_SYS_ERROR) unless -e $b2name;
     &my_die("Can't find expected output file: $statsName", $det_id, $iter, $class_id, $PS_EXIT_SYS_ERROR) unless -e $statsName;
-}
-
-# Get the statistics on the normalised image
-my $stats;                      # Statistics from ppImage
-{
+    
+    # Get the statistics on the normalised image
     my $statsFile;              # File handle
     open $statsFile, $statsName or &my_die("Can't open statistics file $statsName: $!\n", $det_id, $iter, $class_id, $PS_EXIT_SYS_ERROR);
@@ -124 +124 @@
     my $mdcParser = PS::IPP::Metadata::Config->new;     # Parser for metadata config files
     my $metadata = $mdcParser->parse(join "", @contents)
-        or &my_die("Unable to parse metadata config", $det_id, $iter, $class_id, $PS_EXIT_PROG_ERROR);
-    $stats = PS::IPP::Metadata::Stats->new(); # Stats parser
+        or &my_die("Unable to parse metadata config", $det_id, $iter, $class_id, $PS_EXIT_PROG_ERROR);
     $stats->parse($metadata) or &my_die("Unable to find all values in statistics output.", $det_id, $iter, $class_id, $PS_EXIT_PROG_ERROR);
-}
+}    
 
 # Update the database
@@ -133 +132 @@
 $b1name = $ipprc->convert_filename_relative( $b1name );
 $b2name = $ipprc->convert_filename_relative( $b2name );
+
+my $bg = ($stats->bg_mean() or 'NAN');
+my $bg_stdev = ($stats->bg_stdev() or 'NAN');
+my $bg_mean_stdev = ($stats->bg_mean_stdev() or 'NAN');
+
 unless ($no_update) {
     my $command = "$dettool -addnormalizedimfile -det_id $det_id -iteration $iter -class_id $class_id ".
         "-uri $output -b1_uri $outputRoot"; # Command to run
-    # Add the statistics triplet
-    $command .= " -bg " . $stats->bg_mean();
-    if (defined($stats->bg_mean_stdev())) {
-        $command .= " -bg_mean_stdev " . $stats->bg_mean_stdev();
-    } else {
-        # May be undefined if there's only a single imfile
-        $command .= " -bg_mean_stdev 0";
-    }
-    $command .= " -bg_stdev " . $stats->bg_stdev();
-
+    $command .= " -bg $bg -bg_stdev $bg_stdev -bg_mean_stdev $bg_mean_stdev";
     $command .= " -dbname $dbname" if defined $dbname;