Changeset 7592

Timestamp:

Jun 16, 2006, 4:01:17 PM (20 years ago)

Author:

eugene

Message:

updating pmFPAfileDefine APIs, adding chip mosaic

Location:

trunk/ppImage/src

Files:

• Makefile.am (modified) (1 diff)
• ppImage.h (modified) (1 diff)
• ppImageAstrom.c (modified) (1 diff)
• ppImageLoop.c (modified) (2 diffs)
• ppImageMosaic.c (added)
• ppImageParseCamera.c (modified) (3 diffs)
• ppImagePhotom.c (modified) (1 diff)

trunk/ppImage/src/Makefile.am

@@ -19 +19 @@
         ppImageDetrendNonLinear.c \
         ppImageRebinReadout.c \
+        ppImageMosaic.c \
         ppImagePhotom.c \
         ppImageAstrom.c

trunk/ppImage/src/ppImage.h

@@ -39 +39 @@
 bool ppImageAstrom (pmConfig *config);
 
+bool ppImageMosaicChip (pmChip *chip, pmConfig *config, const pmFPAview *view);
+
 #endif

trunk/ppImage/src/ppImageAstrom.c

@@ -13 +13 @@
         // mode is 'REFERENCE' to prevent double frees of the fpa
         pmFPAfile *output = psMetadataLookupPtr (&status, config->files, "PSPHOT.OUTPUT");
-        input = pmFPAfileDefineInput (config->files, config->camera, output->fpa, "PSASTRO.INPUT");
+        input = pmFPAfileDefineInput (config, output->fpa, "PSASTRO.INPUT");
         input->mode = PM_FPA_MODE_REFERENCE;
 
-        pmFPAfileDefineOutput (config->files, config->camera, input->fpa, "PSPHOT.OUTPUT");
+        pmFPAfileDefineOutput (config, input->fpa, "PSPHOT.OUTPUT");
 
         // supply the output name (from cmd-line) to all output (WRITE) files

trunk/ppImage/src/ppImageLoop.c

@@ -45 +45 @@
         }
 
-        // ppImageChipMosaic (config, view);
+        ppImageMosaicChip (chip, config, view);
 
         // we perform photometry on the readouts of this chip in the output
@@ -51 +51 @@
 
         if (!pmFPAfileIOChecks (config, view, PM_FPA_AFTER)) return false;
-
-        // XXX paul added these frees: make sure the same is happening in the pmFileIOChecks
-        // Now I can blow away the mosaic so I can then read more.
-        // psFree(inputChip);
-        // psFree(biasChip);
-        // psFree(darkChip);
-        // psFree(maskChip);
-        // psFree(flatChip);
-        // ppMemUsed();
     }
 

trunk/ppImage/src/ppImageParseCamera.c

@@ -22 +22 @@
 
     // the following files are output targets
-    pmFPAfileDefineOutput (config->files, config->camera, input->fpa, "PPIMAGE.OUTPUT");
+    pmFPAfileDefineOutput (config, input->fpa, "PPIMAGE.OUTPUT");
+    pmFPAfileDefineNewCamera (config, "PPIMAGE.OUTPUT.CHIP");
 
     // the following are defined from the argument list, if given, 
@@ -58 +59 @@
         pmFPAfile *file = pmFPAfileDefineFromFPA (config, input->fpa, options->xBin1, options->yBin1, "PPIMAGE.BIN1");
         if (options->doBin1JPG) {
-            pmFPAfileDefineOutput (config->files, config->camera, file->fpa, "PPIMAGE.JPEG1");
+            pmFPAfileDefineOutput (config, file->fpa, "PPIMAGE.JPEG1");
         }
     }
@@ -64 +65 @@
         pmFPAfile *file = pmFPAfileDefineFromFPA (config, input->fpa, options->xBin2, options->yBin2, "PPIMAGE.BIN2");
         if (options->doBin2JPG) {
-            pmFPAfileDefineOutput (config->files, config->camera, file->fpa, "PPIMAGE.JPEG2");
+            pmFPAfileDefineOutput (config, file->fpa, "PPIMAGE.JPEG2");
         }
     }

trunk/ppImage/src/ppImagePhotom.c

@@ -29 +29 @@
         // mode is 'REFERENCE' to prevent double frees of the fpa
         pmFPAfile *output = psMetadataLookupPtr (&status, config->files, "PPIMAGE.OUTPUT");
-        input = pmFPAfileDefineInput (config->files, config->camera, output->fpa, "PSPHOT.INPUT");
+        input = pmFPAfileDefineInput (config, output->fpa, "PSPHOT.INPUT");
         input->mode = PM_FPA_MODE_REFERENCE;
 
-        pmFPAfileDefineOutput (config->files, config->camera, input->fpa, "PSPHOT.OUTPUT");
+        pmFPAfileDefineOutput (config, input->fpa, "PSPHOT.OUTPUT");
 
         // supply the output name (from cmd-line) to all output (WRITE) files