Changeset 42094 for trunk/ppStack/src/ppStackCombinePrepare.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/ppStackCombinePrepare.c (modified) (4 diffs)

trunk/ppStack/src/ppStackCombinePrepare.c

@@ -31 +31 @@
       options->expRO = pmReadoutAlloc(expCell); //Output readout
     }
-/*     else { */
-/*       options->expRO = NULL; */
-/*     } */
+
     int bkg_r0 = 0,bkg_c0 = 0;
     int bkg_nC = 0,bkg_nR = 0;
@@ -53 +51 @@
       
       options->bkgRO = pmReadoutAlloc(bkgCell); // BKG readout
-      //      if (!pmHDUGenerateForFPA(options->bkgRO->parent->parent->parent)) {
       options->bkgRO->parent->parent->parent->hdu = pmHDUAlloc(NULL);
+
       if (!options->bkgRO->parent->parent->parent->hdu) {
         fprintf(stderr,"failed to generate a HDU for this thing.\n");
@@ -68 +66 @@
                                                                         ro->parent->parent->parent->concepts);
 
-    }
-    else {
+    } else {
       options->bkgRO = NULL;
     }
@@ -97 +94 @@
         return false;
       }
-      
-
-      
     }