Changeset 12587

Timestamp:

Mar 24, 2007, 8:01:21 AM (19 years ago)

Author:

eugene

Message:

psphot image loop now performs the mosaicing function first

Location:

trunk/psphot/src

Files:

• Makefile.am (modified) (1 diff)
• psphot.h (modified) (1 diff)
• psphotImageLoop.c (modified) (7 diffs)
• psphotImageMedian.c (modified) (2 diffs)
• psphotMosaicChip.c (added)
• psphotParseCamera.c (modified) (5 diffs)

trunk/psphot/src/Makefile.am

@@ -16 +16 @@
         psphotArguments.c       \
         psphotParseCamera.c     \
+        psphotMosaicChip.c      \
         psphotImageLoop.c       \
         psphotMaskReadout.c     \

trunk/psphot/src/psphot.h

@@ -24 +24 @@
 bool            psphotParseCamera (pmConfig *config);
 bool            psphotImageLoop (pmConfig *config);
+bool            psphotMosaicChip(pmConfig *config, const pmFPAview *view, char *outFile, char *inFile);
 
 bool            psphotModelTest (pmReadout *readout, psMetadata *recipe);

trunk/psphot/src/psphotImageLoop.c

@@ -1 +1 @@
 # include "psphot.h"
 
-// XXX the errors in the pmFPAfileIOChecks could also be due to a programming or config error
-// XXX we need to either handle those errors or handle the error in pmFPAfileIOChecks and exit
 bool psphotImageLoop (pmConfig *config) {
 
@@ -10 +8 @@
     pmReadout *readout;
 
+    pmFPAfile *load = psMetadataLookupPtr (&status, config->files, "PSPHOT.LOAD");
+    if (!status) {
+        psError(PSPHOT_ERR_PROG, false, "Can't find input data!");
+        return false;
+    }
     pmFPAfile *input = psMetadataLookupPtr (&status, config->files, "PSPHOT.INPUT");
     if (!status) {
@@ -25 +28 @@
     }
 
-    while ((chip = pmFPAviewNextChip (view, input->fpa, 1)) != NULL) {
+    // for psphot, we force data to be read at the chip level 
+    while ((chip = pmFPAviewNextChip (view, load->fpa, 1)) != NULL) {
         psLogMsg ("psphot", 4, "Chip %d: %x %x\n", view->chip, chip->file_exists, chip->process);
         if (! chip->process || ! chip->file_exists) { continue; }
+
+        // load just the input image data (image, mask, weight)
+        pmFPAfileActivate (config->files, false, NULL);
+        pmFPAfileActivate (config->files, true, "PSPHOT.LOAD");
+        pmFPAfileActivate (config->files, true, "PSPHOT.MASK");
+        pmFPAfileActivate (config->files, true, "PSPHOT.WEIGHT");
         if (!pmFPAfileIOChecks (config, view, PM_FPA_BEFORE)) {
             psError(PSPHOT_ERR_DATA, false, "failed IO for chip %d in psphot\n", view->chip);
@@ -33 +43 @@
             return false;
         }
+        pmFPAfileActivate (config->files, true, NULL);
         
+        // mosaic the cells of a chip into a single contiguous chip.
+        // this probably needs to return a new fpa? 
+        if (!psphotMosaicChip(config, view, "PSPHOT.INPUT", "PSPHOT.LOAD")) {
+            psError(PS_ERR_UNKNOWN, false, "Unable to mosaic chip.\n");
+            return false;
+        }
+
+        // try to load the data
+        if (!pmFPAfileIOChecks (config, view, PM_FPA_BEFORE)) {
+            psError(PSPHOT_ERR_DATA, false, "failed IO for chip %d in psphot\n", view->chip);
+            psFree (view);
+            return false;
+        }
+
+        // there is now only a single chip (multiple readouts?). loop over it and process
+        // XXX activate / de-activate files? no I/O here?
         while ((cell = pmFPAviewNextCell (view, input->fpa, 1)) != NULL) {
             psLogMsg ("psphot", 4, "Cell %d: %x %x\n", view->cell, cell->file_exists, cell->process);
-            if (! cell->process || ! cell->file_exists) { continue; }
-            if (!pmFPAfileIOChecks (config, view, PM_FPA_BEFORE)) {
-                psError(PSPHOT_ERR_DATA, false, "failed IO for chip %d, cell %d in psphot\n", view->chip, view->cell);
-                psFree (view);
-                return false;
-            }
+            // if (! cell->process || ! cell->file_exists) { continue; }
+            if (! cell->process) { continue; }
             
             // process each of the readouts
             while ((readout = pmFPAviewNextReadout (view, input->fpa, 1)) != NULL) {
-                if (!pmFPAfileIOChecks (config, view, PM_FPA_BEFORE)) {
-                    psError(PSPHOT_ERR_DATA, false, "failed IO for chip %d, cell %d, readout %d in psphot\n", view->chip, view->cell, view->readout);
-                    psFree (view);
-                    return false;
-                }
-                
+                psLogMsg ("psphot", 4, "Cell %d: %x %x\n", view->cell, cell->file_exists, cell->process);
                 if (! readout->data_exists) { continue; }
-                
+
                 // run the actual photometry analysis
+                // XXX calling psphotReadout here will operate on the mosaic'ed chips (for each readout)
                 if (!psphotReadout (config, view)) {
                     psError(psErrorCodeLast(), false, "failure in psphotReadout for chip %d, cell %d, readout %d\n", view->chip, view->cell, view->readout);
@@ -59 +78 @@
                     return false;
                 }
-
-                if (!pmFPAfileIOChecks (config, view, PM_FPA_AFTER)) {
-                    psError(PSPHOT_ERR_DATA, false, "failed IO for chip %d, cell %d, readout %d in psphot\n", view->chip, view->cell, view->readout);
-                    psFree (view);
-                    return false;
-                }
-            }
-            if (!pmFPAfileIOChecks (config, view, PM_FPA_AFTER)) {
-                psError(PSPHOT_ERR_DATA, false, "failed IO for chip %d, cell %d in psphot\n", view->chip, view->cell);
-                psFree (view);
-                return false;
             }
         }
+
+        // save output which is saved at the chip level
         if (!pmFPAfileIOChecks (config, view, PM_FPA_AFTER)) {
             psError(PSPHOT_ERR_DATA, false, "failed IO for chip %d in psphot\n", view->chip);
@@ -78 +88 @@
         }
     }
+    // save output which is saved at the fpa level
     if (!pmFPAfileIOChecks (config, view, PM_FPA_AFTER)) {
         psError(PSPHOT_ERR_DATA, false, "failed IO for fpa in psphot\n");
@@ -101 +112 @@
 // PSPHOT.PSF     : sample PSF images
 
+// PSPHOT.MASK
+// PSPHOT.WEIGHT
+// 

trunk/psphot/src/psphotImageMedian.c

@@ -122 +122 @@
     } else {
         if (file->mode == PM_FPA_MODE_INTERNAL) {
+            // we are not using PSPHOT.BACKMDL as an I/O file: already defined above
             model = file->readout;
         } else {
@@ -128 +129 @@
             if (model == NULL) {
                 // readout does not yet exist: create from input
+                // XXX we have an inconsistency in this calculation here and in pmFPACopy
                 pmFPAfileCopyStructureView (file->fpa, inFPA, DX, DY, view);
                 model = pmFPAviewThisReadout (view, file->fpa);

trunk/psphot/src/psphotParseCamera.c

@@ -6 +6 @@
     bool status = false;
 
-    // the input image defines the camera
-    pmFPAfile *input = pmFPAfileDefineFromArgs (&status, config, "PSPHOT.INPUT", "INPUT");
+    // the file to be loaded may have subdivisions at the cell and readout level
+    // we load into pmFPAfile *load, then reformat into pmFPAfile *input
+    pmFPAfile *load = pmFPAfileDefineFromArgs (&status, config, "PSPHOT.LOAD", "INPUT");
     if (!status) {
-        psError(PSPHOT_ERR_CONFIG, false, "Failed to build FPA from PSPHOT.INPUT");
+        psError(PSPHOT_ERR_CONFIG, false, "Failed to build FPA from PSPHOT.LOAD");
         return status;
+    }
+    load->dataLevel = PM_FPA_LEVEL_CHIP; // force load at the CHIP level
+
+    // the psphot analysis is performed on chips
+    pmFPAfile *input = pmFPAfileDefineChipMosaic(config, input->fpa, "PSPHOT.INPUT");
+    if (!input) {
+        psError(PSPHOT_ERR_CONFIG, false, _("Unable to generate new file from PSPHOT.INPUT"));
+        return NULL;
     }
 
     // if we have requested PSPHOT.SRC, attempt to resolve it 
+    // this is a list of input sources, stored in a psphot output format file
+# if (0)    
     if (psMetadataLookupPtr(NULL, config->arguments, "SRC")) { 
         pmFPAfileDefineFromArgs (&status, config, "PSPHOT.SRC", "SRC");
@@ -21 +32 @@
         }
     }
+# endif
 
     // select recipe options supplied on command line
     psMetadata *recipe  = psMetadataLookupPtr (&status, config->recipes, PSPHOT_RECIPE);
 
+    // these values are used below to define the background subtraction images.
+
     // if MASK or WEIGHT was supplied on command line, bind files to input fpa
     // XXX these do not quite yet work: pmFPAAddSourceFromHeader is not appropriate
-    pmFPAfileBindFromArgs (NULL, input, config, "PSPHOT.MASK", "MASK");
-    pmFPAfileBindFromArgs (NULL, input, config, "PSPHOT.WEIGHT", "WEIGHT");
+    // the mask and weight will be mosaic'ed with the image
+    pmFPAfileBindFromArgs (NULL, load, config, "PSPHOT.MASK",   "MASK");
+    pmFPAfileBindFromArgs (NULL, load, config, "PSPHOT.WEIGHT", "WEIGHT");
 
     // optionally load the PSF Model and/or fixed stars
-    pmFPAfileBindFromArgs (NULL, input, config, "PSPHOT.PSF", "PSF");
-
-    // set default recipe values here
-    // XXX drop this?  we put this in the default recipe?
-    psMetadataAddStr (recipe, PS_LIST_TAIL, "FITMODE",         PS_META_NO_REPLACE, "default fitting mode", "NONE");
-    psMetadataAddStr (recipe, PS_LIST_TAIL, "BREAK_POINT",     PS_META_NO_REPLACE, "default break point",  "NONE");
-    psMetadataAddF32 (recipe, PS_LIST_TAIL, "ZERO_PT",         PS_META_NO_REPLACE, "default zero point",    25.00);
-    psMetadataAddS32 (recipe, PS_LIST_TAIL, "BACKGROUND.XBIN", PS_META_NO_REPLACE, "default binning",          64);
-    psMetadataAddS32 (recipe, PS_LIST_TAIL, "BACKGROUND.YBIN", PS_META_NO_REPLACE, "default binning",          64);
-    psMetadataAddStr (recipe, PS_LIST_TAIL, "PHOTCODE",        PS_META_NO_REPLACE, "default photcode",     "NONE");
-    // photcode will be added in psphotReadout
+    // XXX bind this to the input or the load file?
+    // if the readout->analysis entries are copied, we can bind to the load file
+    // XXX add this back in later
+    // pmFPAfileBindFromArgs (NULL, input, config, "PSPHOT.PSF", "PSF");
 
     // XXX we need to be able to distinguish several cases:
@@ -49 +57 @@
     // 4) the particular output data was requested but was not generated (surprising failure)
 
-    // these calls bind the I/O handle to the specified fpa
-    bool saveOutput = psMetadataLookupBool (NULL, recipe, "SAVE.OUTPUT");
-    if (saveOutput) {
+    // the output sources are carried on the input->fpa structures
+    if (psMetadataLookupBool (NULL, recipe, "SAVE.OUTPUT")) {
         if (!pmFPAfileDefineOutput (config, input->fpa, "PSPHOT.OUTPUT")) {
             psError(PSPHOT_ERR_CONFIG, false, "Cannot find a rule for PSPHOT.OUTPUT");
@@ -57 +64 @@
         }
     }
-
     // optionally save the residual image 
     if (psMetadataLookupBool(NULL, recipe, "SAVE.RESID")) {
@@ -65 +71 @@
         }
     }
-
-    int DX = psMetadataLookupS32 (&status, recipe, "BACKGROUND.XBIN");
-    int DY = psMetadataLookupS32 (&status, recipe, "BACKGROUND.YBIN");
-
-    // these calls construct a new fpa for the I/O handle 
-
     // optionally save the background model (small FITS image)
     if (psMetadataLookupBool(NULL, recipe, "SAVE.BACKMDL")) {
+        int DX = psMetadataLookupS32 (&status, recipe, "BACKGROUND.XBIN");
+        int DY = psMetadataLookupS32 (&status, recipe, "BACKGROUND.YBIN");
         if (!pmFPAfileDefineFromFPA (config, input->fpa, DX, DY, "PSPHOT.BACKMDL")) {
             psError(PSPHOT_ERR_CONFIG, false, "Cannot find a rule for PSPHOT.BACKMDL");