Index: trunk/psModules/test/tst_pmSubtractBias.c =================================================================== --- trunk/psModules/test/tst_pmSubtractBias.c (revision 3582) +++ trunk/psModules/test/tst_pmSubtractBias.c (revision 4770) @@ -14,6 +14,6 @@ * @author GLG, MHPCC * - * @version $Revision: 1.16 $ $Name: not supported by cvs2svn $ - * @date $Date: 2005-03-31 02:01:57 $ + * @version $Revision: 1.17 $ $Name: not supported by cvs2svn $ + * @date $Date: 2005-08-16 01:10:36 $ * * Copyright 2004 Maui High Performance Computing Center, University of Hawaii @@ -42,4 +42,5 @@ int main(int argc, char* argv[]) { + psLogSetFormat("HLNM"); return !runTestSuite(stderr, "Test Point Driver", tests, argc, argv); } @@ -48,6 +49,6 @@ #define NUM_COLS 8 /****************************************************************************** -doSubtractBiasFullFrame(): a sample psReadout as well as a bias image are -created and the bias image is subtracted from the psReadout. +doSubtractBiasFullFrame(): a sample pmReadout as well as a bias image are +created and the bias image is subtracted from the pmReadout. *****************************************************************************/ int doSubtractBiasFullFrame(int numCols, int numRows) @@ -60,8 +61,8 @@ psImage *tmpImage1 = psImageAlloc(numCols, numRows, PS_TYPE_F32); psImage *tmpImage2 = psImageAlloc(numCols, numRows, PS_TYPE_F32); - // psReadout *myReadout = psReadoutAlloc(numCols, numRows, tmpImage1); - // psReadout *myBias = psReadoutAlloc(numCols, numRows, tmpImage2); - psReadout *myReadout = psReadoutAlloc(); - psReadout *myBias = psReadoutAlloc(); + // pmReadout *myReadout = pmReadoutAlloc(numCols, numRows, tmpImage1); + // pmReadout *myBias = pmReadoutAlloc(numCols, numRows, tmpImage2); + pmReadout *myReadout = pmReadoutAlloc(NULL); + pmReadout *myBias = pmReadoutAlloc(NULL); myReadout->image = tmpImage1; myBias->image = tmpImage2; @@ -110,7 +111,7 @@ /****************************************************************************** -doSubtractFullOverscans(): a sample psReadout as well as several overscan +doSubtractFullOverscans(): a sample pmReadout as well as several overscan images of the same size are created. The overscan images are then subtracted -from the psReadout. +from the pmReadout. *****************************************************************************/ int doSubtractFullOverscans(int numCols, int numRows) @@ -125,6 +126,6 @@ psImage *tmpImage3 = psImageAlloc(numCols, numRows, PS_TYPE_F32); psImage *tmpImage4 = psImageAlloc(numCols, numRows, PS_TYPE_F32); - // psReadout *myReadout = psReadoutAlloc(numCols, numRows, tmpImage1); - psReadout *myReadout = psReadoutAlloc(); + // pmReadout *myReadout = pmReadoutAlloc(numCols, numRows, tmpImage1); + pmReadout *myReadout = pmReadoutAlloc(NULL); myReadout->image = tmpImage1; @@ -185,7 +186,7 @@ /****************************************************************************** -doSubtractFullOverscans(): a sample psReadout as well as several overscan +doSubtractFullOverscans(): a sample pmReadout as well as several overscan images of the same size are created. The overscan images are collected -pixel-by-pixel then subtracted column-wise from the psReadout. +pixel-by-pixel then subtracted column-wise from the pmReadout. *****************************************************************************/ int doSubtractFullOverscanColumns(int numCols, int numRows) @@ -200,5 +201,5 @@ psImage *tmpImage3 = psImageAlloc(numCols, numRows, PS_TYPE_F32); psImage *tmpImage4 = psImageAlloc(numCols, numRows, PS_TYPE_F32); - psReadout *myReadout = psReadoutAlloc(); + pmReadout *myReadout = pmReadoutAlloc(NULL); myReadout->image = tmpImage1; psList *list; @@ -245,7 +246,7 @@ } /****************************************************************************** -doSubtractFullOverscans(): a sample psReadout as well as several overscan +doSubtractFullOverscans(): a sample pmReadout as well as several overscan images of the same size are created. The overscan images are collected -pixel-by-pixel then subtracted column-wise from the psReadout. +pixel-by-pixel then subtracted column-wise from the pmReadout. *****************************************************************************/ int doSubtractFullOverscanColumnsPoly(int numCols, int numRows) @@ -260,5 +261,5 @@ psImage *tmpImage3 = psImageAlloc(numCols, numRows, PS_TYPE_F32); psImage *tmpImage4 = psImageAlloc(numCols, numRows, PS_TYPE_F32); - psReadout *myReadout = psReadoutAlloc(); + pmReadout *myReadout = pmReadoutAlloc(NULL); myReadout->image = tmpImage1; psList *list; @@ -307,7 +308,7 @@ } /****************************************************************************** -doSubtractFullOverscansSmall(): a sample psReadout as well as several overscan +doSubtractFullOverscansSmall(): a sample pmReadout as well as several overscan images of smaller size are created. The overscan images are collected -pixel-by-pixel then subtracted column-wise from the psReadout. +pixel-by-pixel then subtracted column-wise from the pmReadout. *****************************************************************************/ int doSubtractFullOverscanColumnsSmall(int numCols, int numRows) @@ -319,5 +320,5 @@ int testStatus = 0; psImage *tmpImage1 = psImageAlloc(numCols, numRows, PS_TYPE_F32); - psReadout *myReadout = psReadoutAlloc(); + pmReadout *myReadout = pmReadoutAlloc(NULL); myReadout->image = tmpImage1; psImage *tmpImage2 = psImageAlloc(numCols/2, numRows/2, PS_TYPE_F32); @@ -390,7 +391,7 @@ /****************************************************************************** -doSubtractFullOverscans(): a sample psReadout as well as several overscan +doSubtractFullOverscans(): a sample pmReadout as well as several overscan images of the same size are created. The overscan images are collected -pixel-by-pixel then subtracted row-wise from the psReadout. +pixel-by-pixel then subtracted row-wise from the pmReadout. *****************************************************************************/ int doSubtractFullOverscanRows(int numCols, int numRows) @@ -405,5 +406,5 @@ psImage *tmpImage3 = psImageAlloc(numCols, numRows, PS_TYPE_F32); psImage *tmpImage4 = psImageAlloc(numCols, numRows, PS_TYPE_F32); - psReadout *myReadout = psReadoutAlloc(); + pmReadout *myReadout = pmReadoutAlloc(NULL); myReadout->image = tmpImage1; psList *list; @@ -451,7 +452,7 @@ /****************************************************************************** -doSubtractFullOverscansSmall(): a sample psReadout as well as several overscan +doSubtractFullOverscansSmall(): a sample pmReadout as well as several overscan images of smaller size are created. The overscan images are collected -pixel-by-pixel then subtracted row-wise from the psReadout. +pixel-by-pixel then subtracted row-wise from the pmReadout. *****************************************************************************/ int doSubtractFullOverscanRowsSmall(int numCols, int numRows) @@ -474,5 +475,5 @@ psImage *tmpImage3 = psImageAlloc(OSnumCols, OSnumRows, PS_TYPE_F32); psImage *tmpImage4 = psImageAlloc(OSnumCols, OSnumRows, PS_TYPE_F32); - psReadout *myReadout = psReadoutAlloc(); + pmReadout *myReadout = pmReadoutAlloc(NULL); myReadout->image = tmpImage1; psList *list; @@ -554,20 +555,20 @@ psImage *tmpImage3Short = psImageAlloc(numCols-1, numRows-1, PS_TYPE_F32); psImage *tmpImage4Short = psImageAlloc(numCols-1, numRows-1, PS_TYPE_F32); - psReadout *myReadout = psReadoutAlloc(); + pmReadout *myReadout = pmReadoutAlloc(NULL); myReadout->image = tmpImage1; - psReadout *rc = NULL; + pmReadout *rc = NULL; psList *list; psList *listShort; psStats *stat = psStatsAlloc(PS_STAT_SAMPLE_MEAN); psImage *tmpImage5 = psImageAlloc(numCols, numRows, PS_TYPE_F32); - psReadout *myBias = psReadoutAlloc(); + pmReadout *myBias = pmReadoutAlloc(NULL); myBias->image = tmpImage5; printPositiveTestHeader(stdout, "pmSubtractBias", "Testing input parameter error conditions"); psImage *tmpImage5ShortRows = psImageAlloc(numCols, numRows-1, PS_TYPE_F32); - psReadout *myBiasShortRows = psReadoutAlloc(); + pmReadout *myBiasShortRows = pmReadoutAlloc(NULL); myBiasShortRows->image = tmpImage5ShortRows; psImage *tmpImage5ShortCols = psImageAlloc(numCols-1, numRows, PS_TYPE_F32); - psReadout *myBiasShortCols = psReadoutAlloc(); + pmReadout *myBiasShortCols = pmReadoutAlloc(NULL); myBiasShortCols->image = tmpImage5ShortCols; @@ -611,5 +612,5 @@ rc = pmSubtractBias(myReadout, NULL, NULL, PM_OVERSCAN_ALL, stat, 0, PM_FIT_NONE, NULL); if (rc != myReadout) { - printf("TEST ERROR: pmSubtractBias() did not return input psReadout.\n"); + printf("TEST ERROR: pmSubtractBias() did not return input pmReadout.\n"); testStatus = false; } @@ -619,5 +620,5 @@ rc = pmSubtractBias(myReadout, NULL, NULL, PM_OVERSCAN_ROWS, stat, 0, PM_FIT_NONE, NULL); if (rc != myReadout) { - printf("TEST ERROR: pmSubtractBias() did not return input psReadout.\n"); + printf("TEST ERROR: pmSubtractBias() did not return input pmReadout.\n"); testStatus = false; psFree(rc); @@ -628,5 +629,5 @@ rc = pmSubtractBias(myReadout, NULL, NULL, PM_OVERSCAN_COLUMNS, stat, 0, PM_FIT_NONE, NULL); if (rc != myReadout) { - printf("TEST ERROR: pmSubtractBias() did not return input psReadout.\n"); + printf("TEST ERROR: pmSubtractBias() did not return input pmReadout.\n"); testStatus = false; psFree(rc); @@ -694,5 +695,5 @@ rc = pmSubtractBias(myReadout, NULL, NULL, PM_OVERSCAN_NONE, stat, 0, PM_FIT_SPLINE, myBias); if (rc != myReadout) { - printf("TEST ERROR: pmSubtractBias() did not return input psReadout.\n"); + printf("TEST ERROR: pmSubtractBias() did not return input pmReadout.\n"); testStatus = false; psFree(rc); @@ -770,5 +771,5 @@ 0, PM_FIT_NONE, myBiasShortRows); if (rc != myReadout) { - printf("TEST ERROR: pmSubtractBias() did not return input psReadout.\n"); + printf("TEST ERROR: pmSubtractBias() did not return input pmReadout.\n"); testStatus = false; psFree(rc); @@ -781,5 +782,5 @@ 0, PM_FIT_NONE, myBiasShortCols); if (rc != myReadout) { - printf("TEST ERROR: pmSubtractBias() did not return input psReadout.\n"); + printf("TEST ERROR: pmSubtractBias() did not return input pmReadout.\n"); testStatus = false; psFree(rc); @@ -791,5 +792,5 @@ 0, 54321, NULL); if (rc != myReadout) { - printf("TEST ERROR: pmSubtractBias() did not return input psReadout.\n"); + printf("TEST ERROR: pmSubtractBias() did not return input pmReadout.\n"); testStatus = false; psFree(rc); @@ -801,5 +802,5 @@ 0, PM_FIT_NONE, NULL); if (rc != myReadout) { - printf("TEST ERROR: pmSubtractBias() did not return input psReadout.\n"); + printf("TEST ERROR: pmSubtractBias() did not return input pmReadout.\n"); testStatus = false; psFree(rc); @@ -847,7 +848,7 @@ /****************************************************************************** -doSubtractFullOverscansSmall(): a sample psReadout as well as several overscan +doSubtractFullOverscansSmall(): a sample pmReadout as well as several overscan images of smaller size are created. The overscan images are collected -pixel-by-pixel then subtracted column-wise from the psReadout. +pixel-by-pixel then subtracted column-wise from the pmReadout. *****************************************************************************/ int doSubtractFullOverscanColumnsGeneric(int imageNumCols, @@ -866,6 +867,6 @@ psImage *tmpImage1 = psImageAlloc(imageNumCols, imageNumRows, PS_TYPE_F32); - // psReadout *myReadout = psReadoutAlloc(imageNumCols, imageNumRows, tmpImage1); - psReadout *myReadout = psReadoutAlloc(); + // pmReadout *myReadout = pmReadoutAlloc(imageNumCols, imageNumRows, tmpImage1); + pmReadout *myReadout = pmReadoutAlloc(NULL); myReadout->image = tmpImage1; for (i=0;i