Changeset 38385 for trunk

Timestamp:

Jun 5, 2015, 12:38:21 PM (11 years ago)

Author:

bills

Message:

change some static functions to global so that they may be used
by psphotStackUpdateReadout

File:

• trunk/psphot/src/psphotStackReadout.c (modified) (10 diffs)

trunk/psphot/src/psphotStackReadout.c

@@ -1 +1 @@
 # include "psphotInternal.h"
 
-static bool psphotStackMatchPSFsetup (pmConfig *config, const pmFPAview *view, const char *filerule, const char *fPSF);
-static bool psphotStackMatchPSFsetupReadout (pmConfig *config, const pmFPAview *view, const char *filerule, const char *fPSF, int index);
-static bool psphotStackLoadWCS(pmConfig *config, const pmFPAview *view, const char *filerule);
-static void logMemStats(const char *heading);
+static void psphotLogMemoryStats(const char *heading);
 
 // relevant filesets:
@@ -80 +77 @@
     psTimerStart ("psphotReadout");
 
-    logMemStats("Start");
+    psphotLogMemoryStats("Start");
 
     pmModelClassSetLimits(PM_MODEL_LIMITS_LAX); // allow models to have ugly fits (eg, central cusp)
@@ -153 +150 @@
     // psphotDumpTest (config, view, STACK_RAW);
     psMemDump("sourcestats");
-    logMemStats("sourcestats");
+    psphotLogMemoryStats("sourcestats");
 
     // classify sources based on moments, brightness
@@ -205 +202 @@
     // window of size PSF_MOMENTS_RADIUS (same window used to measure the psf-scale moments)
     // but iterates to an appropriately larger size
-    logMemStats("before.kron.1");
+    psphotLogMemoryStats("before.kron.1");
     psphotKronIterate(config, view, STACK_RAW, 1);
-    logMemStats("after.kron.1");
+    psphotLogMemoryStats("after.kron.1");
         
     // identify CRs and extended sources
@@ -219 +216 @@
     psphotReplaceAllSources (config, view, STACK_RAW, false); // pass 1 (detections->allSources)
 
-    logMemStats("pass1");
+    psphotLogMemoryStats("pass1");
 
     // if we only do one pass, skip to extended source analysis
@@ -286 +283 @@
     }
 
-    logMemStats("prematch");
+    psphotLogMemoryStats("prematch");
 
     // generate the objects (objects unify the sources from the different images) NOTE: could
@@ -315 +312 @@
     // re-measure the kron mags with models subtracted
     // psphotKronMasked(config, view, STACK_SRC);
-    logMemStats("before.kron.2");
+    psphotLogMemoryStats("before.kron.2");
     psphotKronIterate(config, view, STACK_RAW, 2);
-    logMemStats("after.kron.2");
+    psphotLogMemoryStats("after.kron.2");
 
     // measure source size for the remaining sources
@@ -435 +432 @@
     psphotCopyEfficiency (config, view, STACK_OUT, STACK_RAW);
 
-    logMemStats("final");
+    psphotLogMemoryStats("final");
 #if (0)
     psphotSourceMemory(config, view, STACK_RAW);
@@ -457 +454 @@
 }
 
-static bool psphotStackLoadWCS(pmConfig *config, const pmFPAview *view, const char *filerule) {
+bool psphotStackLoadWCS(pmConfig *config, const pmFPAview *view, const char *filerule) {
 
     int num = psphotFileruleCount(config, filerule);
@@ -483 +480 @@
 // tries to open and read from a file it is safe
 // XXX: refine this and move it to psLib
-static void logMemStats(const char *heading) {
+void psphotLogMemoryStats(const char *heading) {
 
     // file containing memory statistics for this process proc. See proc(5)