Changeset 20419

Timestamp:

Oct 27, 2008, 2:15:44 PM (18 years ago)

Author:

Paul Price

Message:

Add the name of the detrend that was used.

Location:

trunk/ppImage/src

Files:

• Makefile.am (modified) (3 diffs)
• ppImage.h (modified) (1 diff)
• ppImageDetrendRecord.c (added)
• ppImageLoop.c (modified) (1 diff)

trunk/ppImage/src/Makefile.am

@@ -1 @@
-bin_PROGRAMS = ppImage ppFocus
-
-noinst_PROGRAMS = ppTest
+bin_PROGRAMS = ppImage
 
 noinst_HEADERS = \
@@ -16 +14 @@
         ppImageOptions.c \
         ppImageDetrendReadout.c \
+        ppImageDetrendRecord.c \
         ppImageDetrendNonLinear.c \
         ppImageDetrendFringe.c \
@@ -33 +32 @@
         ppImageMemory.c
 
-ppFocus_CFLAGS = $(PPIMAGE_CFLAGS) $(PPSTATS_CFLAGS) $(PSASTRO_CFLAGS) $(PSPHOT_CFLAGS) $(PSMODULE_CFLAGS) $(PSLIB_CFLAGS)
-ppFocus_LDFLAGS = $(PPIMAGE_LIBS) $(PSASTRO_LIBS) $(PPSTATS_LIBS) $(PSPHOT_LIBS) $(PSMODULE_LIBS) $(PSLIB_LIBS)
-ppFocus_SOURCES = \
-        ppFocus.c \
-        ppFocusArguments.c \
-        ppFocusParseCamera.c \
-        ppFocusGetFWHM.c \
-        ppFocusFitFWHM.c \
-        ppImageLoop.c \
-        ppImageCleanup.c \
-        ppImageOptions.c \
-        ppImageDetrendReadout.c \
-        ppImageDetrendNonLinear.c \
-        ppImageDetrendFringe.c \
-        ppImageRebinReadout.c \
-        ppImageMosaic.c \
-        ppImagePhotom.c \
-        ppImageAstrom.c \
-        ppImageAddstar.c \
-        ppImageStatsOutput.c \
-        ppImagePixelStats.c \
-        ppImageMetadataStats.c \
-        ppImageReplaceBackground.c \
-        ppImageDefineFile.c \
-        ppImageSetMaskBits.c \
-        ppImageFileCheck.c \
-        ppImageVersion.c \
-        ppImageMemory.c
-
-ppTest_CFLAGS = $(PPIMAGE_CFLAGS) $(PSMODULE_CFLAGS) $(PSLIB_CFLAGS)
-ppTest_LDFLAGS = $(PPIMAGE_LIBS) $(PSMODULE_LIBS) $(PSLIB_LIBS)
-ppTest_SOURCES = \
-        ppTest.c
-
 CLEANFILES = *~
 

trunk/ppImage/src/ppImage.h

@@ -125 +125 @@
 pmReadout* ppImageDetrendSelectFirst(pmCell *cell, char *name, bool doThis);
 
+// Record which detrend file was used for the detrending
+bool ppImageDetrendRecord(
+    pmCell *cell,                       // Cell of interest
+    const pmConfig *config,             // Configuration
+    const ppImageOptions *options,      // Processing options
+    const pmFPAview *view               // View to cell
+    );
+
 bool ppImageRebinChip (pmConfig *config, pmFPAview *view, ppImageOptions *options, char *outName);
 bool ppImageRebinReadout (pmReadout *output, pmReadout *input, pmFPAfile *outFile, ppImageOptions *options);

trunk/ppImage/src/ppImageLoop.c

@@ -95 +95 @@
                     ESCAPE("Unable to detrend readout");
                 }
+            }
+
+            if (cell->data_exists) {
+                ppImageDetrendRecord(cell, config, options, view);
             }
         }