Index: /trunk/psModules/src/astrom/pmAstrometry.c =================================================================== --- /trunk/psModules/src/astrom/pmAstrometry.c (revision 5680) +++ /trunk/psModules/src/astrom/pmAstrometry.c (revision 5681) @@ -13,6 +13,6 @@ * XXX: Should we implement non-linear cell->chip transforms? * -* @version $Revision: 1.9 $ $Name: not supported by cvs2svn $ -* @date $Date: 2005-12-05 20:49:30 $ +* @version $Revision: 1.10 $ $Name: not supported by cvs2svn $ +* @date $Date: 2005-12-05 21:28:55 $ * * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii @@ -602,4 +602,7 @@ I'm guessing the p_psProject() and p_psDeproject() functions have bugs. + +XXX: It appears that p_psProject() and p_psDeproject() have been fixed. +Remove this. *****************************************************************************/ psSphere* XXXDeproject( @@ -628,5 +631,6 @@ PS_ASSERT_PTR_NON_NULL(projection, NULL); - psSphere *rc = XXXDeproject(outSphere, tpCoord, projection); + // psSphere *rc = XXXDeproject(outSphere, tpCoord, projection); + psSphere *rc = p_psDeproject(outSphere, tpCoord, projection); if (rc == NULL) { psLogMsg(__func__, PS_LOG_WARN, "WARNING: could not transform tangent plane coords to sky coords.\n"); Index: /trunk/psModules/src/astrom/pmAstrometry.h =================================================================== --- /trunk/psModules/src/astrom/pmAstrometry.h (revision 5680) +++ /trunk/psModules/src/astrom/pmAstrometry.h (revision 5681) @@ -8,6 +8,6 @@ * @author GLG, MHPCC * -* @version $Revision: 1.3 $ $Name: not supported by cvs2svn $ -* @date $Date: 2005-11-18 19:43:14 $ +* @version $Revision: 1.4 $ $Name: not supported by cvs2svn $ +* @date $Date: 2005-12-05 21:28:55 $ * * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii @@ -25,8 +25,11 @@ /// @{ -// XXXX: This is incorrect. Must determine what p_pmHDU is. +// XXX: Is this correct? Must determine what p_pmHDU is. +// XXX: Create the p_pmHDU alloc/free. typedef struct { - int what; + const char *extname; // Extension name, if it corresponds to this level + psArray *pixels; // The pixel data, if it corresponds to this level + psMetadata *header; // The FITS header, if it corresponds to this level } p_pmHDU; Index: /trunk/psModules/test/astrom/tst_pmAstrometry.c =================================================================== --- /trunk/psModules/test/astrom/tst_pmAstrometry.c (revision 5680) +++ /trunk/psModules/test/astrom/tst_pmAstrometry.c (revision 5681) @@ -7,7 +7,8 @@ * * XXX: Untested: pmFPACheckParents() + * XXX: Create the pmHDU alloc/free function, test them here * - * @version $Revision: 1.4 $ $Name: not supported by cvs2svn $ - * @date $Date: 2005-11-23 23:54:30 $ + * @version $Revision: 1.5 $ $Name: not supported by cvs2svn $ + * @date $Date: 2005-12-05 21:28:55 $ * * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii Index: /trunk/psModules/test/astrom/tst_pmAstrometry01.c =================================================================== --- /trunk/psModules/test/astrom/tst_pmAstrometry01.c (revision 5680) +++ /trunk/psModules/test/astrom/tst_pmAstrometry01.c (revision 5681) @@ -5,6 +5,6 @@ * @author GLG, MHPCC * -* @version $Revision: 1.1 $ $Name: not supported by cvs2svn $ -* @date $Date: 2005-11-27 19:28:01 $ +* @version $Revision: 1.2 $ $Name: not supported by cvs2svn $ +* @date $Date: 2005-12-05 21:28:55 $ * * XXX: Add tests were the coordinate does not transform to any legitimate cell @@ -350,7 +350,5 @@ } else { pmCoordFPAToChip(&chipCoord, &fpaCoord, tmpChip); - //printf("HMM: chipCoords are (%f, %f)\n", chipCoord.x, chipCoord.y); pmCoordChipToCell(&cellCoord, &chipCoord, myCell); - //printf("HMM: cellCoords are (%f, %f)\n", cellCoord.x, cellCoord.y); if (x != (psS32) cellCoord.x) { Index: /trunk/psModules/test/detrend/verified/tst_pmFlatField.stderr =================================================================== --- /trunk/psModules/test/detrend/verified/tst_pmFlatField.stderr (revision 5680) +++ /trunk/psModules/test/detrend/verified/tst_pmFlatField.stderr (revision 5681) @@ -5,24 +5,64 @@ \**********************************************************************************/ +|W|pmFlatField + WARNING: in->parent is NULL. +|W|p_psDetermineTrimmedImage + WARNING: could not determine CELL.TRIMSEC from parent cell Metadata (NULL). +|W|pmFlatField + WARNING: in->parent is NULL. +|W|p_psDetermineTrimmedImage + WARNING: could not determine CELL.TRIMSEC from parent cell Metadata (NULL). +|W|pmFlatField + WARNING: in->parent is NULL. +|W|p_psDetermineTrimmedImage + WARNING: could not determine CELL.TRIMSEC from parent cell Metadata (NULL). |E|pmFlatField (FILE:LINENO) - Null not allowed for flat readout. + Unallowable operation: flat is NULL. |E|pmFlatField (FILE:LINENO) - Null not allowed for input image. + Unallowable operation: in->image is NULL. |E|pmFlatField (FILE:LINENO) - Null not allowed for flat image. + Unallowable operation: flat->image is NULL. +|W|pmFlatField + WARNING: in->parent is NULL. +|W|p_psDetermineTrimmedImage + WARNING: could not determine CELL.TRIMSEC from parent cell Metadata (NULL). |E|pmFlatField (FILE:LINENO) Input image size exceeds that of flat image: (3, 3) vs (2, 2) +|W|pmFlatField + WARNING: in->parent is NULL. +|W|p_psDetermineTrimmedImage + WARNING: could not determine CELL.TRIMSEC from parent cell Metadata (NULL). |E|pmFlatField (FILE:LINENO) Input image mask size exceeds that of flat image: (5, 5) vs (3, 3) +|W|pmFlatField + WARNING: in->parent is NULL. +|W|p_psDetermineTrimmedImage + WARNING: could not determine CELL.TRIMSEC from parent cell Metadata (NULL). |E|pmFlatField (FILE:LINENO) - Input image mask size exceeds that of flat image: (5, 5) vs (3, 3) + Total offset >= flat image size: (50, 50) vs (3, 3) +|W|pmFlatField + WARNING: in->parent is NULL. +|W|p_psDetermineTrimmedImage + WARNING: could not determine CELL.TRIMSEC from parent cell Metadata (NULL). |E|pmFlatField (FILE:LINENO) - Input image mask size exceeds that of flat image: (5, 5) vs (3, 3) + Complex types not allowed for input image. Type: 2064 +|W|pmFlatField + WARNING: in->parent is NULL. +|W|p_psDetermineTrimmedImage + WARNING: could not determine CELL.TRIMSEC from parent cell Metadata (NULL). |E|pmFlatField (FILE:LINENO) - Input image mask size exceeds that of flat image: (5, 5) vs (3, 3) + Complex types not allowed for flat image. Type: 2064 +|W|pmFlatField + WARNING: in->parent is NULL. +|W|p_psDetermineTrimmedImage + WARNING: could not determine CELL.TRIMSEC from parent cell Metadata (NULL). |E|pmFlatField (FILE:LINENO) - Input image mask size exceeds that of flat image: (5, 5) vs (3, 3) + Input and flat image types differ: (1032 vs 1028) +|W|pmFlatField + WARNING: in->parent is NULL. +|W|p_psDetermineTrimmedImage + WARNING: could not determine CELL.TRIMSEC from parent cell Metadata (NULL). |E|pmFlatField (FILE:LINENO) - Input image mask size exceeds that of flat image: (5, 5) vs (3, 3) + Mask must be PS_TYPE_MASK type. Type: 1028 ---> TESTPOINT PASSED (Test Point Driver{pmFlatField} | tst_pmFlatField.c) Index: /trunk/psModules/test/detrend/verified/tst_pmFlatField.stdout =================================================================== --- /trunk/psModules/test/detrend/verified/tst_pmFlatField.stdout (revision 5680) +++ /trunk/psModules/test/detrend/verified/tst_pmFlatField.stdout (revision 5681) @@ -4,4 +4,9 @@ * TestType: Positive * \**********************************************************************************/ + +Input mask: +0 0 0 +0 0 0 +0 0 0 Input image: @@ -10,9 +15,4 @@ 6.000000 6.000000 6.000000 -Input mask: -0 0 0 -0 0 0 -0 0 0 - Flat image: 2.000000 2.000000 2.000000 @@ -85,12 +85,12 @@ Resulting mask: -0 0 0 -0 0 0 -0 0 0 +8 8 8 +8 8 8 +0 8 8 Resulting image: 3.000000 3.000000 3.000000 3.000000 3.000000 3.000000 -3.000000 3.000000 3.000000 +1.000000 3.000000 3.000000 Index: /trunk/psModules/test/detrend/verified/tst_pmMaskBadPixels.stderr =================================================================== --- /trunk/psModules/test/detrend/verified/tst_pmMaskBadPixels.stderr (revision 5680) +++ /trunk/psModules/test/detrend/verified/tst_pmMaskBadPixels.stderr (revision 5681) @@ -5,4 +5,8 @@ \**********************************************************************************/ +|W|pmMaskBadPixels + WARNING: in->parent is NULL. +|W|p_psDetermineTrimmedImage + WARNING: could not determine CELL.TRIMSEC from parent cell Metadata (NULL). ---> TESTPOINT PASSED (Test Point Driver{pmMaskBadPixels - Create mask based on maskVal argument} | tst_pmMaskBadPixels.c) @@ -14,4 +18,8 @@ \**********************************************************************************/ +|W|pmMaskBadPixels + WARNING: in->parent is NULL. +|W|p_psDetermineTrimmedImage + WARNING: could not determine CELL.TRIMSEC from parent cell Metadata (NULL). ---> TESTPOINT PASSED (Test Point Driver{pmMaskBadPixels - Create mask based on saturation argument} | tst_pmMaskBadPixels.c) @@ -23,4 +31,8 @@ \**********************************************************************************/ +|W|pmMaskBadPixels + WARNING: in->parent is NULL. +|W|p_psDetermineTrimmedImage + WARNING: could not determine CELL.TRIMSEC from parent cell Metadata (NULL). ---> TESTPOINT PASSED (Test Point Driver{pmMaskBadPixels - Create mask based on growVal and grow arguments} | tst_pmMaskBadPixels.c) @@ -32,4 +44,8 @@ \**********************************************************************************/ +|W|pmMaskBadPixels + WARNING: in->parent is NULL. +|W|p_psDetermineTrimmedImage + WARNING: could not determine CELL.TRIMSEC from parent cell Metadata (NULL). ---> TESTPOINT PASSED (Test Point Driver{pmMaskBadPixels - Auto create mask based on maskVal argument} | tst_pmMaskBadPixels.c) @@ -41,6 +57,8 @@ \**********************************************************************************/ +|W|pmMaskBadPixels + WARNING: in->parent is NULL. |E|pmMaskBadPixels (FILE:LINENO) - Null not allowed for mask image. + Unallowable operation: mask is NULL. ---> TESTPOINT PASSED (Test Point Driver{pmMaskBadPixels - Attempt to use null mask} | tst_pmMaskBadPixels.c) @@ -53,5 +71,5 @@ |E|pmMaskBadPixels (FILE:LINENO) - Null not allowed for input image. + Unallowable operation: in->image is NULL. ---> TESTPOINT PASSED (Test Point Driver{pmMaskBadPixels - Attempt tp use null input image} | tst_pmMaskBadPixels.c) @@ -63,4 +81,8 @@ \**********************************************************************************/ +|W|pmMaskBadPixels + WARNING: in->parent is NULL. +|W|p_psDetermineTrimmedImage + WARNING: could not determine CELL.TRIMSEC from parent cell Metadata (NULL). |E|pmMaskBadPixels (FILE:LINENO) Input image size exceeds that of mask image: (60, 60) vs (50, 50) @@ -74,6 +96,8 @@ \**********************************************************************************/ -|E|pmMaskBadPixels (FILE:LINENO) - Input image mask size exceeds that of mask image: (60, 60) vs (50, 50) +|W|pmMaskBadPixels + WARNING: in->parent is NULL. +|W|p_psDetermineTrimmedImage + WARNING: could not determine CELL.TRIMSEC from parent cell Metadata (NULL). ---> TESTPOINT PASSED (Test Point Driver{pmMaskBadPixels - Attempt to use input image mask bigger than mask} | tst_pmMaskBadPixels.c) @@ -85,4 +109,8 @@ \**********************************************************************************/ +|W|pmMaskBadPixels + WARNING: in->parent is NULL. +|W|p_psDetermineTrimmedImage + WARNING: could not determine CELL.TRIMSEC from parent cell Metadata (NULL). |E|pmMaskBadPixels (FILE:LINENO) Total offset >= mask image: (150, 150) vs (50, 50) @@ -96,4 +124,8 @@ \**********************************************************************************/ +|W|pmMaskBadPixels + WARNING: in->parent is NULL. +|W|p_psDetermineTrimmedImage + WARNING: could not determine CELL.TRIMSEC from parent cell Metadata (NULL). |E|pmMaskBadPixels (FILE:LINENO) Complex types not allowed for input image. Type: 2064 @@ -107,4 +139,8 @@ \**********************************************************************************/ +|W|pmMaskBadPixels + WARNING: in->parent is NULL. +|W|p_psDetermineTrimmedImage + WARNING: could not determine CELL.TRIMSEC from parent cell Metadata (NULL). |E|pmMaskBadPixels (FILE:LINENO) Mask must be PS_TYPE_MASK type. Type: 1032 Index: /trunk/psModules/test/detrend/verified/tst_pmMaskBadPixels.stdout =================================================================== --- /trunk/psModules/test/detrend/verified/tst_pmMaskBadPixels.stdout (revision 5680) +++ /trunk/psModules/test/detrend/verified/tst_pmMaskBadPixels.stdout (revision 5681) @@ -24,6 +24,6 @@ 00000000000000000000000000000000000000000000000000 00000000000000000000000000000000000000000000000000 -00000000000000000000000000000000000000000000000000 -00000000000000000000000010000000000000000000000000 +00000000000000000000000001000000000000000000000000 +00000000000000000000000000000000000000000000000000 00000000000000000000000000000000000000000000000000 00000000000000000000000000000000000000000000000000 @@ -76,6 +76,6 @@ 00000000000000000000000000000000000000000000000000 00000000000000000000000000000000000000000000000000 -00000000000000000000000000000000000000000000000000 -00000000000000000000000010000000000000000000000000 +00000000000000000000000001000000000000000000000000 +00000000000000000000000000000000000000000000000000 00000000000000000000000000000000000000000000000000 00000000000000000000000000000000000000000000000000 @@ -156,54 +156,54 @@ Resulting mask: -44444444444444444444444444444444444444444444444444 -44444444444444444444444444444444444444444444444444 -44444444444444444444444444444444444444444444444444 -44444444444444444444444444444444444444444444444444 -44444444444444444444444444444444444444444444444444 -44444444444444444444444444444444444444444444444444 -44444444444444444444444444444444444444444444444444 -44444444444444444444444444444444444444444444444444 -44444444444444444444444444444444444444444444444444 -44444444444444444444444444444444444444444444444444 -44444444444444444444444444444444444444444444444444 -44444444444444444444444444444444444444444444444444 -44444444444444444444444444444444444444444444444444 -44444444444444444444444444444444444444444444444444 -44444444444444444444444444444444444444444444444444 -44444444444444444444444444444444444444444444444444 -44444444444444444444444444444444444444444444444444 -44444444444444444444444444444444444444444444444444 -44444444444444444444444444444444444444444444444444 -44444444444444444444444444444444444444444444444444 -44444444444444444444444444444444444444444444444444 -44444444444444444444444444444444444444444444444444 -44444444444444444444444444444444444444444444444444 -44444444444444444444444444444444444444444444444444 -44444444444444444444444444444444444444444444444444 -44444444444444444444444444444444444444444444444444 -44444444444444444444444444444444444444444444444444 -44444444444444444444444444444444444444444444444444 -44444444444444444444444444444444444444444444444444 -44444444444444444444444444444444444444444444444444 -44444444444444444444444444444444444444444444444444 -44444444444444444444444444444444444444444444444444 -44444444444444444444444444444444444444444444444444 -44444444444444444444444444444444444444444444444444 -44444444444444444444444444444444444444444444444444 -44444444444444444444444444444444444444444444444444 -44444444444444444444444444444444444444444444444444 -44444444444444444444444444444444444444444444444444 -44444444444444444444444444444444444444444444444444 -44444444444444444444444444444444444444444444444444 -44444444444444444444444444444444444444444444444444 -44444444444444444444444444444444444444444444444444 -44444444444444444444444444444444444444444444444444 -44444444444444444444444444444444444444444444444444 -44444444444444444444444444444444444444444444444444 -44444444444444444444444444444444444444444444444444 -44444444444444444444444444444444444444444444444444 -44444444444444444444444444444444444444444444444444 -44444444444444444444444444444444444444444444444444 -44444444444444444444444444444444444444444444444444 +00000000000000000000000000000000000000000000000000 +00000000000000000000000000000000000000000000000000 +00000000000000000000000000000000000000000000000000 +00000000000000000000000000000000000000000000000000 +00000000000000000000000000000000000000000000000000 +00000000000000000000000000000000000000000000000000 +00000000000000000000000000000000000000000000000000 +00000000000000000000000000000000000000000000000000 +00000000000000000000000000000000000000000000000000 +00000000000000000000000000000000000000000000000000 +00000000000000000000000000000000000000000000000000 +00000000000000000000000000000000000000000000000000 +00000000000000000000000000000000000000000000000000 +00000000000000000000000000000000000000000000000000 +00000000000000000000000000000000000000000000000000 +00000000000000000000000000000000000000000000000000 +00000000000000000000000000000000000000000000000000 +00000000000000000000000000000000000000000000000000 +00000000000000000000000000000000000000000000000000 +00000000000000000000000000000000000000000000000000 +00000000000000000000000000000000000000000000000000 +00000000000000000000000000000000000000000000000000 +00000000000000000000000001000000000000000000000000 +00000000000000000000000011100000000000000000000000 +00000000000000000000000111110000000000000000000000 +00000000000000000000000011100000000000000000000000 +00000000000000000000000001000000000000000000000000 +00000000000000000000000000000000000000000000000000 +00000000000000000000000000000000000000000000000000 +00000000000000000000000000000000000000000000000000 +00000000000000000000000000000000000000000000000000 +00000000000000000000000000000000000000000000000000 +00000000000000000000000000000000000000000000000000 +00000000000000000000000000000000000000000000000000 +00000000000000000000000000000000000000000000000000 +00000000000000000000000000000000000000000000000000 +00000000000000000000000000000000000000000000000000 +00000000000000000000000000000000000000000000000000 +00000000000000000000000000000000000000000000000000 +00000000000000000000000000000000000000000000000000 +00000000000000000000000000000000000000000000000000 +00000000000000000000000000000000000000000000000000 +00000000000000000000000000000000000000000000000000 +00000000000000000000000000000000000000000000000000 +00000000000000000000000000000000000000000000000000 +00000000000000000000000000000000000000000000000000 +00000000000000000000000000000000000000000000000000 +00000000000000000000000000000000000000000000000000 +00000000000000000000000000000000000000000000000000 +00000000000000000000000000000000000000000000000000 Data mask: @@ -233,25 +233,25 @@ 00000000000000000000000000000000000000000000000000 00000000000000000000000000000000000000000000000000 -00000000000000000000000010000000000000000000000000 -00000000000000000000000000000000000000000000000000 -00000000000000000000000000000000000000000000000000 -00000000000000000000000000000000000000000000000000 -00000000000000000000000000000000000000000000000000 -00000000000000000000000000000000000000000000000000 -00000000000000000000000000000000000000000000000000 -00000000000000000000000000000000000000000000000000 -00000000000000000000000000000000000000000000000000 -00000000000000000000000000000000000000000000000000 -00000000000000000000000000000000000000000000000000 -00000000000000000000000000000000000000000000000000 -00000000000000000000000000000000000000000000000000 -00000000000000000000000000000000000000000000000000 -00000000000000000000000000000000000000000000000000 -00000000000000000000000000000000000000000000000000 -00000000000000000000000000000000000000000000000000 -00000000000000000000000000000000000000000000000000 -00000000000000000000000000000000000000000000000000 -00000000000000000000000000000000000000000000000000 -00010000000000000000000000000000000000000000001000 +00000000000000000000000000000000000000000000000000 +00000000000000000000000000000000000000000000000000 +00000000000000000000000000000000000000000000000000 +00000000000000000000000000000000000000000000000000 +00000000000000000000000000000000000000000000000000 +00000000000000000000000000000000000000000000000000 +00000000000000000000000000000000000000000000000000 +00000000000000000000000000000000000000000000000000 +00000000000000000000000000000000000000000000000000 +00000000000000000000000000000000000000000000000000 +00000000000000000000000000000000000000000000000000 +00000000000000000000000000000000000000000000000000 +00000000000000000000000000000000000000000000000000 +00000000000000000000000000000000000000000000000000 +00000000000000000000000000000000000000000000000000 +00000000000000000000000000000000000000000000000000 +00000000000000000000000000000000000000000000000000 +00000000000000000000000000000000000000000000000000 +00000000000000000000000000000000000000000000000000 +00000000000000000000000000000000000000000000000000 +00000000000000000000000000000000000000000000000000 00000000000000000000000000000000000000000000000000 00000000000000000000000000000000000000000000000000 @@ -274,40 +274,40 @@ 00000000000000000000000000000000000000000000000000 00000000000000000000000000000000000000000000000000 -00000000000000000000000000000000000000000000000000 -00000000000000000000011111110000000000000000000000 -00000000000000000001111111111100000000000000000000 -00000000000000000011111111111110000000000000000000 -00000000000000000111111111111111000000000000000000 -00000000000000001111111111111111100000000000000000 -00000000000000011111111111111111110000000000000000 -00000000000000011111111111111111110000000000000000 -00000000000000111111111111111111111000000000000000 -00000000000000111111111111111111111000000000000000 -00000000000000111111111111111111111000000000000000 -00000000000000111111111111111111111000000000000000 -00000000000000111111111111111111111000000000000000 -00000000000000111111111111111111111000000000000000 -00000000000000111111111111111111111000000000000000 -00000000000000011111111111111111110000000000000000 -00000000000000011111111111111111110000000000000000 -00000000000000001111111111111111100000000000000000 -00000000000000000111111111111111000000000000000000 -00000000000000000011111111111110000000000000000000 -00000000000000000001111111111100000000000000000000 -11111110000000000000011111110000000000000001111111 -11111111100000000000000000000000000000000111111111 -11111111110000000000000000000000000000001111111111 -11111111111000000000000000000000000000011111111111 -11111111111100000000000000000000000000111111111111 -11111111111110000000000000000000000001111111111111 -11111111111110000000000000000000000001111111111111 -11111111111111000000000000000000000011111111111111 -11111111111111000000000000000000000011111111111111 -11111111111111000000000000000000000011111111111111 -11111111111111000000000000000000000011111111111111 -11111111111111000000000000000000000011111111111111 -11111111111111000000000000000000000011111111111111 -11111111111111000000000000000000000011111111111111 -11111111111110000000000000000000000001111111111111 +00000000000000000000000001000000000000000000000000 +00000000000000000000011111111100000000000000000000 +00000000000000000001111111111111000000000000000000 +00000000000000000011111111111111100000000000000000 +00000000000000000111111111111111110000000000000000 +00000000000000000111111111111111110000000000000000 +00000000000000001111111111111111111000000000000000 +00000000000000001111111111111111111000000000000000 +00000000000000001111111111111111111000000000000000 +00000000000000001111111111111111111000000000000000 +00000000000000011111111111111111111100000000000000 +00000000000000001111111111111111111000000000000000 +00000000000000001111111111111111111000000000000000 +00000000000010001111111111111111111000100000000000 +00000000111111111111111111111111111111111110000000 +00000011111111111111111111111111111111111111100000 +00000111111111111111111111111111111111111111110000 +00001111111111111111111111111111111111111111111000 +00001111111111111111111111111111111111111111111000 +00011111111111111111111111111111111111111111111100 +00011111111111111111110001000111111111111111111100 +00011111111111111111110000000111111111111111111100 +00011111111111111111110000000111111111111111111100 +00111111111111111111111000001111111111111111111110 +00011111111111111111110000000111111111111111111100 +00011111111111111111110000000111111111111111111100 +00011111111111111111110000000111111111111111111100 +00011111111111111111110000000111111111111111111100 +00001111111111111111100000000011111111111111111000 +00001111111111111111100000000011111111111111111000 +00000111111111111111000000000001111111111111110000 +00000011111111111110000000000000111111111111100000 +00000000111111111000000000000000001111111110000000 +00000000000010000000000000000000000000100000000000 +00000000000000000000000000000000000000000000000000 +00000000000000000000000000000000000000000000000000 Data mask: @@ -336,6 +336,6 @@ 00000000000000000000000000000000000000000000000000 00000000000000000000000000000000000000000000000000 -00000000000000000000000000000000000000000000000000 -00000000000000000000000010000000000000000000000000 +00000000000000000000000001000000000000000000000000 +00000000000000000000000000000000000000000000000000 00000000000000000000000000000000000000000000000000 00000000000000000000000000000000000000000000000000 @@ -379,38 +379,38 @@ 00000000000000000000000000000000000000000000000000 00000000000000000000000000000000000000000000000000 -00000000000000000000011111110000000000000000000000 -00000000000000000001111111111100000000000000000000 -00000000000000000011111111111110000000000000000000 -00000000000000000111111111111111000000000000000000 -00000000000000001111111111111111100000000000000000 -00000000000000011111111111111111110000000000000000 -00000000000000011111111111111111110000000000000000 -00000000000000111111111111111111111000000000000000 -00000000000000111111111111111111111000000000000000 -00000000000000111111111111111111111000000000000000 -00000000000000111111111111111111111000000000000000 -00000000000000111111111111111111111000000000000000 -00000000000000111111111111111111111000000000000000 -00000000000000111111111111111111111000000000000000 -00000000000000011111111111111111110000000000000000 -00000000000000011111111111111111110000000000000000 -00000000000000001111111111111111100000000000000000 -00000000000000000111111111111111000000000000000000 -00000000000000000011111111111110000000000000000000 -00000000000000000001111111111100000000000000000000 -00000000000000000000011111110000000000000000000000 -00000000000000000000000000000000000000000000000000 -00000000000000000000000000000000000000000000000000 -00000000000000000000000000000000000000000000000000 -00000000000000000000000000000000000000000000000000 -00000000000000000000000000000000000000000000000000 -00000000000000000000000000000000000000000000000000 -00000000000000000000000000000000000000000000000000 -00000000000000000000000000000000000000000000000000 -00000000000000000000000000000000000000000000000000 -00000000000000000000000000000000000000000000000000 -00000000000000000000000000000000000000000000000000 -00000000000000000000000000000000000000000000000000 -00000000000000000000000000000000000000000000000000 -00000000000000000000000000000000000000000000000000 - +00000000000000000000000000000000000000000000000000 +00000000000000000000000000000000000000000000000000 +00000000000000000000000000000000000000000000000000 +00000000000000000000000000000000000000000000000000 +00000000000000000000000000000000000000000000000000 +00000000000000000000000000000000000000000000000000 +00000000000000000000000000000000000000000000000000 +00000000000000000000000000000000000000000000000000 +00000000000000000000000000000000000000000000000000 +00000000000000000000000001000000000000000000000000 +00000000000000000000000000000000000000000000000000 +00000000000000000000000000000000000000000000000000 +00000000000000000000000000000000000000000000000000 +00000000000000000000000000000000000000000000000000 +00000000000000000000000000000000000000000000000000 +00000000000000000000000000000000000000000000000000 +00000000000000000000000000000000000000000000000000 +00000000000000000000000000000000000000000000000000 +00000000000000000000000000000000000000000000000000 +00000000000000000000000000000000000000000000000000 +00000000000000000000000000000000000000000000000000 +00000000000000000000000000000000000000000000000000 +00000000000000000000000000000000000000000000000000 +00000000000000000000000000000000000000000000000000 +00000000000000000000000000000000000000000000000000 +00000000000000000000000000000000000000000000000000 +00000000000000000000000000000000000000000000000000 +00000000000000000000000000000000000000000000000000 +00000000000000000000000000000000000000000000000000 +00000000000000000000000000000000000000000000000000 +00000000000000000000000000000000000000000000000000 +00000000000000000000000000000000000000000000000000 +00000000000000000000000000000000000000000000000000 +00000000000000000000000000000000000000000000000000 +00000000000000000000000000000000000000000000000000 + Index: /trunk/psModules/test/detrend/verified/tst_pmNonLinear.stderr =================================================================== --- /trunk/psModules/test/detrend/verified/tst_pmNonLinear.stderr (revision 5680) +++ /trunk/psModules/test/detrend/verified/tst_pmNonLinear.stderr (revision 5681) @@ -5,4 +5,20 @@ \**********************************************************************************/ +|W|pmNonLinearityPolynomial + WARNING: inputReadout->parent is NULL. +|W|p_psDetermineTrimmedImage + WARNING: could not determine CELL.TRIMSEC from parent cell Metadata (NULL). +|W|pmNonLinearityPolynomial + WARNING: inputReadout->parent is NULL. +|W|p_psDetermineTrimmedImage + WARNING: could not determine CELL.TRIMSEC from parent cell Metadata (NULL). +|W|pmNonLinearityPolynomial + WARNING: inputReadout->parent is NULL. +|W|p_psDetermineTrimmedImage + WARNING: could not determine CELL.TRIMSEC from parent cell Metadata (NULL). +|W|pmNonLinearityPolynomial + WARNING: inputReadout->parent is NULL. +|W|p_psDetermineTrimmedImage + WARNING: could not determine CELL.TRIMSEC from parent cell Metadata (NULL). ---> TESTPOINT PASSED (Test Point Driver{pmNonLinearityPolynomial} | tst_pmNonLinear.c) @@ -14,4 +30,20 @@ \**********************************************************************************/ +|W|pmNonLinearityLookup + WARNING: inputReadout->parent is NULL. +|W|p_psDetermineTrimmedImage + WARNING: could not determine CELL.TRIMSEC from parent cell Metadata (NULL). +|W|pmNonLinearityLookup + WARNING: inputReadout->parent is NULL. +|W|p_psDetermineTrimmedImage + WARNING: could not determine CELL.TRIMSEC from parent cell Metadata (NULL). +|W|pmNonLinearityLookup + WARNING: inputReadout->parent is NULL. +|W|p_psDetermineTrimmedImage + WARNING: could not determine CELL.TRIMSEC from parent cell Metadata (NULL). +|W|pmNonLinearityLookup + WARNING: inputReadout->parent is NULL. +|W|p_psDetermineTrimmedImage + WARNING: could not determine CELL.TRIMSEC from parent cell Metadata (NULL). ---> TESTPOINT PASSED (Test Point Driver{pmNonLinearityLookup} | tst_pmNonLinear.c) @@ -42,30 +74,12 @@ |E|pmNonLinearityLookup (FILE:LINENO) Unallowable operation: inputReadout->image is NULL. -|E|pmNonLinearityLookup (FILE:LINENO) - Unallowable operation: inFlux is NULL. -|E|pmNonLinearityLookup (FILE:LINENO) - Unallowable operation: outFlux is NULL. |W|pmNonLinearityLookup - WARNING: pmNonLinear.c: pmNonLinearityLookup(): input vectors have different sizes (24, 25) + WARNING: inputReadout->parent is NULL. +|W|p_psDetermineTrimmedImage + WARNING: could not determine CELL.TRIMSEC from parent cell Metadata (NULL). +|E|psVectorsReadFromFile (FILE:LINENO) + Failed to open file I_DONT_EXIST. |W|pmNonLinearityLookup - WARNING: pmNonLinear.c: pmNonLinearityLookup(): input vectors have different sizes (24, 23) -|W|pmNonLinearityLookup - WARNING: pmNonLinear.c: pmNonLinearityLookup(): input vectors have different sizes (23, 24) -|W|pmNonLinearityLookup - WARNING: pmNonLinear.c: pmNonLinearityLookup(): input vectors have different sizes (25, 24) -|W|pmNonLinearityLookup - WARNING: pmNonLinear.c: pmNonLinearityLookup(): input vectors have different sizes (23, 25) -|W|pmNonLinearityLookup - WARNING: pmNonLinear.c: pmNonLinearityLookup(): input vectors have different sizes (25, 23) -|E|pmNonLinearityLookup (FILE:LINENO) - pmNonLinearityLookup(): input vector less than 2 elements. Returning inputReadout image. -|W|vectorBinDisectF32 - vectorBinDisectF32(): ordinate -1.000000 is outside vector range (0.000000 - 23.000000). -|W|pmNonLinearityLookup - WARNING: pmNonLinear.c: pmNonLinearityLookup(): 1 pixels outside table. -|W|vectorBinDisectF32 - vectorBinDisectF32(): ordinate 100.000000 is outside vector range (0.000000 - 23.000000). -|W|pmNonLinearityLookup - WARNING: pmNonLinear.c: pmNonLinearityLookup(): 1 pixels outside table. + WARNING: Lookup Table is too small. Returning original pmReadout. ---> TESTPOINT PASSED (Test Point Driver{pmNonLinearityLookup(): error/warning conditions} | tst_pmNonLinear.c) Index: /trunk/psModules/test/detrend/verified/tst_pmNonLinear.stdout =================================================================== --- /trunk/psModules/test/detrend/verified/tst_pmNonLinear.stdout (revision 5680) +++ /trunk/psModules/test/detrend/verified/tst_pmNonLinear.stdout (revision 5681) @@ -88,27 +88,7 @@ Calling pmNonLinearityLookup() with NULL input pmReadout->image. Should generate error, return NULL. ------------------------------------------------------------ -Calling pmNonLinearityLookup() with NULL inFlux psVector. Should generate error, return NULL. ------------------------------------------------------------- -Calling pmNonLinearityLookup() with NULL outFlux psVector. Should generate error, return NULL. ------------------------------------------------------------- -Calling pmNonLinearityLookup() with size difference in inFlux/outFLux psVectors. Should generate warning. ------------------------------------------------------------- -Calling pmNonLinearityLookup() with size difference in inFlux/outFLux psVectors. Should generate warning. ------------------------------------------------------------- -Calling pmNonLinearityLookup() with size difference in inFlux/outFLux psVectors. Should generate warning. ------------------------------------------------------------- -Calling pmNonLinearityLookup() with size difference in inFlux/outFLux psVectors. Should generate warning. ------------------------------------------------------------- -Calling pmNonLinearityLookup() with size difference in inFlux/outFLux psVectors. Should generate warning. ------------------------------------------------------------- -Calling pmNonLinearityLookup() with size difference in inFlux/outFLux psVectors. Should generate warning. ------------------------------------------------------------- -Calling pmNonLinearityLookup() with inFlux psVector size 1. Should generate error, return original pmReadout. +Calling pmNonLinearityLookup() with non-existent lookup file. ------------------------------------------------------------ Calling pmNonLinearityLookup() with one pixels outside inFlux range. Should generate warnings. ------------------------------------------------------------- -Calling pmNonLinearityLookup() with one pixels outside inFlux range. Should generate warnings. ------------------------------------------------------------- -Calling pmNonLinearityLookup() with image values not in vector. ---> TESTPOINT PASSED (pmNonLinear{Testing bad input parameter conditions.} | tst_pmNonLinear.c) Index: /trunk/psModules/test/imsubtract/verified/tst_pmSubtractBias.stderr =================================================================== --- /trunk/psModules/test/imsubtract/verified/tst_pmSubtractBias.stderr (revision 5680) +++ /trunk/psModules/test/imsubtract/verified/tst_pmSubtractBias.stderr (revision 5681) @@ -5,10 +5,4 @@ \**********************************************************************************/ -|W|pmSubtractBias - WARNING: pmSubtractBias.(): overscan image has 7 columns, input image has 8 columns -|W|pmSubtractBias - WARNING: pmSubtractBias.(): overscan image has 7 columns, input image has 8 columns -|W|pmSubtractBias - WARNING: pmSubtractBias.(): overscan image has 7 columns, input image has 8 columns ---> TESTPOINT PASSED (Test Point Driver{pmSubtractBias} | tst_pmSubtractBias.c) Index: /trunk/psModules/test/imsubtract/verified/tst_pmSubtractBias.stdout =================================================================== --- /trunk/psModules/test/imsubtract/verified/tst_pmSubtractBias.stdout (revision 5680) +++ /trunk/psModules/test/imsubtract/verified/tst_pmSubtractBias.stdout (revision 5681) @@ -1,9 +1,672 @@ /***************************** TESTPOINT ******************************************\ * TestFile: tst_pmSubtractBias.c * -* TestPoint: pmSubtractBias{Row Overscans} * -* TestType: Positive * -\**********************************************************************************/ - - ----> TESTPOINT PASSED (pmSubtractBias{Row Overscans} | tst_pmSubtractBias.c) - +* TestPoint: pmSubtractBias{PUT COMMENT HERE} * +* TestType: Positive * +\**********************************************************************************/ + +---- doSubtractOverscansGeneric() ---- + Image size: 8 by 8 + Overscan size: 6 by 6 + Total Overscans: 2 + Binning factor: 1 + Overscan axis: PM_OVERSCAN_ALL + Fit type: PM_FIT_SPLINE + +---> TESTPOINT PASSED (pmSubtractBias{Column Overscans} | tst_pmSubtractBias.c) + +/***************************** TESTPOINT ******************************************\ +* TestFile: tst_pmSubtractBias.c * +* TestPoint: pmSubtractBias{PUT COMMENT HERE} * +* TestType: Positive * +\**********************************************************************************/ + +---- doSubtractOverscansGeneric() ---- + Image size: 8 by 8 + Overscan size: 6 by 6 + Total Overscans: 2 + Binning factor: 1 + Overscan axis: PM_OVERSCAN_COLUMNS + Fit type: PM_FIT_SPLINE + +---> TESTPOINT PASSED (pmSubtractBias{Column Overscans} | tst_pmSubtractBias.c) + +/***************************** TESTPOINT ******************************************\ +* TestFile: tst_pmSubtractBias.c * +* TestPoint: pmSubtractBias{PUT COMMENT HERE} * +* TestType: Positive * +\**********************************************************************************/ + +---- doSubtractOverscansGeneric() ---- + Image size: 8 by 8 + Overscan size: 6 by 6 + Total Overscans: 2 + Binning factor: 1 + Overscan axis: PM_OVERSCAN_ROWS + Fit type: PM_FIT_SPLINE + +---> TESTPOINT PASSED (pmSubtractBias{Column Overscans} | tst_pmSubtractBias.c) + +/***************************** TESTPOINT ******************************************\ +* TestFile: tst_pmSubtractBias.c * +* TestPoint: pmSubtractBias{PUT COMMENT HERE} * +* TestType: Positive * +\**********************************************************************************/ + +---- doSubtractOverscansGeneric() ---- + Image size: 8 by 8 + Overscan size: 6 by 6 + Total Overscans: 2 + Binning factor: 2 + Overscan axis: PM_OVERSCAN_ALL + Fit type: PM_FIT_SPLINE + +---> TESTPOINT PASSED (pmSubtractBias{Column Overscans} | tst_pmSubtractBias.c) + +/***************************** TESTPOINT ******************************************\ +* TestFile: tst_pmSubtractBias.c * +* TestPoint: pmSubtractBias{PUT COMMENT HERE} * +* TestType: Positive * +\**********************************************************************************/ + +---- doSubtractOverscansGeneric() ---- + Image size: 8 by 8 + Overscan size: 6 by 6 + Total Overscans: 2 + Binning factor: 2 + Overscan axis: PM_OVERSCAN_COLUMNS + Fit type: PM_FIT_SPLINE + +---> TESTPOINT PASSED (pmSubtractBias{Column Overscans} | tst_pmSubtractBias.c) + +/***************************** TESTPOINT ******************************************\ +* TestFile: tst_pmSubtractBias.c * +* TestPoint: pmSubtractBias{PUT COMMENT HERE} * +* TestType: Positive * +\**********************************************************************************/ + +---- doSubtractOverscansGeneric() ---- + Image size: 8 by 8 + Overscan size: 6 by 6 + Total Overscans: 2 + Binning factor: 2 + Overscan axis: PM_OVERSCAN_ROWS + Fit type: PM_FIT_SPLINE + +---> TESTPOINT PASSED (pmSubtractBias{Column Overscans} | tst_pmSubtractBias.c) + +/***************************** TESTPOINT ******************************************\ +* TestFile: tst_pmSubtractBias.c * +* TestPoint: pmSubtractBias{PUT COMMENT HERE} * +* TestType: Positive * +\**********************************************************************************/ + +---- doSubtractOverscansGeneric() ---- + Image size: 8 by 8 + Overscan size: 8 by 8 + Total Overscans: 2 + Binning factor: 1 + Overscan axis: PM_OVERSCAN_ALL + Fit type: PM_FIT_SPLINE + +---> TESTPOINT PASSED (pmSubtractBias{Column Overscans} | tst_pmSubtractBias.c) + +/***************************** TESTPOINT ******************************************\ +* TestFile: tst_pmSubtractBias.c * +* TestPoint: pmSubtractBias{PUT COMMENT HERE} * +* TestType: Positive * +\**********************************************************************************/ + +---- doSubtractOverscansGeneric() ---- + Image size: 8 by 8 + Overscan size: 8 by 8 + Total Overscans: 2 + Binning factor: 1 + Overscan axis: PM_OVERSCAN_COLUMNS + Fit type: PM_FIT_SPLINE + +---> TESTPOINT PASSED (pmSubtractBias{Column Overscans} | tst_pmSubtractBias.c) + +/***************************** TESTPOINT ******************************************\ +* TestFile: tst_pmSubtractBias.c * +* TestPoint: pmSubtractBias{PUT COMMENT HERE} * +* TestType: Positive * +\**********************************************************************************/ + +---- doSubtractOverscansGeneric() ---- + Image size: 8 by 8 + Overscan size: 8 by 8 + Total Overscans: 2 + Binning factor: 1 + Overscan axis: PM_OVERSCAN_ROWS + Fit type: PM_FIT_SPLINE + +---> TESTPOINT PASSED (pmSubtractBias{Column Overscans} | tst_pmSubtractBias.c) + +/***************************** TESTPOINT ******************************************\ +* TestFile: tst_pmSubtractBias.c * +* TestPoint: pmSubtractBias{PUT COMMENT HERE} * +* TestType: Positive * +\**********************************************************************************/ + +---- doSubtractOverscansGeneric() ---- + Image size: 8 by 8 + Overscan size: 8 by 8 + Total Overscans: 2 + Binning factor: 2 + Overscan axis: PM_OVERSCAN_ALL + Fit type: PM_FIT_SPLINE + +---> TESTPOINT PASSED (pmSubtractBias{Column Overscans} | tst_pmSubtractBias.c) + +/***************************** TESTPOINT ******************************************\ +* TestFile: tst_pmSubtractBias.c * +* TestPoint: pmSubtractBias{PUT COMMENT HERE} * +* TestType: Positive * +\**********************************************************************************/ + +---- doSubtractOverscansGeneric() ---- + Image size: 8 by 8 + Overscan size: 8 by 8 + Total Overscans: 2 + Binning factor: 2 + Overscan axis: PM_OVERSCAN_COLUMNS + Fit type: PM_FIT_SPLINE + +---> TESTPOINT PASSED (pmSubtractBias{Column Overscans} | tst_pmSubtractBias.c) + +/***************************** TESTPOINT ******************************************\ +* TestFile: tst_pmSubtractBias.c * +* TestPoint: pmSubtractBias{PUT COMMENT HERE} * +* TestType: Positive * +\**********************************************************************************/ + +---- doSubtractOverscansGeneric() ---- + Image size: 8 by 8 + Overscan size: 8 by 8 + Total Overscans: 2 + Binning factor: 2 + Overscan axis: PM_OVERSCAN_ROWS + Fit type: PM_FIT_SPLINE + +---> TESTPOINT PASSED (pmSubtractBias{Column Overscans} | tst_pmSubtractBias.c) + +/***************************** TESTPOINT ******************************************\ +* TestFile: tst_pmSubtractBias.c * +* TestPoint: pmSubtractBias{PUT COMMENT HERE} * +* TestType: Positive * +\**********************************************************************************/ + +---- doSubtractOverscansGeneric() ---- + Image size: 8 by 8 + Overscan size: 10 by 10 + Total Overscans: 2 + Binning factor: 1 + Overscan axis: PM_OVERSCAN_ALL + Fit type: PM_FIT_SPLINE + +---> TESTPOINT PASSED (pmSubtractBias{Column Overscans} | tst_pmSubtractBias.c) + +/***************************** TESTPOINT ******************************************\ +* TestFile: tst_pmSubtractBias.c * +* TestPoint: pmSubtractBias{PUT COMMENT HERE} * +* TestType: Positive * +\**********************************************************************************/ + +---- doSubtractOverscansGeneric() ---- + Image size: 8 by 8 + Overscan size: 10 by 10 + Total Overscans: 2 + Binning factor: 1 + Overscan axis: PM_OVERSCAN_COLUMNS + Fit type: PM_FIT_SPLINE + +---> TESTPOINT PASSED (pmSubtractBias{Column Overscans} | tst_pmSubtractBias.c) + +/***************************** TESTPOINT ******************************************\ +* TestFile: tst_pmSubtractBias.c * +* TestPoint: pmSubtractBias{PUT COMMENT HERE} * +* TestType: Positive * +\**********************************************************************************/ + +---- doSubtractOverscansGeneric() ---- + Image size: 8 by 8 + Overscan size: 10 by 10 + Total Overscans: 2 + Binning factor: 1 + Overscan axis: PM_OVERSCAN_ROWS + Fit type: PM_FIT_SPLINE + +---> TESTPOINT PASSED (pmSubtractBias{Column Overscans} | tst_pmSubtractBias.c) + +/***************************** TESTPOINT ******************************************\ +* TestFile: tst_pmSubtractBias.c * +* TestPoint: pmSubtractBias{PUT COMMENT HERE} * +* TestType: Positive * +\**********************************************************************************/ + +---- doSubtractOverscansGeneric() ---- + Image size: 8 by 8 + Overscan size: 10 by 10 + Total Overscans: 2 + Binning factor: 2 + Overscan axis: PM_OVERSCAN_ALL + Fit type: PM_FIT_SPLINE + +---> TESTPOINT PASSED (pmSubtractBias{Column Overscans} | tst_pmSubtractBias.c) + +/***************************** TESTPOINT ******************************************\ +* TestFile: tst_pmSubtractBias.c * +* TestPoint: pmSubtractBias{PUT COMMENT HERE} * +* TestType: Positive * +\**********************************************************************************/ + +---- doSubtractOverscansGeneric() ---- + Image size: 8 by 8 + Overscan size: 10 by 10 + Total Overscans: 2 + Binning factor: 2 + Overscan axis: PM_OVERSCAN_COLUMNS + Fit type: PM_FIT_SPLINE + +---> TESTPOINT PASSED (pmSubtractBias{Column Overscans} | tst_pmSubtractBias.c) + +/***************************** TESTPOINT ******************************************\ +* TestFile: tst_pmSubtractBias.c * +* TestPoint: pmSubtractBias{PUT COMMENT HERE} * +* TestType: Positive * +\**********************************************************************************/ + +---- doSubtractOverscansGeneric() ---- + Image size: 8 by 8 + Overscan size: 10 by 10 + Total Overscans: 2 + Binning factor: 2 + Overscan axis: PM_OVERSCAN_ROWS + Fit type: PM_FIT_SPLINE + +---> TESTPOINT PASSED (pmSubtractBias{Column Overscans} | tst_pmSubtractBias.c) + +/***************************** TESTPOINT ******************************************\ +* TestFile: tst_pmSubtractBias.c * +* TestPoint: pmSubtractBias{PUT COMMENT HERE} * +* TestType: Positive * +\**********************************************************************************/ + +---- doSubtractOverscansGeneric() ---- + Image size: 8 by 8 + Overscan size: 8 by 8 + Total Overscans: 1 + Binning factor: 1 + Overscan axis: PM_OVERSCAN_ALL + Fit type: PM_FIT_SPLINE + +---> TESTPOINT PASSED (pmSubtractBias{Column Overscans} | tst_pmSubtractBias.c) + +/***************************** TESTPOINT ******************************************\ +* TestFile: tst_pmSubtractBias.c * +* TestPoint: pmSubtractBias{PUT COMMENT HERE} * +* TestType: Positive * +\**********************************************************************************/ + +---- doSubtractOverscansGeneric() ---- + Image size: 8 by 8 + Overscan size: 8 by 8 + Total Overscans: 1 + Binning factor: 1 + Overscan axis: PM_OVERSCAN_COLUMNS + Fit type: PM_FIT_SPLINE + +---> TESTPOINT PASSED (pmSubtractBias{Column Overscans} | tst_pmSubtractBias.c) + +/***************************** TESTPOINT ******************************************\ +* TestFile: tst_pmSubtractBias.c * +* TestPoint: pmSubtractBias{PUT COMMENT HERE} * +* TestType: Positive * +\**********************************************************************************/ + +---- doSubtractOverscansGeneric() ---- + Image size: 8 by 8 + Overscan size: 8 by 8 + Total Overscans: 1 + Binning factor: 1 + Overscan axis: PM_OVERSCAN_ROWS + Fit type: PM_FIT_SPLINE + +---> TESTPOINT PASSED (pmSubtractBias{Column Overscans} | tst_pmSubtractBias.c) + +/***************************** TESTPOINT ******************************************\ +* TestFile: tst_pmSubtractBias.c * +* TestPoint: pmSubtractBias{PUT COMMENT HERE} * +* TestType: Positive * +\**********************************************************************************/ + +---- doSubtractOverscansGeneric() ---- + Image size: 8 by 8 + Overscan size: 6 by 6 + Total Overscans: 2 + Binning factor: 1 + Overscan axis: PM_OVERSCAN_ALL + Fit type: PM_FIT_POLYNOMIAL + +---> TESTPOINT PASSED (pmSubtractBias{Column Overscans} | tst_pmSubtractBias.c) + +/***************************** TESTPOINT ******************************************\ +* TestFile: tst_pmSubtractBias.c * +* TestPoint: pmSubtractBias{PUT COMMENT HERE} * +* TestType: Positive * +\**********************************************************************************/ + +---- doSubtractOverscansGeneric() ---- + Image size: 8 by 8 + Overscan size: 6 by 6 + Total Overscans: 2 + Binning factor: 1 + Overscan axis: PM_OVERSCAN_COLUMNS + Fit type: PM_FIT_POLYNOMIAL + +---> TESTPOINT PASSED (pmSubtractBias{Column Overscans} | tst_pmSubtractBias.c) + +/***************************** TESTPOINT ******************************************\ +* TestFile: tst_pmSubtractBias.c * +* TestPoint: pmSubtractBias{PUT COMMENT HERE} * +* TestType: Positive * +\**********************************************************************************/ + +---- doSubtractOverscansGeneric() ---- + Image size: 8 by 8 + Overscan size: 6 by 6 + Total Overscans: 2 + Binning factor: 1 + Overscan axis: PM_OVERSCAN_ROWS + Fit type: PM_FIT_POLYNOMIAL + +---> TESTPOINT PASSED (pmSubtractBias{Column Overscans} | tst_pmSubtractBias.c) + +/***************************** TESTPOINT ******************************************\ +* TestFile: tst_pmSubtractBias.c * +* TestPoint: pmSubtractBias{PUT COMMENT HERE} * +* TestType: Positive * +\**********************************************************************************/ + +---- doSubtractOverscansGeneric() ---- + Image size: 8 by 8 + Overscan size: 6 by 6 + Total Overscans: 2 + Binning factor: 2 + Overscan axis: PM_OVERSCAN_ALL + Fit type: PM_FIT_POLYNOMIAL + +---> TESTPOINT PASSED (pmSubtractBias{Column Overscans} | tst_pmSubtractBias.c) + +/***************************** TESTPOINT ******************************************\ +* TestFile: tst_pmSubtractBias.c * +* TestPoint: pmSubtractBias{PUT COMMENT HERE} * +* TestType: Positive * +\**********************************************************************************/ + +---- doSubtractOverscansGeneric() ---- + Image size: 8 by 8 + Overscan size: 6 by 6 + Total Overscans: 2 + Binning factor: 2 + Overscan axis: PM_OVERSCAN_COLUMNS + Fit type: PM_FIT_POLYNOMIAL + +---> TESTPOINT PASSED (pmSubtractBias{Column Overscans} | tst_pmSubtractBias.c) + +/***************************** TESTPOINT ******************************************\ +* TestFile: tst_pmSubtractBias.c * +* TestPoint: pmSubtractBias{PUT COMMENT HERE} * +* TestType: Positive * +\**********************************************************************************/ + +---- doSubtractOverscansGeneric() ---- + Image size: 8 by 8 + Overscan size: 6 by 6 + Total Overscans: 2 + Binning factor: 2 + Overscan axis: PM_OVERSCAN_ROWS + Fit type: PM_FIT_POLYNOMIAL + +---> TESTPOINT PASSED (pmSubtractBias{Column Overscans} | tst_pmSubtractBias.c) + +/***************************** TESTPOINT ******************************************\ +* TestFile: tst_pmSubtractBias.c * +* TestPoint: pmSubtractBias{PUT COMMENT HERE} * +* TestType: Positive * +\**********************************************************************************/ + +---- doSubtractOverscansGeneric() ---- + Image size: 8 by 8 + Overscan size: 8 by 8 + Total Overscans: 2 + Binning factor: 1 + Overscan axis: PM_OVERSCAN_ALL + Fit type: PM_FIT_POLYNOMIAL + +---> TESTPOINT PASSED (pmSubtractBias{Column Overscans} | tst_pmSubtractBias.c) + +/***************************** TESTPOINT ******************************************\ +* TestFile: tst_pmSubtractBias.c * +* TestPoint: pmSubtractBias{PUT COMMENT HERE} * +* TestType: Positive * +\**********************************************************************************/ + +---- doSubtractOverscansGeneric() ---- + Image size: 8 by 8 + Overscan size: 8 by 8 + Total Overscans: 2 + Binning factor: 1 + Overscan axis: PM_OVERSCAN_COLUMNS + Fit type: PM_FIT_POLYNOMIAL + +---> TESTPOINT PASSED (pmSubtractBias{Column Overscans} | tst_pmSubtractBias.c) + +/***************************** TESTPOINT ******************************************\ +* TestFile: tst_pmSubtractBias.c * +* TestPoint: pmSubtractBias{PUT COMMENT HERE} * +* TestType: Positive * +\**********************************************************************************/ + +---- doSubtractOverscansGeneric() ---- + Image size: 8 by 8 + Overscan size: 8 by 8 + Total Overscans: 2 + Binning factor: 1 + Overscan axis: PM_OVERSCAN_ROWS + Fit type: PM_FIT_POLYNOMIAL + +---> TESTPOINT PASSED (pmSubtractBias{Column Overscans} | tst_pmSubtractBias.c) + +/***************************** TESTPOINT ******************************************\ +* TestFile: tst_pmSubtractBias.c * +* TestPoint: pmSubtractBias{PUT COMMENT HERE} * +* TestType: Positive * +\**********************************************************************************/ + +---- doSubtractOverscansGeneric() ---- + Image size: 8 by 8 + Overscan size: 8 by 8 + Total Overscans: 2 + Binning factor: 2 + Overscan axis: PM_OVERSCAN_ALL + Fit type: PM_FIT_POLYNOMIAL + +---> TESTPOINT PASSED (pmSubtractBias{Column Overscans} | tst_pmSubtractBias.c) + +/***************************** TESTPOINT ******************************************\ +* TestFile: tst_pmSubtractBias.c * +* TestPoint: pmSubtractBias{PUT COMMENT HERE} * +* TestType: Positive * +\**********************************************************************************/ + +---- doSubtractOverscansGeneric() ---- + Image size: 8 by 8 + Overscan size: 8 by 8 + Total Overscans: 2 + Binning factor: 2 + Overscan axis: PM_OVERSCAN_COLUMNS + Fit type: PM_FIT_POLYNOMIAL + +---> TESTPOINT PASSED (pmSubtractBias{Column Overscans} | tst_pmSubtractBias.c) + +/***************************** TESTPOINT ******************************************\ +* TestFile: tst_pmSubtractBias.c * +* TestPoint: pmSubtractBias{PUT COMMENT HERE} * +* TestType: Positive * +\**********************************************************************************/ + +---- doSubtractOverscansGeneric() ---- + Image size: 8 by 8 + Overscan size: 8 by 8 + Total Overscans: 2 + Binning factor: 2 + Overscan axis: PM_OVERSCAN_ROWS + Fit type: PM_FIT_POLYNOMIAL + +---> TESTPOINT PASSED (pmSubtractBias{Column Overscans} | tst_pmSubtractBias.c) + +/***************************** TESTPOINT ******************************************\ +* TestFile: tst_pmSubtractBias.c * +* TestPoint: pmSubtractBias{PUT COMMENT HERE} * +* TestType: Positive * +\**********************************************************************************/ + +---- doSubtractOverscansGeneric() ---- + Image size: 8 by 8 + Overscan size: 10 by 10 + Total Overscans: 2 + Binning factor: 1 + Overscan axis: PM_OVERSCAN_ALL + Fit type: PM_FIT_POLYNOMIAL + +---> TESTPOINT PASSED (pmSubtractBias{Column Overscans} | tst_pmSubtractBias.c) + +/***************************** TESTPOINT ******************************************\ +* TestFile: tst_pmSubtractBias.c * +* TestPoint: pmSubtractBias{PUT COMMENT HERE} * +* TestType: Positive * +\**********************************************************************************/ + +---- doSubtractOverscansGeneric() ---- + Image size: 8 by 8 + Overscan size: 10 by 10 + Total Overscans: 2 + Binning factor: 1 + Overscan axis: PM_OVERSCAN_COLUMNS + Fit type: PM_FIT_POLYNOMIAL + +---> TESTPOINT PASSED (pmSubtractBias{Column Overscans} | tst_pmSubtractBias.c) + +/***************************** TESTPOINT ******************************************\ +* TestFile: tst_pmSubtractBias.c * +* TestPoint: pmSubtractBias{PUT COMMENT HERE} * +* TestType: Positive * +\**********************************************************************************/ + +---- doSubtractOverscansGeneric() ---- + Image size: 8 by 8 + Overscan size: 10 by 10 + Total Overscans: 2 + Binning factor: 1 + Overscan axis: PM_OVERSCAN_ROWS + Fit type: PM_FIT_POLYNOMIAL + +---> TESTPOINT PASSED (pmSubtractBias{Column Overscans} | tst_pmSubtractBias.c) + +/***************************** TESTPOINT ******************************************\ +* TestFile: tst_pmSubtractBias.c * +* TestPoint: pmSubtractBias{PUT COMMENT HERE} * +* TestType: Positive * +\**********************************************************************************/ + +---- doSubtractOverscansGeneric() ---- + Image size: 8 by 8 + Overscan size: 10 by 10 + Total Overscans: 2 + Binning factor: 2 + Overscan axis: PM_OVERSCAN_ALL + Fit type: PM_FIT_POLYNOMIAL + +---> TESTPOINT PASSED (pmSubtractBias{Column Overscans} | tst_pmSubtractBias.c) + +/***************************** TESTPOINT ******************************************\ +* TestFile: tst_pmSubtractBias.c * +* TestPoint: pmSubtractBias{PUT COMMENT HERE} * +* TestType: Positive * +\**********************************************************************************/ + +---- doSubtractOverscansGeneric() ---- + Image size: 8 by 8 + Overscan size: 10 by 10 + Total Overscans: 2 + Binning factor: 2 + Overscan axis: PM_OVERSCAN_COLUMNS + Fit type: PM_FIT_POLYNOMIAL + +---> TESTPOINT PASSED (pmSubtractBias{Column Overscans} | tst_pmSubtractBias.c) + +/***************************** TESTPOINT ******************************************\ +* TestFile: tst_pmSubtractBias.c * +* TestPoint: pmSubtractBias{PUT COMMENT HERE} * +* TestType: Positive * +\**********************************************************************************/ + +---- doSubtractOverscansGeneric() ---- + Image size: 8 by 8 + Overscan size: 10 by 10 + Total Overscans: 2 + Binning factor: 2 + Overscan axis: PM_OVERSCAN_ROWS + Fit type: PM_FIT_POLYNOMIAL + +---> TESTPOINT PASSED (pmSubtractBias{Column Overscans} | tst_pmSubtractBias.c) + +/***************************** TESTPOINT ******************************************\ +* TestFile: tst_pmSubtractBias.c * +* TestPoint: pmSubtractBias{PUT COMMENT HERE} * +* TestType: Positive * +\**********************************************************************************/ + +---- doSubtractOverscansGeneric() ---- + Image size: 8 by 8 + Overscan size: 8 by 8 + Total Overscans: 1 + Binning factor: 1 + Overscan axis: PM_OVERSCAN_ALL + Fit type: PM_FIT_POLYNOMIAL + +---> TESTPOINT PASSED (pmSubtractBias{Column Overscans} | tst_pmSubtractBias.c) + +/***************************** TESTPOINT ******************************************\ +* TestFile: tst_pmSubtractBias.c * +* TestPoint: pmSubtractBias{PUT COMMENT HERE} * +* TestType: Positive * +\**********************************************************************************/ + +---- doSubtractOverscansGeneric() ---- + Image size: 8 by 8 + Overscan size: 8 by 8 + Total Overscans: 1 + Binning factor: 1 + Overscan axis: PM_OVERSCAN_COLUMNS + Fit type: PM_FIT_POLYNOMIAL + +---> TESTPOINT PASSED (pmSubtractBias{Column Overscans} | tst_pmSubtractBias.c) + +/***************************** TESTPOINT ******************************************\ +* TestFile: tst_pmSubtractBias.c * +* TestPoint: pmSubtractBias{PUT COMMENT HERE} * +* TestType: Positive * +\**********************************************************************************/ + +---- doSubtractOverscansGeneric() ---- + Image size: 8 by 8 + Overscan size: 8 by 8 + Total Overscans: 1 + Binning factor: 1 + Overscan axis: PM_OVERSCAN_ROWS + Fit type: PM_FIT_POLYNOMIAL + +---> TESTPOINT PASSED (pmSubtractBias{Column Overscans} | tst_pmSubtractBias.c) + Index: /trunk/psModules/test/objects/tst_pmObjects01.c =================================================================== --- /trunk/psModules/test/objects/tst_pmObjects01.c (revision 5680) +++ /trunk/psModules/test/objects/tst_pmObjects01.c (revision 5681) @@ -20,4 +20,8 @@ * XXX: Memory leaks are not being caught. If I allocated a psVector in these functions * and never deallocate, no error is generated. + * + * XXX: Much of this file is commented out due to the API changes in rel 7. + * + * Fully Tested: pmPeakAlloc() @@ -27,6 +31,6 @@ most of psObjects.c is not tested * - * @version $Revision: 1.5 $ $Name: not supported by cvs2svn $ - * @date $Date: 2005-11-15 20:09:03 $ + * @version $Revision: 1.6 $ $Name: not supported by cvs2svn $ + * @date $Date: 2005-12-05 21:28:55 $ * * Copyright 2004 Maui High Performance Computing Center, University of Hawaii @@ -50,8 +54,8 @@ //static int test07(void); //static int test08(void); -static int test09(void); -static int test15(void); -static int test16(void); -static int test20(void); +//static int test09(void); +//static int test15(void); +//static int test16(void); +//static int test20(void); testDescription tests[] = { {test00, 000, "pmObjects: structure allocators and deallocators", true, false}, @@ -64,8 +68,8 @@ // {test07, 001, "pmObjects: pmMin()", true, false}, // {test08, 001, "pmObjects: pmSourceModelGuess()", true, false}, - {test09, 001, "pmObjects: pmSourceContour()", true, false}, - {test15, 001, "pmObjects: pmSourceAddModel()", true, false}, - {test16, 001, "pmObjects: pmSourceSubModel()", true, false}, - {test20, 001, "pmObjects: pmSourceSubModel()", true, false}, + //{test09, 001, "pmObjects: pmSourceContour()", true, false}, + //{test15, 001, "pmObjects: pmSourceAddModel()", true, false}, + //{test16, 001, "pmObjects: pmSourceSubModel()", true, false}, + //{test20, 001, "pmObjects: pmSourceSubModel()", true, false}, {NULL} }; @@ -1063,4 +1067,5 @@ XXX: We don't verify the numbers. *****************************************************************************/ +/* int test15( void ) { @@ -1083,6 +1088,6 @@ testStatus = false; } - - + + tmpSource->modelPSF = pmModelAlloc(PS_MODEL_GAUSS); tmpSource->modelPSF->params->data.F32[0] = 5.0; @@ -1093,5 +1098,5 @@ tmpSource->modelPSF->params->data.F32[5] = 1.0; tmpSource->modelPSF->params->data.F32[6] = 2.0; - + printf("----------------------------------------------------------------------------------\n"); printf("Calling pmSourceAddModel with NULL psImage. Should generate error, return FALSE.\n"); @@ -1101,5 +1106,5 @@ testStatus = false; } - + printf("----------------------------------------------------------------------------------\n"); printf("Calling pmSourceAddModel with NULL psSrc. Should generate error, return FALSE.\n"); @@ -1109,5 +1114,5 @@ testStatus = false; } - + printf("----------------------------------------------------------------------------------\n"); printf("Calling pmSourceAddModel with acceptable data.\n"); @@ -1117,9 +1122,10 @@ testStatus = false; } - + psFree(tmpSource); psFree(imgData); return(testStatus); } +*/ #define TST16_NUM_ROWS 100 @@ -1134,4 +1140,5 @@ XXX: We don't verify the numbers. *****************************************************************************/ +/* int test16( void ) { @@ -1145,10 +1152,10 @@ pmSource *tmpSource = NULL; psBool rc = false; - + pmPeak *tmpPeak = pmPeakAlloc((psF32) (TST16_NUM_ROWS / 2), (psF32) (TST16_NUM_COLS / 2), 200.0, PM_PEAK_LONE); - + printf("Calling pmSourceLocalSky with valid data.\n"); tmpPeak->x = (psF32) (TST16_NUM_ROWS / 2); @@ -1159,10 +1166,10 @@ (psF32) TST16_INNER_RADIUS, (psF32) TST16_OUTER_RADIUS); - + if (tmpSource == NULL) { printf("TEST ERROR: pmSourceLocalSky() returned a NULL pmSource.\n"); testStatus = false; } - + tmpSource->modelPSF = pmModelAlloc(PS_MODEL_GAUSS); tmpSource->modelPSF->params->data.F32[0] = 5.0; @@ -1173,5 +1180,5 @@ tmpSource->modelPSF->params->data.F32[5] = 1.0; tmpSource->modelPSF->params->data.F32[6] = 2.0; - + printf("----------------------------------------------------------------------------------\n"); printf("Calling pmSourceSubModel with NULL psImage. Should generate error, return FALSE.\n"); @@ -1181,5 +1188,5 @@ testStatus = false; } - + printf("----------------------------------------------------------------------------------\n"); printf("Calling pmSourceSubModel with NULL psSrc. Should generate error, return FALSE.\n"); @@ -1189,5 +1196,5 @@ testStatus = false; } - + printf("----------------------------------------------------------------------------------\n"); printf("Calling pmSourceSubModel with acceptable data.\n"); @@ -1197,9 +1204,10 @@ testStatus = false; } - + psFree(tmpSource); psFree(imgData); return(testStatus); } +*/ #define TST20_NUM_ROWS 100 @@ -1214,4 +1222,5 @@ XXX: We don't verify the numbers. *****************************************************************************/ +/* int test20( void ) { @@ -1225,10 +1234,10 @@ pmSource *tmpSource = NULL; psBool rc = false; - + pmPeak *tmpPeak = pmPeakAlloc((psF32) (TST20_NUM_ROWS / 2), (psF32) (TST20_NUM_COLS / 2), 200.0, PM_PEAK_LONE); - + printf("Calling pmSourceLocalSky with valid data.\n"); tmpPeak->x = (psF32) (TST20_NUM_ROWS / 2); @@ -1239,13 +1248,13 @@ (psF32) TST20_INNER_RADIUS, (psF32) TST20_OUTER_RADIUS); - + if (tmpSource == NULL) { printf("TEST ERROR: pmSourceLocalSky() returned a NULL pmSource.\n"); testStatus = false; } - + tmpSource->modelPSF = pmModelAlloc(PS_MODEL_GAUSS); - - + + tmpSource->modelPSF->params->data.F32[0] = 5.0; tmpSource->modelPSF->params->data.F32[1] = 70.0; @@ -1255,5 +1264,5 @@ tmpSource->modelPSF->params->data.F32[5] = 1.0; tmpSource->modelPSF->params->data.F32[6] = 2.0; - + printf("----------------------------------------------------------------------------------\n"); printf("Calling pmSourceFitModel with NULL psImage. Should generate error, return FALSE.\n"); @@ -1263,5 +1272,5 @@ testStatus = false; } - + printf("----------------------------------------------------------------------------------\n"); printf("Calling pmSourceFitModel with NULL pmSource. Should generate error, return FALSE.\n"); @@ -1271,18 +1280,18 @@ testStatus = false; } - + printf("----------------------------------------------------------------------------------\n"); printf("Calling pmSourceFitModel with acceptable data.\n"); rc = pmSourceFitModel(tmpSource, imgData); printf("pmSourceFitModel returned %d\n", rc); - + // XXX: Memory leaks are not being tested psVector *junk = psVectorAlloc(10, PS_TYPE_F32); junk->data.F32[0] = 0.0; - + psFree(tmpSource); psFree(imgData); return(testStatus); } - - +*/ +