Changeset 7738

Timestamp:

Jun 28, 2006, 2:26:49 PM (20 years ago)

Author:

eugene

Message:

adding ppFocus elements

Location:

trunk/ppImage/src

Files:

• Makefile.am (modified) (2 diffs)
• ppFocus.c (modified) (2 diffs)
• ppFocusArguments.c (modified) (1 diff)
• ppFocusFitFWHM.c (added)
• ppFocusGetFWHM.c (added)
• ppFocusParseCamera.c (modified) (1 diff)
• ppImage.h (modified) (1 diff)
• ppImageLoop.c (modified) (2 diffs)

trunk/ppImage/src/Makefile.am

@@ -1 @@
-bin_PROGRAMS = ppImage ppTest
+bin_PROGRAMS = ppImage ppFocus ppTest
 
 noinst_HEADERS = \
@@ -23 +23 @@
         ppImageAstrom.c
 
-#       ppImageParseCamera.c \
-#       ppDetrendFlat.c \
-#       ppImageWeights.c \
-#       ppImageLoadPixels.c
-#       ppImageOutput.c
-#       ppImageDetrendPedestal.c
-#       ppImageOutput.c
-#       ppImagePhot.c
+ppFocus_CPPFLAGS = $(PSLIB_CFLAGS) $(PSMODULE_CFLAGS) $(PSPHOT_CFLAGS) $(PSASTRO_CFLAGS) $(ppImage_CFLAGS)
+ppFocus_LDFLAGS = $(PSLIB_LIBS) $(PSMODULE_LIBS) $(PSPHOT_LIBS) $(PSASTRO_LIBS)
+ppFocus_SOURCES = \
+        ppFocus.c \
+        ppFocusArguments.c \
+        ppFocusParseCamera.c \
+        ppFocusGetFWHM.c \
+        ppFocusFitFWHM.c \
+        ppImageLoop.c \
+        ppImageCleanup.c \
+        ppImageOptions.c \
+        ppImageDetrendReadout.c \
+        ppImageDetrendBias.c \
+        ppImageDetrendNonLinear.c \
+        ppImageRebinReadout.c \
+        ppImageMosaic.c \
+        ppImagePhotom.c \
+        ppImageAstrom.c
 
 ppTest_CPPFLAGS = $(PSLIB_CFLAGS) $(PSMODULE_CFLAGS) $(ppImage_CFLAGS)

trunk/ppImage/src/ppFocus.c

@@ -25 +25 @@
     }
     
-    
-    
-
-    // Image Arithmetic Loop
-    if (!ppImageLoop(config, options)) {
-        psErrorStackPrint(stderr, "");
+    // we search the argument data for the named fileset (argname)
+    psArray *infiles = psMetadataLookupPtr(NULL, config->arguments, "INPUT");
+    if (!infiles) {
+        psTrace("pmFPAfile", 5, "Failed to find INPUT in argument list");
         exit(1);
     }
 
-    psLogMsg ("ppImage", 3, "complete ppImage run: %f sec\n", psTimerMark (TIMERNAME));
+    // allocate vectors for analysis
+    psVector *focus = psVectorAlloc (infiles->n, PS_TYPE_F32);
+    psVector *fwhm = psVectorAlloc (infiles->n, PS_TYPE_F32);
+
+    for (int i = 0; i < infiles->n; i++) {
+
+        // Image Arithmetic Loop
+        if (!ppImageLoop(config, options)) {
+            psErrorStackPrint(stderr, "");
+            exit(1);
+        }
+        
+        // determine FWHM at reference location in image
+        // (also removes PPIMAGE.INPUT from config->files)
+        ppFocusGetFWHM (config, focus, fwhm);
+
+        // silently ignore failure for (i == infiles->n)
+        pmFPAfileDefineSingleFromArgs (NULL, config, "PPIMAGE.INPUT", "INPUT", i+1);
+    }
+
+    ppFocusFitFWHM (config, focus, fwhm);
+
+    psLogMsg ("ppFocus", 3, "complete ppFocus run: %f sec\n", psTimerMark (TIMERNAME));
 
     // Cleaning up
@@ -44 +64 @@
 // - the input list is a set of independent images (not multiple files for a single image)
 // - each pass to ppImageLoop performs the analysis on a different pmFPAfile
-// - 
+// - after each ppImageLoop, grap the input pmFPAfile and extract the FWHM stats

trunk/ppImage/src/ppFocusArguments.c

@@ -2 +2 @@
 
 static void usage (void) {
-    fprintf (stderr, "USAGE: ppFocus [-file INPUT.fits] [-list INPUT.txt] OUTPUT\n");
+    fprintf (stderr, "USAGE: ppFocus [-file focus.*.fits] [-list INPUT.txt] OUTPUT\n");
     exit (2);
 }

trunk/ppImage/src/ppFocusParseCamera.c

@@ -8 +8 @@
     // the first input image defines the camera, and all recipes and options that follow
     // select only the first file from the INPUT array
-    pmFPAfile *input = pmFPAfileDefineFromArgs (&status, config, "PPIMAGE.INPUT", "INPUT");
+    pmFPAfile *input = pmFPAfileDefineSingleFromArgs (&status, config, "PPIMAGE.INPUT", "INPUT", 0);
     if (!status) {
         psError(PS_ERR_IO, false, "Failed to build FPA from PPIMAGE.INPUT");

trunk/ppImage/src/ppImage.h

@@ -45 +45 @@
 void ppImageFileCheck (pmConfig *config);
 
+// functions used by ppFocus
+pmConfig *ppFocusArguments(int argc, char **argv);
+ppImageOptions *ppFocusParseCamera (pmConfig *config);
+bool ppFocusGetFWHM (pmConfig *config, psVector *focus, psVector *fwhm);
+bool ppFocusFitFWHM (pmConfig *config, psVector *focus, psVector *fwhm);
+
 #endif

trunk/ppImage/src/ppImageLoop.c

@@ -7 +7 @@
     pmCell *cell;
     pmReadout *readout;
-    psMemId ID;
 
     pmFPAfile *input = psMetadataLookupPtr (&status, config->files, "PPIMAGE.INPUT");
@@ -24 +23 @@
         if (!chip->process || !chip->file_exists) { continue; }
 
-        ID = psMemGetId();
         if (!pmFPAfileIOChecks (config, view, PM_FPA_BEFORE)) return false;