Changeset 10281

Timestamp:

Nov 29, 2006, 9:21:53 AM (20 years ago)

Author:

eugene

Message:

adding kapa interactions (with configure test)

Location:

branches/eam_01_branch/psphot

Files:

• configure.ac (modified) (1 diff)
• src/psphotImageMedian.c (modified) (1 diff)
• src/psphotReadout.c (modified) (1 diff)
• src/psphotSummaryPlots.c (added)

branches/eam_01_branch/psphot/configure.ac

@@ -41 +41 @@
 fi
 
+dnl ------------------ kapa,libkapa options -------------------------
+dnl -- libkapa implies the requirement for libpng, libjpeg as well --
+
+dnl save LIBS/CFLAGS/LDFLAGS
+TMP_LIBS=${LIBS}
+TMP_CFLAGS=${CFLAGS}
+TMP_LDFLAGS=${LDFLAGS}
+TMP_CPPFLAGS=${CPPFLAGS}
+
+AC_ARG_WITH(kapa,
+[AS_HELP_STRING(--with-kapa=DIR,Specify location of libkapa)],
+[KAPA_CFLAGS="-I$withval/include"
+ KAPA_LDFLAGS="-L$withval/lib"])
+AC_ARG_WITH(kapa-include,
+[AS_HELP_STRING(--with-kapa-include=DIR,Specify libkapa include directory.)],
+[KAPA_CFLAGS="-I$withval"])
+AC_ARG_WITH(kapa-lib,
+[AS_HELP_STRING(--with-kapa-lib=DIR,Specify libkapa library directory.)],
+[KAPA_LDFLAGS="-L$withval"])
+
+CFLAGS="${CFLAGS} ${KAPA_CFLAGS}"
+CPPFLAGS=${CFLAGS}
+LDFLAGS="${LDFLAGS} ${KAPA_LIBS}"
+
+AC_CHECK_HEADERS([kapa.h],[],
+  [AC_MSG_ERROR([libkapa headers not found.  Obtain it at http://kiawe.ifa.hawaii.edu/Elixir/Ohana or use --with-kapa to specify location.])]
+)
+AC_CHECK_LIB(kapa,KapaInitGraph,[],
+  [AC_MSG_ERROR([libkapa headers not found.  Obtain it at http://kiawe.ifa.hawaii.edu/Elixir/Ohana or use --with-kapa to specify location.])],[-lm]
+)
+
+AC_SUBST([KAPA_CFLAGS])
+
+dnl restore the CFLAGS/LDFLAGS
+LIBS=${TMP_LIBS}
+CFLAGS=${TMP_CFLAGS}
+LDFLAGS=${TMP_LDFLAGS}
+CPPFLAGS=${TMP_CPPFLAGS}
+
+dnl ------------- psLib, psModules ---------------
 PKG_CHECK_MODULES(PSLIB, pslib >= 0.12.99)
 PKG_CHECK_MODULES(PSMODULE, psmodules >= 0.12.99)

branches/eam_01_branch/psphot/src/psphotImageMedian.c

@@ -149 +149 @@
     stats = psImageStats (stats, model->image, NULL, 0);
     psMetadataAdd (recipe, PS_LIST_TAIL, "SKY_MEAN", PS_DATA_F32 | PS_META_REPLACE, "sky model mean",          stats->sampleMean);
-    psMetadataAdd (recipe, PS_LIST_TAIL, "SKY_STDEV", PS_DATA_F32 | PS_META_REPLACE, "sky model stdev",         stats->sampleStdev);
+    psMetadataAdd (recipe, PS_LIST_TAIL, "SKY_STDEV", PS_DATA_F32 | PS_META_REPLACE, "sky model stdev",        stats->sampleStdev);
     psMetadataAdd (recipe, PS_LIST_TAIL, "SKY_MAX",  PS_DATA_F32 | PS_META_REPLACE, "sky model maximum value", stats->max);
     psMetadataAdd (recipe, PS_LIST_TAIL, "SKY_MIN",  PS_DATA_F32 | PS_META_REPLACE, "sky model minimum value", stats->min);
     psMetadataAdd (recipe, PS_LIST_TAIL, "SKY_NX",   PS_DATA_S32 | PS_META_REPLACE, "sky model size (x)",      nx);
     psMetadataAdd (recipe, PS_LIST_TAIL, "SKY_NY",   PS_DATA_S32 | PS_META_REPLACE, "sky model size (y)",      ny);
+    psLogMsg ("psphot", 3, "background sky : min %f mean %f max %f stdev %f", stats->min, stats->sampleMean, stats->max, stats->sampleStdev);
     psFree (stats);
 

branches/eam_01_branch/psphot/src/psphotReadout.c

@@ -74 +74 @@
         return true;
     }
+
+    // XXX test the plotting function
+    psphotPlotMoments (sources);
 
     // psphotTestPSF (readout, sources, recipe);