Changeset 27838 for branches/tap_branches/ippScripts/scripts/flatcorr_proc.pl

Timestamp:

May 3, 2010, 8:41:49 AM (16 years ago)

Author:

eugene

Message:

updates from trunk

Location:

branches/tap_branches

Files:

• . (modified) (1 prop)
• ippScripts/scripts/flatcorr_proc.pl (modified) (15 diffs)

branches/tap_branches/ippScripts/scripts/flatcorr_proc.pl

@@ -11 +11 @@
 # dvoMakeCorr -file outgrid.fits -ref ref.fits outcorr
 
-# dettool -register -det_type FLATCORR -filelevel (level) -workdir -inst, etc 
-
-# foreach $imfile () 
+# dettool -register -det_type FLATCORR -filelevel (level) -workdir -inst, etc
+
+# foreach $imfile ()
 #   dettool -register_imfile -uri, etc, etc
 
@@ -23 +23 @@
 use Sys::Hostname;
 my $host = hostname();
+my $date = `date`;
 print "\n\n";
-print "Starting script $0 on $host\n\n";
+print "Starting script $0 on $host at $date\n\n";
 
 use vars qw( $VERSION );
@@ -42 +43 @@
 use Pod::Usage qw( pod2usage );
 
-my ($corr_id, $det_type, $dvodb, $camera, $region, $filter, $dbname, $workdir, $verbose, $no_update, $no_op);
+my ($corr_id, $det_type, $dvodb, $camera, $region, $filter, $dbname, $workdir, $make_correction, $verbose, $no_update, $no_op);
 GetOptions(
     'corr_id|i=s'      => \$corr_id,
@@ -52 +53 @@
     'dbname|d=s'       => \$dbname,# Database name
     'workdir|w=s'      => \$workdir, # Working directory for output files
-    'verbose'           => \$verbose,   # Print to stdout
+    'make_correction'  => \$make_correction,   # Generate the correction image and save to the detrend database
+    'verbose'          => \$verbose,   # Print to stdout
     'no-update'        => \$no_update,
     'no-op'            => \$no_op,
@@ -73 +75 @@
 my $addstar     = can_run('addstar')      or (warn "Can't find addstar"      and $missing_tools = 1);
 my $dvoMakeCorr = can_run('dvoMakeCorr')  or (warn "Can't find dvoMakeCorr"  and $missing_tools = 1);
-my $detselect   = can_run('detselect')    or (warn "Can't find detselect"    and $missing_tools = 1);
-my $dettool     = can_run('dettool')      or (warn "Can't find dettool"      and $missing_tools = 1);
-my $flatcorr    = can_run('flatcorr')     or (warn "Can't find flatcorr"     and $missing_tools = 1);
-
-if ($missing_tools) { 
+my $detselect   = can_run('detselect')    or (warn "Can't find detselect"    and $missing_tools = 1);
+my $dettool     = can_run('dettool')      or (warn "Can't find dettool"      and $missing_tools = 1);
+my $flatcorr    = can_run('flatcorr')     or (warn "Can't find flatcorr"     and $missing_tools = 1);
+
+if ($missing_tools) {
     warn ("Can't find required tools");
-    exit($PS_EXIT_CONFIG_ERROR); 
+    exit($PS_EXIT_CONFIG_ERROR);
 }
 
@@ -86 +88 @@
 my $mdcParser = PS::IPP::Metadata::Config->new; # Parser for metadata config files
 
-# XXX either workdir needs to be non-nebulous here, or addstar / relphot need to handle 
-# nebulous interactions...
+# dvodb must be non-nebulous; workdir may be in nebulous
 my $outgrid = "$dvodb/flatcorr/$camera.$filter.$corr_id";
 my $outcorr = "$workdir/$camera.$filter.$corr_id";
@@ -95 +96 @@
 $ipprc->outroot_prepare($outcorr);
 
-if (not -e "$dvodb/flatcorr") { 
+if (not -e "$dvodb/flatcorr") {
     mkdir "$dvodb/flatcorr" or &my_die ("Unable to make output directory for relphot $dvodb/flatcorr", $corr_id, 3);
 }
@@ -104 +105 @@
 my ($DECs, $DECe) = split (",", $coords[1]);
 
-# Run addstar -resort to ensure the db is indexed 
+# Run addstar -resort to ensure the db is indexed
 # XXX addstar should be able to recognize and skip indexed tables
 {
-    my $command = "$addstar -resort"; 
+    my $command = "$addstar -resort";
     $command .= " -D CATDIR $dvodb";
     $command .= " -region $RAs $RAe $DECs $DECe";
 
     my ( $success, $error_code, $full_buf, $stdout_buf, $stderr_buf ) =
-        run(command => $command, verbose => $verbose);
-
-    unless ($success) { 
-        $error_code = (($error_code >> 8) or $PS_EXIT_PROG_ERROR);
-        &my_die ("Unable to perform addstar -resort for dvodb $dvodb on region $region: $error_code", $corr_id, $error_code);
+        run(command => $command, verbose => $verbose);
+
+    unless ($success) {
+        $error_code = (($error_code >> 8) or $PS_EXIT_PROG_ERROR);
+        &my_die ("Unable to perform addstar -resort for dvodb $dvodb on region $region: $error_code", $corr_id, $error_code);
     }
 }
@@ -135 +136 @@
 
     my ( $success, $error_code, $full_buf, $stdout_buf, $stderr_buf ) =
-        run(command => $command, verbose => $verbose);
-
-    unless ($success) { 
-        $error_code = (($error_code >> 8) or $PS_EXIT_PROG_ERROR);
-        &my_die ("Unable to perform relphot -grid for dvodb $dvodb on region $region: $error_code", $corr_id, $error_code);
+        run(command => $command, verbose => $verbose);
+
+    unless ($success) {
+        $error_code = (($error_code >> 8) or $PS_EXIT_PROG_ERROR);
+        &my_die ("Unable to perform relphot -grid for dvodb $dvodb on region $region: $error_code", $corr_id, $error_code);
+    }
+}
+
+if ($make_correction) {
+
+    # get a single input exposure
+    # flatcorr -inputexp -corr_id $corr_id -limit 1
+    my $chip_id = &get_chip_id();
+
+    # get the list of imfiles for the single input exposure
+    # flatcorr -inputimfile -chip_id $chip_id
+    my $files = &get_imfiles($chip_id);
+
+    # set up the detrend run to store the corrected imfiles
+    my $det_id = &get_det_id($$files[0]);
+
+    # make the (full-sized) detrend correction images
+    &make_detrend_imfiles($det_id, $files);
+
+    # set the detrun state to 'stop'
+    my $command = "$dettool -updatedetrun";
+    $command .= " -det_id $det_id";
+    $command .= " -state stop";
+    $command .= " -dbname $dbname" if defined $dbname;
+
+    my ( $success, $error_code, $full_buf, $stdout_buf, $stderr_buf ) =
+        run(command => $command, verbose => $verbose);
+
+    unless ($success) {
+        $error_code = (($error_code >> 8) or $PS_EXIT_PROG_ERROR);
+        warn ("Unable to perform dettool -updatedetrun: $error_code");
+        exit($error_code);
+    }
+}
+
+# Push the results into the database
+{
+    my $command = "$flatcorr -addprocess";
+    $command .= " -corr_id $corr_id";
+    $command .= " -hostname $host" if defined $host;
+    $command .= " -dbname $dbname" if defined $dbname;
+
+    unless ($no_update) {
+
+        my ( $success, $error_code, $full_buf, $stdout_buf, $stderr_buf ) =
+            run(command => $command, verbose => $verbose);
+        unless ($success) {
+            $error_code = (($error_code >> 8) or $PS_EXIT_PROG_ERROR);
+            warn ("Unable to perform regtool -addprocessedimfile: $error_code");
+            exit($error_code);
+        }
+    } else {
+        print "skipping command: $command\n";
     }
 }
@@ -145 +199 @@
 # get a single input exposure
 # flatcorr -inputexp -corr_id $corr_id -limit 1
-my $chip_id;
-{
+sub get_chip_id {
+
     my $command = "$flatcorr -inputexp";
     $command .= " -corr_id $corr_id";
@@ -165 +219 @@
         &my_die("Unable to parse metadata list", $corr_id, $PS_EXIT_PROG_ERROR);
 
-    # check for existence 
+    # check for existence
     my $file = $$files[0];
-    $chip_id = $file->{chip_id};
+    my $chip_id = $file->{chip_id};
+
+    return $chip_id;
 }
 
 # get the list of imfiles for the single input exposure
 # flatcorr -inputimfile -chip_id $chip_id
-my $files;
-{
+sub get_imfiles {
+    my $chip_id = shift;
+
     my $command = "$flatcorr -inputimfile";
     $command .= " -chip_id $chip_id";
@@ -188 +245 @@
 
     # extract the metadata for the files into a hash list
-    $files = parse_md_list($metadata) or
+    my $files = parse_md_list($metadata) or
         &my_die("Unable to parse metadata list", $corr_id, $PS_EXIT_PROG_ERROR);
+
+    return $files;
 }
 
 # set up the detrend run to store the corrected imfiles
-my $det_id;
-{
-    # get the filelevel from one of these chips
-    my $file = $$files[0];
+sub get_det_id {
+    # get the filelevel from the supplied chip
+    my $file = shift;
 
     my $filelevel = $file->{filelevel};
@@ -216 +274 @@
 
     my ( $success, $error_code, $full_buf, $stdout_buf, $stderr_buf ) =
-        run(command => $command, verbose => $verbose);
-
-    unless ($success) { 
-        $error_code = (($error_code >> 8) or $PS_EXIT_PROG_ERROR);
-        &my_die ("Unable to register new detrend: $error_code", $corr_id, $PS_EXIT_PROG_ERROR);
+        run(command => $command, verbose => $verbose);
+
+    unless ($success) {
+        $error_code = (($error_code >> 8) or $PS_EXIT_PROG_ERROR);
+        &my_die ("Unable to register new detrend: $error_code", $corr_id, $PS_EXIT_PROG_ERROR);
     }
 
@@ -231 +289 @@
 
     # $file = $$output[0];
-    $det_id = $$output[0]->{det_id};
-}
-
-# use input chip image as a reference image
-foreach my $file (@$files) {
-    # create the detrend correction for the imfiles based on the input imfiles
-    my $reffile = $file->{uri};
-    my $class_id = $file->{class_id};
-
-    my $uri = $ipprc->filename("DVOCORR.OUTPUT", $outcorr, $class_id);
-    unless ($uri) {
-        &my_die ("Unable to find DVOCORR.OUTPUT in filerules", $corr_id, $PS_EXIT_PROG_ERROR);
-    }
-
-    my $command = "$dvoMakeCorr $outcorr";
-    $command .= " -file $outgrid.fits";
-    $command .= " -ref $reffile";
-
-    my ( $success, $error_code, $full_buf, $stdout_buf, $stderr_buf ) =
-        run(command => $command, verbose => $verbose);
-
-    unless ($success) { 
-        $error_code = (($error_code >> 8) or $PS_EXIT_PROG_ERROR);
-        &my_die ("Unable to perform dvoMakeCorr: $error_code", $corr_id, $PS_EXIT_PROG_ERROR);
-    }
-
-    # register the detrend correction imfile
-    $command = "$dettool -register_detrend_imfile";
-    $command .= " -det_id $det_id";
-    $command .= " -class_id $class_id";
-    $command .= " -uri $uri";
-    $command .= " -dbname $dbname" if defined $dbname;
-
-    ( $success, $error_code, $full_buf, $stdout_buf, $stderr_buf ) =
-        run(command => $command, verbose => $verbose);
-
-    unless ($success) { 
-        $error_code = (($error_code >> 8) or $PS_EXIT_PROG_ERROR);
-        &my_die ("Unable to register new detrend: $error_code", $corr_id, $PS_EXIT_PROG_ERROR);
-    }
-}
-
-# set the detrun state to 'stop'
-{
-    my $command = "$dettool -updatedetrun";
-    $command .= " -det_id $det_id";
-    $command .= " -state stop";
-    $command .= " -dbname $dbname" if defined $dbname;
-
-    my ( $success, $error_code, $full_buf, $stdout_buf, $stderr_buf ) =
-        run(command => $command, verbose => $verbose);
-
-    unless ($success) {
-        $error_code = (($error_code >> 8) or $PS_EXIT_PROG_ERROR);
-        warn ("Unable to perform dettool -updatedetrun: $error_code");
-        exit($error_code);
-    }
-}
-
-# Push the results into the database
-{ 
-    my $command = "$flatcorr -addprocess";
-    $command .= " -corr_id $corr_id";
-    $command .= " -hostname $host" if defined $host;
-    $command .= " -dbname $dbname" if defined $dbname;
-
-    unless ($no_update) {
-
-        my ( $success, $error_code, $full_buf, $stdout_buf, $stderr_buf ) =
-            run(command => $command, verbose => $verbose);
-        unless ($success) {
-            $error_code = (($error_code >> 8) or $PS_EXIT_PROG_ERROR);
-            warn ("Unable to perform regtool -addprocessedimfile: $error_code");
-            exit($error_code);
-        }
-    } else {
-        print "skipping command: $command\n";
+    my $det_id = $$output[0]->{det_id};
+    return $det_id;
+}
+
+# use input chip images as reference images to make the detrend correction images
+sub make_detrend_imfiles {
+    my $det_id = shift;
+    my $files = shift;
+
+    foreach my $file (@$files) {
+        # create the detrend correction for the imfiles based on the input imfiles
+        my $reffile = $file->{uri};
+        my $class_id = $file->{class_id};
+
+        my $uri = $ipprc->filename("DVOCORR.OUTPUT", $outcorr, $class_id);
+        unless ($uri) {
+            &my_die ("Unable to find DVOCORR.OUTPUT in filerules", $corr_id, $PS_EXIT_PROG_ERROR);
+        }
+
+        my $command = "$dvoMakeCorr $outcorr";
+        $command .= " -file $outgrid.fits";
+        $command .= " -ref $reffile";
+
+        my ( $success, $error_code, $full_buf, $stdout_buf, $stderr_buf ) =
+            run(command => $command, verbose => $verbose);
+
+        unless ($success) {
+            $error_code = (($error_code >> 8) or $PS_EXIT_PROG_ERROR);
+            &my_die ("Unable to perform dvoMakeCorr: $error_code", $corr_id, $PS_EXIT_PROG_ERROR);
+        }
+
+        # register the detrend correction imfile
+        $command = "$dettool -register_detrend_imfile";
+        $command .= " -det_id $det_id";
+        $command .= " -class_id $class_id";
+        $command .= " -uri $uri";
+        $command .= " -dbname $dbname" if defined $dbname;
+
+        ( $success, $error_code, $full_buf, $stdout_buf, $stderr_buf ) =
+            run(command => $command, verbose => $verbose);
+
+        unless ($success) {
+            $error_code = (($error_code >> 8) or $PS_EXIT_PROG_ERROR);
+            &my_die ("Unable to register new detrend: $error_code", $corr_id, $PS_EXIT_PROG_ERROR);
+        }
     }
 }
@@ -320 +346 @@
     if (not $no_update) {
         my $command = "$flatcorr -addprocess";
-        $command .= " -corr_id $corr_id";
+        $command .= " -corr_id $corr_id";
         $command .= " -fault $exit_code";
         $command .= " -hostname $host" if defined $host;