IPP Software Navigation Tools IPP Links Communication Pan-STARRS Links

Changeset 791


Ignore:
Timestamp:
May 26, 2004, 12:55:46 PM (22 years ago)
Author:
desonia
Message:

removed the use of TSBYTE_IMG, which is not available in pre 2.49 versions of CFITSIO.

Location:
trunk/psLib/src
Files:
2 edited

Legend:

Unmodified
Added
Removed

  • trunk/psLib/src/image/psImage.c

    r790 r791  
    99 *  @author Ross Harman, MHPCC
    1010 *
    11  *  @version $Revision: 1.17 $ $Name: not supported by cvs2svn $
    12  *  @date $Date: 2004-05-26 19:28:57 $
     11 *  @version $Revision: 1.18 $ $Name: not supported by cvs2svn $
     12 *  @date $Date: 2004-05-26 22:55:46 $
    1313 *
    1414 *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
    … …  
    520520    int         bitPix = 0;             /* FITS bitPix value */
    521521    int         hduType = IMAGE_HDU;    /* the HDU type (image,table, etc.) */
     522    double      bscale = 1.0;
     523    double      bzero = 0.0;
    522524
    523525    /* need a valid image to write */
    … …  
    537539        break;
    538540    case PS_TYPE_S8:
    539         bitPix = SBYTE_IMG;
     541        bitPix = BYTE_IMG;
     542        bzero = -128.0;
    540543        datatype = TSBYTE;
    541544        break;
    542545    case PS_TYPE_U16:
    543         bitPix = USHORT_IMG;
     546        bitPix = SHORT_IMG;
     547        bzero = 32768.0;
    544548        datatype = TUSHORT;
    545549        break;
    … …  
    549553        break;
    550554    case PS_TYPE_U32:
    551         bitPix = ULONG_IMG;
     555        bitPix = LONG_IMG;
     556        bzero = 2147483648.0;
    552557        datatype = TULONG;
    553558        break;
    … …  
    628633        }
    629634
     635        // set the bscale/bzero
     636        fits_write_key_dbl(fptr, "BZERO",bzero,5,"Pixel Value Offset",&status);
     637        fits_write_key_dbl(fptr, "BSCALE",bscale,5,"Pixel Value Scale",&status);
     638        fits_set_bscale(fptr,bscale,bzero,&status);
     639
    630640        if (extname != NULL) {
    631641            /* create the extension for the Primary HDU */
    … …  
    649659    lastPixel[2] = z+1;
    650660
     661
    651662    if ( fits_write_subset(fptr, datatype, firstPixel, lastPixel, input->data.v, &status) != 0) {
    652663        (void)fits_get_errstatus(status, fitsErr);

  • trunk/psLib/src/mathtypes/psImage.c

    r790 r791  
    99 *  @author Ross Harman, MHPCC
    1010 *
    11  *  @version $Revision: 1.17 $ $Name: not supported by cvs2svn $
    12  *  @date $Date: 2004-05-26 19:28:57 $
     11 *  @version $Revision: 1.18 $ $Name: not supported by cvs2svn $
     12 *  @date $Date: 2004-05-26 22:55:46 $
    1313 *
    1414 *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
    … …  
    520520    int         bitPix = 0;             /* FITS bitPix value */
    521521    int         hduType = IMAGE_HDU;    /* the HDU type (image,table, etc.) */
     522    double      bscale = 1.0;
     523    double      bzero = 0.0;
    522524
    523525    /* need a valid image to write */
    … …  
    537539        break;
    538540    case PS_TYPE_S8:
    539         bitPix = SBYTE_IMG;
     541        bitPix = BYTE_IMG;
     542        bzero = -128.0;
    540543        datatype = TSBYTE;
    541544        break;
    542545    case PS_TYPE_U16:
    543         bitPix = USHORT_IMG;
     546        bitPix = SHORT_IMG;
     547        bzero = 32768.0;
    544548        datatype = TUSHORT;
    545549        break;
    … …  
    549553        break;
    550554    case PS_TYPE_U32:
    551         bitPix = ULONG_IMG;
     555        bitPix = LONG_IMG;
     556        bzero = 2147483648.0;
    552557        datatype = TULONG;
    553558        break;
    … …  
    628633        }
    629634
     635        // set the bscale/bzero
     636        fits_write_key_dbl(fptr, "BZERO",bzero,5,"Pixel Value Offset",&status);
     637        fits_write_key_dbl(fptr, "BSCALE",bscale,5,"Pixel Value Scale",&status);
     638        fits_set_bscale(fptr,bscale,bzero,&status);
     639
    630640        if (extname != NULL) {
    631641            /* create the extension for the Primary HDU */
    … …  
    649659    lastPixel[2] = z+1;
    650660
     661
    651662    if ( fits_write_subset(fptr, datatype, firstPixel, lastPixel, input->data.v, &status) != 0) {
    652663        (void)fits_get_errstatus(status, fitsErr);
Note: See TracChangeset for help on using the changeset viewer.