Changeset 27625 for branches/eam_branches/stackphot.20100406/psphot/src/psphotStackParseCamera.c

Timestamp:

Apr 6, 2010, 1:36:51 PM (16 years ago)

Author:

eugene

Message:

working on stackphot

File:

• branches/eam_branches/stackphot.20100406/psphot/src/psphotStackParseCamera.c (modified) (5 diffs)

branches/eam_branches/stackphot.20100406/psphot/src/psphotStackParseCamera.c

@@ -15 +15 @@
     }
 
-    psMetadata *item == NULL;
+    psMetadataItem *item = NULL;
     int nInputs = 0;
-    while ((item = psMetadataGetIndex(inputs, nInputs)) != NULL) {
+    while ((item = psMetadataGet(inputs, nInputs)) != NULL) {
         if (item->type != PS_DATA_METADATA) {
             psError(PS_ERR_BAD_PARAMETER_TYPE, true, "Component %s of the input metadata is not of type METADATA", item->name);
@@ -34 +34 @@
         pmFPAfile *imageFile = defineFile(config, NULL, "PSPHOT.INPUT", image, PM_FPA_FILE_IMAGE); // File for image
         if (!imageFile) {
-            psError(PS_ERR_UNKNOWN, false, "Unable to define file from image %d (%s)", i, image);
+            psError(PS_ERR_UNKNOWN, false, "Unable to define file from image %d (%s)", nInputs, image);
             return false;
         }
@@ -41 +41 @@
         if (mask && strlen(mask) > 0) {
             if (!defineFile(config, imageFile, "PSPHOT.INPUT.MASK", mask, PM_FPA_FILE_MASK)) {
-                psError(PS_ERR_UNKNOWN, false, "Unable to define file from mask %d (%s)", i, mask);
+                psError(PS_ERR_UNKNOWN, false, "Unable to define file from mask %d (%s)", nInputs, mask);
                 return false;
             }
         }
 
-        psString variance = psMetadataLookupStr(&mdok, input, "VARIANCE"); // Name of variance map
+        psString variance = psMetadataLookupStr(&status, input, "VARIANCE"); // Name of variance map
         if (variance && strlen(variance) > 0) {
             if (!defineFile(config, imageFile, "PSPHOT.INPUT.VARIANCE", variance, PM_FPA_FILE_VARIANCE)) {
-                psError(PS_ERR_UNKNOWN, false, "Unable to define file from variance %d (%s)", i, variance);
+                psError(PS_ERR_UNKNOWN, false, "Unable to define file from variance %d (%s)", nInputs, variance);
                 return false;
             }
@@ -58 +58 @@
     psMetadataAddS32 (config->arguments, PS_LIST_TAIL, "PSPHOT.INPUT.NUM", PS_META_REPLACE, "number of inputs", nInputs);
 
+    // generate an pmFPAimage for the chisqImage
+    pmFPAfile *chisqImage = pmFPAfileDefineOutput(config, NULL, "PSPHOT.CHISQ.IMAGE");
+    if (!chisqImage) {
+        psError(PSPHOT_ERR_CONFIG, false, "Trouble defining PSPHOT.CHISQ.IMAGE");
+        return false;
+    }
+    pmFPAfile *chisqMask = pmFPAfileDefineOutput(config, chisqImage->fpa, "PPIMAGE.CHISQ.MASK");
+    if (!chisqMask) {
+        psError(PS_ERR_IO, false, _("Unable to generate output file from PPIMAGE.CHISQ.MASK"));
+        return NULL;
+    }
+    if (chisqMask->type != PM_FPA_FILE_MASK) {
+        psError(PS_ERR_IO, true, "PPIMAGE.CHISQ.MASK is not of type MASK");
+        return NULL;
+    }
+    pmFPAfile *chisqVariance = pmFPAfileDefineOutput(config, chisqImage->fpa, "PPIMAGE.CHISQ.VARIANCE");
+    if (!chisqVariance) {
+        psError(PS_ERR_IO, false, _("Unable to generate output file from PPIMAGE.CHISQ.VARIANCE"));
+        return NULL;
+    }
+    if (chisqVariance->type != PM_FPA_FILE_VARIANCE) {
+        psError(PS_ERR_IO, true, "PPIMAGE.CHISQ.VARIANCE is not of type VARIANCE");
+        return NULL;
+    }
+
+# if (0)    
     // define the additional input/output files associated with psphot
     // XXX figure out which files are needed by psphotStack
@@ -64 +90 @@
         return false;
     }
+# endif
 
     psTrace("psphot", 1, "Done with psphotStackParseCamera...\n");