IPP Software Navigation Tools IPP Links Communication Pan-STARRS Links

Changeset 21493


Ignore:
Timestamp:
Feb 15, 2009, 11:11:36 AM (17 years ago)
Author:
eugene
Message:

finalize ps1-v1 format

Location:
branches/eam_branch_20090208/Ohana/src
Files:
13 edited

Legend:

Unmodified
Added
Removed

  • branches/eam_branch_20090208/Ohana/src/addstar/src/ReadStarsFITS.c

    r21491 r21493  
    210210    stars[i].measure.dM         = ps1data[i].dM;
    211211    stars[i].measure.dMcal      = ps1data[i].dMcal;
    212     stars[i].measure.Map        = ps1data[i].Map;
     212    stars[i].measure.Map        = ps1data[i].Map + ZeroPt;
    213213                       
    214214    stars[i].measure.Sky        = ps1data[i].sky;

  • branches/eam_branch_20090208/Ohana/src/addstar/src/find_matches.c

    r21444 r21493  
    156156      catalog[0].measure[Nmeas].dbFlags  = 0;
    157157      catalog[0].measure[Nmeas].averef   = n; // this must be an absolute sequence number, if partial average is loaded
     158      catalog[0].measure[Nmeas].objID    = catalog[0].average[n].objID;
     159      catalog[0].measure[Nmeas].catID    = catalog[0].catID;
    158160
    159161      // rationalize dR:
    … …  
    289291    catalog[0].measure[Nmeas].dbFlags   = 0;
    290292    catalog[0].measure[Nmeas].averef    = Nave; // XXX EAM : must be absolute Nave if partial read
     293    catalog[0].measure[Nmeas].objID     = catalog[0].average[Nave].objID;
     294    catalog[0].measure[Nmeas].catID     = catalog[0].catID;
    291295
    292296    /* set the average magnitude if not already set and the photcode.equiv is not 0 */

  • branches/eam_branch_20090208/Ohana/src/addstar/src/find_matches_closest.c

    r21444 r21493  
    173173    catalog[0].measure[Nmeas].dbFlags  = 0;
    174174    catalog[0].measure[Nmeas].averef   = n;
     175    catalog[0].measure[Nmeas].objID    = catalog[0].average[n].objID;
     176    catalog[0].measure[Nmeas].catID    = catalog[0].catID;
    175177
    176178    // rationalize dR
    … …  
    287289    catalog[0].measure[Nmeas].dbFlags  = 0;
    288290    catalog[0].measure[Nmeas].averef   = Nave;
     291    catalog[0].measure[Nmeas].objID    = catalog[0].average[Nave].objID;
     292    catalog[0].measure[Nmeas].catID    = catalog[0].catID;
    289293
    290294    /* set the average magnitude if not already set and the photcode.equiv is not 0 */

  • branches/eam_branch_20090208/Ohana/src/addstar/src/find_matches_refstars.c

    r21444 r21493  
    165165      catalog[0].measure[Nmeas].averef   = n;
    166166      catalog[0].measure[Nmeas].dbFlags  = 0;
     167      catalog[0].measure[Nmeas].objID    = catalog[0].average[n].objID;
     168      catalog[0].measure[Nmeas].catID    = catalog[0].catID;
    167169
    168170      catalog[0].measure[Nmeas].t        = (TIMEREF == 0) ? stars[N][0].measure.t      : TIMEREF; /** careful : time_t vs e_time **/
    … …  
    289291      catalog[0].measure[Nmeas].dbFlags  = 0;
    290292      catalog[0].measure[Nmeas].averef   = Nave;
     293      catalog[0].measure[Nmeas].objID    = catalog[0].average[Nave].objID;
     294      catalog[0].measure[Nmeas].catID    = catalog[0].catID;
    291295
    292296      stars[N][0].found = Nmeas;

  • branches/eam_branch_20090208/Ohana/src/libautocode/def/measure-ps1-v1.d

    r21491 r21493  
    2929FIELD averef,         AVE_REF,      unsigned int,   reference to average entry     
    3030
    31 # Pan-STARRS uses a 64-bit detection ID.  keep this in two 32 bit ints for backwards compatibility?
     31# internally, this is an unsigned int; however, we do NOT convert with TZERO/TSCAL on output
    3232FIELD detID,          DET_ID,       unsigned int,   detection ID
    3333FIELD imageID,        IMAGE_ID,     unsigned int,   reference to DVO image ID
     34FIELD objID,          OBJ_ID,       unsigned int,   unique ID for object in table
     35FIELD catID,          CAT_ID,       unsigned int,   unique ID for table in which object was first realized
    3436
     37# PSPS uses a 64-bit detection ID
    3538FIELD extID,          EXT_ID,       uint64_t,       external ID (eg PSPS detID)
    3639
    … …  
    6063FIELD dXccd,          X_CCD_ERR,    short,          X coord error on chip,          1/100 of pixels
    6164FIELD dYccd,          Y_CCD_ERR,    short,          Y coord error on chip,          1/100 of pixels
     65
     66FIELD pad,            PAD,          char[6],        padding
     67
     68# local astrometry scales
    6269FIELD posangle,       POSANGLE,     short,          position angle sky to chip,     (0xffff/360) deg
    63 FIELD pad1,           PAD1,         char[2],        padding
    6470FIELD pltscale,       PLTSCALE,     float,          plate scale,                    arcsec/pixel
    6571
    66 FIELD pad2,           PAD2,         char[4],        padding
    67 FIELD dbFlags,        DB_FLAGS,     uint64_t,       flags supplied by analysis in database
    68 FIELD photFlags,      PHOT_FLAGS,   uint64_t,       flags supplied by photometry program
     72FIELD dbFlags,        DB_FLAGS,     unsigned int,   flags supplied by analysis in database
     73FIELD photFlags,      PHOT_FLAGS,   unsigned int,   flags supplied by photometry program
    6974
    7075

  • branches/eam_branch_20090208/Ohana/src/libautocode/def/measure.d

    r21444 r21493  
    3030FIELD averef,         AVE_REF,      unsigned int,   reference to average entry     
    3131
    32 # Pan-STARRS uses a 64-bit detection ID.  keep this in two 32 bit ints for backwards compatibility?
    3332FIELD detID,          DET_ID,       unsigned int,   detection ID
    3433FIELD imageID,        IMAGE_ID,     unsigned int,   reference to DVO image ID
     34FIELD objID,          OBJ_ID,       unsigned int,   unique ID for object in table
     35FIELD catID,          CAT_ID,       unsigned int,   unique ID for table in which object was first realized
     36
     37# PSPS uses a 64-bit detection ID
    3538FIELD extID,          EXT_ID,       uint64_t,       external ID (eg PSPS detID)
    3639
    … …  
    5659FIELD dXccd,          X_CCD_ERR,    short,          X coord error on chip,          1/100 of pixels
    5760FIELD dYccd,          Y_CCD_ERR,    short,          Y coord error on chip,          1/100 of pixels
     61
    5862FIELD posangle,       POSANGLE,     short,          position angle sky to chip,     (0xffff/360) deg
    5963FIELD pltscale,       PLTSCALE,     float,          plate scale,                    arcsec/pixel
    6064
    6165FIELD photcode,       PHOTCODE,     unsigned short, photcode
    62 FIELD dbFlags,        DB_FLAGS,     uint64_t,       flags supplied by analysis in database
    63 FIELD photFlags,      PHOT_FLAGS,   uint64_t,       flags supplied by photometry program
     66FIELD dbFlags,        DB_FLAGS,     unsigned int,   flags supplied by analysis in database
     67FIELD photFlags,      PHOT_FLAGS,   unsigned int,   flags supplied by photometry program
    6468
    6569# *** 20090206 : new fields : t_msec, extID, Mxx, Mxy, Myy, posangle,

  • branches/eam_branch_20090208/Ohana/src/libdvo/src/dvo_convert_PS1_DEV_1.c

    r21444 r21493  
    4848    out[i].t_msec     = 0;
    4949    out[i].extID      = 0;
     50    out[i].objID      = 0;
     51    out[i].catID      = 0;
    5052    out[i].Mxx        = 0.0;
    5153    out[i].Mxy        = 0.0;

  • branches/eam_branch_20090208/Ohana/src/libdvo/src/dvo_convert_PS1_DEV_2.c

    r21444 r21493  
    4545    out[i].t_msec     = 0;
    4646    out[i].extID      = 0;
     47    out[i].objID      = 0;
     48    out[i].catID      = 0;
    4749    out[i].Mxx        = 0.0;
    4850    out[i].Mxy        = 0.0;

  • branches/eam_branch_20090208/Ohana/src/libdvo/src/dvo_convert_PS1_V1.c

    r21444 r21493  
    3030    out[i].detID      = in[i].detID;
    3131    out[i].imageID    = in[i].imageID;
     32    out[i].objID      = in[i].objID;
     33    out[i].catID      = in[i].catID;
    3234    out[i].extID      = in[i].extID;
    3335    out[i].psfQual    = in[i].psfQual;
    … …  
    8183    out[i].detID      = in[i].detID;
    8284    out[i].imageID    = in[i].imageID;
     85    out[i].objID      = in[i].objID;
     86    out[i].catID      = in[i].catID;
    8387    out[i].extID      = in[i].extID;
    8488    out[i].psfQual    = in[i].psfQual;

  • branches/eam_branch_20090208/Ohana/src/libdvo/src/dvo_convert_elixir.c

    r21444 r21493  
    5555    out[i].t_msec     = 0;
    5656    out[i].extID      = 0;
     57    out[i].objID      = 0;
     58    out[i].catID      = 0;
    5759    out[i].Mxx        = 0.0;
    5860    out[i].Mxy        = 0.0;

  • branches/eam_branch_20090208/Ohana/src/libdvo/src/dvo_convert_loneos.c

    r21444 r21493  
    5757    out[i].t_msec     = 0;
    5858    out[i].extID      = 0;
     59    out[i].objID      = 0;
     60    out[i].catID      = 0;
    5961    out[i].Mxx        = 0.0;
    6062    out[i].Mxy        = 0.0;

  • branches/eam_branch_20090208/Ohana/src/libdvo/src/dvo_convert_panstarrs_DEV_0.c

    r21444 r21493  
    5252    out[i].t_msec     = 0;
    5353    out[i].extID      = 0;
     54    out[i].objID      = 0;
     55    out[i].catID      = 0;
    5456    out[i].Mxx        = 0.0;
    5557    out[i].Mxy        = 0.0;

  • branches/eam_branch_20090208/Ohana/src/libdvo/src/dvo_convert_panstarrs_DEV_1.c

    r21444 r21493  
    5252    out[i].t_msec     = 0;
    5353    out[i].extID      = 0;
     54    out[i].objID      = 0;
     55    out[i].catID      = 0;
    5456    out[i].Mxx        = 0.0;
    5557    out[i].Mxy        = 0.0;
Note: See TracChangeset for help on using the changeset viewer.