IPP Software Navigation Tools IPP Links Communication Pan-STARRS Links

Changeset 5681


Ignore:
Timestamp:
Dec 5, 2005, 11:28:55 AM (20 years ago)
Author:
gusciora
Message:

Some code preparation for the release.

Location:
trunk/psModules
Files:
13 edited

Legend:

Unmodified
Added
Removed
  • trunk/psModules/src/astrom/pmAstrometry.c

    r5674 r5681  
    1313* XXX: Should we implement non-linear cell->chip transforms?
    1414*
    15 *  @version $Revision: 1.9 $ $Name: not supported by cvs2svn $
    16 *  @date $Date: 2005-12-05 20:49:30 $
     15*  @version $Revision: 1.10 $ $Name: not supported by cvs2svn $
     16*  @date $Date: 2005-12-05 21:28:55 $
    1717*
    1818*  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
     
    602602 
    603603I'm guessing the p_psProject() and p_psDeproject() functions have bugs.
     604 
     605XXX: It appears that p_psProject() and p_psDeproject() have been fixed.
     606Remove this.
    604607 *****************************************************************************/
    605608psSphere* XXXDeproject(
     
    628631    PS_ASSERT_PTR_NON_NULL(projection, NULL);
    629632
    630     psSphere *rc = XXXDeproject(outSphere, tpCoord, projection);
     633    //    psSphere *rc = XXXDeproject(outSphere, tpCoord, projection);
     634    psSphere *rc = p_psDeproject(outSphere, tpCoord, projection);
    631635    if (rc == NULL) {
    632636        psLogMsg(__func__, PS_LOG_WARN, "WARNING: could not transform tangent plane coords to sky coords.\n");
  • trunk/psModules/src/astrom/pmAstrometry.h

    r5543 r5681  
    88*  @author GLG, MHPCC
    99*
    10 *  @version $Revision: 1.3 $ $Name: not supported by cvs2svn $
    11 *  @date $Date: 2005-11-18 19:43:14 $
     10*  @version $Revision: 1.4 $ $Name: not supported by cvs2svn $
     11*  @date $Date: 2005-12-05 21:28:55 $
    1212*
    1313*  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
     
    2525/// @{
    2626
    27 // XXXX: This is incorrect.  Must determine what p_pmHDU is.
     27// XXX: Is this correct?  Must determine what p_pmHDU is.
     28// XXX: Create the p_pmHDU alloc/free.
    2829typedef struct
    2930{
    30     int what;
     31    const char *extname;                // Extension name, if it corresponds to this level
     32    psArray *pixels;                    // The pixel data, if it corresponds to this level
     33    psMetadata *header;                 // The FITS header, if it corresponds to this level
    3134}
    3235p_pmHDU;
  • trunk/psModules/test/astrom/tst_pmAstrometry.c

    r5587 r5681  
    77 *
    88 *  XXX: Untested: pmFPACheckParents()
     9 *  XXX: Create the pmHDU alloc/free function, test them here
    910 *
    10  *  @version $Revision: 1.4 $ $Name: not supported by cvs2svn $
    11  *  @date $Date: 2005-11-23 23:54:30 $
     11 *  @version $Revision: 1.5 $ $Name: not supported by cvs2svn $
     12 *  @date $Date: 2005-12-05 21:28:55 $
    1213 *
    1314 *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
  • trunk/psModules/test/astrom/tst_pmAstrometry01.c

    r5608 r5681  
    55*  @author GLG, MHPCC
    66*
    7 *  @version $Revision: 1.1 $ $Name: not supported by cvs2svn $
    8 *  @date $Date: 2005-11-27 19:28:01 $
     7*  @version $Revision: 1.2 $ $Name: not supported by cvs2svn $
     8*  @date $Date: 2005-12-05 21:28:55 $
    99*
    1010* XXX: Add tests were the coordinate does not transform to any legitimate cell
     
    350350                    } else {
    351351                        pmCoordFPAToChip(&chipCoord, &fpaCoord, tmpChip);
    352                         //printf("HMM: chipCoords are (%f, %f)\n", chipCoord.x, chipCoord.y);
    353352                        pmCoordChipToCell(&cellCoord, &chipCoord, myCell);
    354                         //printf("HMM: cellCoords are (%f, %f)\n", cellCoord.x, cellCoord.y);
    355353
    356354                        if (x != (psS32) cellCoord.x) {
  • trunk/psModules/test/detrend/verified/tst_pmFlatField.stderr

    r5169 r5681  
    55\**********************************************************************************/
    66
     7<HOST>|W|pmFlatField
     8    WARNING: in->parent is NULL.
     9<HOST>|W|p_psDetermineTrimmedImage
     10    WARNING: could not determine CELL.TRIMSEC from parent cell Metadata (NULL).
     11<HOST>|W|pmFlatField
     12    WARNING: in->parent is NULL.
     13<HOST>|W|p_psDetermineTrimmedImage
     14    WARNING: could not determine CELL.TRIMSEC from parent cell Metadata (NULL).
     15<HOST>|W|pmFlatField
     16    WARNING: in->parent is NULL.
     17<HOST>|W|p_psDetermineTrimmedImage
     18    WARNING: could not determine CELL.TRIMSEC from parent cell Metadata (NULL).
    719<HOST>|E|pmFlatField (FILE:LINENO)
    8     Null not allowed for flat readout.
     20    Unallowable operation: flat is NULL.
    921<HOST>|E|pmFlatField (FILE:LINENO)
    10     Null not allowed for input image.
     22    Unallowable operation: in->image is NULL.
    1123<HOST>|E|pmFlatField (FILE:LINENO)
    12     Null not allowed for flat image.
     24    Unallowable operation: flat->image is NULL.
     25<HOST>|W|pmFlatField
     26    WARNING: in->parent is NULL.
     27<HOST>|W|p_psDetermineTrimmedImage
     28    WARNING: could not determine CELL.TRIMSEC from parent cell Metadata (NULL).
    1329<HOST>|E|pmFlatField (FILE:LINENO)
    1430    Input image size exceeds that of flat image: (3, 3) vs (2, 2)
     31<HOST>|W|pmFlatField
     32    WARNING: in->parent is NULL.
     33<HOST>|W|p_psDetermineTrimmedImage
     34    WARNING: could not determine CELL.TRIMSEC from parent cell Metadata (NULL).
    1535<HOST>|E|pmFlatField (FILE:LINENO)
    1636    Input image mask size exceeds that of flat image: (5, 5) vs (3, 3)
     37<HOST>|W|pmFlatField
     38    WARNING: in->parent is NULL.
     39<HOST>|W|p_psDetermineTrimmedImage
     40    WARNING: could not determine CELL.TRIMSEC from parent cell Metadata (NULL).
    1741<HOST>|E|pmFlatField (FILE:LINENO)
    18     Input image mask size exceeds that of flat image: (5, 5) vs (3, 3)
     42    Total offset >= flat image size: (50, 50) vs (3, 3)
     43<HOST>|W|pmFlatField
     44    WARNING: in->parent is NULL.
     45<HOST>|W|p_psDetermineTrimmedImage
     46    WARNING: could not determine CELL.TRIMSEC from parent cell Metadata (NULL).
    1947<HOST>|E|pmFlatField (FILE:LINENO)
    20     Input image mask size exceeds that of flat image: (5, 5) vs (3, 3)
     48    Complex types not allowed for input image. Type: 2064
     49<HOST>|W|pmFlatField
     50    WARNING: in->parent is NULL.
     51<HOST>|W|p_psDetermineTrimmedImage
     52    WARNING: could not determine CELL.TRIMSEC from parent cell Metadata (NULL).
    2153<HOST>|E|pmFlatField (FILE:LINENO)
    22     Input image mask size exceeds that of flat image: (5, 5) vs (3, 3)
     54    Complex types not allowed for flat image. Type: 2064
     55<HOST>|W|pmFlatField
     56    WARNING: in->parent is NULL.
     57<HOST>|W|p_psDetermineTrimmedImage
     58    WARNING: could not determine CELL.TRIMSEC from parent cell Metadata (NULL).
    2359<HOST>|E|pmFlatField (FILE:LINENO)
    24     Input image mask size exceeds that of flat image: (5, 5) vs (3, 3)
     60    Input and flat image types differ: (1032 vs 1028)
     61<HOST>|W|pmFlatField
     62    WARNING: in->parent is NULL.
     63<HOST>|W|p_psDetermineTrimmedImage
     64    WARNING: could not determine CELL.TRIMSEC from parent cell Metadata (NULL).
    2565<HOST>|E|pmFlatField (FILE:LINENO)
    26     Input image mask size exceeds that of flat image: (5, 5) vs (3, 3)
     66    Mask must be PS_TYPE_MASK type. Type: 1028
    2767
    2868---> TESTPOINT PASSED (Test Point Driver{pmFlatField} | tst_pmFlatField.c)
  • trunk/psModules/test/detrend/verified/tst_pmFlatField.stdout

    r5169 r5681  
    44*             TestType: Positive                                                   *
    55\**********************************************************************************/
     6
     7Input mask:
     80 0 0
     90 0 0
     100 0 0
    611
    712Input image:
     
    10156.000000 6.000000 6.000000
    1116
    12 Input mask:
    13 0 0 0
    14 0 0 0
    15 0 0 0
    16 
    1717Flat image:
    18182.000000 2.000000 2.000000
     
    8585
    8686Resulting mask:
    87 0 0 0
    88 0 0 0
    89 0 0 0
     878 8 8
     888 8 8
     890 8 8
    9090
    9191Resulting image:
    92923.000000 3.000000 3.000000
    93933.000000 3.000000 3.000000
    94 3.000000 3.000000 3.000000
     941.000000 3.000000 3.000000
    9595
    9696
  • trunk/psModules/test/detrend/verified/tst_pmMaskBadPixels.stderr

    r5169 r5681  
    55\**********************************************************************************/
    66
     7<HOST>|W|pmMaskBadPixels
     8    WARNING: in->parent is NULL.
     9<HOST>|W|p_psDetermineTrimmedImage
     10    WARNING: could not determine CELL.TRIMSEC from parent cell Metadata (NULL).
    711
    812---> TESTPOINT PASSED (Test Point Driver{pmMaskBadPixels - Create mask based on maskVal argument} | tst_pmMaskBadPixels.c)
     
    1418\**********************************************************************************/
    1519
     20<HOST>|W|pmMaskBadPixels
     21    WARNING: in->parent is NULL.
     22<HOST>|W|p_psDetermineTrimmedImage
     23    WARNING: could not determine CELL.TRIMSEC from parent cell Metadata (NULL).
    1624
    1725---> TESTPOINT PASSED (Test Point Driver{pmMaskBadPixels - Create mask based on saturation argument} | tst_pmMaskBadPixels.c)
     
    2331\**********************************************************************************/
    2432
     33<HOST>|W|pmMaskBadPixels
     34    WARNING: in->parent is NULL.
     35<HOST>|W|p_psDetermineTrimmedImage
     36    WARNING: could not determine CELL.TRIMSEC from parent cell Metadata (NULL).
    2537
    2638---> TESTPOINT PASSED (Test Point Driver{pmMaskBadPixels - Create mask based on growVal and grow arguments} | tst_pmMaskBadPixels.c)
     
    3244\**********************************************************************************/
    3345
     46<HOST>|W|pmMaskBadPixels
     47    WARNING: in->parent is NULL.
     48<HOST>|W|p_psDetermineTrimmedImage
     49    WARNING: could not determine CELL.TRIMSEC from parent cell Metadata (NULL).
    3450
    3551---> TESTPOINT PASSED (Test Point Driver{pmMaskBadPixels - Auto create mask based on maskVal argument} | tst_pmMaskBadPixels.c)
     
    4157\**********************************************************************************/
    4258
     59<HOST>|W|pmMaskBadPixels
     60    WARNING: in->parent is NULL.
    4361<HOST>|E|pmMaskBadPixels (FILE:LINENO)
    44     Null not allowed for mask image.
     62    Unallowable operation: mask is NULL.
    4563
    4664---> TESTPOINT PASSED (Test Point Driver{pmMaskBadPixels - Attempt to use null mask} | tst_pmMaskBadPixels.c)
     
    5371
    5472<HOST>|E|pmMaskBadPixels (FILE:LINENO)
    55     Null not allowed for input image.
     73    Unallowable operation: in->image is NULL.
    5674
    5775---> TESTPOINT PASSED (Test Point Driver{pmMaskBadPixels - Attempt tp use null input image} | tst_pmMaskBadPixels.c)
     
    6381\**********************************************************************************/
    6482
     83<HOST>|W|pmMaskBadPixels
     84    WARNING: in->parent is NULL.
     85<HOST>|W|p_psDetermineTrimmedImage
     86    WARNING: could not determine CELL.TRIMSEC from parent cell Metadata (NULL).
    6587<HOST>|E|pmMaskBadPixels (FILE:LINENO)
    6688    Input image size exceeds that of mask image: (60, 60) vs (50, 50)
     
    7496\**********************************************************************************/
    7597
    76 <HOST>|E|pmMaskBadPixels (FILE:LINENO)
    77     Input image mask size exceeds that of mask image: (60, 60) vs (50, 50)
     98<HOST>|W|pmMaskBadPixels
     99    WARNING: in->parent is NULL.
     100<HOST>|W|p_psDetermineTrimmedImage
     101    WARNING: could not determine CELL.TRIMSEC from parent cell Metadata (NULL).
    78102
    79103---> TESTPOINT PASSED (Test Point Driver{pmMaskBadPixels - Attempt to use input image mask bigger than mask} | tst_pmMaskBadPixels.c)
     
    85109\**********************************************************************************/
    86110
     111<HOST>|W|pmMaskBadPixels
     112    WARNING: in->parent is NULL.
     113<HOST>|W|p_psDetermineTrimmedImage
     114    WARNING: could not determine CELL.TRIMSEC from parent cell Metadata (NULL).
    87115<HOST>|E|pmMaskBadPixels (FILE:LINENO)
    88116    Total offset >= mask image: (150, 150) vs (50, 50)
     
    96124\**********************************************************************************/
    97125
     126<HOST>|W|pmMaskBadPixels
     127    WARNING: in->parent is NULL.
     128<HOST>|W|p_psDetermineTrimmedImage
     129    WARNING: could not determine CELL.TRIMSEC from parent cell Metadata (NULL).
    98130<HOST>|E|pmMaskBadPixels (FILE:LINENO)
    99131    Complex types not allowed for input image. Type: 2064
     
    107139\**********************************************************************************/
    108140
     141<HOST>|W|pmMaskBadPixels
     142    WARNING: in->parent is NULL.
     143<HOST>|W|p_psDetermineTrimmedImage
     144    WARNING: could not determine CELL.TRIMSEC from parent cell Metadata (NULL).
    109145<HOST>|E|pmMaskBadPixels (FILE:LINENO)
    110146    Mask must be PS_TYPE_MASK type. Type: 1032
  • trunk/psModules/test/detrend/verified/tst_pmMaskBadPixels.stdout

    r5169 r5681  
    242400000000000000000000000000000000000000000000000000
    252500000000000000000000000000000000000000000000000000
    26 00000000000000000000000000000000000000000000000000
    27 00000000000000000000000010000000000000000000000000
     2600000000000000000000000001000000000000000000000000
     2700000000000000000000000000000000000000000000000000
    282800000000000000000000000000000000000000000000000000
    292900000000000000000000000000000000000000000000000000
     
    767600000000000000000000000000000000000000000000000000
    777700000000000000000000000000000000000000000000000000
    78 00000000000000000000000000000000000000000000000000
    79 00000000000000000000000010000000000000000000000000
     7800000000000000000000000001000000000000000000000000
     7900000000000000000000000000000000000000000000000000
    808000000000000000000000000000000000000000000000000000
    818100000000000000000000000000000000000000000000000000
     
    156156
    157157Resulting mask:
    158 44444444444444444444444444444444444444444444444444
    159 44444444444444444444444444444444444444444444444444
    160 44444444444444444444444444444444444444444444444444
    161 44444444444444444444444444444444444444444444444444
    162 44444444444444444444444444444444444444444444444444
    163 44444444444444444444444444444444444444444444444444
    164 44444444444444444444444444444444444444444444444444
    165 44444444444444444444444444444444444444444444444444
    166 44444444444444444444444444444444444444444444444444
    167 44444444444444444444444444444444444444444444444444
    168 44444444444444444444444444444444444444444444444444
    169 44444444444444444444444444444444444444444444444444
    170 44444444444444444444444444444444444444444444444444
    171 44444444444444444444444444444444444444444444444444
    172 44444444444444444444444444444444444444444444444444
    173 44444444444444444444444444444444444444444444444444
    174 44444444444444444444444444444444444444444444444444
    175 44444444444444444444444444444444444444444444444444
    176 44444444444444444444444444444444444444444444444444
    177 44444444444444444444444444444444444444444444444444
    178 44444444444444444444444444444444444444444444444444
    179 44444444444444444444444444444444444444444444444444
    180 44444444444444444444444444444444444444444444444444
    181 44444444444444444444444444444444444444444444444444
    182 44444444444444444444444444444444444444444444444444
    183 44444444444444444444444444444444444444444444444444
    184 44444444444444444444444444444444444444444444444444
    185 44444444444444444444444444444444444444444444444444
    186 44444444444444444444444444444444444444444444444444
    187 44444444444444444444444444444444444444444444444444
    188 44444444444444444444444444444444444444444444444444
    189 44444444444444444444444444444444444444444444444444
    190 44444444444444444444444444444444444444444444444444
    191 44444444444444444444444444444444444444444444444444
    192 44444444444444444444444444444444444444444444444444
    193 44444444444444444444444444444444444444444444444444
    194 44444444444444444444444444444444444444444444444444
    195 44444444444444444444444444444444444444444444444444
    196 44444444444444444444444444444444444444444444444444
    197 44444444444444444444444444444444444444444444444444
    198 44444444444444444444444444444444444444444444444444
    199 44444444444444444444444444444444444444444444444444
    200 44444444444444444444444444444444444444444444444444
    201 44444444444444444444444444444444444444444444444444
    202 44444444444444444444444444444444444444444444444444
    203 44444444444444444444444444444444444444444444444444
    204 44444444444444444444444444444444444444444444444444
    205 44444444444444444444444444444444444444444444444444
    206 44444444444444444444444444444444444444444444444444
    207 44444444444444444444444444444444444444444444444444
     15800000000000000000000000000000000000000000000000000
     15900000000000000000000000000000000000000000000000000
     16000000000000000000000000000000000000000000000000000
     16100000000000000000000000000000000000000000000000000
     16200000000000000000000000000000000000000000000000000
     16300000000000000000000000000000000000000000000000000
     16400000000000000000000000000000000000000000000000000
     16500000000000000000000000000000000000000000000000000
     16600000000000000000000000000000000000000000000000000
     16700000000000000000000000000000000000000000000000000
     16800000000000000000000000000000000000000000000000000
     16900000000000000000000000000000000000000000000000000
     17000000000000000000000000000000000000000000000000000
     17100000000000000000000000000000000000000000000000000
     17200000000000000000000000000000000000000000000000000
     17300000000000000000000000000000000000000000000000000
     17400000000000000000000000000000000000000000000000000
     17500000000000000000000000000000000000000000000000000
     17600000000000000000000000000000000000000000000000000
     17700000000000000000000000000000000000000000000000000
     17800000000000000000000000000000000000000000000000000
     17900000000000000000000000000000000000000000000000000
     18000000000000000000000000001000000000000000000000000
     18100000000000000000000000011100000000000000000000000
     18200000000000000000000000111110000000000000000000000
     18300000000000000000000000011100000000000000000000000
     18400000000000000000000000001000000000000000000000000
     18500000000000000000000000000000000000000000000000000
     18600000000000000000000000000000000000000000000000000
     18700000000000000000000000000000000000000000000000000
     18800000000000000000000000000000000000000000000000000
     18900000000000000000000000000000000000000000000000000
     19000000000000000000000000000000000000000000000000000
     19100000000000000000000000000000000000000000000000000
     19200000000000000000000000000000000000000000000000000
     19300000000000000000000000000000000000000000000000000
     19400000000000000000000000000000000000000000000000000
     19500000000000000000000000000000000000000000000000000
     19600000000000000000000000000000000000000000000000000
     19700000000000000000000000000000000000000000000000000
     19800000000000000000000000000000000000000000000000000
     19900000000000000000000000000000000000000000000000000
     20000000000000000000000000000000000000000000000000000
     20100000000000000000000000000000000000000000000000000
     20200000000000000000000000000000000000000000000000000
     20300000000000000000000000000000000000000000000000000
     20400000000000000000000000000000000000000000000000000
     20500000000000000000000000000000000000000000000000000
     20600000000000000000000000000000000000000000000000000
     20700000000000000000000000000000000000000000000000000
    208208
    209209Data mask:
     
    23323300000000000000000000000000000000000000000000000000
    23423400000000000000000000000000000000000000000000000000
    235 00000000000000000000000010000000000000000000000000
    236 00000000000000000000000000000000000000000000000000
    237 00000000000000000000000000000000000000000000000000
    238 00000000000000000000000000000000000000000000000000
    239 00000000000000000000000000000000000000000000000000
    240 00000000000000000000000000000000000000000000000000
    241 00000000000000000000000000000000000000000000000000
    242 00000000000000000000000000000000000000000000000000
    243 00000000000000000000000000000000000000000000000000
    244 00000000000000000000000000000000000000000000000000
    245 00000000000000000000000000000000000000000000000000
    246 00000000000000000000000000000000000000000000000000
    247 00000000000000000000000000000000000000000000000000
    248 00000000000000000000000000000000000000000000000000
    249 00000000000000000000000000000000000000000000000000
    250 00000000000000000000000000000000000000000000000000
    251 00000000000000000000000000000000000000000000000000
    252 00000000000000000000000000000000000000000000000000
    253 00000000000000000000000000000000000000000000000000
    254 00000000000000000000000000000000000000000000000000
    255 00010000000000000000000000000000000000000000001000
     23500000000000000000000000000000000000000000000000000
     23600000000000000000000000000000000000000000000000000
     23700000000000000000000000000000000000000000000000000
     23800000000000000000000000000000000000000000000000000
     23900000000000000000000000000000000000000000000000000
     24000000000000000000000000000000000000000000000000000
     24100000000000000000000000000000000000000000000000000
     24200000000000000000000000000000000000000000000000000
     24300000000000000000000000000000000000000000000000000
     24400000000000000000000000000000000000000000000000000
     24500000000000000000000000000000000000000000000000000
     24600000000000000000000000000000000000000000000000000
     24700000000000000000000000000000000000000000000000000
     24800000000000000000000000000000000000000000000000000
     24900000000000000000000000000000000000000000000000000
     25000000000000000000000000000000000000000000000000000
     25100000000000000000000000000000000000000000000000000
     25200000000000000000000000000000000000000000000000000
     25300000000000000000000000000000000000000000000000000
     25400000000000000000000000000000000000000000000000000
     25500000000000000000000000000000000000000000000000000
    25625600000000000000000000000000000000000000000000000000
    25725700000000000000000000000000000000000000000000000000
     
    27427400000000000000000000000000000000000000000000000000
    27527500000000000000000000000000000000000000000000000000
    276 00000000000000000000000000000000000000000000000000
    277 00000000000000000000011111110000000000000000000000
    278 00000000000000000001111111111100000000000000000000
    279 00000000000000000011111111111110000000000000000000
    280 00000000000000000111111111111111000000000000000000
    281 00000000000000001111111111111111100000000000000000
    282 00000000000000011111111111111111110000000000000000
    283 00000000000000011111111111111111110000000000000000
    284 00000000000000111111111111111111111000000000000000
    285 00000000000000111111111111111111111000000000000000
    286 00000000000000111111111111111111111000000000000000
    287 00000000000000111111111111111111111000000000000000
    288 00000000000000111111111111111111111000000000000000
    289 00000000000000111111111111111111111000000000000000
    290 00000000000000111111111111111111111000000000000000
    291 00000000000000011111111111111111110000000000000000
    292 00000000000000011111111111111111110000000000000000
    293 00000000000000001111111111111111100000000000000000
    294 00000000000000000111111111111111000000000000000000
    295 00000000000000000011111111111110000000000000000000
    296 00000000000000000001111111111100000000000000000000
    297 11111110000000000000011111110000000000000001111111
    298 11111111100000000000000000000000000000000111111111
    299 11111111110000000000000000000000000000001111111111
    300 11111111111000000000000000000000000000011111111111
    301 11111111111100000000000000000000000000111111111111
    302 11111111111110000000000000000000000001111111111111
    303 11111111111110000000000000000000000001111111111111
    304 11111111111111000000000000000000000011111111111111
    305 11111111111111000000000000000000000011111111111111
    306 11111111111111000000000000000000000011111111111111
    307 11111111111111000000000000000000000011111111111111
    308 11111111111111000000000000000000000011111111111111
    309 11111111111111000000000000000000000011111111111111
    310 11111111111111000000000000000000000011111111111111
    311 11111111111110000000000000000000000001111111111111
     27600000000000000000000000001000000000000000000000000
     27700000000000000000000011111111100000000000000000000
     27800000000000000000001111111111111000000000000000000
     27900000000000000000011111111111111100000000000000000
     28000000000000000000111111111111111110000000000000000
     28100000000000000000111111111111111110000000000000000
     28200000000000000001111111111111111111000000000000000
     28300000000000000001111111111111111111000000000000000
     28400000000000000001111111111111111111000000000000000
     28500000000000000001111111111111111111000000000000000
     28600000000000000011111111111111111111100000000000000
     28700000000000000001111111111111111111000000000000000
     28800000000000000001111111111111111111000000000000000
     28900000000000010001111111111111111111000100000000000
     29000000000111111111111111111111111111111111110000000
     29100000011111111111111111111111111111111111111100000
     29200000111111111111111111111111111111111111111110000
     29300001111111111111111111111111111111111111111111000
     29400001111111111111111111111111111111111111111111000
     29500011111111111111111111111111111111111111111111100
     29600011111111111111111110001000111111111111111111100
     29700011111111111111111110000000111111111111111111100
     29800011111111111111111110000000111111111111111111100
     29900111111111111111111111000001111111111111111111110
     30000011111111111111111110000000111111111111111111100
     30100011111111111111111110000000111111111111111111100
     30200011111111111111111110000000111111111111111111100
     30300011111111111111111110000000111111111111111111100
     30400001111111111111111100000000011111111111111111000
     30500001111111111111111100000000011111111111111111000
     30600000111111111111111000000000001111111111111110000
     30700000011111111111110000000000000111111111111100000
     30800000000111111111000000000000000001111111110000000
     30900000000000010000000000000000000000000100000000000
     31000000000000000000000000000000000000000000000000000
     31100000000000000000000000000000000000000000000000000
    312312
    313313Data mask:
     
    33633600000000000000000000000000000000000000000000000000
    33733700000000000000000000000000000000000000000000000000
    338 00000000000000000000000000000000000000000000000000
    339 00000000000000000000000010000000000000000000000000
     33800000000000000000000000001000000000000000000000000
     33900000000000000000000000000000000000000000000000000
    34034000000000000000000000000000000000000000000000000000
    34134100000000000000000000000000000000000000000000000000
     
    37937900000000000000000000000000000000000000000000000000
    38038000000000000000000000000000000000000000000000000000
    381 00000000000000000000011111110000000000000000000000
    382 00000000000000000001111111111100000000000000000000
    383 00000000000000000011111111111110000000000000000000
    384 00000000000000000111111111111111000000000000000000
    385 00000000000000001111111111111111100000000000000000
    386 00000000000000011111111111111111110000000000000000
    387 00000000000000011111111111111111110000000000000000
    388 00000000000000111111111111111111111000000000000000
    389 00000000000000111111111111111111111000000000000000
    390 00000000000000111111111111111111111000000000000000
    391 00000000000000111111111111111111111000000000000000
    392 00000000000000111111111111111111111000000000000000
    393 00000000000000111111111111111111111000000000000000
    394 00000000000000111111111111111111111000000000000000
    395 00000000000000011111111111111111110000000000000000
    396 00000000000000011111111111111111110000000000000000
    397 00000000000000001111111111111111100000000000000000
    398 00000000000000000111111111111111000000000000000000
    399 00000000000000000011111111111110000000000000000000
    400 00000000000000000001111111111100000000000000000000
    401 00000000000000000000011111110000000000000000000000
    402 00000000000000000000000000000000000000000000000000
    403 00000000000000000000000000000000000000000000000000
    404 00000000000000000000000000000000000000000000000000
    405 00000000000000000000000000000000000000000000000000
    406 00000000000000000000000000000000000000000000000000
    407 00000000000000000000000000000000000000000000000000
    408 00000000000000000000000000000000000000000000000000
    409 00000000000000000000000000000000000000000000000000
    410 00000000000000000000000000000000000000000000000000
    411 00000000000000000000000000000000000000000000000000
    412 00000000000000000000000000000000000000000000000000
    413 00000000000000000000000000000000000000000000000000
    414 00000000000000000000000000000000000000000000000000
    415 00000000000000000000000000000000000000000000000000
    416 
     38100000000000000000000000000000000000000000000000000
     38200000000000000000000000000000000000000000000000000
     38300000000000000000000000000000000000000000000000000
     38400000000000000000000000000000000000000000000000000
     38500000000000000000000000000000000000000000000000000
     38600000000000000000000000000000000000000000000000000
     38700000000000000000000000000000000000000000000000000
     38800000000000000000000000000000000000000000000000000
     38900000000000000000000000000000000000000000000000000
     39000000000000000000000000001000000000000000000000000
     39100000000000000000000000000000000000000000000000000
     39200000000000000000000000000000000000000000000000000
     39300000000000000000000000000000000000000000000000000
     39400000000000000000000000000000000000000000000000000
     39500000000000000000000000000000000000000000000000000
     39600000000000000000000000000000000000000000000000000
     39700000000000000000000000000000000000000000000000000
     39800000000000000000000000000000000000000000000000000
     39900000000000000000000000000000000000000000000000000
     40000000000000000000000000000000000000000000000000000
     40100000000000000000000000000000000000000000000000000
     40200000000000000000000000000000000000000000000000000
     40300000000000000000000000000000000000000000000000000
     40400000000000000000000000000000000000000000000000000
     40500000000000000000000000000000000000000000000000000
     40600000000000000000000000000000000000000000000000000
     40700000000000000000000000000000000000000000000000000
     40800000000000000000000000000000000000000000000000000
     40900000000000000000000000000000000000000000000000000
     41000000000000000000000000000000000000000000000000000
     41100000000000000000000000000000000000000000000000000
     41200000000000000000000000000000000000000000000000000
     41300000000000000000000000000000000000000000000000000
     41400000000000000000000000000000000000000000000000000
     41500000000000000000000000000000000000000000000000000
     416
  • trunk/psModules/test/detrend/verified/tst_pmNonLinear.stderr

    r5169 r5681  
    55\**********************************************************************************/
    66
     7<HOST>|W|pmNonLinearityPolynomial
     8    WARNING: inputReadout->parent is NULL.
     9<HOST>|W|p_psDetermineTrimmedImage
     10    WARNING: could not determine CELL.TRIMSEC from parent cell Metadata (NULL).
     11<HOST>|W|pmNonLinearityPolynomial
     12    WARNING: inputReadout->parent is NULL.
     13<HOST>|W|p_psDetermineTrimmedImage
     14    WARNING: could not determine CELL.TRIMSEC from parent cell Metadata (NULL).
     15<HOST>|W|pmNonLinearityPolynomial
     16    WARNING: inputReadout->parent is NULL.
     17<HOST>|W|p_psDetermineTrimmedImage
     18    WARNING: could not determine CELL.TRIMSEC from parent cell Metadata (NULL).
     19<HOST>|W|pmNonLinearityPolynomial
     20    WARNING: inputReadout->parent is NULL.
     21<HOST>|W|p_psDetermineTrimmedImage
     22    WARNING: could not determine CELL.TRIMSEC from parent cell Metadata (NULL).
    723
    824---> TESTPOINT PASSED (Test Point Driver{pmNonLinearityPolynomial} | tst_pmNonLinear.c)
     
    1430\**********************************************************************************/
    1531
     32<HOST>|W|pmNonLinearityLookup
     33    WARNING: inputReadout->parent is NULL.
     34<HOST>|W|p_psDetermineTrimmedImage
     35    WARNING: could not determine CELL.TRIMSEC from parent cell Metadata (NULL).
     36<HOST>|W|pmNonLinearityLookup
     37    WARNING: inputReadout->parent is NULL.
     38<HOST>|W|p_psDetermineTrimmedImage
     39    WARNING: could not determine CELL.TRIMSEC from parent cell Metadata (NULL).
     40<HOST>|W|pmNonLinearityLookup
     41    WARNING: inputReadout->parent is NULL.
     42<HOST>|W|p_psDetermineTrimmedImage
     43    WARNING: could not determine CELL.TRIMSEC from parent cell Metadata (NULL).
     44<HOST>|W|pmNonLinearityLookup
     45    WARNING: inputReadout->parent is NULL.
     46<HOST>|W|p_psDetermineTrimmedImage
     47    WARNING: could not determine CELL.TRIMSEC from parent cell Metadata (NULL).
    1648
    1749---> TESTPOINT PASSED (Test Point Driver{pmNonLinearityLookup} | tst_pmNonLinear.c)
     
    4274<HOST>|E|pmNonLinearityLookup (FILE:LINENO)
    4375    Unallowable operation: inputReadout->image is NULL.
    44 <HOST>|E|pmNonLinearityLookup (FILE:LINENO)
    45     Unallowable operation: inFlux is NULL.
    46 <HOST>|E|pmNonLinearityLookup (FILE:LINENO)
    47     Unallowable operation: outFlux is NULL.
    4876<HOST>|W|pmNonLinearityLookup
    49     WARNING: pmNonLinear.c: pmNonLinearityLookup(): input vectors have different sizes (24, 25)
     77    WARNING: inputReadout->parent is NULL.
     78<HOST>|W|p_psDetermineTrimmedImage
     79    WARNING: could not determine CELL.TRIMSEC from parent cell Metadata (NULL).
     80<HOST>|E|psVectorsReadFromFile (FILE:LINENO)
     81    Failed to open file I_DONT_EXIST.
    5082<HOST>|W|pmNonLinearityLookup
    51     WARNING: pmNonLinear.c: pmNonLinearityLookup(): input vectors have different sizes (24, 23)
    52 <HOST>|W|pmNonLinearityLookup
    53     WARNING: pmNonLinear.c: pmNonLinearityLookup(): input vectors have different sizes (23, 24)
    54 <HOST>|W|pmNonLinearityLookup
    55     WARNING: pmNonLinear.c: pmNonLinearityLookup(): input vectors have different sizes (25, 24)
    56 <HOST>|W|pmNonLinearityLookup
    57     WARNING: pmNonLinear.c: pmNonLinearityLookup(): input vectors have different sizes (23, 25)
    58 <HOST>|W|pmNonLinearityLookup
    59     WARNING: pmNonLinear.c: pmNonLinearityLookup(): input vectors have different sizes (25, 23)
    60 <HOST>|E|pmNonLinearityLookup (FILE:LINENO)
    61     pmNonLinearityLookup(): input vector less than 2 elements.  Returning inputReadout image.
    62 <HOST>|W|vectorBinDisectF32
    63     vectorBinDisectF32(): ordinate -1.000000 is outside vector range (0.000000 - 23.000000).
    64 <HOST>|W|pmNonLinearityLookup
    65     WARNING: pmNonLinear.c: pmNonLinearityLookup(): 1 pixels outside table.
    66 <HOST>|W|vectorBinDisectF32
    67     vectorBinDisectF32(): ordinate 100.000000 is outside vector range (0.000000 - 23.000000).
    68 <HOST>|W|pmNonLinearityLookup
    69     WARNING: pmNonLinear.c: pmNonLinearityLookup(): 1 pixels outside table.
     83    WARNING: Lookup Table is too small.  Returning original pmReadout.
    7084
    7185---> TESTPOINT PASSED (Test Point Driver{pmNonLinearityLookup(): error/warning conditions} | tst_pmNonLinear.c)
  • trunk/psModules/test/detrend/verified/tst_pmNonLinear.stdout

    r5169 r5681  
    8888Calling pmNonLinearityLookup() with NULL input pmReadout->image.  Should generate error, return NULL.
    8989------------------------------------------------------------
    90 Calling pmNonLinearityLookup() with NULL inFlux psVector.  Should generate error, return NULL.
    91 ------------------------------------------------------------
    92 Calling pmNonLinearityLookup() with NULL outFlux psVector.  Should generate error, return NULL.
    93 ------------------------------------------------------------
    94 Calling pmNonLinearityLookup() with size difference in inFlux/outFLux psVectors.  Should generate warning.
    95 ------------------------------------------------------------
    96 Calling pmNonLinearityLookup() with size difference in inFlux/outFLux psVectors.  Should generate warning.
    97 ------------------------------------------------------------
    98 Calling pmNonLinearityLookup() with size difference in inFlux/outFLux psVectors.  Should generate warning.
    99 ------------------------------------------------------------
    100 Calling pmNonLinearityLookup() with size difference in inFlux/outFLux psVectors.  Should generate warning.
    101 ------------------------------------------------------------
    102 Calling pmNonLinearityLookup() with size difference in inFlux/outFLux psVectors.  Should generate warning.
    103 ------------------------------------------------------------
    104 Calling pmNonLinearityLookup() with size difference in inFlux/outFLux psVectors.  Should generate warning.
    105 ------------------------------------------------------------
    106 Calling pmNonLinearityLookup() with inFlux psVector size 1.  Should generate error, return original pmReadout.
     90Calling pmNonLinearityLookup() with non-existent lookup file.
    10791------------------------------------------------------------
    10892Calling pmNonLinearityLookup() with one pixels outside inFlux range.  Should generate warnings.
    109 ------------------------------------------------------------
    110 Calling pmNonLinearityLookup() with one pixels outside inFlux range.  Should generate warnings.
    111 ------------------------------------------------------------
    112 Calling pmNonLinearityLookup() with image values not in vector.
    11393
    11494---> TESTPOINT PASSED (pmNonLinear{Testing bad input parameter conditions.} | tst_pmNonLinear.c)
  • trunk/psModules/test/imsubtract/verified/tst_pmSubtractBias.stderr

    r5188 r5681  
    55\**********************************************************************************/
    66
    7 <HOST>|W|pmSubtractBias
    8     WARNING: pmSubtractBias.(): overscan image has 7 columns, input image has 8 columns
    9 <HOST>|W|pmSubtractBias
    10     WARNING: pmSubtractBias.(): overscan image has 7 columns, input image has 8 columns
    11 <HOST>|W|pmSubtractBias
    12     WARNING: pmSubtractBias.(): overscan image has 7 columns, input image has 8 columns
    137
    148---> TESTPOINT PASSED (Test Point Driver{pmSubtractBias} | tst_pmSubtractBias.c)
  • trunk/psModules/test/imsubtract/verified/tst_pmSubtractBias.stdout

    r5188 r5681  
    11/***************************** TESTPOINT ******************************************\
    22*             TestFile: tst_pmSubtractBias.c                                       *
    3 *            TestPoint: pmSubtractBias{Row Overscans}                              *
    4 *             TestType: Positive                                                   *
    5 \**********************************************************************************/
    6 
    7 
    8 ---> TESTPOINT PASSED (pmSubtractBias{Row Overscans} | tst_pmSubtractBias.c)
    9 
     3*            TestPoint: pmSubtractBias{PUT COMMENT HERE}                           *
     4*             TestType: Positive                                                   *
     5\**********************************************************************************/
     6
     7---- doSubtractOverscansGeneric() ----
     8    Image size: 8 by 8
     9    Overscan size: 6 by 6
     10    Total Overscans: 2
     11    Binning factor: 1
     12    Overscan axis: PM_OVERSCAN_ALL
     13    Fit type: PM_FIT_SPLINE
     14
     15---> TESTPOINT PASSED (pmSubtractBias{Column Overscans} | tst_pmSubtractBias.c)
     16
     17/***************************** TESTPOINT ******************************************\
     18*             TestFile: tst_pmSubtractBias.c                                       *
     19*            TestPoint: pmSubtractBias{PUT COMMENT HERE}                           *
     20*             TestType: Positive                                                   *
     21\**********************************************************************************/
     22
     23---- doSubtractOverscansGeneric() ----
     24    Image size: 8 by 8
     25    Overscan size: 6 by 6
     26    Total Overscans: 2
     27    Binning factor: 1
     28    Overscan axis: PM_OVERSCAN_COLUMNS
     29    Fit type: PM_FIT_SPLINE
     30
     31---> TESTPOINT PASSED (pmSubtractBias{Column Overscans} | tst_pmSubtractBias.c)
     32
     33/***************************** TESTPOINT ******************************************\
     34*             TestFile: tst_pmSubtractBias.c                                       *
     35*            TestPoint: pmSubtractBias{PUT COMMENT HERE}                           *
     36*             TestType: Positive                                                   *
     37\**********************************************************************************/
     38
     39---- doSubtractOverscansGeneric() ----
     40    Image size: 8 by 8
     41    Overscan size: 6 by 6
     42    Total Overscans: 2
     43    Binning factor: 1
     44    Overscan axis: PM_OVERSCAN_ROWS
     45    Fit type: PM_FIT_SPLINE
     46
     47---> TESTPOINT PASSED (pmSubtractBias{Column Overscans} | tst_pmSubtractBias.c)
     48
     49/***************************** TESTPOINT ******************************************\
     50*             TestFile: tst_pmSubtractBias.c                                       *
     51*            TestPoint: pmSubtractBias{PUT COMMENT HERE}                           *
     52*             TestType: Positive                                                   *
     53\**********************************************************************************/
     54
     55---- doSubtractOverscansGeneric() ----
     56    Image size: 8 by 8
     57    Overscan size: 6 by 6
     58    Total Overscans: 2
     59    Binning factor: 2
     60    Overscan axis: PM_OVERSCAN_ALL
     61    Fit type: PM_FIT_SPLINE
     62
     63---> TESTPOINT PASSED (pmSubtractBias{Column Overscans} | tst_pmSubtractBias.c)
     64
     65/***************************** TESTPOINT ******************************************\
     66*             TestFile: tst_pmSubtractBias.c                                       *
     67*            TestPoint: pmSubtractBias{PUT COMMENT HERE}                           *
     68*             TestType: Positive                                                   *
     69\**********************************************************************************/
     70
     71---- doSubtractOverscansGeneric() ----
     72    Image size: 8 by 8
     73    Overscan size: 6 by 6
     74    Total Overscans: 2
     75    Binning factor: 2
     76    Overscan axis: PM_OVERSCAN_COLUMNS
     77    Fit type: PM_FIT_SPLINE
     78
     79---> TESTPOINT PASSED (pmSubtractBias{Column Overscans} | tst_pmSubtractBias.c)
     80
     81/***************************** TESTPOINT ******************************************\
     82*             TestFile: tst_pmSubtractBias.c                                       *
     83*            TestPoint: pmSubtractBias{PUT COMMENT HERE}                           *
     84*             TestType: Positive                                                   *
     85\**********************************************************************************/
     86
     87---- doSubtractOverscansGeneric() ----
     88    Image size: 8 by 8
     89    Overscan size: 6 by 6
     90    Total Overscans: 2
     91    Binning factor: 2
     92    Overscan axis: PM_OVERSCAN_ROWS
     93    Fit type: PM_FIT_SPLINE
     94
     95---> TESTPOINT PASSED (pmSubtractBias{Column Overscans} | tst_pmSubtractBias.c)
     96
     97/***************************** TESTPOINT ******************************************\
     98*             TestFile: tst_pmSubtractBias.c                                       *
     99*            TestPoint: pmSubtractBias{PUT COMMENT HERE}                           *
     100*             TestType: Positive                                                   *
     101\**********************************************************************************/
     102
     103---- doSubtractOverscansGeneric() ----
     104    Image size: 8 by 8
     105    Overscan size: 8 by 8
     106    Total Overscans: 2
     107    Binning factor: 1
     108    Overscan axis: PM_OVERSCAN_ALL
     109    Fit type: PM_FIT_SPLINE
     110
     111---> TESTPOINT PASSED (pmSubtractBias{Column Overscans} | tst_pmSubtractBias.c)
     112
     113/***************************** TESTPOINT ******************************************\
     114*             TestFile: tst_pmSubtractBias.c                                       *
     115*            TestPoint: pmSubtractBias{PUT COMMENT HERE}                           *
     116*             TestType: Positive                                                   *
     117\**********************************************************************************/
     118
     119---- doSubtractOverscansGeneric() ----
     120    Image size: 8 by 8
     121    Overscan size: 8 by 8
     122    Total Overscans: 2
     123    Binning factor: 1
     124    Overscan axis: PM_OVERSCAN_COLUMNS
     125    Fit type: PM_FIT_SPLINE
     126
     127---> TESTPOINT PASSED (pmSubtractBias{Column Overscans} | tst_pmSubtractBias.c)
     128
     129/***************************** TESTPOINT ******************************************\
     130*             TestFile: tst_pmSubtractBias.c                                       *
     131*            TestPoint: pmSubtractBias{PUT COMMENT HERE}                           *
     132*             TestType: Positive                                                   *
     133\**********************************************************************************/
     134
     135---- doSubtractOverscansGeneric() ----
     136    Image size: 8 by 8
     137    Overscan size: 8 by 8
     138    Total Overscans: 2
     139    Binning factor: 1
     140    Overscan axis: PM_OVERSCAN_ROWS
     141    Fit type: PM_FIT_SPLINE
     142
     143---> TESTPOINT PASSED (pmSubtractBias{Column Overscans} | tst_pmSubtractBias.c)
     144
     145/***************************** TESTPOINT ******************************************\
     146*             TestFile: tst_pmSubtractBias.c                                       *
     147*            TestPoint: pmSubtractBias{PUT COMMENT HERE}                           *
     148*             TestType: Positive                                                   *
     149\**********************************************************************************/
     150
     151---- doSubtractOverscansGeneric() ----
     152    Image size: 8 by 8
     153    Overscan size: 8 by 8
     154    Total Overscans: 2
     155    Binning factor: 2
     156    Overscan axis: PM_OVERSCAN_ALL
     157    Fit type: PM_FIT_SPLINE
     158
     159---> TESTPOINT PASSED (pmSubtractBias{Column Overscans} | tst_pmSubtractBias.c)
     160
     161/***************************** TESTPOINT ******************************************\
     162*             TestFile: tst_pmSubtractBias.c                                       *
     163*            TestPoint: pmSubtractBias{PUT COMMENT HERE}                           *
     164*             TestType: Positive                                                   *
     165\**********************************************************************************/
     166
     167---- doSubtractOverscansGeneric() ----
     168    Image size: 8 by 8
     169    Overscan size: 8 by 8
     170    Total Overscans: 2
     171    Binning factor: 2
     172    Overscan axis: PM_OVERSCAN_COLUMNS
     173    Fit type: PM_FIT_SPLINE
     174
     175---> TESTPOINT PASSED (pmSubtractBias{Column Overscans} | tst_pmSubtractBias.c)
     176
     177/***************************** TESTPOINT ******************************************\
     178*             TestFile: tst_pmSubtractBias.c                                       *
     179*            TestPoint: pmSubtractBias{PUT COMMENT HERE}                           *
     180*             TestType: Positive                                                   *
     181\**********************************************************************************/
     182
     183---- doSubtractOverscansGeneric() ----
     184    Image size: 8 by 8
     185    Overscan size: 8 by 8
     186    Total Overscans: 2
     187    Binning factor: 2
     188    Overscan axis: PM_OVERSCAN_ROWS
     189    Fit type: PM_FIT_SPLINE
     190
     191---> TESTPOINT PASSED (pmSubtractBias{Column Overscans} | tst_pmSubtractBias.c)
     192
     193/***************************** TESTPOINT ******************************************\
     194*             TestFile: tst_pmSubtractBias.c                                       *
     195*            TestPoint: pmSubtractBias{PUT COMMENT HERE}                           *
     196*             TestType: Positive                                                   *
     197\**********************************************************************************/
     198
     199---- doSubtractOverscansGeneric() ----
     200    Image size: 8 by 8
     201    Overscan size: 10 by 10
     202    Total Overscans: 2
     203    Binning factor: 1
     204    Overscan axis: PM_OVERSCAN_ALL
     205    Fit type: PM_FIT_SPLINE
     206
     207---> TESTPOINT PASSED (pmSubtractBias{Column Overscans} | tst_pmSubtractBias.c)
     208
     209/***************************** TESTPOINT ******************************************\
     210*             TestFile: tst_pmSubtractBias.c                                       *
     211*            TestPoint: pmSubtractBias{PUT COMMENT HERE}                           *
     212*             TestType: Positive                                                   *
     213\**********************************************************************************/
     214
     215---- doSubtractOverscansGeneric() ----
     216    Image size: 8 by 8
     217    Overscan size: 10 by 10
     218    Total Overscans: 2
     219    Binning factor: 1
     220    Overscan axis: PM_OVERSCAN_COLUMNS
     221    Fit type: PM_FIT_SPLINE
     222
     223---> TESTPOINT PASSED (pmSubtractBias{Column Overscans} | tst_pmSubtractBias.c)
     224
     225/***************************** TESTPOINT ******************************************\
     226*             TestFile: tst_pmSubtractBias.c                                       *
     227*            TestPoint: pmSubtractBias{PUT COMMENT HERE}                           *
     228*             TestType: Positive                                                   *
     229\**********************************************************************************/
     230
     231---- doSubtractOverscansGeneric() ----
     232    Image size: 8 by 8
     233    Overscan size: 10 by 10
     234    Total Overscans: 2
     235    Binning factor: 1
     236    Overscan axis: PM_OVERSCAN_ROWS
     237    Fit type: PM_FIT_SPLINE
     238
     239---> TESTPOINT PASSED (pmSubtractBias{Column Overscans} | tst_pmSubtractBias.c)
     240
     241/***************************** TESTPOINT ******************************************\
     242*             TestFile: tst_pmSubtractBias.c                                       *
     243*            TestPoint: pmSubtractBias{PUT COMMENT HERE}                           *
     244*             TestType: Positive                                                   *
     245\**********************************************************************************/
     246
     247---- doSubtractOverscansGeneric() ----
     248    Image size: 8 by 8
     249    Overscan size: 10 by 10
     250    Total Overscans: 2
     251    Binning factor: 2
     252    Overscan axis: PM_OVERSCAN_ALL
     253    Fit type: PM_FIT_SPLINE
     254
     255---> TESTPOINT PASSED (pmSubtractBias{Column Overscans} | tst_pmSubtractBias.c)
     256
     257/***************************** TESTPOINT ******************************************\
     258*             TestFile: tst_pmSubtractBias.c                                       *
     259*            TestPoint: pmSubtractBias{PUT COMMENT HERE}                           *
     260*             TestType: Positive                                                   *
     261\**********************************************************************************/
     262
     263---- doSubtractOverscansGeneric() ----
     264    Image size: 8 by 8
     265    Overscan size: 10 by 10
     266    Total Overscans: 2
     267    Binning factor: 2
     268    Overscan axis: PM_OVERSCAN_COLUMNS
     269    Fit type: PM_FIT_SPLINE
     270
     271---> TESTPOINT PASSED (pmSubtractBias{Column Overscans} | tst_pmSubtractBias.c)
     272
     273/***************************** TESTPOINT ******************************************\
     274*             TestFile: tst_pmSubtractBias.c                                       *
     275*            TestPoint: pmSubtractBias{PUT COMMENT HERE}                           *
     276*             TestType: Positive                                                   *
     277\**********************************************************************************/
     278
     279---- doSubtractOverscansGeneric() ----
     280    Image size: 8 by 8
     281    Overscan size: 10 by 10
     282    Total Overscans: 2
     283    Binning factor: 2
     284    Overscan axis: PM_OVERSCAN_ROWS
     285    Fit type: PM_FIT_SPLINE
     286
     287---> TESTPOINT PASSED (pmSubtractBias{Column Overscans} | tst_pmSubtractBias.c)
     288
     289/***************************** TESTPOINT ******************************************\
     290*             TestFile: tst_pmSubtractBias.c                                       *
     291*            TestPoint: pmSubtractBias{PUT COMMENT HERE}                           *
     292*             TestType: Positive                                                   *
     293\**********************************************************************************/
     294
     295---- doSubtractOverscansGeneric() ----
     296    Image size: 8 by 8
     297    Overscan size: 8 by 8
     298    Total Overscans: 1
     299    Binning factor: 1
     300    Overscan axis: PM_OVERSCAN_ALL
     301    Fit type: PM_FIT_SPLINE
     302
     303---> TESTPOINT PASSED (pmSubtractBias{Column Overscans} | tst_pmSubtractBias.c)
     304
     305/***************************** TESTPOINT ******************************************\
     306*             TestFile: tst_pmSubtractBias.c                                       *
     307*            TestPoint: pmSubtractBias{PUT COMMENT HERE}                           *
     308*             TestType: Positive                                                   *
     309\**********************************************************************************/
     310
     311---- doSubtractOverscansGeneric() ----
     312    Image size: 8 by 8
     313    Overscan size: 8 by 8
     314    Total Overscans: 1
     315    Binning factor: 1
     316    Overscan axis: PM_OVERSCAN_COLUMNS
     317    Fit type: PM_FIT_SPLINE
     318
     319---> TESTPOINT PASSED (pmSubtractBias{Column Overscans} | tst_pmSubtractBias.c)
     320
     321/***************************** TESTPOINT ******************************************\
     322*             TestFile: tst_pmSubtractBias.c                                       *
     323*            TestPoint: pmSubtractBias{PUT COMMENT HERE}                           *
     324*             TestType: Positive                                                   *
     325\**********************************************************************************/
     326
     327---- doSubtractOverscansGeneric() ----
     328    Image size: 8 by 8
     329    Overscan size: 8 by 8
     330    Total Overscans: 1
     331    Binning factor: 1
     332    Overscan axis: PM_OVERSCAN_ROWS
     333    Fit type: PM_FIT_SPLINE
     334
     335---> TESTPOINT PASSED (pmSubtractBias{Column Overscans} | tst_pmSubtractBias.c)
     336
     337/***************************** TESTPOINT ******************************************\
     338*             TestFile: tst_pmSubtractBias.c                                       *
     339*            TestPoint: pmSubtractBias{PUT COMMENT HERE}                           *
     340*             TestType: Positive                                                   *
     341\**********************************************************************************/
     342
     343---- doSubtractOverscansGeneric() ----
     344    Image size: 8 by 8
     345    Overscan size: 6 by 6
     346    Total Overscans: 2
     347    Binning factor: 1
     348    Overscan axis: PM_OVERSCAN_ALL
     349    Fit type: PM_FIT_POLYNOMIAL
     350
     351---> TESTPOINT PASSED (pmSubtractBias{Column Overscans} | tst_pmSubtractBias.c)
     352
     353/***************************** TESTPOINT ******************************************\
     354*             TestFile: tst_pmSubtractBias.c                                       *
     355*            TestPoint: pmSubtractBias{PUT COMMENT HERE}                           *
     356*             TestType: Positive                                                   *
     357\**********************************************************************************/
     358
     359---- doSubtractOverscansGeneric() ----
     360    Image size: 8 by 8
     361    Overscan size: 6 by 6
     362    Total Overscans: 2
     363    Binning factor: 1
     364    Overscan axis: PM_OVERSCAN_COLUMNS
     365    Fit type: PM_FIT_POLYNOMIAL
     366
     367---> TESTPOINT PASSED (pmSubtractBias{Column Overscans} | tst_pmSubtractBias.c)
     368
     369/***************************** TESTPOINT ******************************************\
     370*             TestFile: tst_pmSubtractBias.c                                       *
     371*            TestPoint: pmSubtractBias{PUT COMMENT HERE}                           *
     372*             TestType: Positive                                                   *
     373\**********************************************************************************/
     374
     375---- doSubtractOverscansGeneric() ----
     376    Image size: 8 by 8
     377    Overscan size: 6 by 6
     378    Total Overscans: 2
     379    Binning factor: 1
     380    Overscan axis: PM_OVERSCAN_ROWS
     381    Fit type: PM_FIT_POLYNOMIAL
     382
     383---> TESTPOINT PASSED (pmSubtractBias{Column Overscans} | tst_pmSubtractBias.c)
     384
     385/***************************** TESTPOINT ******************************************\
     386*             TestFile: tst_pmSubtractBias.c                                       *
     387*            TestPoint: pmSubtractBias{PUT COMMENT HERE}                           *
     388*             TestType: Positive                                                   *
     389\**********************************************************************************/
     390
     391---- doSubtractOverscansGeneric() ----
     392    Image size: 8 by 8
     393    Overscan size: 6 by 6
     394    Total Overscans: 2
     395    Binning factor: 2
     396    Overscan axis: PM_OVERSCAN_ALL
     397    Fit type: PM_FIT_POLYNOMIAL
     398
     399---> TESTPOINT PASSED (pmSubtractBias{Column Overscans} | tst_pmSubtractBias.c)
     400
     401/***************************** TESTPOINT ******************************************\
     402*             TestFile: tst_pmSubtractBias.c                                       *
     403*            TestPoint: pmSubtractBias{PUT COMMENT HERE}                           *
     404*             TestType: Positive                                                   *
     405\**********************************************************************************/
     406
     407---- doSubtractOverscansGeneric() ----
     408    Image size: 8 by 8
     409    Overscan size: 6 by 6
     410    Total Overscans: 2
     411    Binning factor: 2
     412    Overscan axis: PM_OVERSCAN_COLUMNS
     413    Fit type: PM_FIT_POLYNOMIAL
     414
     415---> TESTPOINT PASSED (pmSubtractBias{Column Overscans} | tst_pmSubtractBias.c)
     416
     417/***************************** TESTPOINT ******************************************\
     418*             TestFile: tst_pmSubtractBias.c                                       *
     419*            TestPoint: pmSubtractBias{PUT COMMENT HERE}                           *
     420*             TestType: Positive                                                   *
     421\**********************************************************************************/
     422
     423---- doSubtractOverscansGeneric() ----
     424    Image size: 8 by 8
     425    Overscan size: 6 by 6
     426    Total Overscans: 2
     427    Binning factor: 2
     428    Overscan axis: PM_OVERSCAN_ROWS
     429    Fit type: PM_FIT_POLYNOMIAL
     430
     431---> TESTPOINT PASSED (pmSubtractBias{Column Overscans} | tst_pmSubtractBias.c)
     432
     433/***************************** TESTPOINT ******************************************\
     434*             TestFile: tst_pmSubtractBias.c                                       *
     435*            TestPoint: pmSubtractBias{PUT COMMENT HERE}                           *
     436*             TestType: Positive                                                   *
     437\**********************************************************************************/
     438
     439---- doSubtractOverscansGeneric() ----
     440    Image size: 8 by 8
     441    Overscan size: 8 by 8
     442    Total Overscans: 2
     443    Binning factor: 1
     444    Overscan axis: PM_OVERSCAN_ALL
     445    Fit type: PM_FIT_POLYNOMIAL
     446
     447---> TESTPOINT PASSED (pmSubtractBias{Column Overscans} | tst_pmSubtractBias.c)
     448
     449/***************************** TESTPOINT ******************************************\
     450*             TestFile: tst_pmSubtractBias.c                                       *
     451*            TestPoint: pmSubtractBias{PUT COMMENT HERE}                           *
     452*             TestType: Positive                                                   *
     453\**********************************************************************************/
     454
     455---- doSubtractOverscansGeneric() ----
     456    Image size: 8 by 8
     457    Overscan size: 8 by 8
     458    Total Overscans: 2
     459    Binning factor: 1
     460    Overscan axis: PM_OVERSCAN_COLUMNS
     461    Fit type: PM_FIT_POLYNOMIAL
     462
     463---> TESTPOINT PASSED (pmSubtractBias{Column Overscans} | tst_pmSubtractBias.c)
     464
     465/***************************** TESTPOINT ******************************************\
     466*             TestFile: tst_pmSubtractBias.c                                       *
     467*            TestPoint: pmSubtractBias{PUT COMMENT HERE}                           *
     468*             TestType: Positive                                                   *
     469\**********************************************************************************/
     470
     471---- doSubtractOverscansGeneric() ----
     472    Image size: 8 by 8
     473    Overscan size: 8 by 8
     474    Total Overscans: 2
     475    Binning factor: 1
     476    Overscan axis: PM_OVERSCAN_ROWS
     477    Fit type: PM_FIT_POLYNOMIAL
     478
     479---> TESTPOINT PASSED (pmSubtractBias{Column Overscans} | tst_pmSubtractBias.c)
     480
     481/***************************** TESTPOINT ******************************************\
     482*             TestFile: tst_pmSubtractBias.c                                       *
     483*            TestPoint: pmSubtractBias{PUT COMMENT HERE}                           *
     484*             TestType: Positive                                                   *
     485\**********************************************************************************/
     486
     487---- doSubtractOverscansGeneric() ----
     488    Image size: 8 by 8
     489    Overscan size: 8 by 8
     490    Total Overscans: 2
     491    Binning factor: 2
     492    Overscan axis: PM_OVERSCAN_ALL
     493    Fit type: PM_FIT_POLYNOMIAL
     494
     495---> TESTPOINT PASSED (pmSubtractBias{Column Overscans} | tst_pmSubtractBias.c)
     496
     497/***************************** TESTPOINT ******************************************\
     498*             TestFile: tst_pmSubtractBias.c                                       *
     499*            TestPoint: pmSubtractBias{PUT COMMENT HERE}                           *
     500*             TestType: Positive                                                   *
     501\**********************************************************************************/
     502
     503---- doSubtractOverscansGeneric() ----
     504    Image size: 8 by 8
     505    Overscan size: 8 by 8
     506    Total Overscans: 2
     507    Binning factor: 2
     508    Overscan axis: PM_OVERSCAN_COLUMNS
     509    Fit type: PM_FIT_POLYNOMIAL
     510
     511---> TESTPOINT PASSED (pmSubtractBias{Column Overscans} | tst_pmSubtractBias.c)
     512
     513/***************************** TESTPOINT ******************************************\
     514*             TestFile: tst_pmSubtractBias.c                                       *
     515*            TestPoint: pmSubtractBias{PUT COMMENT HERE}                           *
     516*             TestType: Positive                                                   *
     517\**********************************************************************************/
     518
     519---- doSubtractOverscansGeneric() ----
     520    Image size: 8 by 8
     521    Overscan size: 8 by 8
     522    Total Overscans: 2
     523    Binning factor: 2
     524    Overscan axis: PM_OVERSCAN_ROWS
     525    Fit type: PM_FIT_POLYNOMIAL
     526
     527---> TESTPOINT PASSED (pmSubtractBias{Column Overscans} | tst_pmSubtractBias.c)
     528
     529/***************************** TESTPOINT ******************************************\
     530*             TestFile: tst_pmSubtractBias.c                                       *
     531*            TestPoint: pmSubtractBias{PUT COMMENT HERE}                           *
     532*             TestType: Positive                                                   *
     533\**********************************************************************************/
     534
     535---- doSubtractOverscansGeneric() ----
     536    Image size: 8 by 8
     537    Overscan size: 10 by 10
     538    Total Overscans: 2
     539    Binning factor: 1
     540    Overscan axis: PM_OVERSCAN_ALL
     541    Fit type: PM_FIT_POLYNOMIAL
     542
     543---> TESTPOINT PASSED (pmSubtractBias{Column Overscans} | tst_pmSubtractBias.c)
     544
     545/***************************** TESTPOINT ******************************************\
     546*             TestFile: tst_pmSubtractBias.c                                       *
     547*            TestPoint: pmSubtractBias{PUT COMMENT HERE}                           *
     548*             TestType: Positive                                                   *
     549\**********************************************************************************/
     550
     551---- doSubtractOverscansGeneric() ----
     552    Image size: 8 by 8
     553    Overscan size: 10 by 10
     554    Total Overscans: 2
     555    Binning factor: 1
     556    Overscan axis: PM_OVERSCAN_COLUMNS
     557    Fit type: PM_FIT_POLYNOMIAL
     558
     559---> TESTPOINT PASSED (pmSubtractBias{Column Overscans} | tst_pmSubtractBias.c)
     560
     561/***************************** TESTPOINT ******************************************\
     562*             TestFile: tst_pmSubtractBias.c                                       *
     563*            TestPoint: pmSubtractBias{PUT COMMENT HERE}                           *
     564*             TestType: Positive                                                   *
     565\**********************************************************************************/
     566
     567---- doSubtractOverscansGeneric() ----
     568    Image size: 8 by 8
     569    Overscan size: 10 by 10
     570    Total Overscans: 2
     571    Binning factor: 1
     572    Overscan axis: PM_OVERSCAN_ROWS
     573    Fit type: PM_FIT_POLYNOMIAL
     574
     575---> TESTPOINT PASSED (pmSubtractBias{Column Overscans} | tst_pmSubtractBias.c)
     576
     577/***************************** TESTPOINT ******************************************\
     578*             TestFile: tst_pmSubtractBias.c                                       *
     579*            TestPoint: pmSubtractBias{PUT COMMENT HERE}                           *
     580*             TestType: Positive                                                   *
     581\**********************************************************************************/
     582
     583---- doSubtractOverscansGeneric() ----
     584    Image size: 8 by 8
     585    Overscan size: 10 by 10
     586    Total Overscans: 2
     587    Binning factor: 2
     588    Overscan axis: PM_OVERSCAN_ALL
     589    Fit type: PM_FIT_POLYNOMIAL
     590
     591---> TESTPOINT PASSED (pmSubtractBias{Column Overscans} | tst_pmSubtractBias.c)
     592
     593/***************************** TESTPOINT ******************************************\
     594*             TestFile: tst_pmSubtractBias.c                                       *
     595*            TestPoint: pmSubtractBias{PUT COMMENT HERE}                           *
     596*             TestType: Positive                                                   *
     597\**********************************************************************************/
     598
     599---- doSubtractOverscansGeneric() ----
     600    Image size: 8 by 8
     601    Overscan size: 10 by 10
     602    Total Overscans: 2
     603    Binning factor: 2
     604    Overscan axis: PM_OVERSCAN_COLUMNS
     605    Fit type: PM_FIT_POLYNOMIAL
     606
     607---> TESTPOINT PASSED (pmSubtractBias{Column Overscans} | tst_pmSubtractBias.c)
     608
     609/***************************** TESTPOINT ******************************************\
     610*             TestFile: tst_pmSubtractBias.c                                       *
     611*            TestPoint: pmSubtractBias{PUT COMMENT HERE}                           *
     612*             TestType: Positive                                                   *
     613\**********************************************************************************/
     614
     615---- doSubtractOverscansGeneric() ----
     616    Image size: 8 by 8
     617    Overscan size: 10 by 10
     618    Total Overscans: 2
     619    Binning factor: 2
     620    Overscan axis: PM_OVERSCAN_ROWS
     621    Fit type: PM_FIT_POLYNOMIAL
     622
     623---> TESTPOINT PASSED (pmSubtractBias{Column Overscans} | tst_pmSubtractBias.c)
     624
     625/***************************** TESTPOINT ******************************************\
     626*             TestFile: tst_pmSubtractBias.c                                       *
     627*            TestPoint: pmSubtractBias{PUT COMMENT HERE}                           *
     628*             TestType: Positive                                                   *
     629\**********************************************************************************/
     630
     631---- doSubtractOverscansGeneric() ----
     632    Image size: 8 by 8
     633    Overscan size: 8 by 8
     634    Total Overscans: 1
     635    Binning factor: 1
     636    Overscan axis: PM_OVERSCAN_ALL
     637    Fit type: PM_FIT_POLYNOMIAL
     638
     639---> TESTPOINT PASSED (pmSubtractBias{Column Overscans} | tst_pmSubtractBias.c)
     640
     641/***************************** TESTPOINT ******************************************\
     642*             TestFile: tst_pmSubtractBias.c                                       *
     643*            TestPoint: pmSubtractBias{PUT COMMENT HERE}                           *
     644*             TestType: Positive                                                   *
     645\**********************************************************************************/
     646
     647---- doSubtractOverscansGeneric() ----
     648    Image size: 8 by 8
     649    Overscan size: 8 by 8
     650    Total Overscans: 1
     651    Binning factor: 1
     652    Overscan axis: PM_OVERSCAN_COLUMNS
     653    Fit type: PM_FIT_POLYNOMIAL
     654
     655---> TESTPOINT PASSED (pmSubtractBias{Column Overscans} | tst_pmSubtractBias.c)
     656
     657/***************************** TESTPOINT ******************************************\
     658*             TestFile: tst_pmSubtractBias.c                                       *
     659*            TestPoint: pmSubtractBias{PUT COMMENT HERE}                           *
     660*             TestType: Positive                                                   *
     661\**********************************************************************************/
     662
     663---- doSubtractOverscansGeneric() ----
     664    Image size: 8 by 8
     665    Overscan size: 8 by 8
     666    Total Overscans: 1
     667    Binning factor: 1
     668    Overscan axis: PM_OVERSCAN_ROWS
     669    Fit type: PM_FIT_POLYNOMIAL
     670
     671---> TESTPOINT PASSED (pmSubtractBias{Column Overscans} | tst_pmSubtractBias.c)
     672
  • trunk/psModules/test/objects/tst_pmObjects01.c

    r5516 r5681  
    2020 * XXX: Memory leaks are not being caught.  If I allocated a psVector in these functions
    2121 * and never deallocate, no error is generated.
     22 *
     23 * XXX: Much of this file is commented out due to the API changes in rel 7.
     24 *
     25 *
    2226Fully Tested:
    2327    pmPeakAlloc()
     
    2731    most of psObjects.c is not tested
    2832 *
    29  *  @version $Revision: 1.5 $ $Name: not supported by cvs2svn $
    30  *  @date $Date: 2005-11-15 20:09:03 $
     33 *  @version $Revision: 1.6 $ $Name: not supported by cvs2svn $
     34 *  @date $Date: 2005-12-05 21:28:55 $
    3135 *
    3236 *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
     
    5054//static int test07(void);
    5155//static int test08(void);
    52 static int test09(void);
    53 static int test15(void);
    54 static int test16(void);
    55 static int test20(void);
     56//static int test09(void);
     57//static int test15(void);
     58//static int test16(void);
     59//static int test20(void);
    5660testDescription tests[] = {
    5761                              {test00, 000, "pmObjects: structure allocators and deallocators", true, false},
     
    6468                              //                              {test07, 001, "pmObjects: pmMin()", true, false},
    6569                              //                              {test08, 001, "pmObjects: pmSourceModelGuess()", true, false},
    66                               {test09, 001, "pmObjects: pmSourceContour()", true, false},
    67                               {test15, 001, "pmObjects: pmSourceAddModel()", true, false},
    68                               {test16, 001, "pmObjects: pmSourceSubModel()", true, false},
    69                               {test20, 001, "pmObjects: pmSourceSubModel()", true, false},
     70                              //{test09, 001, "pmObjects: pmSourceContour()", true, false},
     71                              //{test15, 001, "pmObjects: pmSourceAddModel()", true, false},
     72                              //{test16, 001, "pmObjects: pmSourceSubModel()", true, false},
     73                              //{test20, 001, "pmObjects: pmSourceSubModel()", true, false},
    7074                              {NULL}
    7175                          };
     
    10631067XXX: We don't verify the numbers.
    10641068 *****************************************************************************/
     1069/*
    10651070int test15( void )
    10661071{
     
    10831088        testStatus = false;
    10841089    }
    1085 
    1086 
     1090 
     1091 
    10871092    tmpSource->modelPSF = pmModelAlloc(PS_MODEL_GAUSS);
    10881093    tmpSource->modelPSF->params->data.F32[0] = 5.0;
     
    10931098    tmpSource->modelPSF->params->data.F32[5] = 1.0;
    10941099    tmpSource->modelPSF->params->data.F32[6] = 2.0;
    1095 
     1100 
    10961101    printf("----------------------------------------------------------------------------------\n");
    10971102    printf("Calling pmSourceAddModel with NULL psImage.  Should generate error, return FALSE.\n");
     
    11011106        testStatus = false;
    11021107    }
    1103 
     1108 
    11041109    printf("----------------------------------------------------------------------------------\n");
    11051110    printf("Calling pmSourceAddModel with NULL psSrc.  Should generate error, return FALSE.\n");
     
    11091114        testStatus = false;
    11101115    }
    1111 
     1116 
    11121117    printf("----------------------------------------------------------------------------------\n");
    11131118    printf("Calling pmSourceAddModel with acceptable data.\n");
     
    11171122        testStatus = false;
    11181123    }
    1119 
     1124 
    11201125    psFree(tmpSource);
    11211126    psFree(imgData);
    11221127    return(testStatus);
    11231128}
     1129*/
    11241130
    11251131#define TST16_NUM_ROWS 100
     
    11341140XXX: We don't verify the numbers.
    11351141 *****************************************************************************/
     1142/*
    11361143int test16( void )
    11371144{
     
    11451152    pmSource *tmpSource = NULL;
    11461153    psBool rc = false;
    1147 
     1154 
    11481155    pmPeak *tmpPeak = pmPeakAlloc((psF32) (TST16_NUM_ROWS / 2),
    11491156                                  (psF32) (TST16_NUM_COLS / 2),
    11501157                                  200.0,
    11511158                                  PM_PEAK_LONE);
    1152 
     1159 
    11531160    printf("Calling pmSourceLocalSky with valid data.\n");
    11541161    tmpPeak->x = (psF32) (TST16_NUM_ROWS / 2);
     
    11591166                                 (psF32) TST16_INNER_RADIUS,
    11601167                                 (psF32) TST16_OUTER_RADIUS);
    1161 
     1168 
    11621169    if (tmpSource == NULL) {
    11631170        printf("TEST ERROR: pmSourceLocalSky() returned a NULL pmSource.\n");
    11641171        testStatus = false;
    11651172    }
    1166 
     1173 
    11671174    tmpSource->modelPSF = pmModelAlloc(PS_MODEL_GAUSS);
    11681175    tmpSource->modelPSF->params->data.F32[0] = 5.0;
     
    11731180    tmpSource->modelPSF->params->data.F32[5] = 1.0;
    11741181    tmpSource->modelPSF->params->data.F32[6] = 2.0;
    1175 
     1182 
    11761183    printf("----------------------------------------------------------------------------------\n");
    11771184    printf("Calling pmSourceSubModel with NULL psImage.  Should generate error, return FALSE.\n");
     
    11811188        testStatus = false;
    11821189    }
    1183 
     1190 
    11841191    printf("----------------------------------------------------------------------------------\n");
    11851192    printf("Calling pmSourceSubModel with NULL psSrc.  Should generate error, return FALSE.\n");
     
    11891196        testStatus = false;
    11901197    }
    1191 
     1198 
    11921199    printf("----------------------------------------------------------------------------------\n");
    11931200    printf("Calling pmSourceSubModel with acceptable data.\n");
     
    11971204        testStatus = false;
    11981205    }
    1199 
     1206 
    12001207    psFree(tmpSource);
    12011208    psFree(imgData);
    12021209    return(testStatus);
    12031210}
     1211*/
    12041212
    12051213#define TST20_NUM_ROWS 100
     
    12141222XXX: We don't verify the numbers.
    12151223 *****************************************************************************/
     1224/*
    12161225int test20( void )
    12171226{
     
    12251234    pmSource *tmpSource = NULL;
    12261235    psBool rc = false;
    1227 
     1236 
    12281237    pmPeak *tmpPeak = pmPeakAlloc((psF32) (TST20_NUM_ROWS / 2),
    12291238                                  (psF32) (TST20_NUM_COLS / 2),
    12301239                                  200.0,
    12311240                                  PM_PEAK_LONE);
    1232 
     1241 
    12331242    printf("Calling pmSourceLocalSky with valid data.\n");
    12341243    tmpPeak->x = (psF32) (TST20_NUM_ROWS / 2);
     
    12391248                                 (psF32) TST20_INNER_RADIUS,
    12401249                                 (psF32) TST20_OUTER_RADIUS);
    1241 
     1250 
    12421251    if (tmpSource == NULL) {
    12431252        printf("TEST ERROR: pmSourceLocalSky() returned a NULL pmSource.\n");
    12441253        testStatus = false;
    12451254    }
    1246 
     1255 
    12471256    tmpSource->modelPSF = pmModelAlloc(PS_MODEL_GAUSS);
    1248 
    1249 
     1257 
     1258 
    12501259    tmpSource->modelPSF->params->data.F32[0] = 5.0;
    12511260    tmpSource->modelPSF->params->data.F32[1] = 70.0;
     
    12551264    tmpSource->modelPSF->params->data.F32[5] = 1.0;
    12561265    tmpSource->modelPSF->params->data.F32[6] = 2.0;
    1257 
     1266 
    12581267    printf("----------------------------------------------------------------------------------\n");
    12591268    printf("Calling pmSourceFitModel with NULL psImage.  Should generate error, return FALSE.\n");
     
    12631272        testStatus = false;
    12641273    }
    1265 
     1274 
    12661275    printf("----------------------------------------------------------------------------------\n");
    12671276    printf("Calling pmSourceFitModel with NULL pmSource.  Should generate error, return FALSE.\n");
     
    12711280        testStatus = false;
    12721281    }
    1273 
     1282 
    12741283    printf("----------------------------------------------------------------------------------\n");
    12751284    printf("Calling pmSourceFitModel with acceptable data.\n");
    12761285    rc = pmSourceFitModel(tmpSource, imgData);
    12771286    printf("pmSourceFitModel returned %d\n", rc);
    1278 
     1287 
    12791288    // XXX: Memory leaks are not being tested
    12801289    psVector *junk = psVectorAlloc(10, PS_TYPE_F32);
    12811290    junk->data.F32[0] = 0.0;
    1282 
     1291 
    12831292    psFree(tmpSource);
    12841293    psFree(imgData);
    12851294    return(testStatus);
    12861295}
    1287 
    1288 
     1296*/
     1297
Note: See TracChangeset for help on using the changeset viewer.