Index: trunk/psModules/src/imcombine/Makefile.am =================================================================== --- trunk/psModules/src/imcombine/Makefile.am (revision 23191) +++ trunk/psModules/src/imcombine/Makefile.am (revision 23242) @@ -19,5 +19,6 @@ pmSubtractionThreads.c \ pmPSFEnvelope.c \ - pmSubtractionVisual.c + pmSubtractionVisual.c \ + pmStackVisual.c pkginclude_HEADERS = \ @@ -37,5 +38,6 @@ pmSubtractionThreads.h \ pmPSFEnvelope.h \ - pmSubtractionVisual.h + pmSubtractionVisual.h \ + pmStackVisual.h CLEANFILES = *~ Index: trunk/psModules/src/imcombine/pmPSFEnvelope.c =================================================================== --- trunk/psModules/src/imcombine/pmPSFEnvelope.c (revision 23191) +++ trunk/psModules/src/imcombine/pmPSFEnvelope.c (revision 23242) @@ -30,5 +30,5 @@ #include "pmPSFEnvelope.h" - +#include "pmStackVisual.h" @@ -165,4 +165,5 @@ psStringAppend(&name, "psf_field_%03d.fits", i); psFits *fits = psFitsOpen(name, "w"); + pmStackVisualPlotTestImage(fakeRO->image, name); psFitsWriteImage(fits, NULL, fakeRO->image, 0, NULL); psFitsClose(fits); @@ -182,4 +183,5 @@ // Write out the envelope psFits *fits = psFitsOpen("psf_field_envelope.fits", "w"); + pmStackVisualPlotTestImage(envelope, "psf_field_envelope.fits"); psFitsWriteImage(fits, NULL, envelope, 0, NULL); psFitsClose(fits); @@ -234,4 +236,5 @@ // Write out the envelope psFits *fits = psFitsOpen("psf_field_full.fits", "w"); + pmStackVisualPlotTestImage(readout->image, "psf_field_full.fits"); psFitsWriteImage(fits, NULL, readout->image, 0, NULL); psFitsClose(fits); @@ -315,4 +318,5 @@ { psFits *fits = psFitsOpen("psf_field_model.fits", "w"); + pmStackVisualPlotTestImage(generated->image, "psf_field_model.fits"); psFitsWriteImage(fits, NULL, generated->image, 0, NULL); psFitsClose(fits); @@ -321,4 +325,5 @@ { psFits *fits = psFitsOpen("psf_field_resid.fits", "w"); + pmStackVisualPlotTestImage(generated->image, "psf_field_resid.fits"); psFitsWriteImage(fits, NULL, generated->image, 0, NULL); psFitsClose(fits); Index: trunk/psModules/src/imcombine/pmStack.c =================================================================== --- trunk/psModules/src/imcombine/pmStack.c (revision 23191) +++ trunk/psModules/src/imcombine/pmStack.c (revision 23242) @@ -8,6 +8,6 @@ * @author GLG, MHPCC * - * @version $Revision: 1.48 $ $Name: not supported by cvs2svn $ - * @date $Date: 2009-02-13 23:52:14 $ + * @version $Revision: 1.48.2.1 $ $Name: not supported by cvs2svn $ + * @date $Date: 2009-02-19 17:59:50 $ * Copyright 2004-2007 Institute for Astronomy, University of Hawaii * Index: trunk/psModules/src/imcombine/pmStackVisual.c =================================================================== --- trunk/psModules/src/imcombine/pmStackVisual.c (revision 23242) +++ trunk/psModules/src/imcombine/pmStackVisual.c (revision 23242) @@ -0,0 +1,60 @@ +/** Diagnostic plots for pmStack + * @author Chris Beaumont, IfA + */ + +/* Include Files */ +#ifdef HAVE_CONFIG_H +#include +#endif + +#include +#include +#include +#include +#include +#include + +#include "pmKapaPlots.h" +#include "pmVisual.h" + +#include "pmHDU.h" +#include "pmFPA.h" +#include "pmAstrometryObjects.h" + +# if (HAVE_KAPA) +# include + +//variables to determine when things are plotted +static bool plotTestImage = true; + +// variables to store plotting window indices +static int kapa = -1; +static int kapa2 = -1; + +/** destroy windows at the end of a run*/ +bool pmStackVisualClose() +{ + if(kapa != -1) + KiiClose(kapa); + if(kapa2 != -1) + KiiClose(kapa2); + return true; +} + +/** Display a test image + * @param image to plot + * @param name for plot. No spaces allowed. + */ +bool pmStackVisualPlotTestImage(psImage *image, char *name) { + if (!pmVisualIsVisual() || !plotTestImage) return true; + if (!pmVisualInitWindow(&kapa, "pmStack:Images")) return false; + + if(!pmVisualScaleImage(kapa, image, (const char*)name, 0, true)) return false; + pmVisualAskUser(&plotTestImage); + return true; +} + +#else +bool pmStackVisualClose() {return true;} +bool pmStackVisualPlotTestImage(psImage *image, char *name) {return true;} +#endif Index: trunk/psModules/src/imcombine/pmStackVisual.h =================================================================== --- trunk/psModules/src/imcombine/pmStackVisual.h (revision 23242) +++ trunk/psModules/src/imcombine/pmStackVisual.h (revision 23242) @@ -0,0 +1,7 @@ +#ifndef PM_STACK_VISUAL_H +#define PM_STACK_VISUAL_H + +bool pmStackVisualClose(void); +bool pmStackVisualPlotTestImage(psImage *image, char *name); + +#endif Index: trunk/psModules/src/imcombine/pmSubtractionIO.c =================================================================== --- trunk/psModules/src/imcombine/pmSubtractionIO.c (revision 23191) +++ trunk/psModules/src/imcombine/pmSubtractionIO.c (revision 23242) @@ -16,4 +16,5 @@ #include "pmSubtractionIO.h" +#include "pmStackVisual.h" #define ARRAY_BUFFER 16 // Number to add to array at a time @@ -144,6 +145,6 @@ // CVS tags, used to identify the version of this file (in case incompatibilities are introduced) psString cvsFile = psStringCopy("$RCSfile: pmSubtractionIO.c,v $"); - psString cvsRev = psStringCopy("$Revision: 1.9 $"); - psString cvsDate = psStringCopy("$Date: 2008-10-24 21:21:06 $"); + psString cvsRev = psStringCopy("$Revision: 1.9.18.1 $"); + psString cvsDate = psStringCopy("$Date: 2009-02-19 17:59:50 $"); psStringSubstitute(&cvsFile, NULL, "RCSfile: "); psStringSubstitute(&cvsRev, NULL, "Revision: "); @@ -167,4 +168,6 @@ psImage *image = psMetadataLookupPtr(NULL, ro->analysis, PM_SUBTRACTION_ANALYSIS_KERNEL_IMAGE); // Image + pmStackVisualPlotTestImage(image, "Subtraction_kernels.fits"); + if (image && !psFitsWriteImage(fits, header, image, 0, EXTNAME_IMAGE)) { psError(PS_ERR_IO, false, "Unable to write subtraction kernel image."); Index: trunk/psModules/src/imcombine/pmSubtractionVisual.c =================================================================== --- trunk/psModules/src/imcombine/pmSubtractionVisual.c (revision 23191) +++ trunk/psModules/src/imcombine/pmSubtractionVisual.c (revision 23242) @@ -28,5 +28,4 @@ //variables to determine when things are plotted -static bool isVisual = false; static bool plotConvKernels = true; static bool plotStamps = true; @@ -42,9 +41,4 @@ // Initialization Routines -/** start or stop plotting */ -bool pmSubtractionSetVisual (bool mode) { - isVisual = mode; - return true; -} @@ -65,11 +59,10 @@ * @return true for success */ bool pmSubtractionVisualPlotConvKernels(psImage *convKernels) { - if (!isVisual || !plotConvKernels) return true; + if (!pmVisualIsVisual() || !plotConvKernels) return true; if (!pmVisualInitWindow(&kapa, "ppSub:Images")) { - isVisual = false; return false; } pmVisualScaleImage(kapa, convKernels, "Convolution_Kernels", 0, true); - pmVisualAskUser(&plotConvKernels, &isVisual); + pmVisualAskUser(&plotConvKernels); return true; } @@ -80,11 +73,9 @@ @return true for success */ bool pmSubtractionVisualPlotStamps(pmSubtractionStampList *stamps, pmReadout *ro) { - if (!isVisual || !plotStamps) return true; + if (!pmVisualIsVisual() || !plotStamps) return true; if (!pmVisualInitWindow (&kapa, "ppSub:Images")) { - isVisual = false; return false; } if (!pmVisualInitWindow (&kapa2, "ppSub:StampMasterImage")) { - isVisual = false; return false; } @@ -145,5 +136,5 @@ pmVisualScaleImage(kapa, canvas, "Subtraction_Stamps", 0, true); - pmVisualAskUser(&plotStamps, &isVisual); + pmVisualAskUser(&plotStamps); return true; } @@ -152,7 +143,6 @@ bool pmSubtractionVisualPlotLeastSquares (pmSubtractionStampList *stamps, bool dual) { - if (!isVisual || !plotLeastSquares) return true; + if (!pmVisualIsVisual() || !plotLeastSquares) return true; if (!pmVisualInitWindow (&kapa, "PPSub:Images")) { - isVisual = false; return false; } @@ -209,5 +199,5 @@ pmVisualScaleImage(kapa, canvas32, "Least_Squares", 0, true); - pmVisualAskUser(&plotLeastSquares, &isVisual); + pmVisualAskUser(&plotLeastSquares); psFree(canvas); psFree(canvas32); @@ -216,7 +206,6 @@ bool pmSubtractionVisualShowSubtraction(psImage *image, psImage *ref, psImage *sub) { - if (!isVisual || !plotImage) return true; + if (!pmVisualIsVisual() || !plotImage) return true; if (!pmVisualInitWindow (&kapa, "PPSub:Images")) { - isVisual = false; return false; } @@ -225,5 +214,5 @@ pmVisualScaleImage(kapa, ref, "Reference", 1, true); pmVisualScaleImage(kapa, sub, "Subtraction", 2, true); - pmVisualAskUser(&plotImage, &isVisual); + pmVisualAskUser(&plotImage); return true; } @@ -267,5 +256,4 @@ #else -bool pmSubtractionSetVisual (bool mode) {return true;} bool pmSubtractionVisualClose() {return true;} bool pmSubtractionVisualPlotConvKernels(psImage *convKernels) {return true;} Index: trunk/psModules/src/imcombine/pmSubtractionVisual.h =================================================================== --- trunk/psModules/src/imcombine/pmSubtractionVisual.h (revision 23191) +++ trunk/psModules/src/imcombine/pmSubtractionVisual.h (revision 23242) @@ -2,5 +2,4 @@ #define PM_SUBTRACTION_VISUAL_H -bool pmSubtractionSetVisual (bool mode); bool pmSubtractionVisualClose(); bool pmSubtractionVisualPlotConvKernels(psImage *convKernels);