Index: trunk/psModules/src/objects/Makefile.am =================================================================== --- trunk/psModules/src/objects/Makefile.am (revision 13213) +++ trunk/psModules/src/objects/Makefile.am (revision 13214) @@ -23,4 +23,5 @@ pmSourcePlotPSFModel.c \ pmSourcePlotMoments.c \ + pmSourcePlotApResid.c \ pmResiduals.c \ pmPSF.c \ Index: trunk/psModules/src/objects/pmSourcePlotApResid.c =================================================================== --- trunk/psModules/src/objects/pmSourcePlotApResid.c (revision 13214) +++ trunk/psModules/src/objects/pmSourcePlotApResid.c (revision 13214) @@ -0,0 +1,157 @@ +/** @file pmSourcePlot.c + * + * Plot the Aperture Mag - Fitted Mag residuals + * @author EAM, IfA + * + * @version $Revision: 1.1 $ $Name: not supported by cvs2svn $ + * @date $Date: 2007-05-04 00:54:09 $ + * Copyright 2006 IfA, University of Hawaii + */ + +#ifdef HAVE_CONFIG_H +#include +#endif + +#include +#include +#include + +#include "pmConfig.h" +#include "pmDetrendDB.h" + +#include "pmHDU.h" +#include "pmFPA.h" +#include "pmFPALevel.h" +#include "pmFPAview.h" +#include "pmFPAfile.h" +#include "pmPeaks.h" +#include "pmMoments.h" +#include "pmGrowthCurve.h" +#include "pmResiduals.h" +#include "pmModel.h" +#include "pmPSF.h" +#include "pmSource.h" +#include "pmSourcePlots.h" +#include "pmKapaPlots.h" + +// this variable is defined in psmodules.h if ohana-config is found +# if (HAVE_KAPA) + # include + + // plot the sx, sy, sxy as vector field, + // plot the PSF measured sx, sy, sxy as vector field + // pull the sources from the config / file? + bool pmSourcePlotApResid (const pmFPAview *view, pmFPAfile *file, const pmConfig *config, pmSourcePlotLayout *layout) +{ + + Graphdata graphdata; + KapaSection section; + + psLogMsg ("psphot", 3, "creating ap mag - psf mag plot"); + + // find the currently selected readout + pmReadout *readout = pmFPAfileThisReadout (config->files, view, "PSPHOT.INPUT"); + + psArray *sources = psMetadataLookupPtr (NULL, readout->analysis, "PSPHOT.SOURCES"); + if (sources == NULL) + return false; + + int kapa = pmKapaOpen (true); + if (kapa == -1) { + psError(PS_ERR_UNKNOWN, true, "failure to open kapa"); + return false; + } + + int DX = 1000; + float dx = DX / layout->nX; + float dy = dx * layout->aspectRatio; + int DY = dy * layout->nY; + + // XXX make the aspect-ratio match the image + if (layout->i == 0) { + KapaResize (kapa, DX, DY); + } + + KapaClear (kapa, true); + KapaInitGraph (&graphdata); + section.dx = dx / DX; + section.dy = dy / DY; + section.x = layout->iX * section.dx; + section.y = layout->iY * section.dy; + section.name = NULL; + psStringAppend (§ion.name, "a%d", layout->i); + KapaSetSection (kapa, §ion); + psFree (section.name); + + psVector *x = psVectorAllocEmpty (sources->n, PS_TYPE_F32); + psVector *y = psVectorAllocEmpty (sources->n, PS_TYPE_F32); + + graphdata.xmin = +32.0; + graphdata.xmax = -32.0; + graphdata.ymin = +32.0; + graphdata.ymax = -32.0; + + // construct the plot vectors + int n = 0; + for (int i = 0; i < sources->n; i++) { + pmSource *source = sources->data[i]; + if (!source) continue; + if (source->type != PM_SOURCE_TYPE_STAR) continue; + if (!isfinite (source->apMag)) continue; + if (!isfinite (source->psfMag)) continue; + + x->data.F32[n] = source->psfMag; + y->data.F32[n] = source->apMag - source->psfMag; + graphdata.xmin = PS_MIN(graphdata.xmin, x->data.F32[n]); + graphdata.xmax = PS_MAX(graphdata.xmax, x->data.F32[n]); + graphdata.ymin = PS_MIN(graphdata.ymin, y->data.F32[n]); + graphdata.ymax = PS_MAX(graphdata.ymax, y->data.F32[n]); + + n++; + } + x->n = y->n = n; + + float range; + range = graphdata.xmax - graphdata.xmin; + graphdata.xmax += 0.05*range; + graphdata.xmin -= 0.05*range; + range = graphdata.ymax - graphdata.ymin; + graphdata.ymax += 0.05*range; + graphdata.ymin -= 0.05*range; + + // XXX set the plot range to match the image + KapaSetLimits (kapa, &graphdata); + + KapaSetFont (kapa, "helvetica", 14); + KapaBox (kapa, &graphdata); + KapaSendLabel (kapa, "PSF Mag", KAPA_LABEL_XM); + KapaSendLabel (kapa, "Ap Mag - PSF Mag", KAPA_LABEL_YM); + + graphdata.color = KapaColorByName ("black"); + graphdata.ptype = 2; + graphdata.size = 0.5; + graphdata.style = 2; + KapaPrepPlot (kapa, n, &graphdata); + KapaPlotVector (kapa, n, x->data.F32); + KapaPlotVector (kapa, n, y->data.F32); + + if (layout->i == layout->nTotal - 1) { + psLogMsg ("psphot", 3, "saving plot to %s", file->filename); + KapaPNG (kapa, file->filename); + KapaClear (kapa, true); + } + + psFree (x); + psFree (y); + return true; +} + +# else + + bool pmSourcePlotApResid (const pmFPAview *view, pmFPAfile *file, const pmConfig *config, pmSourcePlotLayout *layout) +{ + psLogMsg ("psphot", 3, "skipping ap-mag resid plot"); + return true; +} + +# endif Index: trunk/psModules/src/objects/pmSourcePlots.c =================================================================== --- trunk/psModules/src/objects/pmSourcePlots.c (revision 13213) +++ trunk/psModules/src/objects/pmSourcePlots.c (revision 13214) @@ -5,6 +5,6 @@ * @author EAM, IfA * - * @version $Revision: 1.3 $ $Name: not supported by cvs2svn $ - * @date $Date: 2007-04-14 03:22:48 $ + * @version $Revision: 1.4 $ $Name: not supported by cvs2svn $ + * @date $Date: 2007-05-04 00:54:09 $ * * Copyright 2006 IfA, University of Hawaii @@ -67,5 +67,5 @@ layout->nX = 4; layout->nY = 2; - layout->aspectRatio = 2.0; + layout->aspectRatio = 1.0; // count the number of chips and their layout (xrange, yrange, axis ratio) for (int i = 0; i < fpa->chips->n; i++) { @@ -104,4 +104,7 @@ layout = pmSourcePlotLayoutAlloc (); layout->nTotal = 1; + layout->nX = 1; + layout->nY = 1; + layout->aspectRatio = 1.0; } else { psMemIncrRefCounter (layout); @@ -119,4 +122,7 @@ if (!strcmp (file->name, "SOURCE.PLOT.MOMENTS")) { pmSourcePlotMoments (newView, file, config, layout); + } + if (!strcmp (file->name, "SOURCE.PLOT.APRESID")) { + pmSourcePlotApResid (newView, file, config, layout); } } Index: trunk/psModules/src/objects/pmSourcePlots.h =================================================================== --- trunk/psModules/src/objects/pmSourcePlots.h (revision 13213) +++ trunk/psModules/src/objects/pmSourcePlots.h (revision 13214) @@ -4,6 +4,6 @@ * @author EAM, IfA * - * @version $Revision: 1.3 $ $Name: not supported by cvs2svn $ - * @date $Date: 2007-04-14 03:22:48 $ + * @version $Revision: 1.4 $ $Name: not supported by cvs2svn $ + * @date $Date: 2007-05-04 00:54:09 $ * Copyright 2006 Institute for Astronomy, University of Hawaii */ @@ -36,4 +36,5 @@ bool pmSourcePlotPSFModel (const pmFPAview *view, pmFPAfile *file, const pmConfig *config, pmSourcePlotLayout *layout); bool pmSourcePlotMoments (const pmFPAview *view, pmFPAfile *file, const pmConfig *config, pmSourcePlotLayout *layout); +bool pmSourcePlotApResid (const pmFPAview *view, pmFPAfile *file, const pmConfig *config, pmSourcePlotLayout *layout); /// @}