Changeset 30623

Timestamp:

Feb 13, 2011, 12:21:06 PM (15 years ago)

Author:

eugene

Message:

updates to headers from pmSubtraction mods; added pmVisualRangeImage

Location:

trunk/psModules/src

Files:

• extras/pmVisual.c (modified) (2 diffs)
• extras/pmVisual.h (modified) (1 diff)
• psmodules.h (modified) (1 diff)

trunk/psModules/src/extras/pmVisual.c

@@ -16 +16 @@
 #include <pslib.h>
 
-#include "pmHDU.h"
-#include "pmFPA.h"
-#include "pmFPAfile.h"
-#include "pmAstrometryObjects.h"
-#include "pmSubtractionStamps.h"
-
-#include "pmTrend2D.h"
-#include "pmResiduals.h"
-#include "pmGrowthCurve.h"
-#include "pmSpan.h"
-#include "pmFootprintSpans.h"
-#include "pmFootprint.h"
-#include "pmPeaks.h"
-#include "pmMoments.h"
-#include "pmModelFuncs.h"
-#include "pmModel.h"
-#include "pmSourceMasks.h"
-#include "pmSourceExtendedPars.h"
-#include "pmSourceDiffStats.h"
-#include "pmSource.h"
-#include "pmSourceFitModel.h"
-#include "pmPSF.h"
-#include "pmPSFtry.h"
-
-#include "pmFPAExtent.h"
-
-#include "pmAstrometryVisual.h"
-#include "pmSubtractionVisual.h"
-#include "pmStackVisual.h"
-#include "pmSourceVisual.h"
+bool pmSubtractionVisualClose(void);
+bool pmAstromVisualClose(void);
+bool pmSubtractionVisualClose(void);
+bool pmStackVisualClose(void);
+bool pmSourceVisualClose(void);
+
+// #include "pmHDU.h"
+// #include "pmFPA.h"
+// #include "pmFPAfile.h"
+// #include "pmAstrometryObjects.h"
+// #include "pmSubtractionStamps.h"
+// #include "pmTrend2D.h"
+// #include "pmResiduals.h"
+// #include "pmGrowthCurve.h"
+// #include "pmSpan.h"
+// #include "pmFootprintSpans.h"
+// #include "pmFootprint.h"
+// #include "pmPeaks.h"
+// #include "pmMoments.h"
+// #include "pmModelFuncs.h"
+// #include "pmModel.h"
+// #include "pmSourceMasks.h"
+// #include "pmSourceExtendedPars.h"
+// #include "pmSourceDiffStats.h"
+// #include "pmSource.h"
+// #include "pmSourceFitModel.h"
+// #include "pmPSF.h"
+// #include "pmPSFtry.h"
+// #include "pmFPAExtent.h"
+// #include "pmAstrometryVisual.h"
+// #include "pmSubtractionVisual.h"
+// #include "pmStackVisual.h"
+// #include "pmSourceVisual.h"
 
 # if (HAVE_KAPA)
@@ -306 +309 @@
 }
 
+bool pmVisualRangeImage (int kapaFD, psImage *inImage, const char *name, int channel, float min, float max) {
+
+    KiiImage image;
+    KapaImageData data;
+    Coords coords;
+
+    strcpy (coords.ctype, "RA---TAN");
+
+    image.data2d = inImage->data.F32;
+    image.Nx = inImage->numCols;
+    image.Ny = inImage->numRows;
+
+    strcpy (data.name, name);
+    strcpy (data.file, name);
+    data.zero = min;
+    data.range = max - min;
+    data.logflux = 0;
+
+    KiiSetChannel (kapaFD, channel);
+    KiiNewPicture2D (kapaFD, &image, &data, &coords);
+
+    return true;
+}
 
 psImage* pmVisualImageToFloat(psImage *image) {

trunk/psModules/src/extras/pmVisual.h

@@ -64 +64 @@
                         const char *name, int channel, bool clip);
 
+bool pmVisualRangeImage (int kapaFD, psImage *inImage, const char *name, int channel, float min, float max);
 
 /** Calculate statistics on an image.

trunk/psModules/src/psmodules.h

@@ -98 +98 @@
 // the following headers are from psModule:imcombine
 #include <pmStack.h>
+#include <pmSubtractionTypes.h>
 #include <pmStackReject.h>
 #include <pmSubtraction.h>