Changeset 38552 for branches/eam_branches/ipp-20150616/psphot/src/psphotStackUpdateReadout.c

Timestamp:

Jun 25, 2015, 10:05:06 PM (11 years ago)

Author:

eugene

Message:

merge changes from trunk

Location:

branches/eam_branches/ipp-20150616

Files:

• . (modified) (1 prop)
• psphot/src/psphotStackUpdateReadout.c (modified) (9 diffs)

branches/eam_branches/ipp-20150616/psphot/src/psphotStackUpdateReadout.c

@@ -116 +116 @@
     // XXX NOTE : if we use the pre-20130914 psphotStackReadout code, we need to use 'false' for the
     // sourcesSubtracted argument
-    psArray *objectsOut = psphotSourceChildrenByObject (config, view, STACK_OUT, objects, true);
+    // XXX: do this here so that the variance is availble to rebuild the models
+    psphotStackMatchPSFsetup (config, view, STACK_OUT, STACK_RAW);
+    psArray *objectsOut = psphotSourceChildrenByObject (config, view, STACK_OUT, STACK_RAW, objects, true);
     if (!objectsOut) {
         psFree(objects);
@@ -135 +137 @@
         // this forces photometry on the undetected sources from other images
 
-        // set up the FWHM vector
-        psphotStackMatchPSFsetup (config, view, STACK_OUT, STACK_RAW);
+//      Moved this up above
+//      psphotStackMatchPSFsetup (config, view, STACK_OUT, STACK_RAW);
         psphotDumpImages (config, view, STACK_RAW, "raw.t0");
         psphotDumpImages (config, view, STACK_OUT, "out.t0");
@@ -177 +179 @@
                 // and to subtract the sources
                 psphotFitSourcesLinear (config, view, STACK_OUT, false, false);
+
+#ifdef notyet
+            psphotRemoveAllSources (config, view, STACK_OUT, false);
+#endif
+
                 snprintf (line, 256, "%s.%d", "out.t4", entry);
                 psphotDumpImages (config, view, STACK_OUT, line);
@@ -221 +228 @@
         COPY_PARAM( "MSKY_NX" );
         COPY_PARAM( "MSKY_NY" );
-        COPY_PARAM( "CHIP_SEEING" );
+        // COPY_PARAM( "CHIP_SEEING" );
 }
 
@@ -293 +300 @@
     maskVal |= markVal;
 
+    // This code currently assumes that all extended source models are PCM.
+    // Examine the recipe and make sure that this is true.
+    psMetadata *allModels = psMetadataLookupMetadata (&status, recipe, "EXTENDED_SOURCE_MODELS");
+    if (!status) {
+        psAssert (allModels, "failed to find list of extended source models\n");
+    }
+    psMetadataIterator *iter = psMetadataIteratorAlloc (allModels, PS_LIST_HEAD, NULL);
+    psMetadataItem *item = NULL;
+    while ((item = psMetadataGetAndIncrement (iter)) != NULL) {
+        if (item->type != PS_DATA_METADATA) {
+            psAbort ("Invalid type for EXTENDED_SOURCE_MODEL entry %s, not a metadata folder", item->name);
+        }
+        psMetadata *model = (psMetadata *) item->data.md;
+        // char *modelName = psMetadataLookupStr (&status, model, "MODEL");
+
+        char *convolvedWord = psMetadataLookupStr (&status, model, "PSF_CONVOLVED");
+        if (!status || (strcasecmp (convolvedWord, "true") && strcasecmp (convolvedWord, "false"))) {
+            psAbort ("PSF_CONVOLVED entry invalid or missing for EXTENDED_SOURCE_MODEL entry %s", item->name);
+        }
+        bool convolved = !strcasecmp (convolvedWord, "true");
+        psAssert (convolved, "EXTENDED SOURCE model %s is not convolved. This code is not ready for that\n", item->name);
+    }
+    psFree (iter);
+
     // setup the PSF fit radius details
     psphotInitRadiusPSF (recipe, readout);
@@ -312 +343 @@
     fitOptions->poissonErrors = psMetadataLookupBool (&status, recipe, "EXTENDED_SOURCE_FITS_POISSON");
     if (!status) fitOptions->poissonErrors = true;
+
     int psfSize  = psMetadataLookupS32 (&status, recipe, "PCM_BOX_SIZE");
     assert (status);
+    
+    // Remember these data for later
+    psMetadataAddPtr (readout->analysis, PS_LIST_TAIL, "PCM_FIT_OPTIONS", PS_DATA_UNKNOWN | PS_META_REPLACE, "pcm fit options", fitOptions);
 
     for (int i = 0; i < sources->n; i++) {
@@ -331 +366 @@
             // fprintf(stderr, "source %d %5d should not have a psf model 0x%08X%08X\n", index, source->seq, source->mode2, source->mode);
             psFree(source->modelPSF) ;
+            modelPSF = NULL;
+            // At least once I saw a source with an extended model but no psf model
+            psFree(source->modelEXT);
+            source->modelEXT = NULL;
         }
 
         // make sure that the window radius is large enough. Should we do this regardless of whether
         // or not the source is extended?
-        if (source->modelEXT) {
-            float fitRadius = NAN;
-            float windowRadius = NAN;
+        float fitRadius = NAN;
+        float windowRadius = NAN;
+        if (1 || source->modelEXT) {
             if (!psphotSetRadiusMoments (&fitRadius, &windowRadius, readout, source, markVal)) {
                 psError (PSPHOT_ERR_UNKNOWN, false, "failed to set radius for ext source");
@@ -387 +426 @@
                 float modelFlux = pow(10., -0.4 * model->mag);
 
-                // XXX: We are assuming here that we only use PCM models. Should get that information from the recipe.
+                model->fitRadius = fitRadius;
+
+                // XXX: We are assuming here that we only use PCM models. 
+                // I Should be getting that information from the recipe.
                 pmPCMdata *pcm = pmPCMinit (source, fitOptions, model, maskVal, psfSize);
                 if (!pcm) {
@@ -394 +436 @@
                 }
                 model->params->data.F32[PM_PAR_I0] = 1.0;
-                pmPCMMakeModel (source, model, pcm->nsigma, maskVal, psfSize);
+                // XXX: this duplicates work that pmPCMCacheModel does
+                // pmPCMMakeModel (source, model, pcm->nsigma, maskVal, psfSize);
                 float normFlux = model->class->modelFlux(model->params);
                 float I0 = modelFlux / normFlux;