Changeset 42094 for trunk/ppStack/src/ppStackPhotometry.c

Timestamp:

Feb 28, 2022, 3:01:31 PM (4 years ago)

Author:

eugene

Message:

some cleanup of ppStackFiles: JPEG1 & JPEG2 are not part of the "convolved" output: they are activated explicitly in ppStackJPEGs.c; add option to generate stacks using the pmStackCombineByPercent method; trap failures in the ppStackReadout threads; fix normalization for both convolved and unconvolved versions (was inconsistent in ppStackLoop)

Location:

trunk/ppStack

Files:

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

trunk/ppStack/src/ppStackPhotometry.c

@@ -19 +19 @@
     ppStackFileActivation(config, PPSTACK_FILES_PHOT, true);
     pmFPAview *photView = ppStackFilesIterateDown(config); // View to readout
-    ppStackFileActivation(config, PPSTACK_FILES_STACK, true);
+
+    ppStackFileList stackFiles = options->convolve ? PPSTACK_FILES_STACK : PPSTACK_FILES_UNCONV;
+    ppStackFileActivation(config, stackFiles, true);
 
     pmFPAfile *photFile = psMetadataLookupPtr(NULL, config->files, "PSPHOT.INPUT"); // File for photometry
@@ -57 +59 @@
     // psphotSetNFrames
     pmReadout *photRO = pmFPAviewThisReadout(photView, photFile->fpa);
-    if (photRO && options->expRO->mask) {
+    if (photRO && options->expRO && options->expRO->mask) {
         psMetadataAddImage(photRO->analysis, PS_LIST_TAIL, "EXPNUM", PS_META_REPLACE, "EXPNUM image", options->expRO->mask);
     }