IPP Software Navigation Tools IPP Links Communication Pan-STARRS Links

Changeset 36988


Ignore:
Timestamp:
Jul 9, 2014, 2:24:49 PM (12 years ago)
Author:
eugene
Message:

replacing typed out values for int/u_int bzero entries with macros FT_BZERO_INT32, etc; moving FT_BZERO_INT16 and related macros to libdvo/include/dvo.h

Location:
branches/eam_branches/ipp-20140610/Ohana/src/uniphot/src
Files:
6 edited

Legend:

Unmodified
Added
Removed

  • branches/eam_branches/ipp-20140610/Ohana/src/uniphot/src/ImageSubset.c

    r33654 r36988  
    9999  gfits_create_table_header (&theader, "BINTABLE", "IMAGE_SUBSET");
    100100
    101   gfits_define_bintable_column (&theader, "E", "MCAL", "zero point offset", "magnitudes", 1.0, 0.0);
    102   gfits_define_bintable_column (&theader, "E", "MCAL_ERR", "zero point error", "magnitudes", 1.0, 0.0);
    103 
    104   // an unsigned int needs to have bzero of 0x8000
    105   gfits_define_bintable_column (&theader, "J", "IMAGE_ID", "image ID", NULL, 1.0, 1.0*0x8000);
    106   gfits_define_bintable_column (&theader, "J", "PHOTOM_MAP", "map", NULL, 1.0, 1.0*0x8000);
    107   gfits_define_bintable_column (&theader, "J", "FLAGS", "flags", NULL, 1.0, 1.0*0x8000);
     101  gfits_define_bintable_column (&theader, "E", "MCAL",       "zero point offset", "magnitudes", 1.0, 0.0);
     102  gfits_define_bintable_column (&theader, "E", "MCAL_ERR",   "zero point error",  "magnitudes", 1.0, 0.0);
     103  gfits_define_bintable_column (&theader, "J", "IMAGE_ID",   "image ID",          NULL,         1.0, FT_BZERO_INT32);
     104  gfits_define_bintable_column (&theader, "J", "PHOTOM_MAP", "map",               NULL,         1.0, FT_BZERO_INT32);
     105  gfits_define_bintable_column (&theader, "J", "FLAGS",      "flags",             NULL,         1.0, FT_BZERO_INT32);
    108106
    109107  // generate the output array that carries the data
    … …  
    114112
    115113  // create intermediate storage arrays
    116   ALLOCATE (Mcal,  float, Nimage);
    117   ALLOCATE (dMcal, float, Nimage);
     114  ALLOCATE (Mcal,    float,        Nimage);
     115  ALLOCATE (dMcal,   float,        Nimage);
    118116  ALLOCATE (imageID, unsigned int, Nimage);
    119117  ALLOCATE (map,     unsigned int, Nimage);

  • branches/eam_branches/ipp-20140610/Ohana/src/uniphot/src/ImageSubsetFixImageIDs.c

    r35764 r36988  
    11# include "fiximids.h"
    2 # define FT_BZERO_INT16 1.0*0x8000       
    3 # define FT_BZERO_INT32 1.0*0x80000000
    42
    53# define GET_COLUMN(OUT,NAME,TYPE) \

  • branches/eam_branches/ipp-20140610/Ohana/src/uniphot/src/ImageSubsetFixStackIDs.c

    r35764 r36988  
    11# include "fixstkids.h"
    2 # define FT_BZERO_INT16 1.0*0x8000       
    3 # define FT_BZERO_INT32 1.0*0x80000000
    42
    53# define GET_COLUMN(OUT,NAME,TYPE) \

  • branches/eam_branches/ipp-20140610/Ohana/src/uniphot/src/ImageSubsetSetPosangle.c

    r34749 r36988  
    149149  gfits_create_table_header (&theader, "BINTABLE", "IMAGE_SUBSET");
    150150
    151   // an unsigned int needs to have bzero of 0x8000
    152   gfits_define_bintable_column (&theader, "J",   "IMAGE_ID",   "image ID", NULL, 1.0, 1.0*0x8000);
     151  gfits_define_bintable_column (&theader, "J",   "IMAGE_ID",   "image ID", NULL, 1.0, FT_BZERO_INT32);
    153152  gfits_define_bintable_column (&theader, "E",   "TZERO",      "tmp",      "mp", 1.0, 0.0);
    154153  gfits_define_bintable_column (&theader, "E",   "TRATE",      "tmp",      "mp", 1.0, 0.0);

  • branches/eam_branches/ipp-20140610/Ohana/src/uniphot/src/load_images_fiximids.c

    r35764 r36988  
    11# include "fiximids.h"
    2 # define FT_BZERO_INT32 1.0*0x80000000
    32
    43off_t   Nimage = 0;

  • branches/eam_branches/ipp-20140610/Ohana/src/uniphot/src/load_images_fixstkids.c

    r35764 r36988  
    11# include "fixstkids.h"
    2 # define FT_BZERO_INT32 1.0*0x80000000
    32
    43off_t Nimage = 0;
Note: See TracChangeset for help on using the changeset viewer.