Changeset 36680 for branches/eam_branches/ps2-tc3-20130727/ppSkycell/src/ppSkycellCamera.c

Timestamp:

Apr 21, 2014, 5:42:34 AM (12 years ago)

Author:

eugene

Message:

merge changes from trunk

Location:

branches/eam_branches/ps2-tc3-20130727

Files:

• . (modified) (1 prop)
• ppSkycell/src/ppSkycellCamera.c (modified) (6 diffs)

branches/eam_branches/ps2-tc3-20130727/ppSkycell/src/ppSkycellCamera.c

@@ -56 +56 @@
     data->numInputs = images->n;
 
-    psArray *masks = NULL;              // Mask names
-    if (data->masksName) {
-        masks = fileList(data->masksName);
-        if (!masks) {
-            psError(psErrorCodeLast(), false, "No masks provided.");
-            psFree(images);
-            return false;
-        }
-        if (masks->n != data->numInputs) {
-            psError(PS_ERR_BAD_PARAMETER_SIZE, true, "Number of images (%ld) and masks (%ld) do not match",
-                    images->n, masks->n);
-            psFree(images);
-            psFree(masks);
-            return false;
-        }
-    }
-
     psArray *wcsref = NULL;             // Names of WCS reference images
     if (data->wcsrefName) {
@@ -79 +62 @@
         psError(psErrorCodeLast(), false, "No WCSrefs provided.");
         psFree(images);
-        psFree(masks);
         return(false);
       }
@@ -86 +68 @@
                 images->n, wcsref->n);
         psFree(images);
-        psFree(masks);
         psFree(wcsref);
         return(false);
@@ -104 +85 @@
         }
 
-        if (data->masksName) {
-            fileArguments("MASK", masks->data[i], "Name of the mask", data->config);
-            if (!pmFPAfileBindFromArgs(&status, image, data->config, "PPSKYCELL.MASK", "MASK") || !status) {
-                psError(PS_ERR_IO, false, "Failed to build file from PPSKYCELL.MASK");
-                // XXX Cleanup
-                return false;
-            }
-        }
-
         if (data->wcsrefName) {
           fileArguments("WCSREF", wcsref->data[i], "Name of the WCS reference", data->config);
@@ -120 +92 @@
             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; */
-/*        } */
         }
-        
     }
 
@@ -145 +112 @@
         psError(psErrorCodeLast(), false, "Unable to define output.");
         return false;
-    }
-    if (data->masksName) {
-      pmFPAfile *mask1 = pmFPAfileDefineOutput(data->config, bin1->fpa , "PPSKYCELL.BIN1.MASK");
-      if (!mask1) {
-        psError(psErrorCodeLast(), false, "Unable to define output.");
-        return false;
-      }
-      mask1->save = true;
-      pmFPAfile *mask2 = pmFPAfileDefineOutput(data->config, bin2->fpa , "PPSKYCELL.BIN2.MASK");
-      if (!mask2) {
-        psError(psErrorCodeLast(), false, "Unable to define output.");
-        return false;
-      }
-      mask2->save = true;
     }