Changeset 38535 for trunk

Timestamp:

Jun 24, 2015, 9:23:29 AM (11 years ago)

Author:

bills

Message:

Do not assert readout->analysis has PCM_FIT_OPTIONS unless EXTENDED_SOURCE_FITS is true

Location:

trunk/psphot/src

Files:

• psphotMergeSources.c (modified) (1 diff)
• psphotReplaceUnfit.c (modified) (2 diffs)

trunk/psphot/src/psphotMergeSources.c

@@ -901 +901 @@
             psAssert (detections, "missing detections?");
         }
-        pmSourceFitOptions *fitOptions = psMetadataLookupPtr (&status, readoutSrc->analysis, "PCM_FIT_OPTIONS");
-        psAssert (fitOptions, "missing pcm fit options");
-        psMetadataAddPtr (readout->analysis, PS_LIST_TAIL, "PCM_FIT_OPTIONS", PS_DATA_UNKNOWN | PS_META_REPLACE, "pcm fit options", fitOptions);
+        pmSourceFitOptions *fitOptions = NULL;
+        if (psMetadataLookupBool(&status, recipe, "EXTENDED_SOURCE_FITS")) {
+            fitOptions = psMetadataLookupPtr (&status, readoutSrc->analysis, "PCM_FIT_OPTIONS");
+            psAssert (fitOptions, "missing pcm fit options");
+            psMetadataAddPtr (readout->analysis, PS_LIST_TAIL, "PCM_FIT_OPTIONS", PS_DATA_UNKNOWN | PS_META_REPLACE, "pcm fit options", fitOptions);
+        }
 
         // we need to save the new sources on the detection arrays of the appropriate image
         detArrays->data[i] = psMemIncrRefCounter(detections);
         readouts->data[i] = psMemIncrRefCounter(readout);
-        fitOptionsArray->data[i] = psMemIncrRefCounter(fitOptions);
+        if (fitOptions) {
+            fitOptionsArray->data[i] = psMemIncrRefCounter(fitOptions);
+        }
     }
 

trunk/psphot/src/psphotReplaceUnfit.c

@@ -316 +316 @@
     }
 
-    pmSourceFitOptions *fitOptions = psMetadataLookupPtr (&status, readout->analysis, "PCM_FIT_OPTIONS");
-    psAssert (fitOptions, "missing pcm fit options");
+    pmSourceFitOptions *fitOptions = NULL;
+    if (psMetadataLookupBool (&status, recipe, "EXTENDED_SOURCE_FITS")) {
+        fitOptions = psMetadataLookupPtr (&status, readout->analysis, "PCM_FIT_OPTIONS");
+        psAssert (fitOptions, "missing pcm fit options");
+    }
 
     // XXX the sources have already been copied (merge into here?)
@@ -397 +400 @@
            pmPCMdata *pcm = pmPCMinit (source, fitOptions, model, maskVal, psfSize);
             if (pcm) {
-                // pmPCMMakeModel (source, model, pcm->nsigma, maskVal, psfSize);
                 pmPCMCacheModel (source, maskVal, psfSize, pcm->nsigma);
                 psFree(pcm);