Changeset 6849

Timestamp:

Apr 12, 2006, 8:29:24 PM (20 years ago)

Author:

eugene

Message:

completed conversion to pmFPAfile paradigm

Location:

trunk/ppImage/src

Files:

• Makefile.am (modified) (3 diffs)
• ppImage.c (modified) (1 diff)
• ppImage.h (modified) (2 diffs)
• ppImageConfig.c (modified) (2 diffs)
• ppImageDetrendCell.c (deleted)
• ppImageDetrendReadout.c (added)
• ppImageLoop.c (modified) (1 diff)
• ppImageOptions.c (modified) (2 diffs)
• ppImageOptions.h (modified) (1 diff)
• ppImageParseDetrend.c (modified) (1 diff)
• ppImageRebinReadout.c (added)
• ppTest.c (modified) (2 diffs)

trunk/ppImage/src/Makefile.am

@@ -3 +3 @@
 noinst_HEADERS = \
         ppImage.h \
-        ppImageDetrend.h \
         ppImageOptions.h \
         ppMem.h
@@ -15 +14 @@
         ppImageParseDetrend.c \
         ppImageLoop.c \
-        ppImageDetrendCell.c \
+        ppImageDetrendReadout.c \
         ppImageDetrendMask.c \
         ppImageDetrendBias.c \
         ppImageDetrendNonLinear.c \
+        ppImageRebinReadout.c \
         ppMem.c
 #       ppImageParseCamera.c \
@@ -35 +35 @@
         ppMem.c
 
-
-
 clean-local:
         -rm -f TAGS

trunk/ppImage/src/ppImage.c

@@ -9 +9 @@
     // Determine camera, format from header if not already defined
     // Construct camera in preparation for reading
-    pmConfig *config = ppImageConfig(argc, argv);
+    pmConfig *config = ppImageConfig(&argc, argv);
 
     // Set various tasks (define optional operations)

trunk/ppImage/src/ppImage.h

@@ -12 +12 @@
 
 // Get the configuration
-pmConfig *ppImageConfig(int argc, char **argv);
+pmConfig *ppImageConfig(int *argc, char **argv);
 
 // Determine what type of camera, and initialise
@@ -30 +30 @@
 bool ppImageDetrendNonLinearPolynomial(pmReadout *input, psMetadataItem *dataItem);
 
+bool ppImageRebinReadout (pmConfig *config, pmFPAview *view, char *filename);
+
 #endif // Pau.

trunk/ppImage/src/ppImageConfig.c

@@ -6 +6 @@
 }
 
