Changeset 25027 for branches/pap/ippScripts/scripts/camera_exp.pl

Timestamp:

Aug 7, 2009, 4:08:25 PM (17 years ago)

Author:

Paul Price

Message:

Merging trunk (r25026) to get up-to-date on old branch.

Location:

branches/pap

Files:

• . (modified) (1 prop)
• ippScripts/scripts/camera_exp.pl (modified) (2 diffs)

branches/pap/ippScripts/scripts/camera_exp.pl

@@ -94 +94 @@
 
 my $recipe_addstar = $ipprc->reduction($reduction, 'ADDSTAR'); # Recipe to use
-&my_die("Unrecognised ADDSTAR recipe", $cam_id, $PS_EXIT_CONFIG_ERROR) unless defined $recipe1;
+&my_die("Unrecognised ADDSTAR recipe", $cam_id, $PS_EXIT_CONFIG_ERROR) unless defined $recipe_addstar;
+
+my $recipe_psastro = $ipprc->reduction($reduction, 'PSASTRO'); # Recipe to use
+&my_die("Unrecognised PSASTRO recipe", $cam_id, $PS_EXIT_CONFIG_ERROR) unless defined $recipe_psastro;
 
 my $mdcParser = PS::IPP::Metadata::Config->new; # Parser for metadata config files
@@ -242 +245 @@
         # run psastro on the chipObjects, producing fpaObjects
         my $command;
-        $command  = "$psastro -list $list3Name -masklist $list4Name $outroot";
+        $command  = "$psastro";
+        $command .= " -list $list3Name";
+        $command .= " -masklist $list4Name";
+        $command .= " $outroot";
+        $command .= " -recipe PSASTRO $recipe_psastro";
         $command .= " -tracedest $traceDest -log $logDest";
         $command .= " -dbname $dbname" if defined $dbname;