Changeset 12225

Timestamp:

Mar 5, 2007, 11:50:50 AM (19 years ago)

Author:

Paul Price

Message:

Chip and camera processing scripts take --recipe argument now to tell them how to process the data. The argument is currently not used, but it will define a 'recipe class' to be used in processing.

Location:

trunk/ippScripts/scripts

Files:

• camera_exp.pl (modified) (2 diffs)
• chip_imfile.pl (modified) (3 diffs)

trunk/ippScripts/scripts/camera_exp.pl

@@ -33 +33 @@
 use Pod::Usage qw( pod2usage );
 
-my ($exp_id, $cam_id, $camera, $dbname, $workdir, $no_update, $no_op);
+my ($exp_id, $cam_id, $recipe, $camera, $dbname, $workdir, $no_update, $no_op);
 GetOptions(
            'exp_id=s'          => \$exp_id, # Exposure identifier
            'cam_id=s'          => \$cam_id, # Camtool identifier
+           'recipe=s'          => \$recipe, # Recipe to use
            'camera|c=s'        => \$camera, # Camera
            'dbname|d=s'        => \$dbname, # Database name
@@ -234 +235 @@
 
 unless ($no_update) {
-    my $command = "$camtool -addprocessedexp -cam_id $cam_id -uri UNKNOWN " .
-        "-recip " . RECIPE1() . "," . RECIPE2() . " -path_base $outputRoot " .
+    my $command = "$camtool -addprocessedexp -cam_id $cam_id -uri UNKNOWN -path_base $outputRoot " .
         "-bg $bg -bg_stdev $bg_stdev -bg_mean_stdev $bg_mean_stdev " .
         "-sigma_ra 0.0 -sigma_dec 0.0 -nastro 0 -zp_mean 0.0 -zp_stdev 0.0"; # Command to run

trunk/ippScripts/scripts/chip_imfile.pl

@@ -36 +36 @@
     $class_id,                  # Class identifier
     $input,                     # Input FITS file
+    $recipe,                    # Recipe to use
     $camera,                    # Camera
     $dbname,                    # Database name
@@ -47 +48 @@
            'class_id=s'    => \$class_id,
            'uri|u=s'       => \$input,
+           'recipe=s'      => \$recipe,
            'camera|c=s'    => \$camera,
            'dbname|d=s'    => \$dbname, # Database name
@@ -141 +143 @@
     $command .= " -chip_id $chip_id";
     $command .= " -class_id $class_id";
-    $command .= " -recip " . RECIPE;
     $command .= " -uri $outputImage";
     $command .= " -path_base $outputRoot";