Changeset 37932 for trunk

Timestamp:

Feb 24, 2015, 5:52:57 PM (11 years ago)

Author:

eugene

Message:

merge change from ipp-20150115 : do not re-measure psf stats on cleanup for psphotReadoutMinimal

Location:

trunk/psphot

Files:

• . (modified) (1 prop)
• src/psphot.h (modified) (1 diff)
• src/psphotReadoutCleanup.c (modified) (1 diff)
• src/psphotReadoutMinimal.c (modified) (1 diff)

trunk/psphot/src/psphot.h

@@ -45 +45 @@
 bool            psphotReadoutCleanup (pmConfig *config, const pmFPAview *view, const char *filerule);
 bool            psphotReadoutCleanupReadout (pmConfig *config, const pmFPAview *view, const char *filerule, int index, psMetadata *recipe);
+bool            psphotReadoutCleanupMinimal (pmConfig *config, const pmFPAview *view, const char *filerule);
+bool            psphotReadoutCleanupReadoutMinimal (pmConfig *config, const pmFPAview *view, const char *filerule, int index, psMetadata *recipe);
 
 bool            psphotDefineFiles (pmConfig *config, pmFPAfile *input);

trunk/psphot/src/psphotReadoutCleanup.c

@@ -111 +111 @@
     return true;
 }
+
+// for now, let's store the detections on the readout->analysis for each readout
+bool psphotReadoutCleanupMinimal (pmConfig *config, const pmFPAview *view, const char *filerule)
+{
+    bool status = true;
+
+    // remove internal pmFPAfiles, if created
+    if (psErrorCodeLast() == (psErrorCode) PSPHOT_ERR_DATA) {
+        psErrorStackPrint(stderr, "Error in the psphot readout analysis");
+        psErrorClear();
+    }
+    if (psErrorCodeLast() != PS_ERR_NONE) {
+        return false;
+    }
+
+    // select the appropriate recipe information
+    psMetadata *recipe  = psMetadataLookupPtr (&status, config->recipes, PSPHOT_RECIPE);
+    psAssert (recipe, "missing recipe?");
+
+    int num = psphotFileruleCount(config, filerule);
+
+    // loop over the available readouts
+    for (int i = 0; i < num; i++) {
+        if (!psphotReadoutCleanupReadoutMinimal (config, view, filerule, i, recipe)) {
+            psError (PSPHOT_ERR_CONFIG, false, "failed on psphotReadoutCleanupMinimal for %s entry %d", filerule, i);
+            return false;
+        }
+    }
+
+    // XXX move this to top of loop?
+    pmKapaClose ();
+
+    return true;
+}
+
+// psphotReadoutCleanupMinimal is called on exit from psphotReadoutMinimal.  If the last raised error is
+// not a DATA error, then there was a serious problem.  Only in this case, or if the fail
+// on the stats measurement, do we return false
+bool psphotReadoutCleanupReadoutMinimal (pmConfig *config, const pmFPAview *view, const char *filerule, int index, psMetadata *recipe) {
+
+    bool status = true;
+
+    // find the currently selected readout
+    pmFPAfile *file = pmFPAfileSelectSingle(config->files, filerule, index); // File of interest
+    psAssert (file, "missing file?");
+
+    pmReadout *readout = pmFPAviewThisReadout(view, file->fpa);
+    psAssert (readout, "missing readout?");
+
+    // when psphotReadoutCleanupMinimal is called, these are not necessarily defined
+    pmPSF        *psf        = psMetadataLookupPtr (&status, readout->analysis, "PSPHOT.PSF");
+    pmDetections *detections = psMetadataLookupPtr (&status, readout->analysis, "PSPHOT.DETECTIONS");
+    psArray      *sources    = detections ? detections->allSources : NULL;
+    // XXX where do we free these, in here (psMetadataRemove?)
+
+    // create an output header with stats results currently saved on readout->analysis
+    psMetadata *header = psphotDefineHeader (readout->analysis);
+
+    // write NSTARS to the image header
+    psphotSetHeaderNstars (header, sources);
+
+    // save the results of the analysis
+    // this should happen way up stream (when needed?)
+    psMetadataAdd (readout->analysis, PS_LIST_TAIL, "PSPHOT.HEADER",  PS_DATA_METADATA | PS_META_REPLACE, "header stats", header);
+
+    if (psf) {
+        // XXX this seems a little silly : we saved the psf on readout->analysis above, but now
+        // we are moving it to chip->analysis.
+        // save the psf for possible output.  if there was already an entry, it was loaded from external sources
+        // the new one may have been updated or modified, so replace the existing entry.  We
+        // are required to save it on the chip, but this will cause problems if we ever want to
+        // run psphot on an unmosaiced image
+        pmCell *cell = readout->parent;
+        pmChip *chip = cell->parent;
+        psMetadataAdd (chip->analysis, PS_LIST_TAIL, "PSPHOT.PSF", PS_DATA_UNKNOWN | PS_META_REPLACE,  "psphot psf", psf);
+    }
+
+    if (psErrorCodeLast() != PS_ERR_NONE) {
+        psErrorStackPrint(stderr, "unexpected remaining errors");
+        abort();
+    }
+
+    psFree (header);
+    return true;
+}

trunk/psphot/src/psphotReadoutMinimal.c

@@ -112 +112 @@
 
     // create the exported-metadata and free local data
-    return psphotReadoutCleanup (config, view, filerule);
+    return psphotReadoutCleanupMinimal (config, view, filerule);
 }