Changeset 41920

Timestamp:

Nov 19, 2021, 10:48:38 AM (5 years ago)

Author:

eugene

Message:

allow expRO to be NULL

Location:

branches/eam_branches/ipp-20211108/ppStack/src

Files:

• ppStackLoopByPercent.c (modified) (1 diff)
• ppStackPhotometry.c (modified) (1 diff)
• ppStackReadout.c (modified) (4 diffs)

branches/eam_branches/ipp-20211108/ppStack/src/ppStackLoopByPercent.c

@@ -24 +24 @@
 
     // Prepare for combination (define outputs, generate output cells)
+    // NOTE: expmaps will be skipped if "PPSTACK.OUTPUT.EXP" -> NULL
     if (!ppStackCombinePrepare("PPSTACK.OUTPUT", "PPSTACK.OUTPUT.EXP", options->doBackground ? "PPSTACK.OUTPUT.BKGMODEL" : NULL, PPSTACK_FILES_STACK, stack, options, config)) {
         psError(psErrorCodeLast(), false, "Unable to prepare for combination.");

branches/eam_branches/ipp-20211108/ppStack/src/ppStackPhotometry.c

@@ -57 +57 @@
     // 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);
     }

branches/eam_branches/ipp-20211108/ppStack/src/ppStackReadout.c

@@ -362 +362 @@
 }
 
+// NOTE: expRO is allowed to be NULL
 bool ppStackReadoutPercent(const pmConfig *config, pmReadout *outRO, pmReadout *expRO, const psArray *readouts,
                                const psVector *mask, const psVector *weightings, const psVector *exposures,
@@ -368 +369 @@
     assert(config);
     assert(outRO);
-    assert(expRO);
     assert(readouts);
     assert(mask && mask->n == readouts->n && mask->type.type == PS_TYPE_VECTOR_MASK);
@@ -420 +420 @@
     }
 
-    // XXX rename minRange to rejectFraction
-    // XXX add expmaps
     if (!pmStackCombineByPercentile(outRO, expRO, stackData, minRange, maskBad, maskSuspect, maskBlank)) {
         psError(PS_ERR_UNKNOWN, false, "Unable to combine input readouts with rejection.");
@@ -432 +430 @@
     outRO->parent->parent->data_exists = true; // output chip
 
-    expRO->data_exists = true;                 // expmap readout 
-    expRO->parent->data_exists = true;         // expmap cell   
-    expRO->parent->parent->data_exists = true; // expmap chip   
-
+    if (expRO) {
+      expRO->data_exists = true;                 // expmap readout 
+      expRO->parent->data_exists = true;               // expmap cell   
+      expRO->parent->parent->data_exists = true; // expmap chip 
+    }
+      
     psFree(stackData);
     sectionNum++;