Changeset 8850

Timestamp:

Sep 19, 2006, 5:42:29 PM (20 years ago)

Author:

Paul Price

Message:

Small bugs in hashes. Works now.

File:

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

trunk/ippScripts/scripts/detrend_calc_norm.pl

@@ -31 +31 @@
 my $files;                      # The input files
 {
-    my $command = "$dettool -processed -unmask -det_id $detId -iter $iter"; # Command to run
+    my $command = "$dettool -processed -unmask -det_id $detId -iteration $iter"; # Command to run
     my ( $success, $error_code, $full_buf, $stdout_buf, $stderr_buf ) =
         run(command => $command, verbose => 1);
@@ -45 +45 @@
 my %matrix; # Matrix of statistics as a function of exposures and classes
 foreach my $file (@$files) {
-    my $expId = $file->{exp_id}; # Exposure ID
-    my $classId = $file->{class_id}; # Class ID
-    my $stat = $file->{STATISTIC}; # Statistic of interest
+    my $expId = $file->{'exp_id'}; # Exposure ID
+    my $classId = $file->{'class_id'}; # Class ID
+    my $stat = $file->{STATISTIC()}; # Statistic of interest
 
     # Create matrix elements
@@ -60 +60 @@
     print $normFile "$expId\tMETADATA\n";
     foreach my $classId (keys %{$matrix{$expId}}) {
-        print $normFile "\t$classId\tF32\t" . $matrix{$expId}->{$classId} . "\n";
+        print $normFile "\t" . $classId . "\tF32\t" . $matrix{$expId}->{$classId} . "\n";
     }
-    print $normFile "\n";
+    print $normFile "END\n\n";
 }
 close $normFile;
-
 
 # Run ppNormCalc
@@ -85 +84 @@
         my $normalisation = $normItem->{value}; # Normalisation for component
 
-        my $command = "$dettool -addnormstat -det_id $detId -iter $iter -class_id $className ".
+        my $command = "$dettool -addnormstat -det_id $detId -iteration $iter -class_id $className ".
             "-norm $normalisation"; # Command to run
         my ( $success, $error_code, $full_buf, $stdout_buf, $stderr_buf ) =