Changeset 27396

Timestamp:

Mar 22, 2010, 3:52:37 PM (16 years ago)

Author:

bills

Message:

check that cam_reduction is defined and not NULL

Location:

trunk/ippScripts/scripts

Files:

• magic_destreak.pl (modified) (1 diff)
• magic_destreak_cleanup.pl (modified) (1 diff)
• magic_destreak_revert.pl (modified) (1 diff)

trunk/ippScripts/scripts/magic_destreak.pl

@@ -86 +86 @@
 my $ipprc = PS::IPP::Config->new( $camera ) or my_die( "Unable to set up", $magic_ds_id, $component, $PS_EXIT_CONFIG_ERROR ); # IPP configuration
 $ipprc->redirect_output($logfile) or my_die( "Unable to redirect output", $magic_ds_id, $component, $PS_EXIT_SYS_ERROR ) if $logfile;
+
+$cam_reduction = 'DEFAULT' if !$cam_reduction or ($cam_reduction eq 'NULL');
+
 my $recipe_psastro = $ipprc->reduction($cam_reduction, 'PSASTRO'); # Recipe to use
 &my_die("Unrecognised PSASTRO recipe", $magic_ds_id, $component, $PS_EXIT_CONFIG_ERROR) unless defined $recipe_psastro;

trunk/ippScripts/scripts/magic_destreak_cleanup.pl

@@ -103 +103 @@
 my $cam_path_base = $run->{cam_path_base};
 my $cam_reduction = $run->{cam_reduction};
+$cam_reduction = 'DEFAULT' if !$cam_reduction or ($cam_reduction eq 'NULL');
 my $inverse = $run->{inverse};
 

trunk/ippScripts/scripts/magic_destreak_revert.pl

@@ -80 +80 @@
 
 $ipprc->redirect_output($logfile) or my_die( "Unable to redirect output", $magic_ds_id, $component, $PS_EXIT_SYS_ERROR ) if $logfile;
+
+$cam_reduction = 'DEFAULT' if !defined $cam_reduction or ($cam_reduction eq "NULL");
 my $recipe_psastro = $ipprc->reduction($cam_reduction, 'PSASTRO'); # Recipe to use
 &my_die("Unrecognised PSASTRO recipe", $magic_ds_id, $component, $PS_EXIT_CONFIG_ERROR) unless defined $recipe_psastro;