IPP Software Navigation Tools IPP Links Communication Pan-STARRS Links

Changeset 5552


Ignore:
Timestamp:
Nov 18, 2005, 2:55:18 PM (21 years ago)
Author:
gusciora
Message:

Replaced psVectorCopy()

Location:
trunk/psModules
Files:
3 edited

Legend:

Unmodified
Added
Removed

  • trunk/psModules/src/astrom/pmAstrometry.c

    r5543 r5552  
    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-11-19 00:55:18 $
    1212*
    1313*  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
    … …  
    498498    return(p_psDeproject(outSphere, tpCoord, projection));
    499499}
     500/*****************************************************************************
     501XXX: What about units for the (x,y) coords?
     502 
     503XXX: This has not been tested.
     504 *****************************************************************************/
     505psPlane* pmCoordSkyToTP(
     506    psPlane* tpCoord,
     507    const psSphere* in,
     508    const psProjection *projection)
     509{
     510    PS_ASSERT_PTR_NON_NULL(in, NULL);
     511    PS_ASSERT_PTR_NON_NULL(projection, NULL);
     512
     513    return(p_psProject(tpCoord, in, projection));
     514}
    500515
    501516
    … …  
    558573             "WARNING: psCoordCellToSkyQuick(): This function is not fully specified in the SDRS.  Returning NULL.\n");
    559574    return(NULL);
    560 }
    561 
    562 
    563 /*****************************************************************************
    564 XXX: What about units for the (x,y) coords?
    565  
    566 XXX: This has not been tested.
    567  *****************************************************************************/
    568 psPlane* pmCoordSkyToTP(
    569     psPlane* tpCoord,
    570     const psSphere* in,
    571     const psProjection *projection)
    572 {
    573     PS_ASSERT_PTR_NON_NULL(in, NULL);
    574     PS_ASSERT_PTR_NON_NULL(projection, NULL);
    575 
    576     return(p_psProject(tpCoord, in, projection));
    577575}
    578576

  • trunk/psModules/src/imsubtract/pmSubtractBias.c

    r5516 r5552  
    66 *  @author GLG, MHPCC
    77 *
    8  *  @version $Revision: 1.5 $ $Name: not supported by cvs2svn $
    9  *  @date $Date: 2005-11-15 20:09:03 $
     8 *  @version $Revision: 1.6 $ $Name: not supported by cvs2svn $
     9 *  @date $Date: 2005-11-19 00:55:18 $
    1010 *
    1111 *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
    … …  
    304304    }
    305305
    306     out->knots = psVectorCopy(out->knots, in->knots, in->knots->type.type);
     306    // XXX: use psVectorCopy if they get it working.
     307    out->knots = psVectorAlloc(in->knots->n, in->knots->type.type);
     308    for (psS32 i = 0 ; i < in->knots->n ; i++) {
     309        out->knots->data.F32[i] = in->knots->data.F32[i];
     310    }
     311    /*
     312        out->knots = psVectorCopy(out->knots, in->knots, in->knots->type.type);
     313    */
    307314
    308315    out->p_psDeriv2 = (psF32 *) psAlloc((in->n + 1) * sizeof(psF32));
    … …  
    11841191    if (overscan == true) {
    11851192        pmOverscanAxis overScanAxis = GetOverscanAxis(in);
    1186 
    11871193        //
    11881194        //  Create a psStats data structure and determine the highest

  • trunk/psModules/test/imsubtract/tst_pmSubtractBias.c

    r5516 r5552  
    2525 *  XXX: Memory leaks are not being detected.
    2626 *
    27  *  @version $Revision: 1.3 $ $Name: not supported by cvs2svn $
    28  *  @date $Date: 2005-11-15 20:09:03 $
     27 *  @version $Revision: 1.4 $ $Name: not supported by cvs2svn $
     28 *  @date $Date: 2005-11-19 00:55:18 $
    2929 *
    3030 *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
    … …  
    4242static int test05(void);
    4343testDescription tests[] = {
    44                               {test00a, 000, "doSubtractBiasFullFrame", 0, false},
    45                               {test00b, 000, "doSubtractDarkFullFrame", 0, false},
     44                              {test00a, 000, "doSubtractBiasFullFrame", 0, true},
     45                              {test00b, 000, "doSubtractDarkFullFrame", 0, true},
    4646                              //                              {test01, 000, "pmSubtractBias", 0, true},
    4747                              //                              {test02, 000, "pmSubtractBias", 0, true},
    48                               //                              {test03, 000, "pmSubtractBias", 0, false},
     48                              //                              {test03, 000, "pmSubtractBias", 0, true},
    4949                              //                              {test04, 000, "pmSubtractBias", 0, true},
    5050                              {test05, 000, "pmSubtractBias", 0, false},
    … …  
    509509*/
    510510
     511void PS_POLY1D_PRINT(
     512    psPolynomial1D *poly)
     513{
     514    printf("-------------- PS_POLY1D_PRINT() --------------\n");
     515    printf("poly->nX is %d\n", poly->nX);
     516    for (psS32 i = 0 ; i < (1 + poly->nX) ; i++) {
     517        printf("poly->coeff[%d] is %f\n", i, poly->coeff[i]);
     518    }
     519}
     520
     521void PS_PRINT_SPLINE2(psSpline1D *mySpline)
     522{
     523    printf("-------------- PS_PRINT_SPLINE2() --------------\n");
     524    if (mySpline != NULL) {
     525        printf("mySpline->n is %d\n", mySpline->n);
     526        for (psS32 i = 0 ; i < mySpline->n ; i++) {
     527            if (mySpline->spline[i] != NULL) {
     528                PS_POLY1D_PRINT(mySpline->spline[i]);
     529            }
     530        }
     531        if (mySpline->knots != NULL) {
     532            PS_VECTOR_PRINT_F32(mySpline->knots);
     533        }
     534    } else {
     535        printf("NULL\n");
     536    }
     537    printf("-------------- PS_PRINT_SPLINE2() DONE --------------\n");
     538}
     539
     540
     541
     542
     543
     544
    511545/******************************************************************************
    512 doSubtractFullOverscanColumnsGeneric(): This is a general version of the
     546doSubtractOverscansGeneric(): This is a general version of the
    513547bias subtraction tests which allows the various parameters to be specified
    514548as arguments.
    515549 *****************************************************************************/
    516 int doSubtractFullOverscanColumnsGeneric(
     550int doSubtractOverscansGeneric(
    517551    int imageNumCols,
    518552    int imageNumRows,
    … …  
    531565
    532566    printPositiveTestHeader(stdout, "pmSubtractBias", "PUT COMMENT HERE");
    533     printf("---- doSubtractFullOverscanColumnsGeneric() ----\n");
     567    printf("---- doSubtractOverscansGeneric() ----\n");
    534568    printf("    Image size: %d by %d\n", imageNumRows, imageNumCols);
    535569    printf("    Overscan size: %d by %d\n", overscanNumRows, overscanNumCols);
    … …  
    636670                                   stat, nBin, NULL, NULL);
    637671    } else if (fit == PM_FIT_SPLINE) {
     672        //        mySpline = psSpline1DAlloc();
    638673        myReadout = pmSubtractBias(myReadout, mySpline, PM_FIT_SPLINE, overscanaxis,
    639674                                   stat, nBin, NULL, NULL);
    … …  
    652687        }
    653688    }
     689    // XXX: Figure out memory deallocation
    654690    psFree(fpa);
    655     psFree(chip);
    656     psFree(cell);
    657     psListElem *tmpElem = (psListElem *) myReadout->bias->head;
    658     while (NULL != tmpElem) {
    659         psFree((psImage *) tmpElem->data);
    660         tmpElem = tmpElem->next;
    661     }
    662     psFree(myReadout);
     691    //    psFree(chip);
     692    //    psFree(cell);
     693    /*
     694        psListElem *tmpElem = (psListElem *) myReadout->bias->head;
     695        while (NULL != tmpElem) {
     696            psFree((psImage *) tmpElem->data);
     697            tmpElem = tmpElem->next;
     698        }
     699        psFree(myReadout);
     700    */
    663701    psFree(camera);
    664702    psFree(stat);
    … …  
    722760    // Overscan images are same size, no fit, bin factor is 1.
    723761    //
    724     testStatus |= doSubtractFullOverscanColumnsGeneric(imageNumCols, imageNumRows,
     762    testStatus |= doSubtractOverscansGeneric(imageNumCols, imageNumRows,
    725763                  overscanNumCols, overscanNumRows, NUM_OVERSCANS,
    726764                  PM_OVERSCAN_ALL,
    727765                  PM_FIT_NONE, 1);
    728766
    729     testStatus |= doSubtractFullOverscanColumnsGeneric(imageNumCols, imageNumRows,
     767    testStatus |= doSubtractOverscansGeneric(imageNumCols, imageNumRows,
    730768                  overscanNumCols, overscanNumRows, NUM_OVERSCANS,
    731769                  PM_OVERSCAN_COLUMNS,
    732770                  PM_FIT_NONE, 1);
    733771
    734     testStatus |= doSubtractFullOverscanColumnsGeneric(imageNumCols, imageNumRows,
     772    testStatus |= doSubtractOverscansGeneric(imageNumCols, imageNumRows,
    735773                  overscanNumCols, overscanNumRows, NUM_OVERSCANS,
    736774                  PM_OVERSCAN_ROWS,
    … …  
    740778    // Overscan images are same size, no fit, bin factor is 2.
    741779    //
    742     testStatus |= doSubtractFullOverscanColumnsGeneric(imageNumCols, imageNumRows,
     780    testStatus |= doSubtractOverscansGeneric(imageNumCols, imageNumRows,
    743781                  overscanNumCols, overscanNumRows, NUM_OVERSCANS,
    744782                  PM_OVERSCAN_ALL,
    745783                  PM_FIT_NONE, 2);
    746784
    747     testStatus |= doSubtractFullOverscanColumnsGeneric(imageNumCols, imageNumRows,
     785    testStatus |= doSubtractOverscansGeneric(imageNumCols, imageNumRows,
    748786                  overscanNumCols, overscanNumRows, NUM_OVERSCANS,
    749787                  PM_OVERSCAN_COLUMNS,
    750788                  PM_FIT_NONE, 2);
    751789
    752     testStatus |= doSubtractFullOverscanColumnsGeneric(imageNumCols, imageNumRows,
     790    testStatus |= doSubtractOverscansGeneric(imageNumCols, imageNumRows,
    753791                  overscanNumCols, overscanNumRows, NUM_OVERSCANS,
    754792                  PM_OVERSCAN_ROWS,
    … …  
    790828    // Overscan images are too small, spline fit, bin factor is 1.
    791829    //
    792     testStatus |= doSubtractFullOverscanColumnsGeneric(imageNumCols, imageNumRows,
     830    testStatus |= doSubtractOverscansGeneric(imageNumCols, imageNumRows,
    793831                  overscanNumCols-2, overscanNumRows-2, NUM_OVERSCANS,
    794832                  PM_OVERSCAN_ALL,
    795833                  PM_FIT_SPLINE, 1);
    796834
    797     testStatus |= doSubtractFullOverscanColumnsGeneric(imageNumCols, imageNumRows,
     835    testStatus |= doSubtractOverscansGeneric(imageNumCols, imageNumRows,
    798836                  overscanNumCols-2, overscanNumRows-2, NUM_OVERSCANS,
    799837                  PM_OVERSCAN_COLUMNS,
    800838                  PM_FIT_SPLINE, 1);
    801839
    802     testStatus |= doSubtractFullOverscanColumnsGeneric(imageNumCols, imageNumRows,
     840    testStatus |= doSubtractOverscansGeneric(imageNumCols, imageNumRows,
    803841                  overscanNumCols-2, overscanNumRows-2, NUM_OVERSCANS,
    804842                  PM_OVERSCAN_ROWS,
    … …  
    808846    // Overscan images are too small, spline fit, bin factor is 2.
    809847    //
    810     testStatus |= doSubtractFullOverscanColumnsGeneric(imageNumCols, imageNumRows,
     848    testStatus |= doSubtractOverscansGeneric(imageNumCols, imageNumRows,
    811849                  overscanNumCols-2, overscanNumRows-2, NUM_OVERSCANS,
    812850                  PM_OVERSCAN_ALL,
    813851                  PM_FIT_SPLINE, 2);
    814852
    815     testStatus |= doSubtractFullOverscanColumnsGeneric(imageNumCols, imageNumRows,
     853    testStatus |= doSubtractOverscansGeneric(imageNumCols, imageNumRows,
    816854                  overscanNumCols-2, overscanNumRows-2, NUM_OVERSCANS,
    817855                  PM_OVERSCAN_COLUMNS,
    818856                  PM_FIT_SPLINE, 2);
    819857
    820     testStatus |= doSubtractFullOverscanColumnsGeneric(imageNumCols, imageNumRows,
     858    testStatus |= doSubtractOverscansGeneric(imageNumCols, imageNumRows,
    821859                  overscanNumCols-2, overscanNumRows-2, NUM_OVERSCANS,
    822860                  PM_OVERSCAN_ROWS,
    … …  
    827865    // Overscan images are same size, spline fit, bin factor is 1.
    828866    //
    829     testStatus |= doSubtractFullOverscanColumnsGeneric(imageNumCols, imageNumRows,
     867    testStatus |= doSubtractOverscansGeneric(imageNumCols, imageNumRows,
    830868                  overscanNumCols, overscanNumRows, NUM_OVERSCANS,
    831869                  PM_OVERSCAN_ALL,
    832870                  PM_FIT_SPLINE, 1);
    833871
    834     testStatus |= doSubtractFullOverscanColumnsGeneric(imageNumCols, imageNumRows,
     872    testStatus |= doSubtractOverscansGeneric(imageNumCols, imageNumRows,
    835873                  overscanNumCols, overscanNumRows, NUM_OVERSCANS,
    836874                  PM_OVERSCAN_COLUMNS,
    837875                  PM_FIT_SPLINE, 1);
    838876
    839     testStatus |= doSubtractFullOverscanColumnsGeneric(imageNumCols, imageNumRows,
     877    testStatus |= doSubtractOverscansGeneric(imageNumCols, imageNumRows,
    840878                  overscanNumCols, overscanNumRows, NUM_OVERSCANS,
    841879                  PM_OVERSCAN_ROWS,
    … …  
    845883    // Overscan images are same size, spline fit, bin factor is 2.
    846884    //
    847     testStatus |= doSubtractFullOverscanColumnsGeneric(imageNumCols, imageNumRows,
     885    testStatus |= doSubtractOverscansGeneric(imageNumCols, imageNumRows,
    848886                  overscanNumCols, overscanNumRows, NUM_OVERSCANS,
    849887                  PM_OVERSCAN_ALL,
    850888                  PM_FIT_SPLINE, 2);
    851889
    852     testStatus |= doSubtractFullOverscanColumnsGeneric(imageNumCols, imageNumRows,
     890    testStatus |= doSubtractOverscansGeneric(imageNumCols, imageNumRows,
    853891                  overscanNumCols, overscanNumRows, NUM_OVERSCANS,
    854892                  PM_OVERSCAN_COLUMNS,
    855893                  PM_FIT_SPLINE, 2);
    856894
    857     testStatus |= doSubtractFullOverscanColumnsGeneric(imageNumCols, imageNumRows,
     895    testStatus |= doSubtractOverscansGeneric(imageNumCols, imageNumRows,
    858896                  overscanNumCols, overscanNumRows, NUM_OVERSCANS,
    859897                  PM_OVERSCAN_ROWS,
    … …  
    863901    // Overscan images are too big, spline fit, bin factor is 1.
    864902    //
    865     testStatus |= doSubtractFullOverscanColumnsGeneric(imageNumCols, imageNumRows,
     903    testStatus |= doSubtractOverscansGeneric(imageNumCols, imageNumRows,
    866904                  overscanNumCols+2, overscanNumRows+2, NUM_OVERSCANS,
    867905                  PM_OVERSCAN_ALL,
    868906                  PM_FIT_SPLINE, 1);
    869907
    870     testStatus |= doSubtractFullOverscanColumnsGeneric(imageNumCols, imageNumRows,
     908    testStatus |= doSubtractOverscansGeneric(imageNumCols, imageNumRows,
    871909                  overscanNumCols+2, overscanNumRows+2, NUM_OVERSCANS,
    872910                  PM_OVERSCAN_COLUMNS,
    873911                  PM_FIT_SPLINE, 1);
    874912
    875     testStatus |= doSubtractFullOverscanColumnsGeneric(imageNumCols, imageNumRows,
     913    testStatus |= doSubtractOverscansGeneric(imageNumCols, imageNumRows,
    876914                  overscanNumCols+2, overscanNumRows+2, NUM_OVERSCANS,
    877915                  PM_OVERSCAN_ROWS,
    … …  
    881919    // Overscan images are too big, spline fit, bin factor is 2.
    882920    //
    883     testStatus |= doSubtractFullOverscanColumnsGeneric(imageNumCols, imageNumRows,
     921    testStatus |= doSubtractOverscansGeneric(imageNumCols, imageNumRows,
    884922                  overscanNumCols+2, overscanNumRows+2, NUM_OVERSCANS,
    885923                  PM_OVERSCAN_ALL,
    886924                  PM_FIT_SPLINE, 2);
    887925
    888     testStatus |= doSubtractFullOverscanColumnsGeneric(imageNumCols, imageNumRows,
     926    testStatus |= doSubtractOverscansGeneric(imageNumCols, imageNumRows,
    889927                  overscanNumCols+2, overscanNumRows+2, NUM_OVERSCANS,
    890928                  PM_OVERSCAN_COLUMNS,
    891929                  PM_FIT_SPLINE, 2);
    892930
    893     testStatus |= doSubtractFullOverscanColumnsGeneric(imageNumCols, imageNumRows,
     931    testStatus |= doSubtractOverscansGeneric(imageNumCols, imageNumRows,
    894932                  overscanNumCols+2, overscanNumRows+2 , NUM_OVERSCANS,
    895933                  PM_OVERSCAN_ROWS,
    … …  
    900938    // A single overscan image of the same size, spline fit, bin factor is 1.
    901939    //
    902     testStatus |= doSubtractFullOverscanColumnsGeneric(imageNumCols, imageNumRows,
     940    testStatus |= doSubtractOverscansGeneric(imageNumCols, imageNumRows,
    903941                  overscanNumCols, overscanNumRows, 1,
    904942                  PM_OVERSCAN_ALL,
    905943                  PM_FIT_SPLINE, 1);
    906944
    907     testStatus |= doSubtractFullOverscanColumnsGeneric(imageNumCols, imageNumRows,
     945    testStatus |= doSubtractOverscansGeneric(imageNumCols, imageNumRows,
    908946                  overscanNumCols, overscanNumRows, 1,
    909947                  PM_OVERSCAN_COLUMNS,
    910948                  PM_FIT_SPLINE, 1);
    911949
    912     testStatus |= doSubtractFullOverscanColumnsGeneric(imageNumCols, imageNumRows,
     950    testStatus |= doSubtractOverscansGeneric(imageNumCols, imageNumRows,
    913951                  overscanNumCols, overscanNumRows, 1,
    914952                  PM_OVERSCAN_ROWS,
    … …  
    919957    // Overscan images are too small, polynomial fit, bin factor is 1.
    920958    //
    921     testStatus |= doSubtractFullOverscanColumnsGeneric(imageNumCols, imageNumRows,
     959    testStatus |= doSubtractOverscansGeneric(imageNumCols, imageNumRows,
    922960                  overscanNumCols-2, overscanNumRows-2, NUM_OVERSCANS,
    923961                  PM_OVERSCAN_ALL,
    924962                  PM_FIT_POLYNOMIAL, 1);
    925963
    926     testStatus |= doSubtractFullOverscanColumnsGeneric(imageNumCols, imageNumRows,
     964    testStatus |= doSubtractOverscansGeneric(imageNumCols, imageNumRows,
    927965                  overscanNumCols-2, overscanNumRows-2, NUM_OVERSCANS,
    928966                  PM_OVERSCAN_COLUMNS,
    929967                  PM_FIT_POLYNOMIAL, 1);
    930968
    931     testStatus |= doSubtractFullOverscanColumnsGeneric(imageNumCols, imageNumRows,
     969    testStatus |= doSubtractOverscansGeneric(imageNumCols, imageNumRows,
    932970                  overscanNumCols-2, overscanNumRows-2, NUM_OVERSCANS,
    933971                  PM_OVERSCAN_ROWS,
    … …  
    937975    // Overscan images are too small, polynomial fit, bin factor is 2.
    938976    //
    939     testStatus |= doSubtractFullOverscanColumnsGeneric(imageNumCols, imageNumRows,
     977    testStatus |= doSubtractOverscansGeneric(imageNumCols, imageNumRows,
    940978                  overscanNumCols-2, overscanNumRows-2, NUM_OVERSCANS,
    941979                  PM_OVERSCAN_ALL,
    942980                  PM_FIT_POLYNOMIAL, 2);
    943981
    944     testStatus |= doSubtractFullOverscanColumnsGeneric(imageNumCols, imageNumRows,
     982    testStatus |= doSubtractOverscansGeneric(imageNumCols, imageNumRows,
    945983                  overscanNumCols-2, overscanNumRows-2, NUM_OVERSCANS,
    946984                  PM_OVERSCAN_COLUMNS,
    947985                  PM_FIT_POLYNOMIAL, 2);
    948986
    949     testStatus |= doSubtractFullOverscanColumnsGeneric(imageNumCols, imageNumRows,
     987    testStatus |= doSubtractOverscansGeneric(imageNumCols, imageNumRows,
    950988                  overscanNumCols-2, overscanNumRows-2, NUM_OVERSCANS,
    951989                  PM_OVERSCAN_ROWS,
    … …  
    956994    // Overscan images are same size, polynomial fit, bin factor is 1.
    957995    //
    958     testStatus |= doSubtractFullOverscanColumnsGeneric(imageNumCols, imageNumRows,
     996    testStatus |= doSubtractOverscansGeneric(imageNumCols, imageNumRows,
    959997                  overscanNumCols, overscanNumRows, NUM_OVERSCANS,
    960998                  PM_OVERSCAN_ALL,
    961999                  PM_FIT_POLYNOMIAL, 1);
    9621000
    963     testStatus |= doSubtractFullOverscanColumnsGeneric(imageNumCols, imageNumRows,
     1001    testStatus |= doSubtractOverscansGeneric(imageNumCols, imageNumRows,
    9641002                  overscanNumCols, overscanNumRows, NUM_OVERSCANS,
    9651003                  PM_OVERSCAN_COLUMNS,
    9661004                  PM_FIT_POLYNOMIAL, 1);
    9671005
    968     testStatus |= doSubtractFullOverscanColumnsGeneric(imageNumCols, imageNumRows,
     1006    testStatus |= doSubtractOverscansGeneric(imageNumCols, imageNumRows,
    9691007                  overscanNumCols, overscanNumRows, NUM_OVERSCANS,
    9701008                  PM_OVERSCAN_ROWS,
    … …  
    9741012    // Overscan images are same size, polynomial fit, bin factor is 2.
    9751013    //
    976     testStatus |= doSubtractFullOverscanColumnsGeneric(imageNumCols, imageNumRows,
     1014    testStatus |= doSubtractOverscansGeneric(imageNumCols, imageNumRows,
    9771015                  overscanNumCols, overscanNumRows, NUM_OVERSCANS,
    9781016                  PM_OVERSCAN_ALL,
    9791017                  PM_FIT_POLYNOMIAL, 2);
    9801018
    981     testStatus |= doSubtractFullOverscanColumnsGeneric(imageNumCols, imageNumRows,
     1019    testStatus |= doSubtractOverscansGeneric(imageNumCols, imageNumRows,
    9821020                  overscanNumCols, overscanNumRows, NUM_OVERSCANS,
    9831021                  PM_OVERSCAN_COLUMNS,
    9841022                  PM_FIT_POLYNOMIAL, 2);
    9851023
    986     testStatus |= doSubtractFullOverscanColumnsGeneric(imageNumCols, imageNumRows,
     1024    testStatus |= doSubtractOverscansGeneric(imageNumCols, imageNumRows,
    9871025                  overscanNumCols, overscanNumRows, NUM_OVERSCANS,
    9881026                  PM_OVERSCAN_ROWS,
    … …  
    9921030    // Overscan images are too big, polynomial fit, bin factor is 1.
    9931031    //
    994     testStatus |= doSubtractFullOverscanColumnsGeneric(imageNumCols, imageNumRows,
     1032    testStatus |= doSubtractOverscansGeneric(imageNumCols, imageNumRows,
    9951033                  overscanNumCols+2, overscanNumRows+2, NUM_OVERSCANS,
    9961034                  PM_OVERSCAN_ALL,
    9971035                  PM_FIT_POLYNOMIAL, 1);
    9981036
    999     testStatus |= doSubtractFullOverscanColumnsGeneric(imageNumCols, imageNumRows,
     1037    testStatus |= doSubtractOverscansGeneric(imageNumCols, imageNumRows,
    10001038                  overscanNumCols+2, overscanNumRows+2, NUM_OVERSCANS,
    10011039                  PM_OVERSCAN_COLUMNS,
    10021040                  PM_FIT_POLYNOMIAL, 1);
    10031041
    1004     testStatus |= doSubtractFullOverscanColumnsGeneric(imageNumCols, imageNumRows,
     1042    testStatus |= doSubtractOverscansGeneric(imageNumCols, imageNumRows,
    10051043                  overscanNumCols+2, overscanNumRows+2, NUM_OVERSCANS,
    10061044                  PM_OVERSCAN_ROWS,
    … …  
    10101048    // Overscan images are too big, polynomial fit, bin factor is 2.
    10111049    //
    1012     testStatus |= doSubtractFullOverscanColumnsGeneric(imageNumCols, imageNumRows,
     1050    testStatus |= doSubtractOverscansGeneric(imageNumCols, imageNumRows,
    10131051                  overscanNumCols+2, overscanNumRows+2, NUM_OVERSCANS,
    10141052                  PM_OVERSCAN_ALL,
    10151053                  PM_FIT_POLYNOMIAL, 2);
    10161054
    1017     testStatus |= doSubtractFullOverscanColumnsGeneric(imageNumCols, imageNumRows,
     1055    testStatus |= doSubtractOverscansGeneric(imageNumCols, imageNumRows,
    10181056                  overscanNumCols+2, overscanNumRows+2, NUM_OVERSCANS,
    10191057                  PM_OVERSCAN_COLUMNS,
    10201058                  PM_FIT_POLYNOMIAL, 2);
    10211059
    1022     testStatus |= doSubtractFullOverscanColumnsGeneric(imageNumCols, imageNumRows,
     1060    testStatus |= doSubtractOverscansGeneric(imageNumCols, imageNumRows,
    10231061                  overscanNumCols+2, overscanNumRows+2, NUM_OVERSCANS,
    10241062                  PM_OVERSCAN_ROWS,
    … …  
    10281066    // A single overscan image of the same size, polynomial fit, bin factor is 1.
    10291067    //
    1030     testStatus |= doSubtractFullOverscanColumnsGeneric(imageNumCols, imageNumRows,
     1068    testStatus |= doSubtractOverscansGeneric(imageNumCols, imageNumRows,
    10311069                  overscanNumCols, overscanNumRows, 1,
    10321070                  PM_OVERSCAN_ALL,
    10331071                  PM_FIT_POLYNOMIAL, 1);
    10341072
    1035     testStatus |= doSubtractFullOverscanColumnsGeneric(imageNumCols, imageNumRows,
     1073    testStatus |= doSubtractOverscansGeneric(imageNumCols, imageNumRows,
    10361074                  overscanNumCols, overscanNumRows, 1,
    10371075                  PM_OVERSCAN_COLUMNS,
    10381076                  PM_FIT_POLYNOMIAL, 1);
    10391077
    1040     testStatus |= doSubtractFullOverscanColumnsGeneric(imageNumCols, imageNumRows,
     1078    testStatus |= doSubtractOverscansGeneric(imageNumCols, imageNumRows,
    10411079                  overscanNumCols, overscanNumRows, 1,
    10421080                  PM_OVERSCAN_ROWS,
    … …  
    10621100{
    10631101    int testStatus = 0;
    1064     testStatus = test05a(NUM_COLS, NUM_ROWS, NUM_COLS, NUM_ROWS);
     1102    //    testStatus = test05a(NUM_COLS, NUM_ROWS, NUM_COLS, NUM_ROWS);
    10651103
    10661104    //    testStatus|= test05b(LOW_COLS, LOW_ROWS, LOW_COLS, LOW_ROWS);
    … …  
    10891127
    10901128
     1129// This code will
Note: See TracChangeset for help on using the changeset viewer.