Changeset 27517 for branches/eam_branches/20100225/ppStack/src/ppStackPhotometry.c

Timestamp:

Mar 29, 2010, 3:55:49 PM (16 years ago)

Author:

eugene

Message:

update merges from trunk

Location:

branches/eam_branches/20100225

Files:

• . (modified) (1 prop)
• ppStack/src/ppStackPhotometry.c (modified) (3 diffs)

branches/eam_branches/20100225/ppStack/src/ppStackPhotometry.c

@@ -26 +26 @@
     psTimerStart("PPSTACK_PHOT");
 
-    ppStackFileActivation(config, PPSTACK_FILES_COMBINE, false);
+    pmFPAfileActivate(config->files, false, NULL);
     ppStackFileActivation(config, PPSTACK_FILES_PHOT, true);
     pmFPAview *photView = ppStackFilesIterateDown(config); // View to readout
-    ppStackFileActivation(config, PPSTACK_FILES_COMBINE, true);
+    ppStackFileActivation(config, PPSTACK_FILES_STACK, true);
 
     pmFPAfile *photFile = psMetadataLookupPtr(NULL, config->files, "PSPHOT.INPUT"); // File for photometry
@@ -72 +72 @@
         psErrorStackPrint(stderr, "Unable to perform photometry on image");
         psWarning("Unable to perform photometry on image --- suspect bad data quality.");
-        if (options->stats && psMetadataLookupS32(NULL, options->stats, "QUALITY") == 0) {
-            psMetadataAddS32(options->stats, PS_LIST_TAIL, "QUALITY", PS_META_REPLACE,
-                             "Unable to perform photometry on image", psErrorCodeLast());
+        if (options->quality == 0) {
+            options->quality = psErrorCodeLast();
         }
         psErrorClear();
@@ -99 +98 @@
         psMetadataAddF32(options->stats, PS_LIST_TAIL, "TIME_PHOT", 0, "Time to do photometry", psTimerMark("PPSTACK_PHOT"));
     }
+
     psFree(photView);