IPP Software Navigation Tools IPP Links Communication Pan-STARRS Links

Changeset 34138


Ignore:
Timestamp:
Jul 11, 2012, 6:58:05 AM (14 years ago)
Author:
eugene
Message:

add PS1_V4 schema to dvo

Location:
branches/eam_branches/ipp-20120627/Ohana/src
Files:
1 added
9 edited

Legend:

Unmodified
Added
Removed

  • branches/eam_branches/ipp-20120627/Ohana/src/libautocode/def/measure-ps1-v3.d

    r33647 r34138  
    55DESCRIPTION  DVO Detection Measurement Table
    66
    7 FIELD dR,             D_RA,         float,          RA offset,                    arcsec
    8 FIELD dD,             D_DEC,        float,          DEC offset,                   arcsec
    9 FIELD M,              MAG,          float,          catalog mag,                  mag
    10 FIELD Mcal,           M_CAL,        float,          image cal mag,                mag
    11 FIELD Map,            M_APER,       float,          aperture mag,                 mag
     7FIELD dR,             D_RA,         float,          RA offset,                    arcsec
     8FIELD dD,             D_DEC,        float,          DEC offset,                   arcsec
     9FIELD M,              MAG,          float,          catalog mag,                  mag
     10FIELD Mcal,           M_CAL,        float,          image cal mag,                mag
     11FIELD Map,            M_APER,       float,          aperture mag,                 mag
    1212FIELD dM,             MAG_ERR,      float,          mag error,                    mag
    1313FIELD dMcal,          MAG_CAL_ERR,  float,          systematic calibration error, mag
    … …  
    1515
    1616# note that with airmass = 1.0 / cos(90 - alt), we have full alt/az representation
    17 FIELD airmass,        AIRMASS,      float,          (airmass - 1),                airmass
     17FIELD airmass,        AIRMASS,      float,          (airmass - 1),                airmass
    1818FIELD az,             AZ,           float,          telescope azimuth
    1919
    … …  
    2626FIELD dSky,           SKY_FLUX_ERR, float,          local estimate of sky flux,    counts/sec
    2727
    28 FIELD t,              TIME,         int,            time in seconds (UNIX)
     28FIELD t,              TIME,         int,            time in seconds (UNIX)
    2929FIELD averef,         AVE_REF,      unsigned int,   reference to average entry     
    3030

  • branches/eam_branches/ipp-20120627/Ohana/src/libautocode/def/measure.d

    r34131 r34138  
    22EXTNAME      DVO_MEASURE
    33TYPE         BINTABLE
    4 SIZE         160
     4SIZE         156
    55DESCRIPTION  DVO Detection Measurement Table
    66
    7 FIELD dR,             D_RA,         float,          RA offset,                      arcsec
    8 FIELD dD,             D_DEC,        float,          DEC offset,                     arcsec
    9 FIELD M,              MAG,          float,          catalog mag,                    mag
    10 FIELD Mcal,           M_CAL,        float,          image cal mag,                  mag
    11 FIELD Map,            M_APER,       float,          aperture mag,                   mag
    12 FIELD Mkron,          M_KRON,       float,          kron magnitude,                 mag
    13 FIELD dMkron,         M_KRON_ERR,   float,          kron magnitude error,           mag
     7FIELD dR,             D_RA,         float,          RA offset,                      arcsec
     8FIELD dD,             D_DEC,        float,          DEC offset,                     arcsec
     9FIELD M,              MAG,          float,          catalog mag,                    mag
     10FIELD Mcal,           M_CAL,        float,          image cal mag,                  mag
     11FIELD Map,            M_APER,       float,          aperture mag,                   mag
     12FIELD Mkron,          M_KRON,       float,          kron magnitude,                 mag
     13FIELD dMkron,         M_KRON_ERR,   float,          kron magnitude error,           mag
    1414FIELD dM,             MAG_ERR,      float,          mag error,                      mag
    1515FIELD dMcal,          MAG_CAL_ERR,  float,          systematic calibration error,   mag
    … …  
    1717
    1818# note that with airmass = 1.0 / cos(90 - alt), we have full alt/az representation
    19 FIELD airmass,        AIRMASS,      float,          (airmass - 1),                  airmass
     19FIELD airmass,        AIRMASS,      float,          (airmass - 1),                  airmass
    2020FIELD az,             AZ,           float,          telescope azimuth
    2121
    … …  
    2828FIELD dSky,           SKY_FLUX_ERR, float,          local estimate of sky flux,     counts/sec
    2929
    30 FIELD t,              TIME,         int,            time in seconds (UNIX)
     30FIELD t,              TIME,         int,            time in seconds (UNIX)
    3131FIELD t_msec,         TIME_MSEC,    unsigned short, time fraction of second,        milliseconds
    3232FIELD averef,         AVE_REF,      unsigned int,   reference to average entry     

  • branches/eam_branches/ipp-20120627/Ohana/src/libdvo/Makefile

    r33649 r34138  
    3535$(DESTINC)/ps1_v2_defs.h \
    3636$(DESTINC)/ps1_v3_defs.h \
     37$(DESTINC)/ps1_v4_defs.h \
    3738$(DESTINC)/ps1_ref_defs.h
    3839
    … …  
    7374$(SRC)/dvo_convert_PS1_V2.$(ARCH).o \
    7475$(SRC)/dvo_convert_PS1_V3.$(ARCH).o \
     76$(SRC)/dvo_convert_PS1_V4.$(ARCH).o \
    7577$(SRC)/dvo_convert_PS1_REF.$(ARCH).o \
    7678$(SRC)/flatcorr_io.$(ARCH).o    \

  • branches/eam_branches/ipp-20120627/Ohana/src/libdvo/doc/notes.txt

    r21508 r34138  
    2525   include the new STRUCT name.
    2626
    27 7) create a new conversion file dvo_convert_foo.c and define the
     277) create a new conversion file libdvo/src/dvo_convert_foo.c and define the
    2828   internal to Foo conversions.
    2929
    30 8) add the new format to the list of FORMAT conversion in dvo_convert.c.
     308a) add the new dvo_convert_foo.c to libdvo/Makefile
     31
     328b) add the new format to the list of FORMAT conversion in dvo_convert.c.
    3133
    32349) any changes to the internal format need to be reflected in the
    … …  
    4446
    454713) Add the conversion functions to the header file libdvo/include/foo_defs.h
     48
     4914) Add the above foo_defs.h to libdvo/include/dvo.h
     50
     5114) Add the above foo_defs.h to libdvo/Makefile
    4652
    4753* Note some esoteric format issues: 

  • branches/eam_branches/ipp-20120627/Ohana/src/libdvo/include/dvo.h

    r34130 r34138  
    572572# include "ps1_v2_defs.h"
    573573# include "ps1_v3_defs.h"
     574# include "ps1_v4_defs.h"
    574575# include "ps1_ref_defs.h"
    575576

  • branches/eam_branches/ipp-20120627/Ohana/src/libdvo/src/LoadPhotcodesFITS.c

    r33649 r34138  
    6363  CONVERT_FORMAT("DVO_PHOTCODE_PS1_V2",    PS1_V2);
    6464  CONVERT_FORMAT("DVO_PHOTCODE_PS1_V3",    PS1_V3);
     65  CONVERT_FORMAT("DVO_PHOTCODE_PS1_V4",    PS1_V4);
    6566
    6667  table = GetPhotcodeTable ();

  • branches/eam_branches/ipp-20120627/Ohana/src/libdvo/src/SavePhotcodesFITS.c

    r33649 r34138  
    44/* locking is used to avoid collisions with programs trying to update the photcodes values */
    55/* XXX better distinction between NOT FOUND and FAILURE */
     6
    67int SavePhotcodesFITS (char *filename) {
    78
    … …  
    2930  // for the moment, we simply support the latest photcode format for output
    3031  // XXX update this as needed as new formats are defined
    31   PhotCode_PS1_V3 *photcode_output = PhotCode_Internal_To_PS1_V3 (table[0].code, table[0].Ncode);
     32  PhotCode_PS1_V4 *photcode_output = PhotCode_Internal_To_PS1_V4 (table[0].code, table[0].Ncode);
    3233
    3334  /* convert FITS format data to internal format (byteswaps & EXTNAME) */
    3435  if (!gfits_db_create (&db)) return (FALSE);
    35   if (!gfits_table_set_PhotCode_PS1_V3 (&db.ftable, photcode_output, table[0].Ncode)) return (FALSE);
     36  if (!gfits_table_set_PhotCode_PS1_V4 (&db.ftable, photcode_output, table[0].Ncode)) return (FALSE);
    3637  if (!gfits_db_save (&db)) return (FALSE);
    3738  if (!gfits_db_close (&db)) return (FALSE);

  • branches/eam_branches/ipp-20120627/Ohana/src/libdvo/src/dvo_image.c

    r34088 r34138  
    212212  if (db[0].format == DVO_FORMAT_PS1_V2)          gfits_modify (&db[0].header, "FORMAT", "%s", 1, "PS1_V2");
    213213  if (db[0].format == DVO_FORMAT_PS1_V3)          gfits_modify (&db[0].header, "FORMAT", "%s", 1, "PS1_V3");
     214  if (db[0].format == DVO_FORMAT_PS1_V4)          gfits_modify (&db[0].header, "FORMAT", "%s", 1, "PS1_V4");
    214215  if (db[0].format == DVO_FORMAT_PS1_REF)         gfits_modify (&db[0].header, "FORMAT", "%s", 1, "PS1_REF");
    215216 

  • branches/eam_branches/ipp-20120627/Ohana/src/libdvo/src/dvo_image_raw.c

    r33649 r34138  
    5858  if (db[0].format == DVO_FORMAT_PS1_V2)          ImageSize = sizeof(Image_PS1_V2);
    5959  if (db[0].format == DVO_FORMAT_PS1_V3)          ImageSize = sizeof(Image_PS1_V3);
     60  if (db[0].format == DVO_FORMAT_PS1_V4)          ImageSize = sizeof(Image_PS1_V4);
    6061  if (db[0].format == DVO_FORMAT_PS1_REF)         ImageSize = sizeof(Image_PS1_REF);
    6162
    … …  
    8788  if (db[0].format == DVO_FORMAT_PS1_V2)          gfits_table_mkheader_Image_PS1_V2 (&db[0].theader);
    8889  if (db[0].format == DVO_FORMAT_PS1_V3)          gfits_table_mkheader_Image_PS1_V3 (&db[0].theader);
     90  if (db[0].format == DVO_FORMAT_PS1_V4)          gfits_table_mkheader_Image_PS1_V4 (&db[0].theader);
    8991  if (db[0].format == DVO_FORMAT_PS1_REF)         gfits_table_mkheader_Image_PS1_REF (&db[0].theader);
    9092   
Note: See TracChangeset for help on using the changeset viewer.