Index: trunk/psModules/src/detrend/pmFlatField.c =================================================================== --- trunk/psModules/src/detrend/pmFlatField.c (revision 5543) +++ trunk/psModules/src/detrend/pmFlatField.c (revision 6872) @@ -1,2 +1,8 @@ +////////////////////////////////////////////////////////////////////////////////////////////////////////////// +// XXX WARNING: I have completely replaced this file with an OLD VERSION (that works) instead of the +// one that was being worked on. +////////////////////////////////////////////////////////////////////////////////////////////////////////////// + + /** @file pmFlatField.c * @@ -18,6 +24,6 @@ * @author Ross Harman, MHPCC * - * @version $Revision: 1.4 $ $Name: not supported by cvs2svn $ - * @date $Date: 2005-11-18 19:43:14 $ + * @version $Revision: 1.5 $ $Name: not supported by cvs2svn $ + * @date $Date: 2006-04-17 18:01:05 $ * * Copyright 2004 Maui High Performance Computing Center, University of Hawaii @@ -30,5 +36,5 @@ #include #include -#include +#include #include "pslib.h" @@ -36,32 +42,8 @@ #include "pmMaskBadPixels.h" #include "pmFlatFieldErrors.h" -#include "pmSubtractBias.h" -// XXX: This should be removed when the autoconf stuff handles psConstants.h correctly. -#define PS_WARN_PTR_NON_NULL(NAME) \ -if ((NAME) == NULL) { \ - psLogMsg(__func__, PS_LOG_WARN, "WARNING: %s is NULL.", #NAME); \ -} \ -bool pmFlatField( - pmReadout *in, - const pmReadout *flat) +bool pmFlatField(pmReadout *in, const pmReadout *flat) { - // XXX: Use the proper image and readout asserts. - PS_ASSERT_PTR_NON_NULL(in, true); - PS_ASSERT_PTR_NON_NULL(in->image, false); - PS_ASSERT_PTR_NON_NULL(in->mask, false); - PS_ASSERT_PTR_NON_NULL(flat, false); - PS_ASSERT_PTR_NON_NULL(flat->image, false); - if (in == NULL) - printf("XXX: NULL\n"); - - // XXX: Not sure if this is correct. Must consult with IfA. - PS_ASSERT_PTR_NON_NULL(in->mask, false); - - PS_WARN_PTR_NON_NULL(in->parent); - if (in->parent != NULL) { - PS_WARN_PTR_NON_NULL(in->parent->concepts); - } int i = 0; int j = 0; @@ -71,28 +53,43 @@ psElemType flatType; psElemType maskType; - psImage *inMask = NULL; - psImage *flatImage = NULL; - // - // Determine trimmed image from metadata. - // - psImage *trimmedImg = p_psDetermineTrimmedImage(in); - flatImage = flat->image; - inMask = in->mask; + // Check for nulls + if (in == NULL) { + return true; // Readout may not have data in it + } else if(flat==NULL) { + psError( PS_ERR_BAD_PARAMETER_NULL, true, + PS_ERRORTEXT_pmFlatField_NULL_FLAT_READOUT); + return false; + } + + psImage *inImage = in->image; // Input image + psImage *inMask = in->mask; // Mask for input image + psImage *flatImage = flat->image; // Flat-field image + + // Offsets on the chip + int x0in = psMetadataLookupS32(NULL, in->parent->concepts, "CELL.X0"); + int y0in = psMetadataLookupS32(NULL, in->parent->concepts, "CELL.Y0"); + int x0flat = psMetadataLookupS32(NULL, flat->parent->concepts, "CELL.X0"); + int y0flat = psMetadataLookupS32(NULL, flat->parent->concepts, "CELL.Y0"); + + if (inImage == NULL) { + psError( PS_ERR_BAD_PARAMETER_NULL, true, + PS_ERRORTEXT_pmFlatField_NULL_INPUT_IMAGE); + return false; + } else if(flatImage == NULL) { + psError( PS_ERR_BAD_PARAMETER_NULL, true, + PS_ERRORTEXT_pmFlatField_NULL_FLAT_IMAGE); + return false; + } // Check input image and its mask are not larger than flat image - if (trimmedImg == NULL) - printf("XXX: 00\n"); - if (flatImage == NULL) - printf("XXX 01\n"); - - if (trimmedImg->numRows>flatImage->numRows || trimmedImg->numCols>flatImage->numCols) { + if (inImage->numRows>flatImage->numRows || inImage->numCols>flatImage->numCols) { psError( PS_ERR_BAD_PARAMETER_SIZE, true, PS_ERRORTEXT_pmFlatField_SIZE_INPUT_IMAGE, - trimmedImg->numRows, trimmedImg->numCols, flatImage->numRows, flatImage->numCols); + inImage->numRows, inImage->numCols, flatImage->numRows, flatImage->numCols); return false; } - if (inMask->numRows > flatImage->numRows || inMask->numCols > flatImage->numCols) { + if (inMask && (inMask->numRows > flatImage->numRows || inMask->numCols > flatImage->numCols)) { psError( PS_ERR_BAD_PARAMETER_SIZE, true, PS_ERRORTEXT_pmFlatField_SIZE_MASK_IMAGE, @@ -102,6 +99,6 @@ // Determine total offset based on image offset with chip offset - totOffCol = trimmedImg->col0 + in->col0; - totOffRow = trimmedImg->row0 + in->row0; + totOffCol = inImage->col0 + y0in - flatImage->col0 - y0flat; + totOffRow = inImage->row0 + x0in - flatImage->row0 - x0flat; // Check that offsets are within image limits @@ -111,10 +108,10 @@ totOffRow, totOffCol, flatImage->numRows, flatImage->numCols); return false; - } else if(totOffRow>=trimmedImg->numRows || totOffCol>=trimmedImg->numCols) { + } else if(totOffRow>=inImage->numRows || totOffCol>=inImage->numCols) { psError( PS_ERR_BAD_PARAMETER_SIZE, true, PS_ERRORTEXT_pmFlatField_OFFSET_INPUT_IMAGE, - totOffRow, totOffCol, trimmedImg->numRows, trimmedImg->numCols); + totOffRow, totOffCol, inImage->numRows, inImage->numCols); return false; - } else if(totOffRow>=inMask->numRows || totOffCol>=inMask->numCols) { + } else if(inMask && (totOffRow>=inMask->numRows || totOffCol>=inMask->numCols)) { psError( PS_ERR_BAD_PARAMETER_SIZE, true, PS_ERRORTEXT_pmFlatField_OFFSET_MASK_IMAGE, @@ -124,5 +121,5 @@ // Check for incorrect types - inType = trimmedImg->type.type; + inType = inImage->type.type; flatType = flatImage->type.type; maskType = inMask->type.type; @@ -137,5 +134,5 @@ flatType); return false; - } else if(maskType != PS_TYPE_MASK) { + } else if(inMask && inMask->type.type != PS_TYPE_MASK) { psError( PS_ERR_BAD_PARAMETER_TYPE, true, PS_ERRORTEXT_pmFlatField_TYPE_MASK_IMAGE, @@ -153,18 +150,20 @@ case PS_TYPE_##TYPE: \ /* Per Eugene's request, use two sets of loops: first to fill mask, second to avoid div with bad pix */ \ - for(j = totOffRow; j < trimmedImg->numRows; j++) { \ - for(i = totOffCol; i < trimmedImg->numCols; i++) { \ + for(j = totOffRow; j < inImage->numRows; j++) { \ + for(i = totOffCol; i < inImage->numCols; i++) { \ if(flatImage->data.TYPE[j][i] <= 0.0) { \ /* Negative or zero flat pixels shall be masked in input image as PM_MASK_FLAT */ \ - inMask->data.PS_TYPE_MASK_DATA[j][i] |= PM_MASK_FLAT; \ + if (inMask) { \ + inMask->data.PS_TYPE_MASK_DATA[j][i] |= PM_MASK_FLAT; \ + } \ flatImage->data.TYPE[j][i] = 0.0; \ } \ } \ } \ - for(j = totOffRow; j < trimmedImg->numRows; j++) { \ - for(i = totOffCol; i < trimmedImg->numCols; i++) { \ - if(!inMask->data.PS_TYPE_MASK_DATA[j][i]) { \ + for(j = totOffRow; j < inImage->numRows; j++) { \ + for(i = totOffCol; i < inImage->numCols; i++) { \ + if(inMask && !inMask->data.PS_TYPE_MASK_DATA[j][i]) { \ /* Module shall divide the input image by the flat-fielded image */ \ - trimmedImg->data.TYPE[j][i] /= flatImage->data.TYPE[j][i]; \ + inImage->data.TYPE[j][i] /= flatImage->data.TYPE[j][i]; \ } \ } \