Changeset 14009 for trunk/ippScripts/scripts/detrend_norm_calc.pl

Timestamp:

Jul 4, 2007, 1:53:22 PM (19 years ago)

Author:

eugene

Message:

extensive changes to use new stats calculation tools; general cleanups

File:

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

trunk/ippScripts/scripts/detrend_norm_calc.pl

@@ -11 +11 @@
 print "Starting script $0 on $host\n\n";
 
+use vars qw( $VERSION );
+$VERSION = '0.01';
+
 use IPC::Cmd 0.36 qw( can_run );
-use IPC::Run qw ( run );
+use IPC::Run 0.36 qw( run );
 use PS::IPP::Metadata::Config;
 use PS::IPP::Metadata::List qw( parse_md_list );
-use Data::Dumper;
-
-use PS::IPP::Config qw(
-    $PS_EXIT_SUCCESS
-    $PS_EXIT_UNKNOWN_ERROR
-    $PS_EXIT_SYS_ERROR
-    $PS_EXIT_CONFIG_ERROR
-    $PS_EXIT_PROG_ERROR
-    $PS_EXIT_DATA_ERROR
-    $PS_EXIT_TIMEOUT_ERROR
-    );
+
+use PS::IPP::Config qw($PS_EXIT_SUCCESS
+                       $PS_EXIT_UNKNOWN_ERROR
+                       $PS_EXIT_SYS_ERROR
+                       $PS_EXIT_CONFIG_ERROR
+                       $PS_EXIT_PROG_ERROR
+                       $PS_EXIT_DATA_ERROR
+                       $PS_EXIT_TIMEOUT_ERROR
+                       );
 
 use Getopt::Long qw( GetOptions :config auto_help auto_version gnu_getopt );
 use Pod::Usage qw( pod2usage );
 
-
 # Parse command-line arguments
-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_op,                     # Don't do operations
-    );
+my ($det_id, $iter, $detType, $workdir, $dbname, $no_update, $no_op);
 GetOptions(
-        '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-op'         => \$no_op,
+        'det_id|d=s'    => \$det_id,    # Detrend id                         
+        'iteration|i=s' => \$iter,      # Iteration                          
+        'det_type|t=s'  => \$detType,   # Detrend type                       
+        'workdir|w=s'   => \$workdir,   # Working directory for output files 
+        'dbname|d=s'    => \$dbname,    # Database name                      
+        'no-update'     => \$no_update, # Don't update the database?         
+        'no-op'         => \$no_op,     # Don't do operations                
         ) or pod2usage( 2 );
 
@@ -53 +46 @@
 pod2usage( -msg => "Required options --det_id --iteration --det_type",
            -exitval => 3,
-           ) unless defined $det_id
+           ) 
+    unless defined $det_id
     and defined $iter
     and defined $detType;
 
-
 use constant STATISTIC => 'bg'; # Background statistic to use from the database
+
 # Define which detrend types we normalise
 use constant NORMALIZE => {
@@ -70 +64 @@
     }; 
 
-
 # Look for programs we need
 my $missing_tools;
@@ -80 +73 @@
 }
 
-&my_die("Unrecognised detrend type: $detType", $det_id, $iter, $PS_EXIT_PROG_ERROR) unless
-    exists NORMALIZE()->{lc($detType)};
+&my_die("Unrecognised detrend type: $detType", $det_id, $iter, $PS_EXIT_PROG_ERROR) unless exists NORMALIZE()->{lc($detType)};
 
 my $mdcParser = PS::IPP::Metadata::Config->new; # Parser for metadata config files
@@ -172 +164 @@
 }
 
+my $commandBase = "$dettool -addnormalizedstat";
+$commandBase .= " -det_id $det_id";
+$commandBase .= " -iteration $iter";
+$commandBase .= " -dbname $dbname" if defined $dbname;
 
 # Process output normalisations
 unless ($no_update) {
     foreach my $normItem (@$norms) {
+
         my $className = $normItem->{name}; # Name of component
         my $normalisation = $normItem->{value}; # Normalisation for component
 
-        my $command = "$dettool -addnormalizedstat -det_id $det_id -iteration $iter -class_id $className ".
-            "-norm $normalisation"; # Command to run
-        $command .= " -dbname $dbname" if defined $dbname;
+        my $command = $commandBase;
+        $command .= " -class_id $className";
+        $command .= " -norm $normalisation";
+
         my @command = split /\s+/, $command;
 
@@ -192 +190 @@
         print $stdout . "\n";
     }
+} else {
+    print "skipping command: $commandBase\n";
 }
 
@@ -203 +203 @@
     carp($msg);
     if ($det_id and $iter and not $no_update) {
-        my $command = "$dettool -addnormalizedstat -det_id $det_id -iteration $iter -code $exit_code";
+        my $command = "$dettool -addnormalizedstat";
+        $command .= " -det_id $det_id";
+        $command .= " -iteration $iter";
+        $command .= " -code $exit_code";
         $command .= " -dbname $dbname" if defined $dbname;
 ###        system ($command);