IPP Software Navigation Tools IPP Links Communication Pan-STARRS Links

Changeset 5435 for trunk/psModules/src


Ignore:
Timestamp:
Oct 20, 2005, 1:06:24 PM (21 years ago)
Author:
gusciora
Message:

....

Location:
trunk/psModules/src
Files:
11 edited

Legend:

Unmodified
Added
Removed

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

    r5170 r5435  
    88*  @author GLG, MHPCC
    99*
    10 *  @version $Revision: 1.1 $ $Name: not supported by cvs2svn $
    11 *  @date $Date: 2005-09-28 20:43:52 $
     10*  @version $Revision: 1.2 $ $Name: not supported by cvs2svn $
     11*  @date $Date: 2005-10-20 23:06:24 $
    1212*
    1313*  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
    … …  
    7171        }
    7272        psFree(fpa->chips);
    73         psFree(fpa->header);
    74         psFree(fpa->db);
     73        psFree(fpa->private);
     74        psFree(fpa->phu);
    7575    }
    7676}
    … …  
    9393        psFree(chip->cells);
    9494        psFree(chip->parent);
    95         psFree(chip->extname);
    96         psFree(chip->pixels);
    97         psFree(chip->header);
     95        psFree(chip->private);
    9896    }
    9997}
    … …  
    106104        psFree(cell->toSky);
    107105        psFree(cell->concepts);
     106        psFree(cell->camera);
    108107        psFree(cell->analysis);
    109108        //
    … …  
    117116        psFree(cell->readouts);
    118117        psFree(cell->parent);
    119         psFree(cell->extname);
    120         psFree(cell->pixels);
    121         psFree(cell->header);
     118        psFree(cell->private);
    122119    }
    123120}
    … …  
    128125        psFree(readout->image);
    129126        psFree(readout->mask);
     127        psFree(readout->weight);
     128        psFree(readout->bias);
    130129        psFree(readout->analysis);
    131         psFree(readout->concepts);
    132130        psFree(readout->parent);
    133131    }
    … …  
    145143    tmpReadout->image = NULL;
    146144    tmpReadout->mask = NULL;
     145    tmpReadout->weight = NULL;
     146    tmpReadout->bias = NULL;
    147147    tmpReadout->analysis = psMetadataAlloc();
    148     tmpReadout->concepts = psMetadataAlloc();
    149148    tmpReadout->parent = cell;
    150149    if (cell != NULL) {
    … …  
    155154}
    156155
    157 pmCell *pmCellAlloc(pmChip *chip)
     156pmCell *pmCellAlloc(
     157    pmChip *chip,
     158    psMetadata *cameradata,
     159    psString name
     160)
    158161{
    159162    pmCell *tmpCell = (pmCell *) psAlloc(sizeof(pmCell));
    … …  
    164167    tmpCell->toFPA = NULL;
    165168    tmpCell->toSky = NULL;
    166     tmpCell->analysis = psMetadataAlloc();
    167169    tmpCell->concepts = psMetadataAlloc();
     170    psBool rc = psMetadataAddStr(tmpCell->concepts, PS_LIST_HEAD, "CELL.NAME", 0, NULL, name);
     171    if (rc == false) {
     172        psLogMsg(__func__, PS_LOG_WARN, "WARNING: Could not add CELL.NAME to metadata.\n");
     173    }
     174    tmpCell->camera = cameradata;
     175    psMemIncrRefCounter((psMetadata *) cameradata);
     176    tmpCell->analysis = NULL;
    168177    tmpCell->readouts = psArrayAlloc(0);
    169178    tmpCell->parent = chip;
    … …  
    172181    }
    173182    tmpCell->valid = false;
    174     tmpCell->extname = NULL;
    175     tmpCell->pixels = NULL;
    176     tmpCell->header = NULL;
     183    tmpCell->private = NULL;
    177184
    178185    psMemSetDeallocator(tmpCell, (psFreeFunc) cellFree);
    … …  
    180187}
    181188
    182 pmChip *pmChipAlloc(pmFPA *fpa)
     189pmChip *pmChipAlloc(
     190    pmFPA *fpa,
     191    psString name
     192)
    183193{
    184194    pmChip *tmpChip = (pmChip *) psAlloc(sizeof(pmChip));
    … …  
    189199    tmpChip->fromFPA = NULL;
    190200    tmpChip->concepts = psMetadataAlloc();
    191     tmpChip->analysis = psMetadataAlloc();
     201    psBool rc = psMetadataAddStr(tmpChip->concepts, PS_LIST_HEAD, "CHIP.NAME", 0, NULL, name);
     202    if (rc == false) {
     203        psLogMsg(__func__, PS_LOG_WARN, "WARNING: Could not add CHIP.NAME to metadata.\n");
     204    }
     205    tmpChip->analysis = NULL;
    192206    tmpChip->cells = psArrayAlloc(0);
    193207    tmpChip->parent = fpa;
    … …  
    196210    }
    197211    tmpChip->valid = false;
    198     tmpChip->extname = NULL;
    199     tmpChip->pixels = NULL;
    200     tmpChip->header = NULL;
     212    tmpChip->private = NULL;
    201213
    202214    psMemSetDeallocator(tmpChip, (psFreeFunc) chipFree);
    … …  
    204216}
    205217
    206 pmFPA *pmFPAAlloc(
    207     const psMetadata *camera,
    208     psDB *db)
     218pmFPA *pmFPAAlloc(const psMetadata *camera)
    209219{
    210220    pmFPA *tmpFPA = (pmFPA *) psAlloc(sizeof(pmFPA));
    … …  
    214224    tmpFPA->projection = NULL;
    215225    tmpFPA->concepts = psMetadataAlloc();
    216     tmpFPA->analysis = psMetadataAlloc();
     226    tmpFPA->analysis = NULL;
    217227    tmpFPA->camera = camera;
    218228    psMemIncrRefCounter((psPtr) camera);
    219229    tmpFPA->chips = psArrayAlloc(0);
    220     tmpFPA->header = NULL;
    221     tmpFPA->db = db;
    222     psMemIncrRefCounter((psPtr) db);
     230    tmpFPA->private = NULL;
     231    tmpFPA->phu = NULL;
    223232
    224233    psMemSetDeallocator(tmpFPA, (psFreeFunc) FPAFree);
    … …  
    739748psMetadataItem *pmReadoutGetConcept(pmReadout *readout, const char *concept)
    740749{
    741     return(psMetadataLookup(readout->concepts, concept));
     750    //    return(psMetadataLookup(readout->concepts, concept));
     751    return(NULL);
    742752}
    743753

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

    r5170 r5435  
    88*  @author GLG, MHPCC
    99*
    10 *  @version $Revision: 1.1 $ $Name: not supported by cvs2svn $
    11 *  @date $Date: 2005-09-28 20:43:52 $
     10*  @version $Revision: 1.2 $ $Name: not supported by cvs2svn $
     11*  @date $Date: 2005-10-20 23:06:24 $
    1212*
    1313*  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
    … …  
    2424/// @addtogroup AstroImage
    2525/// @{
     26
     27// XXXX: This is incorrect.  Must determine what p_pmHDU is.
     28typedef struct
     29{
     30    int what;
     31}
     32p_pmHDU;
    2633
    2734/** Focal plane data structure
    … …  
    5259    const psMetadata *camera;           ///< Camera configuration
    5360    psArray *chips;                     ///< The chips
    54     // FITS data
    55     psMetadata *header;                 ///< The FITS header, if it corresponds to this level
    56     psDB *db;                           ///< Database handle
     61    p_pmHDU *private;                   ///< FITS data
     62    psMetadata *phu;                    ///< Primary Header
    5763}
    5864pmFPA;
    … …  
    8692    pmFPA *parent;                      ///< Parent FPA
    8793    bool valid;                         ///< Do we bother about reading and working with this chip?
    88     // FITS data
    89     const char *extname;                ///< Extension name, if it corresponds to this level
    90     psArray *pixels;                    ///< The pixel data, if it corresponds to this level
    91     psMetadata *header;                 ///< The FITS header, if it corresponds to this level
     94    p_pmHDU *private;                   ///< FITS data
    9295}
    9396pmChip;
    … …  
    113116    // Information
    114117    psMetadata *concepts;               ///< Cache for PS concepts
     118    psMetadata *camera;                 ///< Camera Info
    115119    psMetadata *analysis;               ///< Cell-level analysis metadata
    116120    psArray *readouts;                  ///< The readouts (referred to by number)
    117121    pmChip *parent;                     ///< Parent chip
    118122    bool valid;                         ///< Do we bother about reading and working with this cell?
    119     // FITS data
    120     const char *extname;                ///< Extension name, if it corresponds to this level
    121     psArray *pixels;                    ///< The pixel data, if it corresponds to this level
    122     psMetadata *header;                 ///< The FITS header, if it corresponds to this level
     123    p_pmHDU *private;                   ///< FITS data
    123124}
    124125pmCell;
    … …  
    143144    // Information
    144145    psImage *image;                     ///< Imaging area of readout
    145     // XXX: The following mask was removed from the pmReadout struct in recent SDRS
    146     // versions.  However, I'm keeping it here since al ot of modules still require
    147     // it.
    148146    psImage *mask;                      ///< Mask of input image
     147    psImage *weight;                    ///< Weight of input image
     148    psList *bias;                       ///< List of bias section (sub-)images
    149149    psMetadata *analysis;               ///< Readout-level analysis metadata
    150     psMetadata *concepts;               ///< Cache for PS Concepts
    151150    pmCell *parent;                     ///< Parent cell
    152151}
    … …  
    178177 */
    179178pmCell *pmCellAlloc(
    180     pmChip *chip                        ///< Parent chip
     179    pmChip *chip,                        ///< Parent chip
     180    psMetadata *cameradata,
     181    psString name
    181182);
    182183
    … …  
    191192 *  @return pmChip*    newly allocated pmChip
    192193 */
    193 pmChip *pmChipAlloc(pmFPA *fpa);
     194pmChip *pmChipAlloc(
     195    pmFPA *fpa,
     196    psString name
     197
     198);
    194199
    195200/** Allocates a pmFPA
    … …  
    202207 */
    203208pmFPA *pmFPAAlloc(
    204     const psMetadata *camera,           ///< Camera configuration
    205     psDB *db                            ///< Database handle
     209    const psMetadata *camera            ///< Camera configuration
    206210);
    207211

  • trunk/psModules/src/config/pmConfig.c

    r5356 r5435  
    33 *  @author PAP, IfA
    44 *
    5  *  @version $Revision: 1.2 $ $Name: not supported by cvs2svn $
    6  *  @date $Date: 2005-10-17 23:37:11 $
     5 *  @version $Revision: 1.3 $ $Name: not supported by cvs2svn $
     6 *  @date $Date: 2005-10-20 23:06:24 $
    77 *
    88 *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
    … …  
    404404    return recipe;
    405405}
     406
     407/******************************************************************************
     408pmConfigDB(*site)
     409 
     410XXX: What should we use for the Database namespace in the call to psDBInit()?
     411This is currently NULL.
     412 *****************************************************************************/
     413
     414psDB *pmConfigDB(
     415    psMetadata *site)
     416{
     417    PS_ASSERT_PTR_NON_NULL(site, NULL);
     418    psBool mdStatus01 = false;
     419    psBool mdStatus02 = false;
     420    psBool mdStatus03 = false;
     421
     422    psString dbServer = psMetadataLookupStr(&mdStatus01, site, "DBSERVER");
     423    psString dbUsername = psMetadataLookupStr(&mdStatus02, site, "DBUSER");
     424    psString dbPassword = psMetadataLookupStr(&mdStatus03, site, "DBPASSWORD");
     425    if (!(mdStatus01 & mdStatus02 & mdStatus03)) {
     426        psLogMsg(__func__, PS_LOG_WARN, "Could not determine database server name, userID, and password from site metadata.\n");
     427        return(NULL);
     428    }
     429
     430    return(psDBInit(dbServer, dbUsername, dbPassword, NULL));
     431}

  • trunk/psModules/src/config/pmConfig.h

    r5355 r5435  
    33 *  @author PAP, IfA
    44 *
    5  *  @version $Revision: 1.1 $ $Name: not supported by cvs2svn $
    6  *  @date $Date: 2005-10-17 21:34:12 $
     5 *  @version $Revision: 1.2 $ $Name: not supported by cvs2svn $
     6 *  @date $Date: 2005-10-20 23:06:24 $
    77 *
    88 *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
    … …  
    8484);
    8585
     86/** pmConfigDB
     87 *
     88 * pmConfigDB shall use the site configuration data to open a database handle.
     89 * This is fairly straightforward at the moment, but will change when we beef up
     90 * security. (TBD)
     91 *
     92 */
     93psDB *pmConfigDB(
     94    psMetadata *site
     95);
     96
     97
    8698#endif

  • trunk/psModules/src/detrend/pmFlatField.c

    r5170 r5435  
    1818 *  @author Ross Harman, MHPCC
    1919 *
    20  *  @version $Revision: 1.1 $ $Name: not supported by cvs2svn $
    21  *  @date $Date: 2005-09-28 20:43:52 $
     20 *  @version $Revision: 1.2 $ $Name: not supported by cvs2svn $
     21 *  @date $Date: 2005-10-20 23:06:24 $
    2222 *
    2323 *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
    … …  
    3838
    3939
    40 bool pmFlatField(pmReadout *in, pmReadout *mask, const pmReadout *flat)
     40bool pmFlatField(
     41    pmReadout *in,
     42    const pmReadout *flat)
    4143{
    4244    // XXX: Not sure if this is correct.  Must consult with IfA.
    43     PS_ASSERT_PTR_NON_NULL(mask, false);
     45    PS_ASSERT_PTR_NON_NULL(in->mask, false);
    4446    int i = 0;
    4547    int j = 0;
    … …  
    5658    // Check for nulls
    5759    if (in == NULL) {
    58         return true;       // Readout may not have data in it
     60        return true;       // Readout might have data in it
    5961    } else if(flat==NULL) {
    6062        psError( PS_ERR_BAD_PARAMETER_NULL, true,
    … …  
    7476        return false;
    7577    }
    76     inMask = mask->image;
     78    inMask = in->mask;
    7779
    7880    // Check input image and its mask are not larger than flat image

  • trunk/psModules/src/detrend/pmFlatField.h

    r5170 r5435  
    1818 *  @author Ross Harman, MHPCC
    1919 *
    20  *  @version $Revision: 1.1 $ $Name: not supported by cvs2svn $
    21  *  @date $Date: 2005-09-28 20:43:52 $
     20 *  @version $Revision: 1.2 $ $Name: not supported by cvs2svn $
     21 *  @date $Date: 2005-10-20 23:06:24 $
    2222 *
    2323 *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
    … …  
    3737bool pmFlatField(
    3838    pmReadout *in,          ///< Readout with input image
    39     pmReadout *mask,        ///< Input image mask
    4039    const pmReadout *flat   ///< Readout with flat image
    4140);

  • trunk/psModules/src/detrend/pmNonLinear.c

    r5170 r5435  
    55 *  @author GLG, MHPCC
    66 *
    7  *  @version $Revision: 1.1 $ $Name: not supported by cvs2svn $
    8  *  @date $Date: 2005-09-28 20:43:52 $
     7 *  @version $Revision: 1.2 $ $Name: not supported by cvs2svn $
     8 *  @date $Date: 2005-10-20 23:06:24 $
    99 *
    1010 *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
    … …  
    5656inFluxe, and the corresponding value in outFlux.  The image pixel will then
    5757be set to the value from outFlux.
     58 
     59XXX: Must assert that filename exists.  This should probably happen in
     60the lookup files.
    5861 *****************************************************************************/
    59 pmReadout *pmNonLinearityLookup(pmReadout *inputReadout,
    60                                 const psVector *inFlux,
    61                                 const psVector *outFlux)
     62pmReadout *pmNonLinearityLookup(
     63    pmReadout *inputReadout,
     64    const char *filename
     65)
    6266{
    6367    PS_ASSERT_PTR_NON_NULL(inputReadout,NULL);
    6468    PS_ASSERT_PTR_NON_NULL(inputReadout->image,NULL);
    6569    PS_ASSERT_IMAGE_TYPE(inputReadout->image, PS_TYPE_F32, NULL);
    66     PS_ASSERT_PTR_NON_NULL(inFlux,NULL);
    67     if (inFlux->n < 2) {
    68         psError(PS_ERR_UNKNOWN,true, "pmNonLinearityLookup(): input vector less than 2 elements.  Returning inputReadout image.");
    69         return(inputReadout);
    70     }
    71     PS_ASSERT_PTR_NON_NULL(outFlux,NULL);
    72     psS32 tableSize = inFlux->n;
    73     if (inFlux->n != outFlux->n) {
    74         tableSize = PS_MIN(inFlux->n, outFlux->n);
     70    psLookupTable *tmpLT = psLookupTableAlloc(filename, "%f %f", 0);
     71    psS32 numLines = psLookupTableRead(tmpLT);
     72    psS32 numPixels = 0;
     73    if (numLines < 2) {
    7574        psLogMsg(__func__, PS_LOG_WARN,
    76                  "WARNING: pmNonLinear.c: pmNonLinearityLookup(): input vectors have different sizes (%d, %d)\n", inFlux->n, outFlux->n);
    77     }
    78     PS_ASSERT_VECTOR_TYPE(inFlux, PS_TYPE_F32, NULL);
    79     PS_ASSERT_VECTOR_TYPE(outFlux, PS_TYPE_F32, NULL);
    80 
    81     psS32 i;
    82     psS32 j;
    83     psS32 binNum;
    84     psScalar x;
    85     psS32 numPixels = 0;
    86     psF32 slope;
    87 
    88     x.type.type = PS_TYPE_F32;
    89     for (i=0;i<inputReadout->image->numRows;i++) {
    90         for (j=0;j<inputReadout->image->numCols;j++) {
    91             x.data.F32 = inputReadout->image->data.F32[i][j];
    92             binNum = p_psVectorBinDisect((psVector *)inFlux, &x);
    93 
    94             if (binNum == -2) {
    95                 // We get here if x is below the table lookup range.
    96                 inputReadout->image->data.F32[i][j] = outFlux->data.F32[0];
    97                 numPixels++;
    98 
    99             } else if (binNum == -1) {
    100                 // We get here if x is above the table lookup range.
    101                 inputReadout->image->data.F32[i][j] = outFlux->data.F32[tableSize-1];
    102                 numPixels++;
    103 
    104             } else if (binNum < -2) {
    105                 // We get here if there was some other problem.
    106                 psError(PS_ERR_UNKNOWN,true, "pmNonLinearityLookup(): Could not perform p_psVectorBinDisect().  Returning inputReadout image.");
    107                 return(inputReadout);
    108                 numPixels++;
    109             } else {
    110                 // Perform linear interpolation.
    111                 slope = (outFlux->data.F32[binNum+1] - outFlux->data.F32[binNum]) /
    112                         (inFlux->data.F32[binNum+1]  - inFlux->data.F32[binNum]);
    113                 inputReadout->image->data.F32[i][j] = outFlux->data.F32[binNum] +
    114                                                       ((x.data.F32 - inFlux->data.F32[binNum]) * slope);
     75                 "WARNING: Lookup Table is too small.  Returning original pmReadout.\n");
     76    } else {
     77        for (psS32 i=0;i<inputReadout->image->numRows;i++) {
     78            for (psS32 j=0;j<inputReadout->image->numCols;j++) {
     79                psF64 tmpD = psLookupTableInterpolate(tmpLT, inputReadout->image->data.F32[i][j], 1);
     80                if (!isnan(tmpD)) {
     81                    inputReadout->image->data.F32[i][j] = tmpD;
     82                } else {
     83                    numPixels++;
     84                }
    11585            }
    11686        }
     87        if (numPixels > 0) {
     88            psLogMsg(__func__, PS_LOG_WARN,
     89                     "WARNING: pmNonLinear.c: pmNonLinearityLookup(): %d pixels outside table.", numPixels);
     90        }
    11791    }
    118     if (numPixels > 0) {
    119         psLogMsg(__func__, PS_LOG_WARN,
    120                  "WARNING: pmNonLinear.c: pmNonLinearityLookup(): %d pixels outside table.", numPixels);
    121     }
     92
    12293    return(inputReadout);
    12394}

  • trunk/psModules/src/detrend/pmNonLinear.h

    r5170 r5435  
    55 *  @author GLG, MHPCC
    66 *
    7  *  @version $Revision: 1.1 $ $Name: not supported by cvs2svn $
    8  *  @date $Date: 2005-09-28 20:43:52 $
     7 *  @version $Revision: 1.2 $ $Name: not supported by cvs2svn $
     8 *  @date $Date: 2005-10-20 23:06:24 $
    99 *
    1010 *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
    … …  
    1818#include "pmAstrometry.h"
    1919
    20 pmReadout *pmNonLinearityPolynomial(pmReadout *in,
    21                                     const psPolynomial1D *coeff);
     20pmReadout *pmNonLinearityPolynomial(
     21    pmReadout *in,
     22    const psPolynomial1D *coeff
     23);
    2224
    23 pmReadout *pmNonLinearityLookup(pmReadout *in,
    24                                 const psVector *inFlux,
    25                                 const psVector *outFlux);
     25pmReadout *pmNonLinearityLookup(
     26    pmReadout *in,
     27    const char *filename
     28);
    2629
    2730#endif

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

    r5294 r5435  
    66 *  @author GLG, MHPCC
    77 *
    8  *  @version $Revision: 1.3 $ $Name: not supported by cvs2svn $
    9  *  @date $Date: 2005-10-12 21:02:04 $
     8 *  @version $Revision: 1.4 $ $Name: not supported by cvs2svn $
     9 *  @date $Date: 2005-10-20 23:06:24 $
    1010 *
    1111 *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
    … …  
    282282XXX: The SDRS does not specify type support.  F32 is implemented here.
    283283 *****************************************************************************/
    284 pmReadout *pmSubtractBias(pmReadout *in,
    285                           void *fitSpec,
    286                           const psList *overscans,
    287                           pmOverscanAxis overScanAxis,
    288                           psStats *stat,
    289                           psS32 nBinOrig,
    290                           pmFit fit,
    291                           const pmReadout *bias)
     284pmReadout *pmSubtractBias(
     285    pmReadout *in,
     286    void *fitSpec,
     287    pmFit fit,
     288    bool overscan,
     289    psStats *stat,
     290    int nBin,
     291    const pmReadout *bias,
     292    const pmReadout *dark
     293)
    292294{
    293295    psTrace(".psModule.pmSubtracBias.pmSubtractBias", 4,

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

    r5170 r5435  
    66 *  @author GLG, MHPCC
    77 *
    8  *  @version $Revision: 1.1 $ $Name: not supported by cvs2svn $
    9  *  @date $Date: 2005-09-28 20:43:52 $
     8 *  @version $Revision: 1.2 $ $Name: not supported by cvs2svn $
     9 *  @date $Date: 2005-10-20 23:06:24 $
    1010 *
    1111 *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
    … …  
    3838} pmFit;
    3939
    40 pmReadout *pmSubtractBias(pmReadout *in,                ///< The input pmReadout image
    41                           void *fitSpec,                ///< A polynomial or spline, defining the fit type.
    42                           const psList *overscans,      ///< A psList of overscan images
    43                           pmOverscanAxis overScanAxis,  ///< Defines how overscans are applied
    44                           psStats *stat,                ///< The statistic to be used in combining overscan data
    45                           int nBin,                     ///< The amount of binning to be done image pixels.
    46                           pmFit fit,                    ///< PM_FIT_SPLINE, PM_FIT_POLYNOMIAL, or PM_FIT_NONE
    47                           const pmReadout *bias);       ///< A possibly NULL bias pmReadout which is to be subtracted
     40pmReadout *pmSubtractBias(
     41    pmReadout *in,                      ///< The input pmReadout image
     42    void *fitSpec,                      ///< A polynomial or spline, defining the fit type.
     43    pmFit fit,                          ///< PM_FIT_SPLINE, PM_FIT_POLYNOMIAL, or PM_FIT_NONE
     44    bool overscan,
     45    psStats *stat,                      ///< The statistic to be used in combining overscan data
     46    int nBin,                           ///< The amount of binning to be done image pixels.
     47    const pmReadout *bias,              ///< A possibly NULL bias pmReadout which is to be subtracted
     48    const pmReadout *dark               ///< A possibly NULL bias pmReadout which is to be subtracted
     49)
     50// OLD: remove this
     51//    const psList *overscans,      ///< A psList of overscan images
     52//    pmOverscanAxis overScanAxis,  ///< Defines how overscans are applied
    4853
    4954#endif

  • trunk/psModules/src/objects/pmObjects.c

    r5255 r5435  
    66 *  @author EAM, IfA: significant modifications.
    77 *
    8  *  @version $Revision: 1.2 $ $Name: not supported by cvs2svn $
    9  *  @date $Date: 2005-10-10 19:53:40 $
     8 *  @version $Revision: 1.3 $ $Name: not supported by cvs2svn $
     9 *  @date $Date: 2005-10-20 23:06:24 $
    1010 *
    1111 *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
    … …  
    14451445XXX: What is mode?
    14461446XXX: The top, bottom of the contour is not correctly determined.
    1447 XXX EAM : this functions is using the model for the contour, but it should
     1447XXX EAM : this function is using the model for the contour, but it should
    14481448          be using only the image counts
    14491449*****************************************************************************/
Note: See TracChangeset for help on using the changeset viewer.