Changeset 28483

Timestamp:

Jun 24, 2010, 2:37:26 PM (16 years ago)

Author:

Paul Price

Message:

Get bgtool -addwarp to play nice.

Location:

branches/pap

Files:

• ippScripts/scripts/background_warp.pl (modified) (2 diffs)
• ippTools/src/bgtool.c (modified) (2 diffs)
• ippTools/src/bgtoolConfig.c (modified) (1 diff)
• ippconfig/recipes/ppStatsFromMetadata.config (modified) (1 diff)

branches/pap/ippScripts/scripts/background_warp.pl

@@ -174 +174 @@
     &my_die("Couldn't find expected output file: $out_stats", $warp_bg_id, $skycell_id, $PS_EXIT_SYS_ERROR) unless $ipprc->file_exists($out_stats);
 
-    my $command = "$ppStatsFromMetadata $out_stats - WARP_SKYCELL";
+    my $command = "$ppStatsFromMetadata $out_stats - BACKGROUND_WARP";
     my ( $success, $error_code, $full_buf, $stdout_buf, $stderr_buf ) =
         run(command => $command, verbose => $verbose);
@@ -229 +229 @@
     warn($msg);
     if (defined $warp_bg_id and defined $skycell_id and not $no_update) {
-        my $command = "$bgtool -addwarped";
+        my $command = "$bgtool -addwarp";
         $command .= " -warp_bg_id $warp_bg_id";
         $command .= " -skycell_id $skycell_id";

branches/pap/ippTools/src/bgtool.c

@@ -1401 +1401 @@
     PXOPT_LOOKUP_STR(ver_pslib, config->args, "-ver_pslib", false, false);
     PXOPT_LOOKUP_STR(ver_psmodules, config->args, "-ver_psmodules", false, false);
-    PXOPT_LOOKUP_STR(ver_ppbackground, config->args, "-ver_ppbackground", false, false);
+    PXOPT_LOOKUP_STR(ver_pswarp, config->args, "-ver_pswarp", false, false);
     PXOPT_LOOKUP_STR(ver_ppstats, config->args, "-ver_ppstats", false, false);
     PXOPT_LOOKUP_F64(bg, config->args, "-bg", false, false);
@@ -1412 +1412 @@
 
     psString ver_code = pxMergeCodeVersions(ver_pslib, ver_psmodules);
-    ver_code = pxMergeCodeVersions(ver_code, ver_ppbackground);
+    ver_code = pxMergeCodeVersions(ver_code, ver_pswarp);
     ver_code = pxMergeCodeVersions(ver_code, ver_ppstats);
 

branches/pap/ippTools/src/bgtoolConfig.c

@@ -306 +306 @@
     psMetadataAddStr(addwarpArgs, PS_LIST_TAIL, "-ver_pslib", 0, "define psLib version", NULL);
     psMetadataAddStr(addwarpArgs, PS_LIST_TAIL, "-ver_psmodules", 0, "define psModules version", NULL);
-    psMetadataAddStr(addwarpArgs, PS_LIST_TAIL, "-ver_ppbackground", 0, "define ppBackground version", NULL);
+    psMetadataAddStr(addwarpArgs, PS_LIST_TAIL, "-ver_pswarp", 0, "define pswarp version", NULL);
     psMetadataAddStr(addwarpArgs, PS_LIST_TAIL, "-ver_ppstats", 0, "define ppStats version", NULL);
     psMetadataAddF64(addwarpArgs, PS_LIST_TAIL, "-bg", 0, "define exposure background", NAN);

branches/pap/ippconfig/recipes/ppStatsFromMetadata.config

@@ -326 +326 @@
 END
 
+
+BACKGROUND_WARP METADATA
+  ENTRY MULTI
+  TYPE   VAL  KEYWORD             TYPE STATISTIC         FLAG 
+  ENTRY  VAL  ROBUST_MEDIAN       F32  ROBUST_MEDIAN     -bg            
+  ENTRY  VAL  ROBUST_STDEV        F32  RMS               -bg_stdev      
+  ENTRY  VAL  QUALITY             S32  CONSTANT          -quality             # Bad quality flag
+
+  # Revision values
+  ENTRY  VAL  PSLIB_V             STR  CONSTANT         -ver_pslib
+  ENTRY  VAL  MODULE_V            STR  CONSTANT         -ver_psmodules
+  ENTRY  VAL  STATS_V             STR  CONSTANT         -ver_ppstats
+  ENTRY  VAL  WARP_V              STR  CONSTANT         -ver_pswarp
+
+  # Mask stats values
+  ENTRY VAL MASKFRAC_NPIX         S32  CONSTANT         -maskfrac_npix
+  ENTRY VAL MASKFRAC_STATIC       F32  CONSTANT         -maskfrac_static
+  ENTRY VAL MASKFRAC_DYNAMIC      F32  CONSTANT         -maskfrac_dynamic
+  ENTRY VAL MASKFRAC_MAGIC        F32  CONSTANT         -maskfrac_magic
+  ENTRY VAL MASKFRAC_ADVISORY     F32  CONSTANT         -maskfrac_advisory
+END
+
+
 STACK_SKYCELL METADATA
   ENTRY MULTI