Changeset 15376 for trunk/ippTools/src

Timestamp:

Oct 25, 2007, 10:34:12 AM (19 years ago)

Author:

Paul Price

Message:

Adding good_frac for the fraction of good pixels (replacing pixel_fill for warpSkyfile).

Location:

trunk/ippTools/src

Files:

• difftool.c (modified) (3 diffs)
• difftoolConfig.c (modified) (1 diff)
• stacktool.c (modified) (2 diffs)
• stacktoolConfig.c (modified) (1 diff)
• warptool.c (modified) (2 diffs)
• warptoolConfig.c (modified) (1 diff)

trunk/ippTools/src/difftool.c

@@ -267 +267 @@
     }
     if (stack_id && warp_id) {
-        psError(PS_ERR_UNKNOWN, true, "either -stack_id or -warp_id must be specified"); 
+        psError(PS_ERR_UNKNOWN, true, "either -stack_id or -warp_id must be specified");
         return false;
     }
@@ -596 +596 @@
     }
 
+    psF64 good_frac = psMetadataLookupF64(&status, config->args, "-good_frac");
+    if (!status) {
+        psError(PS_ERR_UNKNOWN, false, "failed to lookup value for -good_frac");
+        return false;
+    }
+
     if (!psDBTransaction(config->dbh)) {
         psError(PS_ERR_UNKNOWN, false, "database error");
@@ -607 +613 @@
             bg,
             bg_stdev,
+            good_frac,
             code
         )) {

trunk/ippTools/src/difftoolConfig.c

@@ -126 +126 @@
     psMetadataAddF64(adddiffskyfileArgs, PS_LIST_TAIL, "-bg_stdev",  0,
             "define exposure background mean stdev", NAN);
+    psMetadataAddF64(adddiffskyfileArgs, PS_LIST_TAIL, "-good_frac",  0,
+            "define %% of good pixels", NAN);
     psMetadataAddS16(adddiffskyfileArgs, PS_LIST_TAIL, "-code",  0,
             "set fault code", 0);

trunk/ippTools/src/stacktool.c

@@ -526 +526 @@
     }
 
+    psF64 good_frac = psMetadataLookupF64(&status, config->args, "-good_frac");
+    if (!status) {
+        psError(PS_ERR_UNKNOWN, false, "failed to lookup value for -good_frac");
+        return false;
+    }
+
     // default values
     psS16 code = psMetadataLookupS16(&status, config->args, "-code");
@@ -547 +553 @@
             bg,
             bg_stdev,
+            good_frac,
             code
         )) {

trunk/ippTools/src/stacktoolConfig.c

@@ -118 +118 @@
     psMetadataAddF64(addsumskyfileArgs, PS_LIST_TAIL, "-bg_stdev",  0,
             "define exposue background mean stdev", NAN);
+    psMetadataAddF64(addsumskyfileArgs, PS_LIST_TAIL, "-good_frac",  0,
+            "define %% of good pixels", NAN);
     psMetadataAddS16(addsumskyfileArgs, PS_LIST_TAIL, "-code",  0,
             "set fault code", 0);

trunk/ippTools/src/warptool.c

@@ -937 +937 @@
     }
 
-    psF64 pixel_fill = psMetadataLookupF64(&status, config->args, "-pixel_fill");
-    if (!status) {
-        psError(PS_ERR_UNKNOWN, false, "failed to lookup value for -pixel_fill");
+    psF64 good_frac = psMetadataLookupF64(&status, config->args, "-good_frac");
+    if (!status) {
+        psError(PS_ERR_UNKNOWN, false, "failed to lookup value for -good_frac");
         return false;
     }
@@ -966 +966 @@
             bg,
             bg_stdev,
-            pixel_fill,
+            good_frac,
             code
         )) {

trunk/ippTools/src/warptoolConfig.c

@@ -171 +171 @@
     psMetadataAddF64(addwarpedArgs, PS_LIST_TAIL, "-bg_stdev",  0,
             "define exposure background stdev", NAN);
-    psMetadataAddF64(addwarpedArgs, PS_LIST_TAIL, "-pixel_fill",  0,
-            "define %% of live pixels", NAN);
+    psMetadataAddF64(addwarpedArgs, PS_LIST_TAIL, "-good_frac",  0,
+            "define %% of good pixels", NAN);
     psMetadataAddS16(addwarpedArgs, PS_LIST_TAIL, "-code",  0,
             "set fault code", 0);