Changeset 19332

Timestamp:

Sep 2, 2008, 11:27:22 AM (18 years ago)

Author:

Paul Price

Message:

Typo in fringe component; caught by Armin Rest.

Location:

trunk/ippScripts/scripts

Files:

• camera_exp.pl (modified) (4 diffs)
• detrend_resid_exp.pl (modified) (2 diffs)

trunk/ippScripts/scripts/camera_exp.pl

@@ -81 +81 @@
         { name => "fringe_0",       type => "mean",  flag => "-fringe_0",       dtype => "float" },
         { name => "fringe_1",       type => "rms",   flag => "-fringe_1",       dtype => "float" },
-        { name => "fringe_0",       type => "stdev", flag => "-fringe_2",       dtype => "float" },
+        { name => "fringe_2",       type => "stdev", flag => "-fringe_2",       dtype => "float" },
 #        { name => "sigma_ra",       type => "rms",   flag => "-sigma_ra",       dtype => "float" },
 #        { name => "sigma_dec",      type => "rms",   flag => "-sigma_dec",      dtype => "float" },
@@ -240 +240 @@
         $command  = "$psastro -list $list3Name $outroot";
         $command .= " -tracedest $traceDest -log $logDest";
-        $command .= " -stats $fpaStats -recipe PPSTATS CHIPSTATS";
+        $command .= " -stats $fpaStats -recipe PPSTATS CHIPSTATS";
         $command .= " -dbname $dbname" if defined $dbname;
 
@@ -253 +253 @@
         &my_die("Unable to find expected output file: $fpaStats",   $cam_id, $PS_EXIT_PROG_ERROR) unless -f $ipprc->file_resolve($fpaObjects);
 
-        # Get the statistics on the processed image
-        my $statsFile;              # File handle
-        open $statsFile, $ipprc->file_resolve($fpaStats) or &my_die("Can't open statistics file $fpaStats: $!", $cam_id, $PS_EXIT_SYS_ERROR);
-        my @contents = <$statsFile>; # Contents of file
-        close $statsFile;
-
-        # parse the statistics MDC file
-        my $mdcParser = PS::IPP::Metadata::Config->new();   # Parser for metadata config files
-        my $metadata = $mdcParser->parse(join "", @contents);
-        unless ($metadata) {
-            &my_die("Unable to parse metadata config doc", $cam_id, $PS_EXIT_PROG_ERROR);
-        }
-
-        # extract the stats from the metadata
-        unless ($camStats->parse($metadata)) {
-            &my_die("Failure extracting metadata from the statistics output file.\n", $cam_id, $PS_EXIT_PROG_ERROR);
-        }
+        # Get the statistics on the processed image
+        my $statsFile;              # File handle
+        open $statsFile, $ipprc->file_resolve($fpaStats) or &my_die("Can't open statistics file $fpaStats: $!", $cam_id, $PS_EXIT_SYS_ERROR);
+        my @contents = <$statsFile>; # Contents of file
+        close $statsFile;
+
+        # parse the statistics MDC file
+        my $mdcParser = PS::IPP::Metadata::Config->new();   # Parser for metadata config files
+        my $metadata = $mdcParser->parse(join "", @contents);
+        unless ($metadata) {
+            &my_die("Unable to parse metadata config doc", $cam_id, $PS_EXIT_PROG_ERROR);
+        }
+
+        # extract the stats from the metadata
+        unless ($camStats->parse($metadata)) {
+            &my_die("Failure extracting metadata from the statistics output file.\n", $cam_id, $PS_EXIT_PROG_ERROR);
+        }
 
         # run addstar on the output fpaObjects (if a DVO database is defined)
@@ -328 +328 @@
     if (defined $cam_id and not $no_update) {
         my $command = "$camtool -addprocessedexp";
-        $command .= " -cam_id $cam_id";
-        $command .= " -uri UNKNOWN";
-        $command .= " -code $exit_code";
-        $command .= " -path_base $outroot";
+        $command .= " -cam_id $cam_id";
+        $command .= " -uri UNKNOWN";
+        $command .= " -code $exit_code";
+        $command .= " -path_base $outroot";
         $command .= " -hostname $host" if defined $host;
         $command .= " -dbname $dbname" if defined $dbname;

trunk/ippScripts/scripts/detrend_resid_exp.pl

@@ -99 +99 @@
         { name => "fringe_0",       type => "mean",  flag => "-fringe_0",      dtype => "float" },
         { name => "fringe_1",       type => "rms",   flag => "-fringe_1",      dtype => "float" },
-        { name => "fringe_0",       type => "stdev", flag => "-fringe_2",      dtype => "float" },
+        { name => "fringe_2",       type => "stdev", flag => "-fringe_2",      dtype => "float" },
         { name => "user_1",         type => "mean",  flag => "-user_1",        dtype => "float" }, # fringe residual
         { name => "user_2",         type => "rms",   flag => "-user_2",        dtype => "float" }, # fringe residual
@@ -542 +542 @@
         $command .= " -iteration $iter";
         $command .= " -exp_id $exp_id";
-        $command .= " -path_base $outroot";
+        $command .= " -path_base $outroot";
         $command .= " -code $exit_code";
         $command .= " -dbname $dbname" if defined $dbname;