Changeset 6114

Timestamp:

Jan 20, 2006, 6:37:29 PM (20 years ago)

Author:

Paul Price

Message:

Freeing detrend cells as we go

Location:

trunk/ppImage/src

Files:

• ppImage.c (modified) (2 diffs)
• ppImageDetrendCell.c (modified) (1 diff)
• ppImageLoop.c (modified) (1 diff)
• ppImageOutput.c (modified) (1 diff)
• ppImageParseCamera.c (modified) (1 diff)
• ppImagePhot.c (modified) (1 diff)

trunk/ppImage/src/ppImage.c

@@ -27 +27 @@
     ppImageLoop(&data, &options, &config);
 
+#if 0
     // Output image
     ppImageOutput(&data, &config);
@@ -32 +33 @@
     // Do photometry
     ppImagePhot(&data, &options, &config);
+#endif
 
     exit(EXIT_SUCCESS);

trunk/ppImage/src/ppImageDetrendCell.c

@@ -63 +63 @@
         // Flat-field correction (no options used?)
         if (options->doFlat) {
-#if 0
-            psLogMsg("phase2", PS_LOG_INFO, "flat field disabled.\n");
-#endif
             pmFlatField(input, flat);
         }

trunk/ppImage/src/ppImageLoop.c

@@ -89 +89 @@
 
             ppDetrendCell(&detrend, options, config);
+
+            // Need to free detrend cells here so we have enough memory to do other stuff
+            psFree(detrend.bias);
+            psFree(detrend.dark);
+            psFree(detrend.mask);
+            psFree(detrend.flat);
         }
+
+        int numMosaicked = pmChipMosaic(inputChip, 1, 1); // Number of cells mosaicked together
+        psLogMsg(__func__, PS_LOG_INFO, "%d cells mosaicked.\n", numMosaicked);
+
     }
+
+    // Free the detrend FPA and chips
+    psFree(data->bias);
+    psFree(data->dark);
+    psFree(data->mask);
+    psFree(data->flat);
+
+
     return true;
 }

trunk/ppImage/src/ppImageOutput.c

@@ -4 +4 @@
 {
     const char *outname = psMetadataLookupStr(NULL, config->arguments, "-output"); // Name of output file
-    psFits *outFile = psFitsOpen(outname, "w"); // File for writing
+    psFits *outFile = psFitsOpen(outname, "a"); // File for writing
 
     // Write the output

trunk/ppImage/src/ppImageParseCamera.c

@@ -55 +55 @@
     data->flat->fpa    = pmFPAConstruct(config->camera);
     data->fringe->fpa  = pmFPAConstruct(config->camera);
-#if 0
-    data->process->fpa = pmFPAConstruct(config->camera);
-#endif
 
     // XXX EAM : extend this to allow an array of selected chips by name

trunk/ppImage/src/ppImagePhot.c

@@ -6 +6 @@
     pmFPA *fpa = input->fpa;       // The input FPA
 
-    int numMosaicked = pmFPAMosaicChips(fpa, 1, 1); // Number of chips mosaicked together
+    int numMosaicked = pmFPAMosaicCells(fpa, 1, 1); // Number of chips mosaicked together
     psLogMsg(__func__, PS_LOG_INFO, "%d chips mosaicked.\n", numMosaicked);