Changeset 31533

Timestamp:

May 11, 2011, 5:50:38 PM (15 years ago)

Author:

watersc1

Message:

backports from the trunk:

stacktool: implement -warp_id option to definebyquery
laptool: add -listrun mode that is an alias of -pendingrun (because once the job completes -listrun makes more sense)
camera_exp.pl : set the quality for exposures with very large FWHM values to prevent them from continuing
camera.config : set the MAX_ALLOWED_FWHM to 12 (3")
lap_science.pl : make use of the stacktool -warp_id option to only queue stacks that have good data_states.

Location:

tags/ipp-20110505

Files:

• ippScripts/scripts/camera_exp.pl (modified) (1 diff)
• ippScripts/scripts/lap_science.pl (modified) (4 diffs)
• ippTools/src/laptoolConfig.c (modified) (2 diffs)
• ippTools/src/stacktool.c (modified) (1 diff)
• ippTools/src/stacktoolConfig.c (modified) (1 diff)
• ippconfig/gpc1/camera.config (modified) (1 diff)

tags/ipp-20110505/ippScripts/scripts/camera_exp.pl

@@ -153 +153 @@
     }
     chomp $cmdflags;
+
+    { # Determine if FWHM is too large to bother continuing.
+        my $command = "$ppConfigDump -camera $camera -dump-camera -";
+        my ($success, $error_code, $full_buf, $stdout_buf, $stderr_buf ) =
+            run(command => $command, verbose => $verbose);
+        unless ($success) {
+            $error_code = (($error_code >> 8) or $PS_EXIT_PROG_ERROR);
+            &my_die("Unable to perform ppConfigDump: $error_code", $cam_id, $PS_EXIT_CONFIG_ERROR);
+        }
+        my $cameraConfig = $mdcParser->parse(join "", @$stdout_buf) or
+            &my_die("Unable to parse metadata config doc", $cam_id, $PS_EXIT_CONFIG_ERROR);
+
+        my $maxFWHM = metadataLookupStr($cameraConfig, 'MAX_ALLOWED_FWHM');
+        if ($maxFWHM) {
+            my $expFWHM;
+            ($expFWHM) = $cmdflags =~ /-fwhm_major (\d+)/;      
+            
+            if ($expFWHM > $maxFWHM) {
+                print "Setting quality to 4007 due to large FWHM: exposure: $expFWHM  maximum: $maxFWHM\n";
+                $cmdflags .= " -quality 4007 "; # This corresponds to PSASTRO_ERR_DATA
+                $no_op = 1;
+            }
+        }
+    }
 }
 

tags/ipp-20110505/ippScripts/scripts/lap_science.pl

@@ -621 +621 @@
     }
 
+    my $warps = '';
+    foreach $exposure (@$exposures) {
+        if (($exposure->{data_state} != 'drop')&&
+            (S64_IS_NOT_NULL($exposure->{warp_id}))) {
+            $warps .= " -warp_id $exposure->{warp_id} ";
+        }
+    }
+
     my @utctime = gmtime();
     $utctime[5] += 1900;
@@ -636 +644 @@
     $command .= "  -set_workdir $workdir  -set_dist_group NODIST ";
     $command .= " -min_num 2 -set_reduction QUICKSTACK ";
+    $command .= " $warps ";
 
     my ($success, $error_code, $full_buf, $stdout_buf, $stderr_buf ) =
@@ -689 +698 @@
     unless (defined($label) && defined($filter) && defined($proj_cell)) {
         &my_die("Unable to perform stacktool. Insufficient information.", $lap_id);
+    }
+
+    my $warps = '';
+    foreach $exposure (@$exposures) {
+        if (($exposure->{data_state} != 'drop')&&
+            (S64_IS_NOT_NULL($exposure->{magicked}))&&
+            (S64_IS_NOT_NULL($exposure->{warp_id}))) {
+            $warps .= " -warp_id $exposure->{warp_id} ";
+        }
     }
 
@@ -704 +722 @@
     $command .= " -definebyquery -select_label $label -select_skycell_id ${proj_cell}.% -select_filter $filter ";
     $command .= " -set_label ${label} -set_workdir $workdir -set_data_group $data_group ";
-    $command .= " -min_num 2 -set_reduction THREEPI_STACK -set_dist_group ${label}";
+    $command .= " -min_num 2 -set_reduction THREEPI_STACK -set_dist_group ${label} ";
+    $command .= " $warps ";
 
     my ($success, $error_code, $full_buf, $stdout_buf, $stderr_buf ) =

