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

Timestamp:

Apr 9, 2010, 4:41:16 PM (16 years ago)

Author:

eugene

Message:

working on psphotStack (nearly done)

File:

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

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

@@ -15 +15 @@
     }
 
-    psMetadataItem *item = NULL;
-    int nInputs = 0;
-    while ((item = psMetadataGet(inputs, nInputs)) != NULL) {
+    int nInputs = inputs->list->n;
+    for (int i = 0; i < nInputs; i++) {
+        psMetadataItem *item = psMetadataGet(inputs, i);
         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)", nInputs, image);
+            psError(PS_ERR_UNKNOWN, false, "Unable to define file from image %d (%s)", i, image);
             return false;
         }
@@ -40 +40 @@
         psString mask = psMetadataLookupStr(&status, input, "MASK"); // Name of mask
         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)", nInputs, mask);
+            if (!defineFile(config, imageFile, "PSPHOT.MASK", mask, PM_FPA_FILE_MASK)) {
+                psError(PS_ERR_UNKNOWN, false, "Unable to define file from mask %d (%s)", i, mask);
                 return false;
             }
@@ -48 +48 @@
         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)", nInputs, variance);
+            if (!defineFile(config, imageFile, "PSPHOT.VARIANCE", variance, PM_FPA_FILE_VARIANCE)) {
+                psError(PS_ERR_UNKNOWN, false, "Unable to define file from variance %d (%s)", i, variance);
                 return false;
             }
         }
-        nInputs ++;
+        // the output sources are carried on the input->fpa structures
+        pmFPAfile *outsources = pmFPAfileDefineOutputFromFile (config, imageFile, "PSPHOT.STACK.OUTPUT");
+        if (!outsources) {
+            psError(PSPHOT_ERR_CONFIG, false, "Cannot find a rule for PSPHOT.STACK.OUTPUT");
+            return false;
+        }
+        outsources->save = true;
+        outsources->fileID = i;         // this is used to generate output names
     }
     psMetadataRemoveKey(config->arguments, "FILENAMES");
     psMetadataAddS32 (config->arguments, PS_LIST_TAIL, "PSPHOT.INPUT.NUM", PS_META_REPLACE, "number of inputs", nInputs);
+
+    if (!psphotSetMaskBits (config)) {
+        psError (PS_ERR_UNKNOWN, false, "failed to set mask bit values");
+        return NULL;
+    }
 
     // generate an pmFPAimage for the chisqImage
@@ -64 +76 @@
         return false;
     }
-    pmFPAfile *chisqMask = pmFPAfileDefineOutput(config, chisqImage->fpa, "PPIMAGE.CHISQ.MASK");
+    chisqImage->save = true;
+
+    pmFPAfile *chisqMask = pmFPAfileDefineOutput(config, chisqImage->fpa, "PSPHOT.CHISQ.MASK");
     if (!chisqMask) {
-        psError(PS_ERR_IO, false, _("Unable to generate output file from PPIMAGE.CHISQ.MASK"));
+        psError(PS_ERR_IO, false, _("Unable to generate output file from PSPHOT.CHISQ.MASK"));
         return NULL;
     }
     if (chisqMask->type != PM_FPA_FILE_MASK) {
-        psError(PS_ERR_IO, true, "PPIMAGE.CHISQ.MASK is not of type MASK");
+        psError(PS_ERR_IO, true, "PSPHOT.CHISQ.MASK is not of type MASK");
         return NULL;
     }
-    pmFPAfile *chisqVariance = pmFPAfileDefineOutput(config, chisqImage->fpa, "PPIMAGE.CHISQ.VARIANCE");
+    chisqMask->save = true;
+
+    pmFPAfile *chisqVariance = pmFPAfileDefineOutput(config, chisqImage->fpa, "PSPHOT.CHISQ.VARIANCE");
     if (!chisqVariance) {
-        psError(PS_ERR_IO, false, _("Unable to generate output file from PPIMAGE.CHISQ.VARIANCE"));
+        psError(PS_ERR_IO, false, _("Unable to generate output file from PSPHOT.CHISQ.VARIANCE"));
         return NULL;
     }
     if (chisqVariance->type != PM_FPA_FILE_VARIANCE) {
-        psError(PS_ERR_IO, true, "PPIMAGE.CHISQ.VARIANCE is not of type VARIANCE");
+        psError(PS_ERR_IO, true, "PSPHOT.CHISQ.VARIANCE is not of type VARIANCE");
         return NULL;
     }
+    chisqVariance->save = true;
 
 # if (0)