Changeset 10614

Timestamp:

Dec 10, 2006, 8:38:42 AM (19 years ago)

Author:

eugene

Message:

moved kapa plots to psModules

Location:

trunk/psphot/src

Files:

• psphot.h (modified) (1 diff)
• psphotReadout.c (modified) (1 diff)
• psphotSummaryPlots.c (modified) (4 diffs)

trunk/psphot/src/psphot.h

@@ -94 +94 @@
 bool psphotPlotMoments (pmConfig *config, pmFPAview *view, psArray *sources);
 bool psphotPlotPSFModel (pmConfig *config, pmFPAview *view, psArray *sources);
-
-// move to psLib or psModules
-int psphotKapaOpen ();
-bool psphotKapaClose ();

trunk/psphot/src/psphotReadout.c

@@ -175 +175 @@
     pmFPAfileDropInternal (config->files, "PSPHOT.BACKGND");
 
-    psphotKapaClose ();
+    // XXX move this to top of loop
+    pmKapaClose ();
 
     psFree (psf);

trunk/psphot/src/psphotSummaryPlots.c

@@ -5 +5 @@
 // which perform NOP and return false (XXX should this be true??)
 
+// this variable is defined in psmodules.h if ohana-config is found
 # if (HAVE_KAPA)
 
 # include <kapa.h>
-
-// XXX not thread safe (perhaps not needed)
-// to make this thread safe, we could check the thread ID and tie to it
-static int kapa_fd = -1;
-int psphotKapaOpen () {
-
-    if (kapa_fd == -1) {
-        // XXX make -noX an option
-        // XXX -noX is crashing kapa on point plotting
-        kapa_fd = KapaOpen ("kapa", "psphot");
-    }
-    return kapa_fd;
-}
-
-bool psphotKapaClose () {
-    
-    if (kapa_fd == -1) return true;
-    KapaClose (kapa_fd);
-    kapa_fd = -1;
-    return true;
-}
 
 // plot the sx, sy moments plane (faint and bright sources)
@@ -47 +27 @@
     psLogMsg ("psphot", 3, "creating moments plot");
 
-    int kapa = psphotKapaOpen ();
+    int kapa = pmKapaOpen ();
     if (kapa == -1) {
         psError(PSPHOT_ERR_UNKNOWN, true, "failure to open kapa");
@@ -143 +123 @@
     psLogMsg ("psphot", 3, "creating psf model plot");
 
-    int kapa = psphotKapaOpen ();
+    int kapa = pmKapaOpen ();
     if (kapa == -1) {
         psError(PSPHOT_ERR_UNKNOWN, true, "failure to open kapa");
@@ -297 +277 @@
 }
 
-int psphotKapaOpen () {
-    return -1;
-}
-
-bool psphotKapaClose () {
-    return true;
-}
-
 # endif