Changeset 37941

Timestamp:

Mar 3, 2015, 1:54:23 PM (11 years ago)

Author:

bills

Message:

add code to allow psphotFullForce to set a quality value when background modeling fails

Location:

trunk/psphot/src

Files:

• Makefile.am (modified) (1 diff)
• psphotCleanup.c (modified) (1 diff)
• psphotFullForce.c (modified) (2 diffs)
• psphotFullForceArguments.c (modified) (1 diff)
• psphotInternal.h (modified) (1 diff)
• psphotReadoutCleanup.c (modified) (1 diff)
• psphotStandAlone.h (modified) (1 diff)

trunk/psphot/src/Makefile.am

@@ -230 +230 @@
         psphotLoadSRCTEXT.c            \
         psphotReadoutCleanup.c         \
+        psphotStatsFile.c              \
         psphotSourcePlots.c            \
         psphotRadialPlot.c             \

trunk/psphot/src/psphotCleanup.c

@@ -10 +10 @@
         (void)pmConfigRecipesCull(config,NULL);
         pmConfigDump(config, dump_file);
+    }
+
+    // if the program has stats write it out
+    psphotStatsFile *statsFile = psphotStatsFileGet();
+    if (statsFile) {
+        psphotStatsFileSave(config, statsFile);
     }
 

trunk/psphot/src/psphotFullForce.c

@@ -10 +10 @@
     pmConfig *config = psphotFullForceArguments (argc, argv);
     assert(config);
+
+    if (!psphotStatsFileOpen(config)) {
+        psErrorStackPrint(stderr, "Error creating statsFile\n");
+        exit (psphotGetExitStatus());
+    }
 
     psphotVersionPrint();
@@ -25 +30 @@
     }
 
-    psLogMsg ("psphot", 3, "complete psphot run: %f sec\n", psTimerMark ("complete"));
+    psLogMsg ("psphot", 3, "complete psphotFullForce run: %f sec\n", psTimerMark ("complete"));
 
     psErrorCode exit_status = psphotGetExitStatus();

trunk/psphot/src/psphotFullForceArguments.c

@@ -65 +65 @@
         psMetadataAddStr (config->arguments, PS_LIST_TAIL, "CHIP_SELECTIONS", PS_DATA_STRING, "", argv[N]);
         psArgumentRemove (N, &argc, argv);
+    }
+
+    if ((N = psArgumentGet(argc, argv, "-stats"))) {
+        psArgumentRemove(N, &argc, argv);
+        psMetadataAddStr(config->arguments, PS_LIST_TAIL, "STATS", PS_DATA_STRING,
+                         "Filename for statistics of output file", argv[N]);
+        psArgumentRemove(N, &argc, argv);
     }
 

trunk/psphot/src/psphotInternal.h

@@ -14 +14 @@
 #include <psmodules.h>
 #include "psphot.h"
+#include "psphotStatsFile.h"
 
 #endif

trunk/psphot/src/psphotReadoutCleanup.c

@@ -54 +54 @@
     psArray      *sources    = detections ? detections->allSources : NULL;
     // XXX where do we free these, in here (psMetadataRemove?)
+
+    int quality = psMetadataLookupS32 (&status, readout->analysis, "PSPHOT_QUALITY");
+    if (quality) {
+        // if there is no stats file this will be a no-op
+        psphotStatsFileSetQuality(quality);
+    }
 
     // use the psf-model to measure FWHM stats

trunk/psphot/src/psphotStandAlone.h

@@ -10 +10 @@
 #include <psmodules.h>
 #include "psphot.h"
+#include "psphotStatsFile.h"
 
 // Top level functions