Changeset 13937 for trunk/ippScripts/scripts/detrend_resid.pl

Timestamp:

Jun 21, 2007, 2:10:11 PM (19 years ago)

Author:

Paul Price

Message:

Changes to multiple packages in order to use "reduction classes" to
specify recipe names. The idea is to give a group of recipes a
symbolic name, which distinguish how the reduction is to be performed,
without going to all the trouble of changing the recipes themselves.

For example, we might want to turn off the usual
overscan/bias/dark/shutter/flat processing and only do photometry if
we have pre-processed data. Gene also wants a similar ability for
building the flat-field correction.

Added a REDUCTION metadata to the camera configuration that contains
multiple METADATA entries that have recipes for different processing
steps. PS::IPP::Config has a 'reduction' function to return the
appropriate recipe, and this is now used in the scripts. Updated
ippTasks to use these where appropriate.

This necessitated changing the database, so that the desired reduction
class can be specified in the right places. Instructions on converting
an extant database are in dbconfig/changes.txt.

Tested with the SIMTEST, and it works.

There is currently no way of specifying the reduction class when an
exposure proceeds from 'register' to 'chip' (it has to be hacked in
the database directly: "update chipPendingExp set reduction =
'SOME_CLASS' where ..."), but it can be specified when adding a
detrend run or queuing chips with 'chiptool -queue' (the '-reduction'
option). Also, the 'recipe' columns remain throughout the detrend
tables, and they continue to be populated with the actual recipe used
(rather than the reduction class; but that is contained in the
detRun).

File:

• trunk/ippScripts/scripts/detrend_resid.pl (modified) (5 diffs)

trunk/ippScripts/scripts/detrend_resid.pl

@@ -34 +34 @@
 
 my ($det_id, $iter, $exp_tag, $class_id, $det_type, $detrend,
-        $input_uri, $camera, $mode, $dbname, $workdir, $no_update, $no_op);
+        $input_uri, $camera, $mode, $dbname, $workdir, $reduction, $no_update, $no_op);
 GetOptions(
     'det_id|d=s'        => \$det_id,
@@ -47 +47 @@
     'dbname|d=s'        => \$dbname, # Database name
     'workdir|w=s'       => \$workdir,   # Working directory, for output files
+    'reduction=s'       => \$reduction, # Reduction class
     'no-update'         => \$no_update,
     'no-op'             => \$no_op,
@@ -67 +68 @@
 $ipprc->define_camera($camera);
 
-# Recipes to use, as a function of the detrend type
-use constant RECIPES => {
-    'master' => {               # We're creating a master --- already processed the input
-        'bias'     => 'PPIMAGE_B',      # Bias only
-        'dark'     => 'PPIMAGE_D',      # Dark only
-        'shutter'  => 'PPIMAGE_S',      # Shutter only
-        'flat'     => 'PPIMAGE_F',      # Flat-field only
-        'domeflat' => 'PPIMAGE_F',      # Flat-field only
-        'skyflat'  => 'PPIMAGE_F',      # Flat-field only
-        'fringe'   => 'PPIMAGE_R',      # Fringe only
-    },
-    'verify' => {               # We're checking the master --- input is not already processed
-        'bias'     => 'PPIMAGE_OB',     # Bias only
-        'dark'     => 'PPIMAGE_OBD',    # Dark only
-        'shutter'  => 'PPIMAGE_OBDS',   # Shutter only
-        'flat'     => 'PPIMAGE_OBDSF',  # Flat-field only
-        'domeflat' => 'PPIMAGE_OBDSF',  # Flat-field only
-        'skyflat'  => 'PPIMAGE_OBDSF',  # Flat-field only
-        'fringe'   => 'PPIMAGE_OBDSFR', # Fringe only
-    },
-};
+$reduction = 'DETREND' unless defined $reduction;
+my $recipe;                     # Name of recipe to use
+if ($mode eq 'master') {
+    $recipe = $det_type . '_RESID';
+} elsif ($mode eq 'verify') {
+    $recipe = $det_type . '_VERIFY';
+} else {
+    &my_die("Unrecognised mode: $mode", $det_id, $iter, $exp_tag, $class_id, $PS_EXIT_PROG_ERROR);
+}
+$recipe = $ipprc->reduction($reduction, $recipe);
 
 # Flags to specify the particular detrend to use
@@ -113 +103 @@
 $ppImage .= " -dbname $dbname" if defined $dbname;
 
-# Recipe to use in processing
-&my_die("Unrecognised mode: $mode", $det_id, $iter, $exp_tag, $class_id, $PS_EXIT_PROG_ERROR) unless defined RECIPES->{$mode};
-my $recipe = RECIPES->{$mode}->{lc($det_type)};
-&my_die("Unrecognised detrend type: $det_type", $det_id, $iter, $exp_tag, $class_id, $PS_EXIT_PROG_ERROR) unless defined $recipe;
-
 $workdir = caturi( $workdir, "$camera.$det_type.$det_id" ) if defined $workdir;
 
@@ -183 +168 @@
 my $bg_mean_stdev = ($stats->bg_mean_stdev() or 'NAN');
 my $bin_stdev     = ($binnedStats->bg_stdev() or 'NAN');
-my $fringe_0      = (${$stats->fringe()[0]} or 'NAN');
-my $fringe_1      = (${$stats->fringe_err()[0]} or 'NAN');
+my $fringe_0      = (${$stats->fringe()}[0] or 'NAN');
+my $fringe_1      = (${$stats->fringe_err()}[0] or 'NAN');
 my $fringe_2      = 'NAN';