Changeset 11837 for trunk/ippScripts/scripts/detrend_norm_calc.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_calc.pl (modified) (8 diffs)

trunk/ippScripts/scripts/detrend_norm_calc.pl

@@ -31 +31 @@
 
 # Parse command-line arguments
-my ($detId,                     # Detrend id
+my ($det_id,                    # Detrend id
     $iter,                      # Iteration
     $detType,                   # Detrend type
     $workdir,                   # Working directory for output files
     $dbname,                    # Database name
-    $no_update                  # Don't update the database?
+    $no_update,                 # Don't update the database?
+    $no_op,                     # Don't do operations
     );
 GetOptions(
-        'det_id|d=s'    => \$detId,
+        'det_id|d=s'    => \$det_id,
         'iteration|i=s' => \$iter,
         'det_type|t=s'  => \$detType,
         'workdir|w=s'   => \$workdir,
         'dbname|d=s'    => \$dbname,# Database name
-        'no-update'     => \$no_update
+        'no-update'     => \$no_update,
+        'no-op'         => \$no_op,
         ) or pod2usage( 2 );
 
@@ -50 +52 @@
 pod2usage( -msg => "Required options --det_id --iteration --det_type",
            -exitval => 3,
-           ) unless defined $detId
+           ) unless defined $det_id
     and defined $iter
     and defined $detType;
@@ -85 +87 @@
 my @files;                      # The input files
 {
-    my $command = "$dettool -processedimfile -det_id $detId"; # Command to run
+    my $command = "$dettool -processedimfile -det_id $det_id"; # Command to run
     $command .= " -dbname $dbname" if defined $dbname;
     my @command = split /\s+/, $command;
@@ -91 +93 @@
     print "Running [$command]...\n";
     if (not run(\@command, \$stdin, \$stdout, \$stderr)) {
-        &my_die("Unable to perform dettool -processedimfile on detrend $detId/$iter: $?",
+        &my_die("Unable to perform dettool -processedimfile on detrend $det_id/$iter: $?",
                 $det_id, $iter, $PS_EXIT_SYS_ERROR);
     }
@@ -115 +117 @@
 
 my $norms;                      # MDC with normalisations
-if (NORMALIZE()->{lc($detType)}) {
+if (NORMALIZE()->{lc($detType)} and not $no_op) {
 
     my %matrix; # Matrix of statistics as a function of exposures and classes
     foreach my $file (@files) {
-        my $expTag = $file->{'exp_tag'}; # Exposure ID
-        my $classId = $file->{'class_id'}; # Class ID
+        my $exp_tag = $file->{'exp_tag'}; # Exposure ID
+        my $class_id = $file->{'class_id'}; # Class ID
         my $stat = $file->{STATISTIC()}; # Statistic of interest
         
         # Create matrix elements
-        $matrix{$expTag} = {} if not defined $matrix{$expTag};
-        $matrix{$expTag}->{$classId} = $stat;
+        $matrix{$exp_tag} = {} if not defined $matrix{$exp_tag};
+        $matrix{$exp_tag}->{$class_id} = $stat;
     }
     
     # Generate the input for ppNormCalc
     my $normData;                       # Normalisation data
-    foreach my $expTag (keys %matrix) {
-        $normData .= "$expTag\tMETADATA\n";
-        foreach my $classId (keys %{$matrix{$expTag}}) {
-            $normData .= "\t" . $classId . "\tF32\t" . $matrix{$expTag}->{$classId} . "\n";
+    foreach my $exp_tag (keys %matrix) {
+        $normData .= "$exp_tag\tMETADATA\n";
+        foreach my $class_id (keys %{$matrix{$exp_tag}}) {
+            $normData .= "\t" . $class_id . "\tF32\t" . $matrix{$exp_tag}->{$class_id} . "\n";
         }
         $normData .= "END\n\n";
@@ -157 +159 @@
     my %classes;                # List of unique classes
     foreach my $file (@files) {
-        my $classId = $file->{'class_id'}; # Class Id
-        $classes{$classId} = 1;
+        my $class_id = $file->{'class_id'}; # Class Id
+        $classes{$class_id} = 1;
     }
     
-    foreach my $classId (keys %classes) {
+    foreach my $class_id (keys %classes) {
         my %mdValue;    # Metadata value for this class id
-        $mdValue{name} = $classId;
+        $mdValue{name} = $class_id;
         $mdValue{value} = 1.0;
         push @$norms, \%mdValue;
@@ -176 +178 @@
         my $normalisation = $normItem->{value}; # Normalisation for component
 
-        my $command = "$dettool -addnormalizedstat -det_id $detId -iteration $iter -class_id $className ".
+        my $command = "$dettool -addnormalizedstat -det_id $det_id -iteration $iter -class_id $className ".
             "-norm $normalisation"; # Command to run
         $command .= " -dbname $dbname" if defined $dbname;
@@ -199 +201 @@
 
     warn($msg);
-    if ($det_id and $iter and $class_id and not $no_update) {
+    if ($det_id and $iter and not $no_update) {
         my $command = "$dettool -addnormalizedstat -det_id $det_id -iteration $iter -code $exit_code";
         $command .= " -dbname $dbname" if defined $dbname;