Index: trunk/psModules/test/detrend/tst_pmFlatField.c =================================================================== --- trunk/psModules/test/detrend/tst_pmFlatField.c (revision 5435) +++ trunk/psModules/test/detrend/tst_pmFlatField.c (revision 5516) @@ -21,6 +21,8 @@ * @author Ross Harman, MHPCC * - * @version $Revision: 1.2 $ $Name: not supported by cvs2svn $ - * @date $Date: 2005-10-20 23:06:24 $ + * XXX: I added the CELL.TRIMSEC region code but there are not tests for it. + * + * @version $Revision: 1.3 $ $Name: not supported by cvs2svn $ + * @date $Date: 2005-11-15 20:09:03 $ * * Copyright 2004 Maui High Performance Computing Center, University of Hawaii Index: trunk/psModules/test/detrend/tst_pmMaskBadPixels.c =================================================================== --- trunk/psModules/test/detrend/tst_pmMaskBadPixels.c (revision 5435) +++ trunk/psModules/test/detrend/tst_pmMaskBadPixels.c (revision 5516) @@ -17,6 +17,6 @@ * @author Ross Harman, MHPCC * - * @version $Revision: 1.1 $ $Name: not supported by cvs2svn $ - * @date $Date: 2005-09-28 20:42:52 $ + * @version $Revision: 1.2 $ $Name: not supported by cvs2svn $ + * @date $Date: 2005-11-15 20:09:03 $ * * Copyright 2004 Maui High Performance Computing Center, University of Hawaii @@ -32,12 +32,12 @@ printf(STRING); \ printf("\n"); \ -for(int i=IMAGE->numRows-1; i>-1; i--) { \ - for(int j=0; jnumCols; j++) { \ - if(PS_IS_PSELEMTYPE_COMPLEX(IMAGE->type.type)) { \ - printf("%f+%fi ", creal(IMAGE->data.TYPE[i][j]), cimag(IMAGE->data.TYPE[i][j])); \ - } else if(PS_IS_PSELEMTYPE_INT(IMAGE->type.type)) { \ - printf("%d", (int)IMAGE->data.TYPE[i][j]); \ +for(int i=(IMAGE)->numRows-1; i>-1; i--) { \ + for(int j=0; j<(IMAGE)->numCols; j++) { \ + if(PS_IS_PSELEMTYPE_COMPLEX((IMAGE)->type.type)) { \ + printf("%f+%fi ", creal((IMAGE)->data.TYPE[i][j]), cimag((IMAGE)->data.TYPE[i][j])); \ + } else if(PS_IS_PSELEMTYPE_INT((IMAGE)->type.type)) { \ + printf("%d", (int)(IMAGE)->data.TYPE[i][j]); \ } else { \ - printf("%f", (double)IMAGE->data.TYPE[i][j]); \ + printf("%f", (double)(IMAGE)->data.TYPE[i][j]); \ } \ } \ @@ -48,11 +48,10 @@ #define CREATE_AND_SET_IMAGE(NAME,TYPE,VALUE,NROWS,NCOLS) \ -psImage *NAME = (psImage*)psImageAlloc(NCOLS,NROWS,PS_TYPE_##TYPE); \ -for(int i=0; inumRows; i++) { \ - for(int j=0; jnumCols; j++) { \ - NAME->data.TYPE[i][j] = VALUE; \ +(NAME) = (psImage*)psImageAlloc(NCOLS,NROWS,PS_TYPE_##TYPE); \ +for(int i=0; i<(NAME)->numRows; i++) { \ + for(int j=0; j<(NAME)->numCols; j++) { \ + (NAME)->data.TYPE[i][j] = VALUE; \ } \ } - static int testMaskBadPixels1(void); @@ -80,8 +79,13 @@ {testMaskBadPixels9, 885, "pmMaskBadPixels - Attempt to use offset greater than input image", 0, false}, {testMaskBadPixels10, 885, "pmMaskBadPixels - Attempt to use complex input image", 0, false}, - {testMaskBadPixels11, 885, "pmMaskBadPixels - Attempt to use non-mask type mask image", 0, false}, + {testMaskBadPixels11, 885, "pmMaskBadPixels - Attempt to use non-mask type mask image", 0, false }, {NULL} }; +/* + #define PS_TYPE_MASK PS_TYPE_U8 + #define PS_TYPE_MASK_DATA U8 + #define PS_TYPE_MASK_NAME "psU8" +*/ int main(int argc, char* argv[]) @@ -92,39 +96,66 @@ +#define NUM_ROWS 50 +#define NUM_COLS 50 +#define DEFAULT_IMAGE_VAL 0.0 +#define DEFAULT_MASK_VAL 0 +#define MASK_VAL 1 +#define SAT_VAL 100.0 +#define GROW_VAL 1 +#define GROW_RAD 10 int testMaskBadPixels1( void ) { + // // Test A - Create mask based on maskVal argument - CREATE_AND_SET_IMAGE(inImage1,F64,0,50,50); - CREATE_AND_SET_IMAGE(mask1,U8,0,50,50) - // pmReadout *inReadout = pmReadoutAlloc(0, 0, inImage1); - pmReadout *inReadout = pmReadoutAlloc(NULL); - inReadout->row0 = 0; - inReadout->col0 = 0; - inReadout->image = inImage1; - mask1->data.PS_TYPE_MASK_DATA[24][24]=1; - PRINT_MATRIX(mask1, U8, "Data mask:"); - pmMaskBadPixels(inReadout, mask1, 1, 100.0, 0, 0); + // + + pmReadout *inReadout = pmReadoutAlloc(NULL); + CREATE_AND_SET_IMAGE(inReadout->image, F32, DEFAULT_IMAGE_VAL, NUM_ROWS, NUM_COLS); + inReadout->image->row0 = 0; + inReadout->image->col0 = 0; + inReadout->row0 = 0; + inReadout->col0 = 0; + + pmReadout *maskReadout = pmReadoutAlloc(NULL); + CREATE_AND_SET_IMAGE(maskReadout->image, U8, DEFAULT_MASK_VAL, NUM_ROWS, NUM_COLS) + maskReadout->image->data.PS_TYPE_MASK_DATA[NUM_ROWS/2][NUM_COLS/2]=1; + maskReadout->image->row0 = 0; + maskReadout->image->col0 = 0; + + PRINT_MATRIX(maskReadout->image, U8, "Data mask:"); + + pmMaskBadPixels(inReadout, maskReadout, MASK_VAL, SAT_VAL, GROW_VAL, GROW_RAD); + PRINT_MATRIX(inReadout->mask, PS_TYPE_MASK_DATA, "Resulting mask:"); + + psFree(inReadout); + psFree(maskReadout); + + return 0; +} + +int testMaskBadPixels2( void ) +{ + // + // Test B - Create mask based on saturation argument + // + + pmReadout *inReadout = pmReadoutAlloc(NULL); + CREATE_AND_SET_IMAGE(inReadout->image, F32, DEFAULT_IMAGE_VAL, NUM_ROWS, NUM_COLS); + inReadout->image->row0 = 0; + inReadout->image->col0 = 0; + inReadout->row0 = 0; + inReadout->col0 = 0; + inReadout->image->data.F32[NUM_ROWS/2][NUM_COLS/2] = 150.0; + + pmReadout *maskReadout = pmReadoutAlloc(NULL); + CREATE_AND_SET_IMAGE(maskReadout->image, U8, DEFAULT_MASK_VAL, NUM_ROWS, NUM_COLS) + + //PS_IMAGE_PRINT_F32(inReadout->image); + PRINT_MATRIX(maskReadout->image, U8, "Data mask:"); + pmMaskBadPixels(inReadout, maskReadout, MASK_VAL, SAT_VAL, GROW_VAL, GROW_RAD); PRINT_MATRIX(inReadout->mask, U8, "Resulting mask:"); - psFree(mask1); - psFree(inReadout); - - return 0; -} - -int testMaskBadPixels2( void ) -{ - // Test B - Create mask based on saturation argument - CREATE_AND_SET_IMAGE(inImage2,F64,150.0,50,50); - CREATE_AND_SET_IMAGE(mask2,U8,0,50,50) - // pmReadout *inReadout2 = pmReadoutAlloc(0, 0, inImage2); - pmReadout *inReadout2 = pmReadoutAlloc(NULL); - inReadout2->row0 = 0; - inReadout2->col0 = 0; - inReadout2->image = inImage2; - PRINT_MATRIX(mask2, U8, "Data mask:"); - pmMaskBadPixels(inReadout2, mask2, 0, 100.0, 0, 0); - PRINT_MATRIX(inReadout2->mask, U8, "Resulting mask:"); - psFree(mask2); - psFree(inReadout2); + + psFree(inReadout); + psFree(maskReadout); return 0; @@ -133,20 +164,28 @@ int testMaskBadPixels3( void ) { + // // Test C - Create mask based on growVal and grow arguments - CREATE_AND_SET_IMAGE(inImage3,F64,50.0,50,50); - CREATE_AND_SET_IMAGE(mask3,U8,0,50,50) - // pmReadout *inReadout3 = pmReadoutAlloc(0, 0, inImage3); - pmReadout *inReadout3 = pmReadoutAlloc(NULL); - inReadout3->row0 = 0; - inReadout3->col0 = 0; - inReadout3->image = inImage3; - mask3->data.PS_TYPE_MASK_DATA[24][24]=1; - mask3->data.PS_TYPE_MASK_DATA[4][3]=1; - mask3->data.PS_TYPE_MASK_DATA[4][46]=1; - PRINT_MATRIX(mask3, U8, "Data mask:"); - pmMaskBadPixels(inReadout3, mask3, 0, 100.0, 1, 10); - PRINT_MATRIX(inReadout3->mask, U8, "Resulting mask:"); - psFree(mask3); - psFree(inReadout3); + // + + pmReadout *inReadout = pmReadoutAlloc(NULL); + CREATE_AND_SET_IMAGE(inReadout->image, F32, DEFAULT_IMAGE_VAL, NUM_ROWS, NUM_COLS); + inReadout->image->row0 = 0; + inReadout->image->col0 = 0; + inReadout->row0 = 0; + inReadout->col0 = 0; + inReadout->image->data.F32[NUM_ROWS/2][NUM_COLS/2]=GROW_VAL; + inReadout->image->data.F32[NUM_ROWS/4][NUM_COLS/4]=GROW_VAL; + inReadout->image->data.F32[NUM_ROWS/4][NUM_COLS-(NUM_COLS/4)]=GROW_VAL; + + pmReadout *maskReadout = pmReadoutAlloc(NULL); + CREATE_AND_SET_IMAGE(maskReadout->image, U8, DEFAULT_MASK_VAL, NUM_ROWS, NUM_COLS); + + PRINT_MATRIX(maskReadout->image, U8, "Data mask:"); + //PS_IMAGE_PRINT_F32(inReadout->image); + pmMaskBadPixels(inReadout, maskReadout, MASK_VAL, SAT_VAL, GROW_VAL, GROW_RAD); + PRINT_MATRIX(inReadout->mask, U8, "Resulting mask:"); + + psFree(inReadout); + psFree(maskReadout); return 0; @@ -155,20 +194,25 @@ int testMaskBadPixels4( void ) { + // // Test D - Auto Create mask based on maskVal argument - CREATE_AND_SET_IMAGE(inImage4,F64,50.0,50,50); - CREATE_AND_SET_IMAGE(mask4,U8,0,50,50) - CREATE_AND_SET_IMAGE(mask4i,U8,0,50,50) - // pmReadout *inReadout4 = pmReadoutAlloc(0, 0, inImage4); - pmReadout *inReadout4 = pmReadoutAlloc(NULL); - inReadout4->row0 = 0; - inReadout4->col0 = 0; - inReadout4->image = inImage4; - inReadout4->mask = mask4i; - mask4->data.PS_TYPE_MASK_DATA[24][24]=1; - PRINT_MATRIX(mask4, U8, "Data mask:"); - pmMaskBadPixels(inReadout4, mask4, 0, 100.0, 1, 10); - PRINT_MATRIX(inReadout4->mask, U8, "Resulting mask:"); - psFree(mask4); - psFree(inReadout4); + // + + pmReadout *inReadout = pmReadoutAlloc(NULL); + CREATE_AND_SET_IMAGE(inReadout->image, F32, DEFAULT_IMAGE_VAL, NUM_ROWS, NUM_COLS); + inReadout->image->row0 = 0; + inReadout->image->col0 = 0; + inReadout->row0 = 0; + inReadout->col0 = 0; + + pmReadout *maskReadout = pmReadoutAlloc(NULL); + CREATE_AND_SET_IMAGE(maskReadout->image, U8, DEFAULT_MASK_VAL, NUM_ROWS, NUM_COLS) + maskReadout->image->data.PS_TYPE_MASK_DATA[NUM_ROWS/2][NUM_COLS/2]=1; + + PRINT_MATRIX(maskReadout->image, U8, "Data mask:"); + pmMaskBadPixels(inReadout, maskReadout, MASK_VAL, SAT_VAL, GROW_VAL, GROW_RAD); + PRINT_MATRIX(inReadout->mask, U8, "Resulting mask:"); + + psFree(inReadout); + psFree(maskReadout); return 0; @@ -177,13 +221,17 @@ int testMaskBadPixels5( void ) { + // // Test E - Attempt to use null mask - CREATE_AND_SET_IMAGE(inImage5,F64,50.0,50,50); - // pmReadout *inReadout5 = pmReadoutAlloc(0, 0, inImage5); - pmReadout *inReadout5 = pmReadoutAlloc(NULL); - inReadout5->row0 = 0; - inReadout5->col0 = 0; - inReadout5->image = inImage5; - pmMaskBadPixels(inReadout5, NULL, 0, 100.0, 1, 10); - psFree(inReadout5); + // + + pmReadout *inReadout = pmReadoutAlloc(NULL); + CREATE_AND_SET_IMAGE(inReadout->image, F32, DEFAULT_IMAGE_VAL, NUM_ROWS, NUM_COLS); + inReadout->image->row0 = 0; + inReadout->image->col0 = 0; + inReadout->row0 = 0; + inReadout->col0 = 0; + + pmMaskBadPixels(inReadout, NULL, MASK_VAL, SAT_VAL, GROW_VAL, GROW_RAD); + psFree(inReadout); return 0; @@ -192,13 +240,19 @@ int testMaskBadPixels6( void ) { + // // Test F - Attempt tp use null input image - CREATE_AND_SET_IMAGE(mask6,U8,0,50,50) - // pmReadout *inReadout6 = pmReadoutAlloc(0, 0, NULL); - pmReadout *inReadout6 = pmReadoutAlloc(NULL); - inReadout6->row0 = 0; - inReadout6->col0 = 0; - inReadout6->mask = mask6; - pmMaskBadPixels(inReadout6, mask6, 0, 100.0, 1, 10); - psFree(inReadout6); + // + + pmReadout *inReadout = pmReadoutAlloc(NULL); + inReadout->row0 = 0; + inReadout->col0 = 0; + + pmReadout *maskReadout = pmReadoutAlloc(NULL); + CREATE_AND_SET_IMAGE(maskReadout->image, U8, DEFAULT_MASK_VAL, NUM_ROWS, NUM_COLS) + + pmMaskBadPixels(inReadout, maskReadout, MASK_VAL, SAT_VAL, GROW_VAL, GROW_RAD); + + psFree(inReadout); + psFree(maskReadout); return 0; @@ -207,17 +261,22 @@ int testMaskBadPixels7( void ) { + // // Test G - Attempt to use input image bigger than mask - CREATE_AND_SET_IMAGE(inImage7,F64,0.0,60,60); - CREATE_AND_SET_IMAGE(mask7,U8,0,50,50) - CREATE_AND_SET_IMAGE(mask7i,U8,0,50,50) - // pmReadout *inReadout7 = pmReadoutAlloc(0, 0, inImage7); - pmReadout *inReadout7 = pmReadoutAlloc(NULL); - inReadout7->row0 = 0; - inReadout7->col0 = 0; - inReadout7->image = inImage7; - inReadout7->mask = mask7i; - pmMaskBadPixels(inReadout7, mask7, 0, 100.0, 1, 10); - psFree(mask7); - psFree(inReadout7); + // + + pmReadout *inReadout = pmReadoutAlloc(NULL); + CREATE_AND_SET_IMAGE(inReadout->image, F32, DEFAULT_IMAGE_VAL, NUM_ROWS+10, NUM_COLS+10); + inReadout->image->row0 = 0; + inReadout->image->col0 = 0; + inReadout->row0 = 0; + inReadout->col0 = 0; + + pmReadout *maskReadout = pmReadoutAlloc(NULL); + CREATE_AND_SET_IMAGE(maskReadout->image, U8, DEFAULT_MASK_VAL, NUM_ROWS, NUM_COLS) + + pmMaskBadPixels(inReadout, maskReadout, MASK_VAL, SAT_VAL, GROW_VAL, GROW_RAD); + + psFree(inReadout); + psFree(maskReadout); return 0; @@ -226,17 +285,22 @@ int testMaskBadPixels8( void ) { - // Test H - Attempt to use input image mask bigger than mask - CREATE_AND_SET_IMAGE(inImage8,F64,0.0,50,50); - CREATE_AND_SET_IMAGE(mask8,U8,0,50,50) - CREATE_AND_SET_IMAGE(mask8i,U8,0,60,60) - // pmReadout *inReadout8 = pmReadoutAlloc(0, 0, inImage8); - pmReadout *inReadout8 = pmReadoutAlloc(NULL); - inReadout8->row0 = 0; - inReadout8->col0 = 0; - inReadout8->image = inImage8; - inReadout8->mask = mask8i; - pmMaskBadPixels(inReadout8, mask8, 0, 100.0, 1, 10); - psFree(mask8); - psFree(inReadout8); + // + // Test H - Attempt to use mask bigger than image + // + + pmReadout *inReadout = pmReadoutAlloc(NULL); + CREATE_AND_SET_IMAGE(inReadout->image, F32, DEFAULT_IMAGE_VAL, NUM_ROWS, NUM_COLS); + inReadout->image->row0 = 0; + inReadout->image->col0 = 0; + inReadout->row0 = 0; + inReadout->col0 = 0; + + pmReadout *maskReadout = pmReadoutAlloc(NULL); + CREATE_AND_SET_IMAGE(maskReadout->image, U8, DEFAULT_MASK_VAL, NUM_ROWS+10, NUM_COLS+10) + + pmMaskBadPixels(inReadout, maskReadout, MASK_VAL, SAT_VAL, GROW_VAL, GROW_RAD); + + psFree(inReadout); + psFree(maskReadout); return 0; @@ -245,19 +309,23 @@ int testMaskBadPixels9( void ) { + // // Test I - Attempt to use offset greater than input image - CREATE_AND_SET_IMAGE(inImage9,F64,0.0,50,50); - CREATE_AND_SET_IMAGE(mask9,U8,0,50,50) - CREATE_AND_SET_IMAGE(mask9i,U8,0,50,50) - // pmReadout *inReadout9 = pmReadoutAlloc(0, 0, inImage9); - pmReadout *inReadout9 = pmReadoutAlloc(NULL); - inReadout9->image = inImage9; - inReadout9->mask = mask9i; - inReadout9->row0 = 0; - inReadout9->col0 = 0; - *(int*)&inReadout9->col0 = 150; - *(int*)&inReadout9->row0 = 150; - pmMaskBadPixels(inReadout9, mask9, 0, 100.0, 1, 10); - psFree(mask9); - psFree(inReadout9); + // + + pmReadout *inReadout = pmReadoutAlloc(NULL); + CREATE_AND_SET_IMAGE(inReadout->image, F32, DEFAULT_IMAGE_VAL, NUM_ROWS, NUM_COLS); + inReadout->image->row0 = 0; + inReadout->image->col0 = 0; + inReadout->row0 = 0; + inReadout->col0 = 0; + *(int*)&inReadout->image->col0 = 150; + *(int*)&inReadout->image->row0 = 150; + + pmReadout *maskReadout = pmReadoutAlloc(NULL); + CREATE_AND_SET_IMAGE(maskReadout->image, U8, DEFAULT_MASK_VAL, NUM_ROWS, NUM_COLS) + pmMaskBadPixels(inReadout, maskReadout, MASK_VAL, SAT_VAL, GROW_VAL, GROW_RAD); + + psFree(inReadout); + psFree(maskReadout); return 0; @@ -266,17 +334,22 @@ int testMaskBadPixels10( void ) { + // // Test J - Attempt to use complex input image - CREATE_AND_SET_IMAGE(inImage10,C64,50.0,50,50); - CREATE_AND_SET_IMAGE(mask10,U8,0,50,50) - CREATE_AND_SET_IMAGE(mask10i,U8,0,50,50) - // pmReadout *inReadout10 = pmReadoutAlloc(0, 0, inImage10); - pmReadout *inReadout10 = pmReadoutAlloc(NULL); - inReadout10->row0 = 0; - inReadout10->col0 = 0; - inReadout10->image = inImage10; - inReadout10->mask = mask10i; - pmMaskBadPixels(inReadout10, mask10, 0, 100.0, 1, 10); - psFree(mask10); - psFree(inReadout10); + // + + pmReadout *inReadout = pmReadoutAlloc(NULL); + CREATE_AND_SET_IMAGE(inReadout->image, C64, DEFAULT_IMAGE_VAL, NUM_ROWS, NUM_COLS); + inReadout->image->row0 = 0; + inReadout->image->col0 = 0; + inReadout->row0 = 0; + inReadout->col0 = 0; + + pmReadout *maskReadout = pmReadoutAlloc(NULL); + CREATE_AND_SET_IMAGE(maskReadout->image, U8, DEFAULT_MASK_VAL, NUM_ROWS, NUM_COLS) + + pmMaskBadPixels(inReadout, maskReadout, MASK_VAL, SAT_VAL, GROW_VAL, GROW_RAD); + + psFree(inReadout); + psFree(maskReadout); return 0; @@ -285,19 +358,24 @@ int testMaskBadPixels11( void ) { - // Test K - Attempt to use non-mask type mask image - CREATE_AND_SET_IMAGE(inImage11,F64,50.0,50,50); - CREATE_AND_SET_IMAGE(mask11,F64,0,50,50) - CREATE_AND_SET_IMAGE(mask11i,U8,0,50,50) - // pmReadout *inReadout11 = pmReadoutAlloc(0, 0, inImage11); - pmReadout *inReadout11 = pmReadoutAlloc(NULL); - inReadout11->row0 = 0; - inReadout11->col0 = 0; - inReadout11->image = inImage11; - inReadout11->mask = mask11i; - pmMaskBadPixels(inReadout11, mask11, 0, 100.0, 1, 10); - psFree(mask11); - psFree(inReadout11); - - return 0; -} - + // + // Test K - Attempt to use mask image with wrong data type. + // + + pmReadout *inReadout = pmReadoutAlloc(NULL); + CREATE_AND_SET_IMAGE(inReadout->image, F32, DEFAULT_IMAGE_VAL, NUM_ROWS, NUM_COLS); + inReadout->image->row0 = 0; + inReadout->image->col0 = 0; + inReadout->row0 = 0; + inReadout->col0 = 0; + + pmReadout *maskReadout = pmReadoutAlloc(NULL); + CREATE_AND_SET_IMAGE(maskReadout->image, F64, DEFAULT_MASK_VAL, NUM_ROWS, NUM_COLS) + + pmMaskBadPixels(inReadout, maskReadout, MASK_VAL, SAT_VAL, GROW_VAL, GROW_RAD); + + psFree(inReadout); + psFree(maskReadout); + + return 0; +} + Index: trunk/psModules/test/imsubtract/tst_pmSubtractBias.c =================================================================== --- trunk/psModules/test/imsubtract/tst_pmSubtractBias.c (revision 5435) +++ trunk/psModules/test/imsubtract/tst_pmSubtractBias.c (revision 5516) @@ -3,12 +3,21 @@ * @brief Contains the tests for pmSubtractBias.c: * - * test00: This code will subtract full bias frames from the input image. - * test01: Multiple overscan regions, calculate a scalar statistic for - * each, then subtract from the input image. - * test02: Calculate a column overscan vector and subtract it from each - * column in the input image. - * test03: Calculate a row overscan vector and subtract it from each + * test00a: This code will subtract full bias frames from the input image. + * XXX: Must test: + * Various image offsets. + * Various image size combinations. + * Various data types for the bias and input images. + * Ensure code works when CELL.TRIMSEC is not set. + * test00b: This code will subtract full dark frames from the input image. + * XXX: Must test: + * Various image offsets. + * Various image size combinations. + * Various data types for the bias and input images. + * Code properly determines CELL.DARKTIME from cell metadata. + * Ensure code works when CELL.DARKTIME is not set. + * Ensure code works when CELL.TRIMSEC is not set. + * test03: Calculate a row overscan vector and subtract it from each * row in the input image. - * test04: + * test05: * * @author GLG, MHPCC @@ -16,6 +25,6 @@ * XXX: Memory leaks are not being detected. * - * @version $Revision: 1.2 $ $Name: not supported by cvs2svn $ - * @date $Date: 2005-09-29 21:57:31 $ + * @version $Revision: 1.3 $ $Name: not supported by cvs2svn $ + * @date $Date: 2005-11-15 20:09:03 $ * * Copyright 2004 Maui High Performance Computing Center, University of Hawaii @@ -25,17 +34,19 @@ #include "pslib.h" #include "pmSubtractBias.h" -static int test00(void); -static int test01(void); -static int test02(void); -static int test03(void); -static int test04(void); -static int testX(void); +static int test00a(void); +static int test00b(void); +//static int test01(void); +//static int test02(void); +//static int test03(void); +//static int test04(void); +static int test05(void); testDescription tests[] = { - {test00, 000, "pmSubtractBias", 0, true}, - {test01, 000, "pmSubtractBias", 0, true}, - {test02, 000, "pmSubtractBias", 0, true}, - {test03, 000, "pmSubtractBias", 0, false}, - {test04, 000, "pmSubtractBias", 0, true}, - {testX, 000, "pmSubtractBias", 0, true}, + {test00a, 000, "doSubtractBiasFullFrame", 0, false}, + {test00b, 000, "doSubtractDarkFullFrame", 0, false}, + // {test01, 000, "pmSubtractBias", 0, true}, + // {test02, 000, "pmSubtractBias", 0, true}, + // {test03, 000, "pmSubtractBias", 0, false}, + // {test04, 000, "pmSubtractBias", 0, true}, + {test05, 000, "pmSubtractBias", 0, false}, {NULL} }; @@ -45,4 +56,16 @@ { psLogSetFormat("HLNM"); + + psTraceSetLevel(".", 0); + psTraceSetLevel("spline1DFree", 0); + psTraceSetLevel("calculateSecondDerivs", 0); + psTraceSetLevel("vectorBinDisectF32", 0); + psTraceSetLevel("vectorBinDisectF64", 0); + psTraceSetLevel("p_psVectorBinDisect", 0); + psTraceSetLevel("psSpline1DAlloc", 0); + psTraceSetLevel("psVectorFitSpline1D", 0); + psTraceSetLevel("psSpline1DEval", 0); + psTraceSetLevel("psSpline1DEvalVector", 0); + return !runTestSuite(stderr, "Test Point Driver", tests, argc, argv); } @@ -50,4 +73,7 @@ #define NUM_ROWS 8 #define NUM_COLS 8 +#define MAX_HEADER_MSG_LENGTH 1000 +#define POLYNOMIAL_FIT_ORDER 2 +#define NUM_OVERSCANS 2 /****************************************************************************** doSubtractBiasFullFrame(): a sample pmReadout as well as a bias image are @@ -63,6 +89,4 @@ psImage *tmpImage1 = psImageAlloc(numCols, numRows, PS_TYPE_F32); psImage *tmpImage2 = psImageAlloc(numCols, numRows, PS_TYPE_F32); - // pmReadout *myReadout = pmReadoutAlloc(numCols, numRows, tmpImage1); - // pmReadout *myBias = pmReadoutAlloc(numCols, numRows, tmpImage2); pmReadout *myReadout = pmReadoutAlloc(NULL); pmReadout *myBias = pmReadoutAlloc(NULL); @@ -70,6 +94,7 @@ myBias->image = tmpImage2; - - printPositiveTestHeader(stdout, "pmSubtractBias", "doSubtractBiasFullFrame"); + char *HeaderMessageStr = (char *) psAlloc(MAX_HEADER_MSG_LENGTH); + sprintf(HeaderMessageStr, "doSubtractBiasFullFrame(%d, %d)", numRows, numCols); + printPositiveTestHeader(stdout, "pmSubtractBias", HeaderMessageStr); for (i=0;iimage = tmpImage1; - - - printPositiveTestHeader(stdout, "pmSubtractBias", "doSubtractFullOverscans"); - psList *list; - psStats *stat = psStatsAlloc(PS_STAT_SAMPLE_MEAN); - + myDark->image = tmpImage2; + + char *HeaderMessageStr = (char *) psAlloc(MAX_HEADER_MSG_LENGTH); + sprintf(HeaderMessageStr, "doSubtractDarkFullFrame(%d, %d)", numRows, numCols); + printPositiveTestHeader(stdout, "pmSubtractBias", HeaderMessageStr); for (i=0;iimage->data.F32[i][j] = (float) (i + j); - tmpImage2->data.F32[i][j] = 3.0; - tmpImage3->data.F32[i][j] = 4.0; - tmpImage4->data.F32[i][j] = 5.0; - } - } - list = psListAlloc(tmpImage2); - psListAdd(list, PS_LIST_HEAD, tmpImage3); - psListAdd(list, PS_LIST_HEAD, tmpImage4); - - myReadout = pmSubtractBias(myReadout, NULL, list, PM_OVERSCAN_ALL, stat, - 0, PM_FIT_NONE, NULL); + myDark->image->data.F32[i][j] = 1.0; + } + } + + myReadout = pmSubtractBias(myReadout, NULL, PM_FIT_NONE, false, + NULL, 0, NULL, myDark); for (i=0;iimage->data.F32[i][j]; if (FLT_EPSILON < fabs(expect - actual)) { @@ -165,385 +183,24 @@ psFree(myReadout); - psFree(tmpImage2); - psFree(tmpImage3); - psFree(tmpImage4); - psFree(stat); - psFree(list); - - printFooter(stdout, "pmSubtractBias", "doSubtractFullOverscans", true); + psFree(myDark); + printFooter(stdout, "pmSubtractBias", HeaderMessageStr, true); + psFree(HeaderMessageStr); return(testStatus); } -int test01( void ) + +int test00b( void ) { int testStatus = 0; - testStatus |= doSubtractFullOverscans(1, 1); - testStatus |= doSubtractFullOverscans(1, NUM_ROWS); - testStatus |= doSubtractFullOverscans(NUM_COLS, 1); - testStatus |= doSubtractFullOverscans(NUM_COLS, NUM_ROWS); - + testStatus |= doSubtractDarkFullFrame(1, 1); + testStatus |= doSubtractDarkFullFrame(NUM_COLS, 1); + testStatus |= doSubtractDarkFullFrame(1, NUM_ROWS); + testStatus |= doSubtractDarkFullFrame(NUM_COLS, NUM_ROWS); return(testStatus); } -/****************************************************************************** -doSubtractFullOverscans(): a sample pmReadout as well as several overscan -images of the same size are created. The overscan images are collected -pixel-by-pixel then subtracted column-wise from the pmReadout. - *****************************************************************************/ -int doSubtractFullOverscanColumns(int numCols, int numRows) -{ - int i; - int j; - float actual; - float expect; - int testStatus = 0; - psImage *tmpImage1 = psImageAlloc(numCols, numRows, PS_TYPE_F32); - psImage *tmpImage2 = psImageAlloc(numCols, numRows, PS_TYPE_F32); - psImage *tmpImage3 = psImageAlloc(numCols, numRows, PS_TYPE_F32); - psImage *tmpImage4 = psImageAlloc(numCols, numRows, PS_TYPE_F32); - pmReadout *myReadout = pmReadoutAlloc(NULL); - myReadout->image = tmpImage1; - psList *list; - psStats *stat = psStatsAlloc(PS_STAT_SAMPLE_MEAN); - - for (i=0;iimage->data.F32[i][j] = (float) (i + j); - tmpImage2->data.F32[i][j] = 3.0; - tmpImage3->data.F32[i][j] = 4.0; - tmpImage4->data.F32[i][j] = 5.0; - } - } - list = psListAlloc(tmpImage2); - psListAdd(list, PS_LIST_HEAD, tmpImage3); - psListAdd(list, PS_LIST_HEAD, tmpImage4); - - printPositiveTestHeader(stdout, "pmSubtractBias", "Column Overscans"); - - myReadout = pmSubtractBias(myReadout, NULL, list, PM_OVERSCAN_COLUMNS, stat, - 0, PM_FIT_NONE, NULL); - - for (i=0;iimage->data.F32[i][j]; - if (FLT_EPSILON < fabs(expect - actual)) { - printf("TEST ERROR: image[%d][%d] is %f, should be %f\n", i, j, actual, expect); - testStatus = 1; - } - } - } - - - psFree(myReadout); - psFree(tmpImage2); - psFree(tmpImage3); - psFree(tmpImage4); - psFree(stat); - psFree(list); - - printFooter(stdout, "pmSubtractBias", "Column Overscans", true); - return(testStatus); -} -/****************************************************************************** -doSubtractFullOverscans(): a sample pmReadout as well as several overscan -images of the same size are created. The overscan images are collected -pixel-by-pixel then subtracted column-wise from the pmReadout. - *****************************************************************************/ -int doSubtractFullOverscanColumnsPoly(int numCols, int numRows) -{ - int i; - int j; - float actual; - float expect; - int testStatus = 0; - psImage *tmpImage1 = psImageAlloc(numCols, numRows, PS_TYPE_F32); - psImage *tmpImage2 = psImageAlloc(numCols, numRows, PS_TYPE_F32); - psImage *tmpImage3 = psImageAlloc(numCols, numRows, PS_TYPE_F32); - psImage *tmpImage4 = psImageAlloc(numCols, numRows, PS_TYPE_F32); - pmReadout *myReadout = pmReadoutAlloc(NULL); - myReadout->image = tmpImage1; - psList *list; - psStats *stat = psStatsAlloc(PS_STAT_SAMPLE_MEAN); - psPolynomial1D *myPoly = psPolynomial1DAlloc(1, PS_POLYNOMIAL_ORD); - - for (i=0;iimage->data.F32[i][j] = (float) (i + j); - tmpImage2->data.F32[i][j] = 3.0; - tmpImage3->data.F32[i][j] = 4.0; - tmpImage4->data.F32[i][j] = 5.0; - } - } - list = psListAlloc(tmpImage2); - psListAdd(list, PS_LIST_HEAD, tmpImage3); - psListAdd(list, PS_LIST_HEAD, tmpImage4); - - printPositiveTestHeader(stdout, "pmSubtractBias", "Column Overscans"); - - myReadout = pmSubtractBias(myReadout, myPoly, list, PM_OVERSCAN_COLUMNS, stat, - 0, PM_FIT_POLYNOMIAL, NULL); - - for (i=0;iimage->data.F32[i][j]; - if (FLT_EPSILON < fabs(expect - actual)) { - printf("TEST ERROR: image[%d][%d] is %f, should be %f\n", i, j, actual, expect); - testStatus = 1; - } - } - } - - - psFree(myReadout); - psFree(tmpImage2); - psFree(tmpImage3); - psFree(tmpImage4); - psFree(stat); - psFree(list); - psFree(myPoly); - - printFooter(stdout, "pmSubtractBias", "Column Overscans", true); - return(testStatus); -} -/****************************************************************************** -doSubtractFullOverscansSmall(): a sample pmReadout as well as several overscan -images of smaller size are created. The overscan images are collected -pixel-by-pixel then subtracted column-wise from the pmReadout. - *****************************************************************************/ -int doSubtractFullOverscanColumnsSmall(int numCols, int numRows) -{ - int i; - int j; - float actual; - float expect; - int testStatus = 0; - psImage *tmpImage1 = psImageAlloc(numCols, numRows, PS_TYPE_F32); - pmReadout *myReadout = pmReadoutAlloc(NULL); - myReadout->image = tmpImage1; - psImage *tmpImage2 = psImageAlloc(numCols/2, numRows/2, PS_TYPE_F32); - psImage *tmpImage3 = psImageAlloc(numCols/2, numRows/2, PS_TYPE_F32); - psImage *tmpImage4 = psImageAlloc(numCols/2, numRows/2, PS_TYPE_F32); - psList *list; - psStats *stat = psStatsAlloc(PS_STAT_SAMPLE_MEAN); - - for (i=0;iimage->data.F32[i][j] = (float) (i + j); - } - } - for (i=0;idata.F32[i][j] = 3.0; - tmpImage3->data.F32[i][j] = 4.0; - tmpImage4->data.F32[i][j] = 5.0; - } - } - list = psListAlloc(tmpImage2); - psListAdd(list, PS_LIST_HEAD, tmpImage3); - psListAdd(list, PS_LIST_HEAD, tmpImage4); - - printPositiveTestHeader(stdout, "pmSubtractBias", "Column Overscans"); - - myReadout = pmSubtractBias(myReadout, NULL, list, PM_OVERSCAN_COLUMNS, stat, - 0, PM_FIT_POLYNOMIAL, NULL); - - for (i=0;iimage->data.F32[i][j]; - if (FLT_EPSILON < fabs(expect - actual)) { - printf("TEST ERROR: image[%d][%d] is %f, should be %f\n", i, j, actual, expect); - testStatus = 1; - } - } - } - - - psFree(myReadout); - psFree(tmpImage2); - psFree(tmpImage3); - psFree(tmpImage4); - psFree(stat); - psFree(list); - - printFooter(stdout, "pmSubtractBias", "Column Overscans", true); - return(testStatus); -} - -int test02( void ) -{ - int testStatus = 0; - - testStatus |= doSubtractFullOverscanColumns(1, 1); - testStatus |= doSubtractFullOverscanColumns(1, NUM_ROWS); - testStatus |= doSubtractFullOverscanColumns(NUM_COLS, 1); - testStatus |= doSubtractFullOverscanColumns(NUM_COLS, NUM_ROWS); - /* These tests do not make sense until the SDRS is clarified. - testStatus |= doSubtractFullOverscanColumnsSmall(1, 1); - testStatus |= doSubtractFullOverscanColumnsSmall(1, NUM_ROWS); - testStatus |= doSubtractFullOverscanColumnsSmall(NUM_COLS, 1); - testStatus |= doSubtractFullOverscanColumnsSmall(NUM_COLS, NUM_ROWS); - */ - - return(testStatus); -} - -/****************************************************************************** -doSubtractFullOverscans(): a sample pmReadout as well as several overscan -images of the same size are created. The overscan images are collected -pixel-by-pixel then subtracted row-wise from the pmReadout. - *****************************************************************************/ -int doSubtractFullOverscanRows(int numCols, int numRows) -{ - int i; - int j; - float actual; - float expect; - int testStatus = 0; - psImage *tmpImage1 = psImageAlloc(numCols, numRows, PS_TYPE_F32); - psImage *tmpImage2 = psImageAlloc(numCols, numRows, PS_TYPE_F32); - psImage *tmpImage3 = psImageAlloc(numCols, numRows, PS_TYPE_F32); - psImage *tmpImage4 = psImageAlloc(numCols, numRows, PS_TYPE_F32); - pmReadout *myReadout = pmReadoutAlloc(NULL); - myReadout->image = tmpImage1; - psList *list; - psStats *stat = psStatsAlloc(PS_STAT_SAMPLE_MEAN); - - for (i=0;iimage->data.F32[i][j] = (float) (i + j); - tmpImage2->data.F32[i][j] = 3.0; - tmpImage3->data.F32[i][j] = 4.0; - tmpImage4->data.F32[i][j] = 5.0; - } - } - list = psListAlloc(tmpImage2); - psListAdd(list, PS_LIST_HEAD, tmpImage3); - psListAdd(list, PS_LIST_HEAD, tmpImage4); - - printPositiveTestHeader(stdout, "pmSubtractBias", "Row Overscans"); - - myReadout = pmSubtractBias(myReadout, NULL, list, PM_OVERSCAN_ROWS, stat, - 0, PM_FIT_NONE, NULL); - - for (i=0;iimage->data.F32[i][j]; - if (FLT_EPSILON < fabs(expect - actual)) { - printf("TEST ERROR: image[%d][%d] is %f, should be %f\n", i, j, actual, expect); - testStatus = 1; - } - } - } - - - psFree(myReadout); - psFree(tmpImage2); - psFree(tmpImage3); - psFree(tmpImage4); - psFree(stat); - psFree(list); - - printFooter(stdout, "pmSubtractBias", "Row Overscans", true); - return(testStatus); -} - -/****************************************************************************** -doSubtractFullOverscansSmall(): a sample pmReadout as well as several overscan -images of smaller size are created. The overscan images are collected -pixel-by-pixel then subtracted row-wise from the pmReadout. - *****************************************************************************/ -int doSubtractFullOverscanRowsSmall(int numCols, int numRows) -{ - int i; - int j; - float actual; - float expect; - int testStatus = 0; - psS32 OSnumRows = numRows-1; - if (OSnumRows == 0) { - OSnumRows = 1; - } - psS32 OSnumCols = numCols-1; - if (OSnumCols == 0) { - OSnumCols = 1; - } - psImage *tmpImage1 = psImageAlloc(numCols, numRows, PS_TYPE_F32); - psImage *tmpImage2 = psImageAlloc(OSnumCols, OSnumRows, PS_TYPE_F32); - psImage *tmpImage3 = psImageAlloc(OSnumCols, OSnumRows, PS_TYPE_F32); - psImage *tmpImage4 = psImageAlloc(OSnumCols, OSnumRows, PS_TYPE_F32); - pmReadout *myReadout = pmReadoutAlloc(NULL); - myReadout->image = tmpImage1; - psList *list; - psStats *stat = psStatsAlloc(PS_STAT_SAMPLE_MEAN); - - for (i=0;iimage->data.F32[i][j] = (float) (i + j); - } - } - for (i=0;idata.F32[i][j] = 3.0; - tmpImage3->data.F32[i][j] = 4.0; - tmpImage4->data.F32[i][j] = 5.0; - } - } - list = psListAlloc(tmpImage2); - psListAdd(list, PS_LIST_HEAD, tmpImage3); - psListAdd(list, PS_LIST_HEAD, tmpImage4); - - printPositiveTestHeader(stdout, "pmSubtractBias", "Row Overscans"); - - myReadout = pmSubtractBias(myReadout, NULL, list, PM_OVERSCAN_ROWS, stat, - 0, PM_FIT_SPLINE, NULL); - - for (i=0;iimage->data.F32[i][j]; - if (FLT_EPSILON < fabs(expect - actual)) { - printf("TEST ERROR: image[%d][%d] is %f, should be %f\n", i, j, actual, expect); - testStatus = 1; - } - } - } - - - psFree(myReadout); - psFree(tmpImage2); - psFree(tmpImage3); - psFree(tmpImage4); - psFree(stat); - psFree(list); - - printFooter(stdout, "pmSubtractBias", "Row Overscans", true); - return(testStatus); -} - - -// XXX: HEY -int test03( void ) -{ - int testStatus = 0; - - // testStatus |= doSubtractFullOverscanRows(1, 1); - // testStatus |= doSubtractFullOverscanRows(1, NUM_ROWS); - // testStatus |= doSubtractFullOverscanRows(NUM_COLS, 1); - // testStatus |= doSubtractFullOverscanRows(NUM_COLS, NUM_ROWS); - // testStatus |= doSubtractFullOverscanRowsSmall(1, 1); - // testStatus |= doSubtractFullOverscanRowsSmall(1, NUM_ROWS); - // testStatus |= doSubtractFullOverscanRowsSmall(NUM_COLS, 1); - testStatus |= doSubtractFullOverscanRowsSmall(NUM_COLS, NUM_ROWS); - - return(testStatus); -} - - - + +/* int doSubtractOverscansTestInputCases(int numCols, int numRows) { @@ -568,5 +225,5 @@ myBias->image = tmpImage5; printPositiveTestHeader(stdout, "pmSubtractBias", "Testing input parameter error conditions"); - + psImage *tmpImage5ShortRows = psImageAlloc(numCols, numRows-1, PS_TYPE_F32); pmReadout *myBiasShortRows = pmReadoutAlloc(NULL); @@ -575,5 +232,5 @@ pmReadout *myBiasShortCols = pmReadoutAlloc(NULL); myBiasShortCols->image = tmpImage5ShortCols; - + for (i=0;iimage->data.F32[i][j] = (float) (i + j); } } - - /* XXX: This does not seem to be a requirement. + + // XXX: This does not seem to be a requirement. + if (0) { printf("------------------------------------------------------------------\n"); printf("Calling pmSubtractBias() with NULL overscan list and PM_OVERSCAN_NONE. Should generate warning.\n"); @@ -674,6 +332,6 @@ } } - */ - + } + printf("------------------------------------------------------------------\n"); printf("Calling pmSubtractBias() with PM_OVERSCAN_NONE and PM_FIT_POLYNOMIAL. Should generate Warning.\n"); @@ -687,11 +345,11 @@ testStatus = 1; } - + // Restore myReadout for next test. myReadout->image->data.F32[i][j] = (float) (i + j); } } - - + + printf("------------------------------------------------------------------\n"); printf("Calling pmSubtractBias() with PM_OVERSCAN_ALL and PM_FIT_SPLINE. Should generate Warning.\n"); @@ -702,5 +360,5 @@ psFree(rc); } - + for (i=0;iimage->data.F32[i][j] = (float) (i + j); } } - - + + printf("------------------------------------------------------------------\n"); printf("Calling pmSubtractBias() with multiple stats->options. Should generate Warning.\n"); @@ -734,10 +392,10 @@ } stat->options = PS_STAT_SAMPLE_MEAN; - + printf("------------------------------------------------------------------\n"); printf("Calling pmSubtractBias() undersize overscans (PM_OVERSCAN_ROWS). Should generate Warning.\n"); rc = pmSubtractBias(myReadout, NULL, listShort, PM_OVERSCAN_ROWS, stat, 0, PM_FIT_NONE, NULL); - /* + if (0) { for (i=0;iimage = tmpImage1; + printPositiveTestHeader(stdout, "pmSubtractBias", "PUT COMMENT HERE"); + printf("---- doSubtractFullOverscanColumnsGeneric() ----\n"); + printf(" Image size: %d by %d\n", imageNumRows, imageNumCols); + printf(" Overscan size: %d by %d\n", overscanNumRows, overscanNumCols); + printf(" Total Overscans: %d\n", numOverscans); + printf(" Binning factor: %d\n", nBin); + if (overscanaxis == PM_OVERSCAN_ROWS) + printf(" Overscan axis: PM_OVERSCAN_ROWS\n"); + if (overscanaxis == PM_OVERSCAN_COLUMNS) + printf(" Overscan axis: PM_OVERSCAN_COLUMNS\n"); + if (overscanaxis == PM_OVERSCAN_ALL) + printf(" Overscan axis: PM_OVERSCAN_ALL\n"); + if (overscanaxis == PM_OVERSCAN_NONE) + printf(" Overscan axis: PM_OVERSCAN_NONE\n"); + if (fit == PM_FIT_NONE) + printf(" Fit type: PM_FIT_NONE\n"); + if (fit == PM_FIT_POLYNOMIAL) + printf(" Fit type: PM_FIT_POLYNOMIAL\n"); + if (fit == PM_FIT_SPLINE) + printf(" Fit type: PM_FIT_SPLINE\n"); + + // + // Create and initialize input image, FPA hierarchy. + // + const psMetadata *camera = psMetadataAlloc(); + pmFPA* fpa = pmFPAAlloc(camera); + + if (fpa == NULL) { + psLogMsg(__func__,PS_LOG_ERROR, "TEST ERROR: pmFPAAlloc returned a NULL.\n"); + return 1; + } + + pmChip *chip = pmChipAlloc(fpa, "ChipName"); + if (chip == NULL) { + psLogMsg(__func__,PS_LOG_ERROR, "TEST ERROR: pmChipAlloc returned a NULL.\n"); + return 2; + } + + pmCell *cell = pmCellAlloc(chip, (psMetadata *) camera, "CellName"); + if (cell == NULL) { + psLogMsg(__func__,PS_LOG_ERROR, "TEST ERROR: pmCellAlloc returned a NULL.\n"); + return 3; + } + + pmReadout *myReadout = pmReadoutAlloc(cell); + myReadout->image = psImageAlloc(imageNumCols, imageNumRows, PS_TYPE_F32); + for (i=0;iimage->numRows;i++) { + for (j=0;jimage->numCols;j++) { + myReadout->image->data.F32[i][j] = (float) (i + j); + } + } + + // + // Set overscan axis in the metadata. + // + psBool rc; + if (overscanaxis == PM_OVERSCAN_ROWS) { + rc = psMetadataAddS32(myReadout->parent->concepts, PS_LIST_HEAD, "CELL.READDIR", 0, NULL, 1); + } else if (overscanaxis == PM_OVERSCAN_COLUMNS) { + rc = psMetadataAddS32(myReadout->parent->concepts, PS_LIST_HEAD, "CELL.READDIR", 0, NULL, 2); + } else if (overscanaxis == PM_OVERSCAN_ALL) { + rc = psMetadataAddS32(myReadout->parent->concepts, PS_LIST_HEAD, "CELL.READDIR", 0, NULL, 3); + } else if (overscanaxis == PM_OVERSCAN_NONE) { + rc = psMetadataAddS32(myReadout->parent->concepts, PS_LIST_HEAD, "CELL.READDIR", 0, NULL, 0); + } + if (rc == false) { + printf("TEST ERROR: Could not set CELL.READDIR metadata.\n"); + testStatus = 1; + } + + psStats *stat = psStatsAlloc(PS_STAT_SAMPLE_MEAN); + psPolynomial1D *myPoly = psPolynomial1DAlloc(POLYNOMIAL_FIT_ORDER, PS_POLYNOMIAL_ORD); + psSpline1D *mySpline = NULL; + + + if (0) { + if (overscanNumRows <= 0) { + overscanNumRows = 1; + } + if (overscanNumCols <= 0) { + overscanNumCols = 1; + } + } + psF32 oAverage = 0.0; + myReadout->bias = NULL; + for (psS32 i = 0 ; i < numOverscans ; i++) { + psImage *tmpImage = psImageAlloc(overscanNumCols, overscanNumRows, PS_TYPE_F32); + psF32 oValue = (float) (i + 3); + PS_IMAGE_SET_F32(tmpImage, oValue); + oAverage += oValue; + if (myReadout->bias == NULL) { + myReadout->bias = psListAlloc(tmpImage); + } else { + psListAdd(myReadout->bias, PS_LIST_HEAD, tmpImage); + } + } + oAverage/= (psF32) numOverscans; + + + if (fit == PM_FIT_NONE) { + myReadout = pmSubtractBias(myReadout, NULL, PM_FIT_NONE, overscanaxis, + stat, nBin, NULL, NULL); + } else if (fit == PM_FIT_POLYNOMIAL) { + myReadout = pmSubtractBias(myReadout, myPoly, PM_FIT_POLYNOMIAL, overscanaxis, + stat, nBin, NULL, NULL); + } else if (fit == PM_FIT_SPLINE) { + myReadout = pmSubtractBias(myReadout, mySpline, PM_FIT_SPLINE, overscanaxis, + stat, nBin, NULL, NULL); + } + for (i=0;iimage->data.F32[i][j] = (float) (i + j); - } - } - - psStats *stat = psStatsAlloc(PS_STAT_SAMPLE_MEAN); - psPolynomial1D *myPoly = psPolynomial1DAlloc(1, PS_POLYNOMIAL_ORD); - psSpline1D *mySpline = NULL; - - - /* - if (overscanNumRows <= 0) { - overscanNumRows = 1; - } - if (overscanNumCols <= 0) { - overscanNumCols = 1; - } - */ - psImage *tmpImage2 = psImageAlloc(overscanNumCols, overscanNumRows, PS_TYPE_F32); - psImage *tmpImage3 = psImageAlloc(overscanNumCols, overscanNumRows, PS_TYPE_F32); - psImage *tmpImage4 = psImageAlloc(overscanNumCols, overscanNumRows, PS_TYPE_F32); - psList *list; - for (i=0;idata.F32[i][j] = 3.0; - tmpImage3->data.F32[i][j] = 4.0; - tmpImage4->data.F32[i][j] = 5.0; - } - } - list = psListAlloc(tmpImage2); - psListAdd(list, PS_LIST_HEAD, tmpImage3); - psListAdd(list, PS_LIST_HEAD, tmpImage4); - - printPositiveTestHeader(stdout, "pmSubtractBias", "Column Overscans"); - - if (fit == PM_FIT_NONE) { - myReadout = pmSubtractBias(myReadout, NULL, list, overscanaxis, stat, - nBin, fit, NULL); - } else if (fit == PM_FIT_POLYNOMIAL) { - myReadout = pmSubtractBias(myReadout, myPoly, list, overscanaxis, stat, - nBin, fit, NULL); - } else if (fit == PM_FIT_SPLINE) { - myReadout = pmSubtractBias(myReadout, mySpline, list, overscanaxis, stat, - nBin, fit, NULL); - } - - for (i=0;iimage->data.F32[i][j]; if (FLT_EPSILON < fabs(expect - actual)) { printf("TEST ERROR: image[%d][%d] is %f, should be %f\n", i, j, actual, expect); testStatus = 1; + } else { + //printf("COOL: image[%d][%d] is %f, should be %f\n", i, j, actual, expect); } } } - - + psFree(fpa); + psFree(chip); + psFree(cell); + psListElem *tmpElem = (psListElem *) myReadout->bias->head; + while (NULL != tmpElem) { + psFree((psImage *) tmpElem->data); + tmpElem = tmpElem->next; + } psFree(myReadout); - psFree(tmpImage2); - psFree(tmpImage3); - psFree(tmpImage4); + psFree(camera); psFree(stat); - psFree(list); psFree(myPoly); psFree(mySpline); @@ -945,5 +670,47 @@ } -int testX( void ) + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +/****************************************************************************** +test05a() The following combinations are tested here: + Overscan images are same size, no fit, bin factor is 1. + Overscan images are same size, no fit, bin factor is 2. + *****************************************************************************/ +int test05a( + psS32 imageNumCols, + psS32 imageNumRows, + psS32 overscanNumCols, + psS32 overscanNumRows) { int testStatus = 0; @@ -955,16 +722,16 @@ // Overscan images are same size, no fit, bin factor is 1. // - testStatus |= doSubtractFullOverscanColumnsGeneric(NUM_COLS, NUM_ROWS, - NUM_COLS, NUM_ROWS, + testStatus |= doSubtractFullOverscanColumnsGeneric(imageNumCols, imageNumRows, + overscanNumCols, overscanNumRows, NUM_OVERSCANS, PM_OVERSCAN_ALL, PM_FIT_NONE, 1); - testStatus |= doSubtractFullOverscanColumnsGeneric(NUM_COLS, NUM_ROWS, - NUM_COLS, NUM_ROWS, + testStatus |= doSubtractFullOverscanColumnsGeneric(imageNumCols, imageNumRows, + overscanNumCols, overscanNumRows, NUM_OVERSCANS, PM_OVERSCAN_COLUMNS, PM_FIT_NONE, 1); - testStatus |= doSubtractFullOverscanColumnsGeneric(NUM_COLS, NUM_ROWS, - NUM_COLS, NUM_ROWS, + testStatus |= doSubtractFullOverscanColumnsGeneric(imageNumCols, imageNumRows, + overscanNumCols, overscanNumRows, NUM_OVERSCANS, PM_OVERSCAN_ROWS, PM_FIT_NONE, 1); @@ -973,125 +740,351 @@ // Overscan images are same size, no fit, bin factor is 2. // - testStatus |= doSubtractFullOverscanColumnsGeneric(NUM_COLS, NUM_ROWS, - NUM_COLS, NUM_ROWS, + testStatus |= doSubtractFullOverscanColumnsGeneric(imageNumCols, imageNumRows, + overscanNumCols, overscanNumRows, NUM_OVERSCANS, PM_OVERSCAN_ALL, PM_FIT_NONE, 2); - testStatus |= doSubtractFullOverscanColumnsGeneric(NUM_COLS, NUM_ROWS, - NUM_COLS, NUM_ROWS, + testStatus |= doSubtractFullOverscanColumnsGeneric(imageNumCols, imageNumRows, + overscanNumCols, overscanNumRows, NUM_OVERSCANS, PM_OVERSCAN_COLUMNS, PM_FIT_NONE, 2); - testStatus |= doSubtractFullOverscanColumnsGeneric(NUM_COLS, NUM_ROWS, - NUM_COLS, NUM_ROWS, + testStatus |= doSubtractFullOverscanColumnsGeneric(imageNumCols, imageNumRows, + overscanNumCols, overscanNumRows, NUM_OVERSCANS, PM_OVERSCAN_ROWS, PM_FIT_NONE, 2); - // - // Overscan images are too small, spline fit, bin factor is 1. - // - testStatus |= doSubtractFullOverscanColumnsGeneric(NUM_COLS, NUM_ROWS, - NUM_COLS-1, NUM_ROWS-1, - PM_OVERSCAN_ALL, - PM_FIT_SPLINE, 1); - - testStatus |= doSubtractFullOverscanColumnsGeneric(NUM_COLS, NUM_ROWS, - NUM_COLS-1, NUM_ROWS-1, - PM_OVERSCAN_COLUMNS, - PM_FIT_SPLINE, 1); - - testStatus |= doSubtractFullOverscanColumnsGeneric(NUM_COLS, NUM_ROWS, - NUM_COLS-1, NUM_ROWS-1, - PM_OVERSCAN_ROWS, - PM_FIT_SPLINE, 1); - - // - // Overscan images are too small, spline fit, bin factor is 2. - // - testStatus |= doSubtractFullOverscanColumnsGeneric(NUM_COLS, NUM_ROWS, - NUM_COLS-1, NUM_ROWS-1, - PM_OVERSCAN_ALL, - PM_FIT_SPLINE, 2); - - testStatus |= doSubtractFullOverscanColumnsGeneric(NUM_COLS, NUM_ROWS, - NUM_COLS-1, NUM_ROWS-1, - PM_OVERSCAN_COLUMNS, - PM_FIT_SPLINE, 2); - - testStatus |= doSubtractFullOverscanColumnsGeneric(NUM_COLS, NUM_ROWS, - NUM_COLS-1, NUM_ROWS-1, - PM_OVERSCAN_ROWS, - PM_FIT_SPLINE, 2); - - // - // Overscan images are same size, spline fit, bin factor is 1. - // - testStatus |= doSubtractFullOverscanColumnsGeneric(NUM_COLS, NUM_ROWS, - NUM_COLS, NUM_ROWS, - PM_OVERSCAN_ALL, - PM_FIT_SPLINE, 1); - - testStatus |= doSubtractFullOverscanColumnsGeneric(NUM_COLS, NUM_ROWS, - NUM_COLS, NUM_ROWS, - PM_OVERSCAN_COLUMNS, - PM_FIT_SPLINE, 1); - - testStatus |= doSubtractFullOverscanColumnsGeneric(NUM_COLS, NUM_ROWS, - NUM_COLS, NUM_ROWS, - PM_OVERSCAN_ROWS, - PM_FIT_SPLINE, 1); - // - // Overscan images are same size, spline fit, bin factor is 2. - // - testStatus |= doSubtractFullOverscanColumnsGeneric(NUM_COLS, NUM_ROWS, - NUM_COLS, NUM_ROWS, - PM_OVERSCAN_ALL, - PM_FIT_SPLINE, 2); - - testStatus |= doSubtractFullOverscanColumnsGeneric(NUM_COLS, NUM_ROWS, - NUM_COLS, NUM_ROWS, - PM_OVERSCAN_COLUMNS, - PM_FIT_SPLINE, 2); - - testStatus |= doSubtractFullOverscanColumnsGeneric(NUM_COLS, NUM_ROWS, - NUM_COLS, NUM_ROWS, - PM_OVERSCAN_ROWS, - PM_FIT_SPLINE, 2); - - // - // Overscan images are same size, polynomial fit, bin factor is 1. - // - testStatus |= doSubtractFullOverscanColumnsGeneric(NUM_COLS, NUM_ROWS, - NUM_COLS, NUM_ROWS, - PM_OVERSCAN_ALL, - PM_FIT_POLYNOMIAL, 1); - - testStatus |= doSubtractFullOverscanColumnsGeneric(NUM_COLS, NUM_ROWS, - NUM_COLS, NUM_ROWS, - PM_OVERSCAN_COLUMNS, - PM_FIT_POLYNOMIAL, 1); - - testStatus |= doSubtractFullOverscanColumnsGeneric(NUM_COLS, NUM_ROWS, - NUM_COLS, NUM_ROWS, - PM_OVERSCAN_ROWS, - PM_FIT_POLYNOMIAL, 1); - // - // Overscan images are same size, polynomial fit, bin factor is 2. - // - testStatus |= doSubtractFullOverscanColumnsGeneric(NUM_COLS, NUM_ROWS, - NUM_COLS, NUM_ROWS, - PM_OVERSCAN_ALL, - PM_FIT_POLYNOMIAL, 2); - - testStatus |= doSubtractFullOverscanColumnsGeneric(NUM_COLS, NUM_ROWS, - NUM_COLS, NUM_ROWS, - PM_OVERSCAN_COLUMNS, - PM_FIT_POLYNOMIAL, 2); - - testStatus |= doSubtractFullOverscanColumnsGeneric(NUM_COLS, NUM_ROWS, - NUM_COLS, NUM_ROWS, - PM_OVERSCAN_ROWS, - PM_FIT_POLYNOMIAL, 2); return(testStatus); } + +/****************************************************************************** +test05b() The following combinations are tested here: + Overscan images are too small, spline fit, bin factor is 1. + Overscan images are too small, spline fit, bin factor is 2. + Overscan images are same size, spline fit, bin factor is 1. + Overscan images are same size, spline fit, bin factor is 2. + Overscan images are too big, spline fit, bin factor is 1. + Overscan images are too big, spline fit, bin factor is 2. + A single overscan image of the same size, spline fit, bin factor is 1. + + Overscan images are too small, polynomial fit, bin factor is 1. + Overscan images are too small, polynomial fit, bin factor is 2. + Overscan images are same size, polynomial fit, bin factor is 1. + Overscan images are same size, polynomial fit, bin factor is 2. + Overscan images are too big, polynomial fit, bin factor is 1. + Overscan images are too big, polynomial fit, bin factor is 2. + A single overscan image of the same size, polynomial fit, bin factor is 1. + +XXX: Must add M-by-N image size tests. + *****************************************************************************/ +int test05b( + psS32 imageNumCols, + psS32 imageNumRows, + psS32 overscanNumCols, + psS32 overscanNumRows) +{ + int testStatus = 0; + + // + // Overscan images are too small, spline fit, bin factor is 1. + // + testStatus |= doSubtractFullOverscanColumnsGeneric(imageNumCols, imageNumRows, + overscanNumCols-2, overscanNumRows-2, NUM_OVERSCANS, + PM_OVERSCAN_ALL, + PM_FIT_SPLINE, 1); + + testStatus |= doSubtractFullOverscanColumnsGeneric(imageNumCols, imageNumRows, + overscanNumCols-2, overscanNumRows-2, NUM_OVERSCANS, + PM_OVERSCAN_COLUMNS, + PM_FIT_SPLINE, 1); + + testStatus |= doSubtractFullOverscanColumnsGeneric(imageNumCols, imageNumRows, + overscanNumCols-2, overscanNumRows-2, NUM_OVERSCANS, + PM_OVERSCAN_ROWS, + PM_FIT_SPLINE, 1); + + // + // Overscan images are too small, spline fit, bin factor is 2. + // + testStatus |= doSubtractFullOverscanColumnsGeneric(imageNumCols, imageNumRows, + overscanNumCols-2, overscanNumRows-2, NUM_OVERSCANS, + PM_OVERSCAN_ALL, + PM_FIT_SPLINE, 2); + + testStatus |= doSubtractFullOverscanColumnsGeneric(imageNumCols, imageNumRows, + overscanNumCols-2, overscanNumRows-2, NUM_OVERSCANS, + PM_OVERSCAN_COLUMNS, + PM_FIT_SPLINE, 2); + + testStatus |= doSubtractFullOverscanColumnsGeneric(imageNumCols, imageNumRows, + overscanNumCols-2, overscanNumRows-2, NUM_OVERSCANS, + PM_OVERSCAN_ROWS, + PM_FIT_SPLINE, 2); + + + // + // Overscan images are same size, spline fit, bin factor is 1. + // + testStatus |= doSubtractFullOverscanColumnsGeneric(imageNumCols, imageNumRows, + overscanNumCols, overscanNumRows, NUM_OVERSCANS, + PM_OVERSCAN_ALL, + PM_FIT_SPLINE, 1); + + testStatus |= doSubtractFullOverscanColumnsGeneric(imageNumCols, imageNumRows, + overscanNumCols, overscanNumRows, NUM_OVERSCANS, + PM_OVERSCAN_COLUMNS, + PM_FIT_SPLINE, 1); + + testStatus |= doSubtractFullOverscanColumnsGeneric(imageNumCols, imageNumRows, + overscanNumCols, overscanNumRows, NUM_OVERSCANS, + PM_OVERSCAN_ROWS, + PM_FIT_SPLINE, 1); + + // + // Overscan images are same size, spline fit, bin factor is 2. + // + testStatus |= doSubtractFullOverscanColumnsGeneric(imageNumCols, imageNumRows, + overscanNumCols, overscanNumRows, NUM_OVERSCANS, + PM_OVERSCAN_ALL, + PM_FIT_SPLINE, 2); + + testStatus |= doSubtractFullOverscanColumnsGeneric(imageNumCols, imageNumRows, + overscanNumCols, overscanNumRows, NUM_OVERSCANS, + PM_OVERSCAN_COLUMNS, + PM_FIT_SPLINE, 2); + + testStatus |= doSubtractFullOverscanColumnsGeneric(imageNumCols, imageNumRows, + overscanNumCols, overscanNumRows, NUM_OVERSCANS, + PM_OVERSCAN_ROWS, + PM_FIT_SPLINE, 2); + + // + // Overscan images are too big, spline fit, bin factor is 1. + // + testStatus |= doSubtractFullOverscanColumnsGeneric(imageNumCols, imageNumRows, + overscanNumCols+2, overscanNumRows+2, NUM_OVERSCANS, + PM_OVERSCAN_ALL, + PM_FIT_SPLINE, 1); + + testStatus |= doSubtractFullOverscanColumnsGeneric(imageNumCols, imageNumRows, + overscanNumCols+2, overscanNumRows+2, NUM_OVERSCANS, + PM_OVERSCAN_COLUMNS, + PM_FIT_SPLINE, 1); + + testStatus |= doSubtractFullOverscanColumnsGeneric(imageNumCols, imageNumRows, + overscanNumCols+2, overscanNumRows+2, NUM_OVERSCANS, + PM_OVERSCAN_ROWS, + PM_FIT_SPLINE, 1); + + // + // Overscan images are too big, spline fit, bin factor is 2. + // + testStatus |= doSubtractFullOverscanColumnsGeneric(imageNumCols, imageNumRows, + overscanNumCols+2, overscanNumRows+2, NUM_OVERSCANS, + PM_OVERSCAN_ALL, + PM_FIT_SPLINE, 2); + + testStatus |= doSubtractFullOverscanColumnsGeneric(imageNumCols, imageNumRows, + overscanNumCols+2, overscanNumRows+2, NUM_OVERSCANS, + PM_OVERSCAN_COLUMNS, + PM_FIT_SPLINE, 2); + + testStatus |= doSubtractFullOverscanColumnsGeneric(imageNumCols, imageNumRows, + overscanNumCols+2, overscanNumRows+2 , NUM_OVERSCANS, + PM_OVERSCAN_ROWS, + PM_FIT_SPLINE, 2); + + + // + // A single overscan image of the same size, spline fit, bin factor is 1. + // + testStatus |= doSubtractFullOverscanColumnsGeneric(imageNumCols, imageNumRows, + overscanNumCols, overscanNumRows, 1, + PM_OVERSCAN_ALL, + PM_FIT_SPLINE, 1); + + testStatus |= doSubtractFullOverscanColumnsGeneric(imageNumCols, imageNumRows, + overscanNumCols, overscanNumRows, 1, + PM_OVERSCAN_COLUMNS, + PM_FIT_SPLINE, 1); + + testStatus |= doSubtractFullOverscanColumnsGeneric(imageNumCols, imageNumRows, + overscanNumCols, overscanNumRows, 1, + PM_OVERSCAN_ROWS, + PM_FIT_SPLINE, 1); + + + // + // Overscan images are too small, polynomial fit, bin factor is 1. + // + testStatus |= doSubtractFullOverscanColumnsGeneric(imageNumCols, imageNumRows, + overscanNumCols-2, overscanNumRows-2, NUM_OVERSCANS, + PM_OVERSCAN_ALL, + PM_FIT_POLYNOMIAL, 1); + + testStatus |= doSubtractFullOverscanColumnsGeneric(imageNumCols, imageNumRows, + overscanNumCols-2, overscanNumRows-2, NUM_OVERSCANS, + PM_OVERSCAN_COLUMNS, + PM_FIT_POLYNOMIAL, 1); + + testStatus |= doSubtractFullOverscanColumnsGeneric(imageNumCols, imageNumRows, + overscanNumCols-2, overscanNumRows-2, NUM_OVERSCANS, + PM_OVERSCAN_ROWS, + PM_FIT_POLYNOMIAL, 1); + + // + // Overscan images are too small, polynomial fit, bin factor is 2. + // + testStatus |= doSubtractFullOverscanColumnsGeneric(imageNumCols, imageNumRows, + overscanNumCols-2, overscanNumRows-2, NUM_OVERSCANS, + PM_OVERSCAN_ALL, + PM_FIT_POLYNOMIAL, 2); + + testStatus |= doSubtractFullOverscanColumnsGeneric(imageNumCols, imageNumRows, + overscanNumCols-2, overscanNumRows-2, NUM_OVERSCANS, + PM_OVERSCAN_COLUMNS, + PM_FIT_POLYNOMIAL, 2); + + testStatus |= doSubtractFullOverscanColumnsGeneric(imageNumCols, imageNumRows, + overscanNumCols-2, overscanNumRows-2, NUM_OVERSCANS, + PM_OVERSCAN_ROWS, + PM_FIT_POLYNOMIAL, 2); + + + // + // Overscan images are same size, polynomial fit, bin factor is 1. + // + testStatus |= doSubtractFullOverscanColumnsGeneric(imageNumCols, imageNumRows, + overscanNumCols, overscanNumRows, NUM_OVERSCANS, + PM_OVERSCAN_ALL, + PM_FIT_POLYNOMIAL, 1); + + testStatus |= doSubtractFullOverscanColumnsGeneric(imageNumCols, imageNumRows, + overscanNumCols, overscanNumRows, NUM_OVERSCANS, + PM_OVERSCAN_COLUMNS, + PM_FIT_POLYNOMIAL, 1); + + testStatus |= doSubtractFullOverscanColumnsGeneric(imageNumCols, imageNumRows, + overscanNumCols, overscanNumRows, NUM_OVERSCANS, + PM_OVERSCAN_ROWS, + PM_FIT_POLYNOMIAL, 1); + + // + // Overscan images are same size, polynomial fit, bin factor is 2. + // + testStatus |= doSubtractFullOverscanColumnsGeneric(imageNumCols, imageNumRows, + overscanNumCols, overscanNumRows, NUM_OVERSCANS, + PM_OVERSCAN_ALL, + PM_FIT_POLYNOMIAL, 2); + + testStatus |= doSubtractFullOverscanColumnsGeneric(imageNumCols, imageNumRows, + overscanNumCols, overscanNumRows, NUM_OVERSCANS, + PM_OVERSCAN_COLUMNS, + PM_FIT_POLYNOMIAL, 2); + + testStatus |= doSubtractFullOverscanColumnsGeneric(imageNumCols, imageNumRows, + overscanNumCols, overscanNumRows, NUM_OVERSCANS, + PM_OVERSCAN_ROWS, + PM_FIT_POLYNOMIAL, 2); + + // + // Overscan images are too big, polynomial fit, bin factor is 1. + // + testStatus |= doSubtractFullOverscanColumnsGeneric(imageNumCols, imageNumRows, + overscanNumCols+2, overscanNumRows+2, NUM_OVERSCANS, + PM_OVERSCAN_ALL, + PM_FIT_POLYNOMIAL, 1); + + testStatus |= doSubtractFullOverscanColumnsGeneric(imageNumCols, imageNumRows, + overscanNumCols+2, overscanNumRows+2, NUM_OVERSCANS, + PM_OVERSCAN_COLUMNS, + PM_FIT_POLYNOMIAL, 1); + + testStatus |= doSubtractFullOverscanColumnsGeneric(imageNumCols, imageNumRows, + overscanNumCols+2, overscanNumRows+2, NUM_OVERSCANS, + PM_OVERSCAN_ROWS, + PM_FIT_POLYNOMIAL, 1); + + // + // Overscan images are too big, polynomial fit, bin factor is 2. + // + testStatus |= doSubtractFullOverscanColumnsGeneric(imageNumCols, imageNumRows, + overscanNumCols+2, overscanNumRows+2, NUM_OVERSCANS, + PM_OVERSCAN_ALL, + PM_FIT_POLYNOMIAL, 2); + + testStatus |= doSubtractFullOverscanColumnsGeneric(imageNumCols, imageNumRows, + overscanNumCols+2, overscanNumRows+2, NUM_OVERSCANS, + PM_OVERSCAN_COLUMNS, + PM_FIT_POLYNOMIAL, 2); + + testStatus |= doSubtractFullOverscanColumnsGeneric(imageNumCols, imageNumRows, + overscanNumCols+2, overscanNumRows+2, NUM_OVERSCANS, + PM_OVERSCAN_ROWS, + PM_FIT_POLYNOMIAL, 2); + + // + // A single overscan image of the same size, polynomial fit, bin factor is 1. + // + testStatus |= doSubtractFullOverscanColumnsGeneric(imageNumCols, imageNumRows, + overscanNumCols, overscanNumRows, 1, + PM_OVERSCAN_ALL, + PM_FIT_POLYNOMIAL, 1); + + testStatus |= doSubtractFullOverscanColumnsGeneric(imageNumCols, imageNumRows, + overscanNumCols, overscanNumRows, 1, + PM_OVERSCAN_COLUMNS, + PM_FIT_POLYNOMIAL, 1); + + testStatus |= doSubtractFullOverscanColumnsGeneric(imageNumCols, imageNumRows, + overscanNumCols, overscanNumRows, 1, + PM_OVERSCAN_ROWS, + PM_FIT_POLYNOMIAL, 1); + + return(testStatus); +} + + + +#define LOW_COLS 3 +#define LOW_ROWS 3 + +/****************************************************************************** +test05(): See test05a() and test05b(). + +We run the tests in test05b() starting with all possible combinations of +sizes. + +XXX: Must add M-by-N image size tests. + *****************************************************************************/ +int test05() +{ + int testStatus = 0; + testStatus = test05a(NUM_COLS, NUM_ROWS, NUM_COLS, NUM_ROWS); + + // testStatus|= test05b(LOW_COLS, LOW_ROWS, LOW_COLS, LOW_ROWS); + // testStatus|= test05b(LOW_COLS, LOW_ROWS, LOW_COLS, NUM_ROWS); + // testStatus|= test05b(LOW_COLS, LOW_ROWS, NUM_COLS, LOW_ROWS); + // testStatus|= test05b(LOW_COLS, LOW_ROWS, NUM_COLS, NUM_ROWS); + + // testStatus|= test05b(LOW_COLS, NUM_ROWS, LOW_COLS, LOW_ROWS); + // testStatus|= test05b(LOW_COLS, NUM_ROWS, LOW_COLS, NUM_ROWS); + // testStatus|= test05b(LOW_COLS, NUM_ROWS, NUM_COLS, LOW_ROWS); + // testStatus|= test05b(LOW_COLS, NUM_ROWS, NUM_COLS, NUM_ROWS); + + // testStatus|= test05b(NUM_COLS, LOW_ROWS, LOW_COLS, LOW_ROWS); + // testStatus|= test05b(NUM_COLS, LOW_ROWS, LOW_COLS, NUM_ROWS); + // testStatus|= test05b(NUM_COLS, LOW_ROWS, NUM_COLS, LOW_ROWS); + // testStatus|= test05b(NUM_COLS, LOW_ROWS, NUM_COLS, NUM_ROWS); + + // testStatus|= test05b(NUM_COLS, NUM_ROWS, LOW_COLS, LOW_ROWS); + // testStatus|= test05b(NUM_COLS, NUM_ROWS, LOW_COLS, NUM_ROWS); + // testStatus|= test05b(NUM_COLS, NUM_ROWS, NUM_COLS, LOW_ROWS); + testStatus|= test05b(NUM_COLS, NUM_ROWS, NUM_COLS, NUM_ROWS); + + + return(testStatus); +} + + Index: trunk/psModules/test/imsubtract/tst_pmSubtractSky.c =================================================================== --- trunk/psModules/test/imsubtract/tst_pmSubtractSky.c (revision 5435) +++ trunk/psModules/test/imsubtract/tst_pmSubtractSky.c (revision 5516) @@ -7,12 +7,11 @@ * @author GLG, MHPCC * - * @version $Revision: 1.1 $ $Name: not supported by cvs2svn $ - * @date $Date: 2005-09-28 20:42:52 $ + * @version $Revision: 1.2 $ $Name: not supported by cvs2svn $ + * @date $Date: 2005-11-15 20:09:03 $ + * + * XXX: I added the CELL.TRIMSEC region code but there are not tests for it. * * Copyright 2004 Maui High Performance Computing Center, University of Hawaii */ - - - #include "psTest.h" #include "pslib.h" @@ -67,9 +66,14 @@ myReadout = pmSubtractSky(myReadout, (void *) myPoly, PM_FIT_POLYNOMIAL, binFactor, myStats, 10.0); - for (i=0;iimage->data.F32[i][j])) { - printf("TEST ERROR: image[%d][%d] is %f, should be 0.0\n", i, j, myReadout->image->data.F32[i][j]); - testStatus = 1; + if (myReadout == NULL) { + printf("TEST ERROR: pmSubtractSky() returned NULL.\n"); + testStatus = 1; + } else { + for (i=0;iimage->data.F32[i][j])) { + printf("TEST ERROR: image[%d][%d] is %f, should be 0.0\n", i, j, myReadout->image->data.F32[i][j]); + testStatus = 1; + } } } @@ -117,10 +121,15 @@ myReadout = pmSubtractSky(myReadout, (void *) myPoly, PM_FIT_POLYNOMIAL, binFactor, myStats, 2.0); - for (i=0;iimage->data.F32[i][j] - trueImage->data.F32[i][j])) { - printf("TEST ERROR: image[%d][%d] is %f, should be %f\n", i, j, - myReadout->image->data.F32[i][j], trueImage->data.F32[i][j]); - testStatus = 1; + if (myReadout == NULL) { + printf("TEST ERROR: pmSubtractSky() returned NULL.\n"); + testStatus = 1; + } else { + for (i=0;iimage->data.F32[i][j] - trueImage->data.F32[i][j])) { + printf("TEST ERROR: image[%d][%d] is %f, should be %f\n", i, j, + myReadout->image->data.F32[i][j], trueImage->data.F32[i][j]); + testStatus = 1; + } } } Index: trunk/psModules/test/objects/tst_pmObjects01.c =================================================================== --- trunk/psModules/test/objects/tst_pmObjects01.c (revision 5435) +++ trunk/psModules/test/objects/tst_pmObjects01.c (revision 5516) @@ -27,6 +27,6 @@ most of psObjects.c is not tested * - * @version $Revision: 1.4 $ $Name: not supported by cvs2svn $ - * @date $Date: 2005-10-20 23:06:24 $ + * @version $Revision: 1.5 $ $Name: not supported by cvs2svn $ + * @date $Date: 2005-11-15 20:09:03 $ * * Copyright 2004 Maui High Performance Computing Center, University of Hawaii @@ -1287,6 +1287,2 @@ -// this code will - - -