Changeset 20428

Timestamp:

Oct 27, 2008, 4:44:49 PM (18 years ago)

Author:

Paul Price

Message:

Can't get recipe until camera is defined.

Location:

trunk/ippScripts/scripts

Files:

• diff_skycell.pl (modified) (2 diffs)
• stack_skycell.pl (modified) (2 diffs)

trunk/ippScripts/scripts/diff_skycell.pl

@@ -61 +61 @@
     warn("Can't find required tools.");
     exit($PS_EXIT_CONFIG_ERROR);
-}
-
-# Recipes to use based on reduction class
-$reduction = 'DEFAULT' unless defined $reduction;
-my $recipe_ppSub = $ipprc->reduction($reduction, 'DIFF_PPSUB'); # Recipe to use for ppSub
-my $recipe_psphot  = $ipprc->reduction($reduction, 'DIFF_PSPHOT'); # Recipe to use for psphot
-unless ($recipe_ppSub and $recipe_psphot) {
-    &my_die("Couldn't find selected reduction for DIFF_PPSUB and DIFF_PSPHOT: $reduction\n", $diff_id, $PS_EXIT_CONFIG_ERROR);
 }
 
@@ -149 +141 @@
 $ipprc->define_camera($camera);
 
+# Recipes to use based on reduction class
+$reduction = 'DEFAULT' unless defined $reduction;
+my $recipe_ppSub = $ipprc->reduction($reduction, 'DIFF_PPSUB'); # Recipe to use for ppSub
+my $recipe_psphot  = $ipprc->reduction($reduction, 'DIFF_PSPHOT'); # Recipe to use for psphot
+unless ($recipe_ppSub and $recipe_psphot) {
+    &my_die("Couldn't find selected reduction for DIFF_PPSUB and DIFF_PSPHOT: $reduction\n", $diff_id, $PS_EXIT_CONFIG_ERROR);
+}
+
 # print "templateMask: $templateMask\n";
 # print "templatePath: $templatePath\n";

trunk/ippScripts/scripts/stack_skycell.pl

@@ -77 +77 @@
 }
 
-# Recipes to use based on reduction class
-$reduction = 'DEFAULT' unless defined $reduction;
-my $recipe_ppStack = $ipprc->reduction($reduction, 'STACK_PPSTACK'); # Recipe to use for ppStack
-my $recipe_ppSub = $ipprc->reduction($reduction, 'STACK_PPSUB'); # Recipe to use for ppSub
-my $recipe_psphot  = $ipprc->reduction($reduction, 'STACK_PSPHOT'); # Recipe to use for psphot
-unless ($recipe_ppStack and $recipe_ppSub and $recipe_psphot) {
-    &my_die("Couldn't find selected reduction for STACK_PPSTACK, STACK_PPSUB and STACK_PSPHOT: $reduction\n", $stack_id, $PS_EXIT_CONFIG_ERROR);
-}
-
 # Get list of components for stacking
 my $mdcParser = PS::IPP::Metadata::Config->new; # Parser for metadata config files
@@ -139 +130 @@
 &my_die("Can't find camera", $stack_id, $PS_EXIT_SYS_ERROR) unless defined $camera;
 $ipprc->define_camera($camera);
+
+# Recipes to use based on reduction class
+$reduction = 'DEFAULT' unless defined $reduction;
+my $recipe_ppStack = $ipprc->reduction($reduction, 'STACK_PPSTACK'); # Recipe to use for ppStack
+my $recipe_ppSub = $ipprc->reduction($reduction, 'STACK_PPSUB'); # Recipe to use for ppSub
+my $recipe_psphot  = $ipprc->reduction($reduction, 'STACK_PSPHOT'); # Recipe to use for psphot
+unless ($recipe_ppStack and $recipe_ppSub and $recipe_psphot) {
+    &my_die("Couldn't find selected reduction for STACK_PPSTACK, STACK_PPSUB and STACK_PSPHOT: $reduction\n", $stack_id, $PS_EXIT_CONFIG_ERROR);
+}
 
 # Generate MDC file with the inputs