Changeset 33638 for branches/eam_branches/ipp-20111122/ippScripts/scripts/camera_exp.pl

Timestamp:

Mar 30, 2012, 2:49:37 PM (14 years ago)

Author:

eugene

Message:

merge changes from trunk

File:

• branches/eam_branches/ipp-20111122/ippScripts/scripts/camera_exp.pl (modified) (9 diffs)

branches/eam_branches/ipp-20111122/ippScripts/scripts/camera_exp.pl

@@ -41 +41 @@
 
 my ( $exp_tag, $cam_id, $camera, $outroot, $dbname, $reduction, $dvodb, $verbose, $no_update,
-     $no_op, $redirect, $save_temps, $run_state);
+     $no_op, $redirect, $save_temps, $run_state, $skip_binned, $skip_masks);
 GetOptions(
-    'exp_tag=s'          => \$exp_tag, # Exposure identifier
+    'exp_tag=s'         => \$exp_tag, # Exposure identifier
     'cam_id=s'          => \$cam_id, # Camtool identifier
     'camera|c=s'        => \$camera, # Camera
@@ -51 +51 @@
     'dvodb|w=s'         => \$dvodb,  # output DVO database
     'run-state=s'       => \$run_state, # 'new' or 'update'
+    'skip-binned'       => \$skip_binned, # override recipe - don't create binned images
+    'skip-refmask'      => \$skip_masks, # override recipe - don't create refmask
     'verbose'           => \$verbose,   # Print to stdout
     'no-update'         => \$no_update, # Update the database?
@@ -156 +158 @@
     { # Determine if FWHM is too large to bother continuing.
         my $maxFWHM = 0;
+      # XXX: temporary hack if this is a CNP exposure set maxFWHM to a large
+      # value.
+      # Before the next tag we will put this into a recipe
+      if ($outroot =~ /CNP/) {
+            $maxFWHM = 25;
+      } else {
         my $command = "$ppConfigDump -camera $camera -get-key MAX_ALLOWED_FWHM";
         my ($success, $error_code, $full_buf, $stdout_buf, $stderr_buf ) =
@@ -168 +176 @@
             $maxFWHM = metadataLookupStr($cameraConfig, 'MAX_ALLOWED_FWHM');
         }
+      }
         if ($maxFWHM) {
             my $expFWHM;
@@ -183 +192 @@
 
 my $produceMasks;               # Produce masks?
-{
+if (!$skip_masks) {
     # Get the PSASTRO recipe
     my $command = "$ppConfigDump -camera $camera -recipe PSASTRO $recipe_psastro -dump-recipe PSASTRO -";
@@ -198 +207 @@
 }
 
-
 ### not needed to have such an extensive temp file name.
 my ($list1File, $list1Name) = tempfile( "/tmp/$exp_tag.cm.$cam_id.b1.list.XXXX", UNLINK => !$save_temps ); # For binning 1
@@ -254 +262 @@
 
     # Make the jpeg for binning 1
-    if ($run_state eq 'new') {
+    if (!$skip_binned and ($run_state eq 'new')) {
         my $command = "$ppImage -list $list1Name $outroot"; # Command to run
         $command .= " -recipe PPIMAGE $recipe1";
@@ -269 +277 @@
 
     # Make the jpeg for binning 2
-    if ($run_state eq 'new') {
+    if (!$skip_binned and ($run_state eq 'new')) {
         my $command = "$ppImage -list $list2Name $outroot"; # Command to run
         $command .= " -recipe PPIMAGE $recipe2";
@@ -288 +296 @@
         $command  = "$psastro";
         $command .= " -list $list3Name";
-        $command .= " -masklist $list4Name";
+        $command .= " -masklist $list4Name" if $produceMasks;
         $command .= " $outroot";
         $command .= " -recipe PSASTRO $recipe_psastro";
+        $command .= " -Db PSASTRO:REFSTAR_MASK F" if $skip_masks;
         $command .= " -tracedest $traceDest -log $logDest";
         $command .= " -dbname $dbname" if defined $dbname;