Changeset 10828

Timestamp:

Dec 22, 2006, 6:08:35 PM (20 years ago)

Author:

eugene

Message:

further work on plotting functions

Location:

trunk/psphot/src

Files:

• psphotApResid.c (modified) (1 diff)
• psphotParseCamera.c (modified) (1 diff)
• psphotReadout.c (modified) (2 diffs)
• psphotSummaryPlots.c (modified) (2 diffs)

trunk/psphot/src/psphotApResid.c

@@ -334 +334 @@
 
     psLogMsg ("psphot.apresid", PS_LOG_INFO, "measure full-frame aperture residuals for %d of %d objects: %f sec\n", 
-              psTimerMark ("psphot"), Nkeep, Npsf);
+              Nkeep, Npsf, psTimerMark ("psphot"));
     psLogMsg ("psphot.apresid", PS_LOG_DETAIL, "aperture residual: %f +/- %f : %f bias, %f skysat\n",
               psf->ApResid, psf->dApResid, psf->skyBias, psf->skySat);

trunk/psphot/src/psphotParseCamera.c

@@ -85 +85 @@
     // optionally save the PSF Model
     if (psMetadataLookupBool(NULL, recipe, "SAVE.PLOTS")) {
-        if (!pmFPAfileDefineOutput (config, input->fpa, "PSPHOT.MOMENT.PLT")) {
-            psError(PS_ERR_IO, false, "Cannot find a rule for PSPHOT.MOMENT.PLT");
-            return false;
+        if (!pmFPAfileDefineOutput (config, input->fpa, "SOURCE.PLOT.MOMENTS")) {
+            psTrace ("psphot", 3, "Cannot find a rule for SOURCE.PLOT.MOMENTS");
         }
-        if (!pmFPAfileDefineOutput (config, input->fpa, "PSPHOT.PSFMODEL.PLT")) {
-            psError(PS_ERR_IO, false, "Cannot find a rule for PSPHOT.MOMENT.PLT");
-            return false;
+        if (!pmFPAfileDefineOutput (config, input->fpa, "SOURCE.PLOT.PSFMODEL")) {
+            psTrace ("psphot", 3, "Cannot find a rule for SOURCE.PLOT.PSFMODEL");
         }
     }

trunk/psphot/src/psphotReadout.c

@@ -71 +71 @@
     }
     // XXX test the plotting function
-    psphotPlotMoments (config, view, sources);
+    // psphotPlotMoments (config, view, sources);
 
     if (!strcasecmp (breakPt, "MOMENTS")) {
@@ -122 +122 @@
 
     // XXX test the plotting function
-    psphotPlotPSFModel (config, view, sources);
+    // psphotPlotPSFModel (config, view, sources);
 
 finish:

trunk/psphot/src/psphotSummaryPlots.c

@@ -27 +27 @@
     psLogMsg ("psphot", 3, "creating moments plot");
 
-    int kapa = pmKapaOpen ();
+    // XXX get the 'showWindow' option from the recipes somewhere
+    int kapa = pmKapaOpen (false);
     if (kapa == -1) {
         psError(PSPHOT_ERR_UNKNOWN, true, "failure to open kapa");
         return false;
     }
+
 
     KapaResize (kapa, 500, 500);
@@ -123 +125 @@
     psLogMsg ("psphot", 3, "creating psf model plot");
 
-    int kapa = pmKapaOpen ();
+    int kapa = pmKapaOpen (false);
     if (kapa == -1) {
         psError(PSPHOT_ERR_UNKNOWN, true, "failure to open kapa");