-pmConfig *ppImageConfig(int argc, char **argv)
+pmConfig *ppImageConfig(int *argc, char **argv)
 {
 
     bool status;
 
-    if (argc == 1) usage ();
+    if (*argc == 1) usage ();
 
     // load the site-wide configuration information
-    pmConfig *config = pmConfigRead(&argc, argv);
+    pmConfig *config = pmConfigRead(argc, argv);
     if (! config) {
         psErrorStackPrint(stderr, "Can't find site configuration!\n");
@@ -25 +25 @@
     // if these command-line options are supplied, load the file name lists into config->arguments
     // override any configuration-specified source for these files
-    status = pmConfigFileSetsMD (config->arguments, &argc, argv, "BIAS", "-bias", "-biaslist");
-    status = pmConfigFileSetsMD (config->arguments, &argc, argv, "DARK", "-dark", "-darklist");
-    status = pmConfigFileSetsMD (config->arguments, &argc, argv, "FLAT", "-flat", "-flatlist");
-    status = pmConfigFileSetsMD (config->arguments, &argc, argv, "MASK", "-mask", "-masklist");
-    status = pmConfigFileSetsMD (config->arguments, &argc, argv, "FRINGE", "-fringe", "-fringelist");
+    status = pmConfigFileSetsMD (config->arguments, argc, argv, "BIAS", "-bias", "-biaslist");
+    status = pmConfigFileSetsMD (config->arguments, argc, argv, "DARK", "-dark", "-darklist");
+    status = pmConfigFileSetsMD (config->arguments, argc, argv, "FLAT", "-flat", "-flatlist");
+    status = pmConfigFileSetsMD (config->arguments, argc, argv, "MASK", "-mask", "-masklist");
+    status = pmConfigFileSetsMD (config->arguments, argc, argv, "FRINGE", "-fringe", "-fringelist");
 
     // the input file is a required argument; if not found, we will exit
-    status = pmConfigFileSetsMD (config->arguments, &argc, argv, "INPUT", "-file", "-list");
+    status = pmConfigFileSetsMD (config->arguments, argc, argv, "INPUT", "-file", "-list");
     if (!status) { usage ();}
 
-    if (! psArgumentParse(config->arguments, &argc, argv) || argc != 2) {
+    if (! psArgumentParse(config->arguments, argc, argv) || *argc != 2) {
         usage ();
     }

trunk/ppImage/src/ppImageLoop.c

@@ -37 +37 @@
                 ppImageDetrendReadout (options, config, view);
 
+                if (options->doBin1) {
+                    ppImageRebinReadout (config, view, "PPIMAGE.BIN1");
+                }
+
+                if (options->doBin2) {
+                    ppImageRebinReadout (config, view, "PPIMAGE.BIN2");
+                }
+
                 pmFPAfileIOChecks (config->files, view, PM_FPA_AFTER);
             }

trunk/ppImage/src/ppImageOptions.c

@@ -23 +23 @@
 ppImageOptions *ppImageOptionsParse(pmConfig *config)
 {
-
+    bool status;
     ppImageOptions *options = ppImageOptionsAlloc ();
 
@@ -137 +137 @@
 
     // Mask recipe options
-    if (psMetadataLookupBool(NULL, recipe, "MASK")) {
-        options->doMask = true;
-    }
+    options->doMask = psMetadataLookupBool(NULL, recipe, "MASK");
+    options->doBias = psMetadataLookupBool(NULL, recipe, "BIAS");
+    options->doDark = psMetadataLookupBool(NULL, recipe, "DARK");
+    options->doFlat = psMetadataLookupBool(NULL, recipe, "FLAT");
 
-    // Bias recipe options
-    if (psMetadataLookupBool(NULL, recipe, "BIAS")) {
-        options->doBias = true;
-    }
+    // binned image options
+    options->xBin1 = psMetadataLookupS32(&status, recipe, "BIN1.XBIN"); 
+    if (!status) options->xBin1 = 16;
+    options->yBin1 = psMetadataLookupS32(&status, recipe, "BIN1.YBIN"); 
+    if (!status) options->yBin1 = 16;
 
-    // Dark recipe options
-    if (psMetadataLookupBool(NULL, recipe, "DARK")) {
-        options->doDark = true;
-    }
+    options->xBin2 = psMetadataLookupS32(&status, recipe, "BIN2.XBIN"); 
+    if (!status) options->xBin1 = 16;
+    options->yBin2 = psMetadataLookupS32(&status, recipe, "BIN2.YBIN"); 
+    if (!status) options->yBin1 = 16;
 
-    // Flat recipe options
-    if (psMetadataLookupBool(NULL, recipe, "FLAT")) {
-        options->doFlat = true;
-    }
+    options->doBin1 = psMetadataLookupBool(NULL, recipe, "BIN1.FITS");
+    options->doBin2 = psMetadataLookupBool(NULL, recipe, "BIN2.FITS");
 
+    // options->doBin1JPEG = psMetadataLookupBool(NULL, recipe, "BIN1.JPEG");
+    // options->doBin2JPEG = psMetadataLookupBool(NULL, recipe, "BIN2.JPEG");
+    
     return options;
 }

trunk/ppImage/src/ppImageOptions.h

@@ -11 +11 @@
     bool doSource;                      // Source identification and photometry
     bool doAstrom;                      // Astrometry
+
     bool doOverscan;                    // Overscan subtraction
     pmOverscanOptions *overscan;        // Overscan options
+
     bool doNonLin;                      // Non-linearity correction
     psDataType nonLinearType;
     psMetadataItem *nonLinearData;
     void *nonLinearSource;
+
+    bool doBin1;
+    int xBin1, yBin1;
+
+    bool doBin2;
+    int xBin2, yBin2;
+
 } ppImageOptions;
 

trunk/ppImage/src/ppImageParseDetrend.c

@@ -48 +48 @@
 
     // XXX do these need to construct a new fpa?
-    // pmFPAfileDefine (config->files, config->camera, input->input, "PPIMAGE.BIN1");
-    // pmFPAfileDefine (config->files, config->camera, input->input, "PPIMAGE.BIN2");
-    // pmFPAfileDefine (config->files, config->camera, input->input, "PPIMAGE.JPG1");
-    // pmFPAfileDefine (config->files, config->camera, input->input, "PPIMAGE.JPG2");
+    if (options->doBin1) {
+        pmFPAfileFromFPA (config, input->fpa, options->xBin1, options->yBin1, "PPIMAGE.BIN1");
+    }
+    if (options->doBin2) {
+        pmFPAfileFromFPA (config, input->fpa, options->xBin2, options->yBin2, "PPIMAGE.BIN2");
+    }
+    // pmFPAfileDefine (config->files, config->camera, input->fpa, "PPIMAGE.JPG1");
+    // pmFPAfileDefine (config->files, config->camera, input->fpa, "PPIMAGE.JPG2");
 
     // ppImage is supplied with an output name, which may be used by multiple

trunk/ppImage/src/ppTest.c

@@ -91 +91 @@
 
     // Add in a source file
-    pmFPAview *view = pmFPAAddSource(fpa, phu, cameraFormat);
+    pmFPAview *view = pmFPAAddSourceFromHeader(fpa, phu, cameraFormat);
     printf("View chip: %d\n", view->chip);
     printf("View cell: %d\n", view->cell);
@@ -101 +101 @@
     psMetadata *newFormat = psMetadataConfigParse(NULL, NULL, "mcshort_splice.config", true);
     pmConfigConformHeader(phu, newFormat);
-    pmFPAview *newView = pmFPAAddSource(newFPA, phu, newFormat);
+    pmFPAview *newView = pmFPAAddSourceFromHeader(newFPA, phu, newFormat);
     printf("View chip: %d\n", newView->chip);
     printf("View cell: %d\n", newView->cell);