Changeset 35852 for trunk/ppSkycell/src/ppSkycellCamera.c

Timestamp:

Jul 24, 2013, 4:56:48 PM (13 years ago)

Author:

watersc1

Message:

Addition of WCS-reference option to fix the cases where the WCS is missing. Fix bug in WCS calculation/propagation that shows up when corners aren't populated.

File:

• trunk/ppSkycell/src/ppSkycellCamera.c (modified) (2 diffs)

trunk/ppSkycell/src/ppSkycellCamera.c

@@ -73 +73 @@
     }
 
+    psArray *wcsref = NULL;             // Names of WCS reference images
+    if (data->wcsrefName) {
+      wcsref = fileList(data->wcsrefName);
+      if (!wcsref) {
+        psError(psErrorCodeLast(), false, "No WCSrefs provided.");
+        psFree(images);
+        psFree(masks);
+        return(false);
+      }
+      if (wcsref->n != data->numInputs) {
+        psError(PS_ERR_BAD_PARAMETER_SIZE, true, "Number of images (%ld) and wcsrefs (%ld) do not match",
+                images->n, wcsref->n);
+        psFree(images);
+        psFree(masks);
+        psFree(wcsref);
+        return(false);
+      }
+    }
+    
     psMetadataAddStr(data->config->arguments, PS_LIST_TAIL, "OUTPUT", 0, "Output root", data->outRoot);
 
@@ -93 +112 @@
             }
         }
+
+        if (data->wcsrefName) {
+          fileArguments("WCSREF", wcsref->data[i], "Name of the WCS reference", data->config);
+          pmFPAfile *wcsref = pmFPAfileDefineFromArgs(&status, data->config, "PPSKYCELL.WCSREF", "WCSREF");
+          if (!status || !wcsref) {
+            psError(PS_ERR_IO, false, "Failed to build file from PPSKYCELL.WCSREF");
+            return(false);
+          }
+/*        if (!pmFPAfileBindFromArgs(&status, image, data->config, "PPSKYCELL.WCSREF", "WCSREF") || !status) { */
+/*          psError(PS_ERR_IO, false, "Failed to build file from PPSKYCELL.WCSREF"); */
+/*          return false; */
+/*        } */
+        }
+        
     }