tags/ipp-20110505/ippTools/src/laptoolConfig.c

@@ -75 +75 @@
   ADD_OPT(Bool,pendingrunArgs, "-simple",                     "use the simple output format", false);
 
+  // -listrun
+  psMetadata *listrunArgs = psMetadataAlloc();
+  ADD_OPT(S64, listrunArgs, "-seq_id",                     "search by LAP sequence ID", 0);
+  ADD_OPT(S64, listrunArgs, "-lap_id",                     "search by LAP run ID", 0);
+  ADD_OPT(Str, listrunArgs, "-projection_cell",            "search by projection cell", NULL);
+  ADD_OPT(Str, listrunArgs, "-filter",                     "search by filter", NULL);
+  //  ADD_OPT(Str, listrunArgs, "-label",                      "search by LAP run label", NULL);
+  psMetadataAddStr(listrunArgs, PS_LIST_TAIL, "-label", PS_META_DUPLICATE_OK, "search by LAP run label", NULL);
+  ADD_OPT(Str, listrunArgs, "-state",                      "search by LAP run state", NULL);
+  ADD_OPT(Str, listrunArgs, "-fault",                      "search by LAP run fault", NULL);
+  ADD_OPT(Bool,listrunArgs, "-simple",                     "use the simple output format", false);
+
   // -updaterun
   psMetadata *updaterunArgs = psMetadataAlloc();
@@ -129 +141 @@
   psMetadata *argSets = psMetadataAlloc();
   psMetadata *modes = psMetadataAlloc();
-
+  
   PXOPT_ADD_MODE("-definesequence",          "", LAPTOOL_MODE_DEFINESEQUENCE,   definesequenceArgs);
   PXOPT_ADD_MODE("-listsequence",            "", LAPTOOL_MODE_LISTSEQUENCE,     listsequenceArgs);
   PXOPT_ADD_MODE("-definerun",               "", LAPTOOL_MODE_DEFINERUN,        definerunArgs);
   PXOPT_ADD_MODE("-pendingrun",              "", LAPTOOL_MODE_PENDINGRUN,       pendingrunArgs);
+  PXOPT_ADD_MODE("-listrun",                 "", LAPTOOL_MODE_PENDINGRUN,       listrunArgs);
   PXOPT_ADD_MODE("-updaterun",               "", LAPTOOL_MODE_UPDATERUN,        updaterunArgs);
   PXOPT_ADD_MODE("-pendingexp",              "", LAPTOOL_MODE_PENDINGEXP,       pendingexpArgs);

tags/ipp-20110505/ippTools/src/stacktool.c

@@ -246 +246 @@
     PXOPT_COPY_STR(config->args,  where, "-select_data_group",         "warpRun.data_group", "==");
     pxAddLabelSearchArgs (config, where, "-select_label",              "warpRun.label", "LIKE"); // define using warp label
-
+    pxAddLabelSearchArgs (config, where, "-warp_id",                   "warpRun.warp_id", "==");
+    
     // these are used to build the HAVING restriction
     PXOPT_COPY_S32(config->args, having, "-min_num", "num_warp", ">=");

tags/ipp-20110505/ippTools/src/stacktoolConfig.c

@@ -91 +91 @@
     psMetadataAddF64(definebyqueryArgs, PS_LIST_TAIL, "-select_zpt_obs_max", 0, "define max zero point", NAN);
     psMetadataAddF64(definebyqueryArgs, PS_LIST_TAIL, "-select_astrom", 0, "define max astrometry rms", NAN);
+    psMetadataAddS64(definebyqueryArgs, PS_LIST_TAIL, "-warp_id", PS_META_DUPLICATE_OK, "include this warp ID (multiple OK)", 0);
     psMetadataAddS32(definebyqueryArgs, PS_LIST_TAIL, "-random", 0, "use this number of random elements", 0);
     psMetadataAddS32(definebyqueryArgs, PS_LIST_TAIL, "-min_num", 0, "minimum number of inputs", 0);

tags/ipp-20110505/ippconfig/gpc1/camera.config

@@ -165 +165 @@
 NPIX_INTERCHIP          S32     103794483
 
+# This sets the maximum size for the fwhm_major.  This is roughly 3", and 98.67% of all exposures in the database are less than this.
+MAX_ALLOWED_FWHM          F32         12
+
 # The set of maskbits that should not be set to NAN in "released" images
 # This value is equal to CONV.POOR | STARCORE | SPIKE | SUSPECT  = 0x5280