Changeset 37068 for branches/eam_branches/ipp-ops-20130712/ppSkycell

Timestamp:

Jul 17, 2014, 12:36:19 PM (12 years ago)

Author:

eugene

Message:

merge changes (from past YEAR) from trunk

Location:

branches/eam_branches/ipp-ops-20130712

Files:

• . (modified) (1 prop)
• ppSkycell (modified) (1 prop)
• ppSkycell/src (modified) (1 prop)
• ppSkycell/src/ppSkycell.h (modified) (1 diff)
• ppSkycell/src/ppSkycellArguments.c (modified) (2 diffs)
• ppSkycell/src/ppSkycellCamera.c (modified) (2 diffs)
• ppSkycell/src/ppSkycellData.c (modified) (2 diffs)

branches/eam_branches/ipp-ops-20130712/ppSkycell/src/ppSkycell.h

@@ -10 +10 @@
 typedef struct {
     psString imagesName;                // Filename with images
+    psString wcsrefName;                // Filename with WCS references
     psString wcsrefName;                // Filename with WCS references
     psString outRoot;                   // Output root name

branches/eam_branches/ipp-ops-20130712/ppSkycell/src/ppSkycellArguments.c

@@ -52 +52 @@
     psMetadataAddStr(arguments, PS_LIST_TAIL, "-wcsref", 0, "Filename with WCS references", NULL);
     psMetadataAddS16(arguments, PS_LIST_TAIL, "-exptimeOrder", 0, "Order of exptime scaling", 0);
+    psMetadataAddStr(arguments, PS_LIST_TAIL, "-wcsref", 0, "Filename with WCS references", NULL);
     if (argc == 1 || !psArgumentParse(arguments, &argc, argv) || argc != 2) {
         usage(argv[0], arguments, data);
@@ -59 +60 @@
     data->wcsrefName = psMemIncrRefCounter(psMetadataLookupStr(NULL, arguments, "-wcsref"));
     data->exptimeOrder = psMetadataLookupS16(NULL,arguments,"-exptimeOrder");
+    
+    data->wcsrefName = psMemIncrRefCounter(psMetadataLookupStr(NULL, arguments, "-wcsref"));
     
     data->outRoot = psStringCopy(argv[1]);

branches/eam_branches/ipp-ops-20130712/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; */
+/*        } */
+        }
+        
     }
 

branches/eam_branches/ipp-ops-20130712/ppSkycell/src/ppSkycellData.c

@@ -15 +15 @@
     psFree(data->imagesName);
     psFree(data->wcsrefName);
+    psFree(data->wcsrefName);
     psFree(data->outRoot);
     psFree(data->config);
@@ -27 +28 @@
 
     data->imagesName = NULL;
+    data->wcsrefName = NULL;
     data->wcsrefName = NULL;
     data->outRoot = NULL;