Changeset 34041 for branches/meh_branches/ppstack_test/psphot/src/psphotStackParseCamera.c

Timestamp:

Jun 19, 2012, 5:24:19 PM (14 years ago)

Author:

mhuber

Message:

merging latest r34040 trunk changes to branch

Location:

branches/meh_branches/ppstack_test

Files:

• . (modified) (1 prop)
• psphot (modified) (1 prop)
• psphot/src (modified) (1 prop)
• psphot/src/psphotStackParseCamera.c (modified) (7 diffs)

branches/meh_branches/ppstack_test/psphot/src/psphotStackParseCamera.c

@@ -59 +59 @@
                 }
             }
+            psString expnum = psMetadataLookupStr(&status, input, "RAW:EXPNUM"); // Name of expnum image
+            if (expnum && strlen(expnum) > 0) {
+                if (!defineFile(config, rawInputFile, "PSPHOT.STACK.EXPNUM.RAW", expnum, PM_FPA_FILE_EXPNUM)) {
+                    psError(PS_ERR_UNKNOWN, false, "Unable to define file from expnum %d (%s)", i, expnum);
+                    return false;
+                }
+            }
             nRaw ++;
         }
@@ -84 +91 @@
                 }
             }
+            psString expnum = psMetadataLookupStr(&status, input, "CNV:EXPNUM"); // Name of EXPNUM image
+            if (expnum && strlen(expnum) > 0) {
+                if (!defineFile(config, cnvInputFile, "PSPHOT.STACK.EXPNUM.CNV", expnum, PM_FPA_FILE_EXPNUM)) {
+                    psError(PS_ERR_UNKNOWN, false, "Unable to define file from expnum %d (%s)", i, expnum);
+                    return false;
+                }
+            }
             psString psf = psMetadataLookupStr(&status, input, "CNV:PSF"); // Name of mask
             if (psf && strlen(psf) > 0) {
@@ -115 +129 @@
         }
 
+        psS64 stack_id = psMetadataLookupS64(&status, input, "STACK_ID");
+        if (!status) {
+            psError(PS_ERR_UNKNOWN, false, "Unable to find STACK_ID from sources %d", i);
+            return false;
+        }
         // generate an pmFPAimage for the output convolved image
         // XXX output of these files should be optional
@@ -125 +144 @@
             }
             outputImage->save = true;
-            outputImage->fileID = i;            // this is used to generate output names
+            outputImage->fileID = stack_id;             // this is used to generate output names
 
             pmFPAfile *outputMask = pmFPAfileDefineOutput(config, outputImage->fpa, "PSPHOT.STACK.OUTPUT.MASK");
@@ -137 +156 @@
             }
             outputMask->save = true;
-            outputMask->fileID = i;             // this is used to generate output names
+            outputMask->fileID = stack_id;              // this is used to generate output names
 
             pmFPAfile *outputVariance = pmFPAfileDefineOutput(config, outputImage->fpa, "PSPHOT.STACK.OUTPUT.VARIANCE");
@@ -149 +168 @@
             }
             outputVariance->save = true;
-            outputVariance->fileID = i;         // this is used to generate output names
+            outputVariance->fileID = stack_id;          // this is used to generate output names
 
             // the output sources are carried on the outputImage->fpa structures
@@ -158 +177 @@
             }
             outsources->save = true;
-            outsources->fileID = i;             // this is used to generate output names
+            outsources->fileID = stack_id;              // this is used to generate output names
         }
     }