Changeset 16084

Timestamp:

Jan 15, 2008, 2:45:18 PM (18 years ago)

Author:

Paul Price

Message:

Adding old code to track memory usage in ppImage.

Location:

trunk/ppImage/src

Files:

• Makefile.am (modified) (2 diffs)
• ppImage.h (modified) (7 diffs)
• ppImageAstrom.c (modified) (3 diffs)
• ppImageDetrendReadout.c (modified) (1 diff)
• ppImageMemory.c (added)
• ppImagePhotom.c (modified) (1 diff)

trunk/ppImage/src/Makefile.am

@@ -30 +30 @@
         ppImageDefineFile.c \
         ppImageFileCheck.c \
-        ppImageVersion.c
+        ppImageVersion.c \
+        ppImageMemory.c
 
 ppFocus_CPPFLAGS = $(PSLIB_CFLAGS) $(PSMODULE_CFLAGS) $(PSPHOT_CFLAGS) $(PSASTRO_CFLAGS) $(PPSTATS_CFLAGS) $(ppImage_CFLAGS)
@@ -58 +59 @@
         ppImageDefineFile.c \
         ppImageFileCheck.c \
-        ppImageVersion.c
+        ppImageVersion.c \
+        ppImageMemory.c
 
 ppTest_CPPFLAGS = $(PSLIB_CFLAGS) $(PSMODULE_CFLAGS) $(ppImage_CFLAGS)

trunk/ppImage/src/ppImage.h

@@ -35 +35 @@
     bool doAstromChip;                  // per-chip Astrometry
     bool doAstromMosaic;                // full-mosaic Astrometry
-    bool doStats;                       // call ppStats on the image
-    bool replaceMasked;                 // fill in masked values with background model
+    bool doStats;                       // call ppStats on the image
+    bool replaceMasked;                 // fill in masked values with background model
 
     // output files requested
@@ -70 +70 @@
 
     // binning parameters
-    int xBin1;                          // x-binning, scale 1
-    int yBin1;                          // y-binning, scale 1
-    int xBin2;                          // x-binning, scale 2
-    int yBin2;                          // y-binning, scale 2
+    int xBin1;                          // x-binning, scale 1
+    int yBin1;                          // y-binning, scale 1
+    int xBin2;                          // x-binning, scale 2
+    int yBin2;                          // y-binning, scale 2
 
     // parameters used by the fringe analysis
@@ -150 +150 @@
 bool ppImageStats (pmConfig *config, pmChip *chip, const pmFPAview *inputView, const ppImageOptions *options);
 
-// write stats to output file 
+// write stats to output file
 bool ppImageStatsOutput (pmConfig *config, const ppImageOptions *options);
 
@@ -157 +157 @@
 bool ppImageDetrendFringeMeasure(pmReadout *readout, // Readout to measure
                                  pmCell *fringe, // Fringe cell (each readout is a different component)
-                                 const bool isResidual,
+                                 const bool isResidual,
                                  const ppImageOptions *options // Options
     );
@@ -164 +164 @@
 bool ppImageDetrendFringeSolve(pmChip *scienceChip, // Chip with science
                                const pmChip *refChip, // Chip with reference fringes
-                               const bool isResidual,
+                               const bool isResidual,
                                const ppImageOptions *options // Options
     );
@@ -171 +171 @@
 bool ppImageDetrendFringeGenerate(pmCell *science, // Science cell
                                   pmCell *fringes, // Fringe cell, one readout per fringe component
-                                  const ppImageOptions *options // Options
+                                  const ppImageOptions *options // Options
     );
 
 
 bool ppImageDetrendFringeApply (pmConfig *config, // config
-                                pmChip *chip, // science chip
-                                const pmFPAview *inputView, // current view
-                                const ppImageOptions *options // options
+                                pmChip *chip, // science chip
+                                const pmFPAview *inputView, // current view
+                                const ppImageOptions *options // options
     );
 
@@ -200 +200 @@
 void ppImageFileCheck (pmConfig *config);
 
+/// Dump memory summary to text file
+void ppImageMemoryDump(const char *description);
+
 #endif

trunk/ppImage/src/ppImageAstrom.c

@@ -19 +19 @@
     PS_ASSERT (input, false);
 
+    ppImageMemoryDump("astrom");
+
     // convert the output sources created by psphot into astrometry objects
     if (!psastroConvertFPA (input->fpa, recipe)) {
-        psError (PSASTRO_ERR_UNKNOWN, false, "error reading input data\n");
-        return false;
+        psError (PSASTRO_ERR_UNKNOWN, false, "error reading input data\n");
+        return false;
     }
 
     if (!psastroAnalysis (config)) {
-        psError (PSASTRO_ERR_UNKNOWN, false, "failure in psastro analysis\n");
-        return false;
+        psError (PSASTRO_ERR_UNKNOWN, false, "failure in psastro analysis\n");
+        return false;
     }
 
@@ -39 +41 @@
     while ((chip = pmFPAviewNextChip(view, input->fpa, 1)) != NULL) {
         psLogMsg ("ppImageLoop", 4, "Chip %d: %x %x\n", view->chip, chip->file_exists, chip->process);
+
+        ppImageMemoryDump("astrom");
 
         // Output and Close at Chip level
@@ -53 +57 @@
     }
 
-    // deactivate the PSASTRO files, re-active all else 
+    // deactivate the PSASTRO files, re-active all else
     // XXX do we need a way to activate / deactivate other groups?
     pmFPAfileActivate (config->files, true, NULL);

trunk/ppImage/src/ppImageDetrendReadout.c

@@ -92 +92 @@
     }
 
+    ppImageMemoryDump("detrend");
+
     psFree(detview);
     return true;

trunk/ppImage/src/ppImagePhotom.c

@@ -43 +43 @@
     }
 
+    ppImageMemoryDump("photom");
+
     // the PSPHOT.INPUT file is a temporary file used to carry PPIMAGE.CHIP to psphotReadout
     // XXX not sure that this is needed...
-    pmFPAfileActivate (config->files, false, "PSPHOT.INPUT");
+//    pmFPAfileActivate (config->files, false, "PSPHOT.INPUT");
 
     return true;