IPP Software Navigation Tools IPP Links Communication Pan-STARRS Links

Changeset 16699


Ignore:
Timestamp:
Feb 27, 2008, 5:16:19 PM (18 years ago)
Author:
eugene
Message:

creating PS1_DEV_2 formats; fixing definitions of imageID, objID, detID; changing psfProb to psfChisq

Location:
branches/eam_branch_20080223/Ohana/src
Files:
2 added
2 deleted
31 edited

Legend:

Unmodified
Added
Removed

  • branches/eam_branch_20080223/Ohana/src/libautocode/Makefile.Targets

    r15694 r16699  
    88$(ASRC)/average-panstarrs-dev-1.$(ARCH).o \
    99$(ASRC)/average-ps1-dev-1.$(ARCH).o \
     10$(ASRC)/average-ps1-dev-2.$(ARCH).o \
    1011$(ASRC)/secfilt.$(ARCH).o \
    1112$(ASRC)/secfilt-loneos.$(ARCH).o \
    … …  
    1415$(ASRC)/secfilt-panstarrs-dev-1.$(ARCH).o \
    1516$(ASRC)/secfilt-ps1-dev-1.$(ARCH).o \
     17$(ASRC)/secfilt-ps1-dev-2.$(ARCH).o \
    1618$(ASRC)/measure.$(ARCH).o \
    1719$(ASRC)/measure-loneos.$(ARCH).o \
    … …  
    2022$(ASRC)/measure-panstarrs-dev-1.$(ARCH).o \
    2123$(ASRC)/measure-ps1-dev-1.$(ARCH).o \
     24$(ASRC)/measure-ps1-dev-2.$(ARCH).o \
    2225$(ASRC)/missing.$(ARCH).o \
    2326$(ASRC)/photcode.$(ARCH).o \
    2427$(ASRC)/photcode-elixir.$(ARCH).o \
    2528$(ASRC)/photcode-ps1-dev-1.$(ARCH).o \
     29$(ASRC)/photcode-ps1-dev-2.$(ARCH).o \
    2630$(ASRC)/image.$(ARCH).o \
    2731$(ASRC)/image-loneos.$(ARCH).o \
    … …  
    3034$(ASRC)/image-panstarrs-dev-1.$(ARCH).o \
    3135$(ASRC)/image-ps1-dev-1.$(ARCH).o \
     36$(ASRC)/image-ps1-dev-2.$(ARCH).o \
    3237$(ASRC)/regimage.$(ARCH).o \
    3338$(ASRC)/detreg.$(ARCH).o \
    … …  
    5560$(AINC)/average-panstarrs-dev-1.h \
    5661$(AINC)/average-ps1-dev-1.h \
     62$(AINC)/average-ps1-dev-2.h \
    5763$(AINC)/secfilt.h \
    5864$(AINC)/secfilt-loneos.h \
    … …  
    6167$(AINC)/secfilt-panstarrs-dev-1.h \
    6268$(AINC)/secfilt-ps1-dev-1.h \
     69$(AINC)/secfilt-ps1-dev-2.h \
    6370$(AINC)/measure.h \
    6471$(AINC)/measure-loneos.h \
    … …  
    6774$(AINC)/measure-panstarrs-dev-1.h \
    6875$(AINC)/measure-ps1-dev-1.h \
     76$(AINC)/measure-ps1-dev-2.h \
    6977$(AINC)/missing.h \
    7078$(AINC)/photcode.h \
    7179$(AINC)/photcode-elixir.h \
    7280$(AINC)/photcode-ps1-dev-1.h \
     81$(AINC)/photcode-ps1-dev-2.h \
    7382$(AINC)/image.h \
    7483$(AINC)/image-loneos.h \
    … …  
    7786$(AINC)/image-panstarrs-dev-1.h \
    7887$(AINC)/image-ps1-dev-1.h \
     88$(AINC)/image-ps1-dev-2.h \
    7989$(AINC)/regimage.h \
    8090$(AINC)/detreg.h \

  • branches/eam_branch_20080223/Ohana/src/libautocode/def/AddstarClientOptions.d

    r16652 r16699  
    22EXTNAME OPTIONS
    33TYPE    BINTABLE
    4 SIZE    76
     4SIZE    80
    55
    66FIELD     Nsigma,           NSIGMA,               double,         match radius in terms of astrometric error

  • branches/eam_branch_20080223/Ohana/src/libautocode/def/Stars.d

    r15038 r16699  
    22EXTNAME STARS
    33TYPE    BINTABLE
    4 SIZE    244
     4SIZE    248
    55
    66FIELD     X,                X,          double,    x coordinate on image,            pixels
    … …  
    2020FIELD     M,                M,          double,    instrumental mag
    2121FIELD     dM,               DM,         double,    error on mag
     22FIELD     dMcal,            DMCAL,      double,    systematic error on mag
    2223FIELD     sky,              SKY,        double,    local sky counts
    2324FIELD     dsky,             dSKY,       double,    local sky error counts
    … …  
    2526FIELD     fy,               FY,         double,    object FWHM y-dir,                pixels?
    2627FIELD     df,               DF,         double,    object position angle,            degrees
    27 FIELD     Mgal,             MGAL,       double,    alternative (galaxy) magnitude
     28# FIELD     Mgal,             MGAL,       double,    alternative (galaxy) magnitude
    2829FIELD     Map,              MAP,        double,    alternative (aperture) magnitude
    2930FIELD     Mpeak,            MPEAK,      double,    alternative (peak) magnitude
    3031FIELD     detID,            ID,         int,       detection identifier
     32FIELD     imageID,          IMAGE_ID,   int,       image identifier
    3133FIELD     found,            FOUND,      int,       found in database catalog?
    3234FIELD     t,                T,          e_time,    date/time of exposure (UNIX)
    3335FIELD     dt,               EXPTIME,    float,     exposure time,                    2.5*log(exptime)
    34 FIELD     psfProb,          PSF_PROB,   float
     36FIELD     psfChisq,         PSF_CHISQ,  float
    3537FIELD     crNsigma,         CR_NSIGMA,  float
    3638FIELD     extNsigma,        EXT_NSIGMA, float

  • branches/eam_branch_20080223/Ohana/src/libautocode/def/average-panstarrs-dev-0.d

    r15511 r16699  
    2727
    2828# Pan-STARRS uses a 64-bit detection ID.  keep this in two 32 bit ints for backwards compatibility?
    29 FIELD objID_hi,       OBJ_ID_HI,    unsigned int,   ID upper bytes
    30 FIELD objID_lo,       OBJ_ID_LO,    unsigned int,   ID lower bytes
     29FIELD objID,          OBJ_ID,     unsigned int,   ID upper bytes
     30FIELD catID,          CAT_ID,     unsigned int,   ID lower bytes
    3131
    3232# this structure should only be used for internal representations

  • branches/eam_branch_20080223/Ohana/src/libautocode/def/average-panstarrs-dev-1.d

    r15511 r16699  
    2727
    2828# Pan-STARRS uses a 64-bit detection ID.  keep this in two 32 bit ints for backwards compatibility?
    29 FIELD objID_hi,       OBJ_ID_HI,    unsigned int,   ID upper bytes
    30 FIELD objID_lo,       OBJ_ID_LO,    unsigned int,   ID lower bytes
     29FIELD objID,          OBJ_ID,     unsigned int,   ID upper bytes
     30FIELD catID,          CAT_ID,     unsigned int,   ID lower bytes
    3131
    3232# this structure should only be used for internal representations

  • branches/eam_branch_20080223/Ohana/src/libautocode/def/average-ps1-dev-1.d

    r15511 r16699  
    2727
    2828# Pan-STARRS uses a 64-bit detection ID.  keep this in two 32 bit ints for backwards compatibility?
    29 FIELD objID_hi,       OBJ_ID_HI,    unsigned int,   ID upper bytes
    30 FIELD objID_lo,       OBJ_ID_LO,    unsigned int,   ID lower bytes
     29FIELD objID,          OBJ_ID,     unsigned int,   ID upper bytes
     30FIELD catID,          CAT_ID,     unsigned int,   ID lower bytes
    3131
    3232# this structure should only be used for internal representations

  • branches/eam_branch_20080223/Ohana/src/libautocode/def/average-ps1-dev-2.d

    r16632 r16699  
    22EXTNAME      DVO_AVERAGE_PS1_DEV_2
    33TYPE         BINTABLE
    4 SIZE         72
     4SIZE         80
    55DESCRIPTION  DVO Average Object Table
    66
    … …  
    1919FIELD dP,             PAR_ERR,    float,            parallax error,               arcsec
    2020
    21 FIELD Xp,             SIGMA_POS,  short,            position scatter,             1/100 arcsec
    22 FIELD Npsf,           NPSF,       unsigned short,   number of psf measurements
    23 FIELD Next,           NEXT,       unsigned short,   number of extended measurements
    24 FIELD Nmiss,          NMISS,      unsigned short,   number of missings
    25 FIELD psfOffset,      OFF_PSF,    int,              offset to first measurement
    26 FIELD extOffset,      OFF_EXT,    int,              offset to first measurement
    27 FIELD missOffset,     OFF_MISS,   int,              offset to first missing obs
     21FIELD Xp,             SIGMA_POS,   short,           position scatter,             1/100 arcsec
     22FIELD Nmeasure,       NMEASURE,    unsigned short,  number of psf measurements
     23FIELD Nmissing,       NMISSING,    unsigned short,  number of missings
     24FIELD Nextend,        NEXTEND,     unsigned short,  number of extended measurements
     25FIELD measureOffset,  OFF_MEASURE, int,             offset to first psf measurement
     26FIELD missingOffset,  OFF_MISSING, int,             offset to first missing obs
     27FIELD extendOffset,   OFF_EXTEND,  int,             offset to first extended measurement
    2828
    2929FIELD code,           code,       unsigned short,   ID code (star; ghost; etc)
     30FIELD dummy,          DUMMY,      char[2],          padding
    3031
    31 # Pan-STARRS uses a 64-bit detection ID.  keep this in two 32 bit ints for backwards compatibility?
    32 FIELD objID_hi,       OBJ_ID_HI,  unsigned int,     ID upper bytes
    33 FIELD objID_lo,       OBJ_ID_LO,  unsigned int,     ID lower bytes
     32# Pan-STARRS uses a 64-bit detection ID.  keep this in two 32 bit ints
     33# for C89 compatibility.  The objID is constructed based on the
     34# position of first instatiation.  this is actually quite expensive
     35# because we need to include the uniqueness test to construct this,
     36# which requires a select for each new object.  Therefore, I will use
     37# a table based ID (table ID + object ID), and we will have to
     38# re-number the object IDs if we change the table density, OR treat
     39# all subdivisions as entries which are from a foreign table.
     40
     41FIELD objID,          OBJ_ID,    unsigned int,   unique ID for object in table
     42FIELD catID,          CAT_ID,    unsigned int,   unique ID for table in which object was first realized
    3443
    3544# this structure should only be used for internal representations

  • branches/eam_branch_20080223/Ohana/src/libautocode/def/average.d

    r16634 r16699  
    3939# all subdivisions as entries which are from a foreign table.
    4040
    41 FIELD objID_hi,       OBJ_ID_HI,    unsigned int,   ID upper bytes
    42 FIELD objID_lo,       OBJ_ID_LO,    unsigned int,   ID lower bytes
     41FIELD objID,          OBJ_ID,    unsigned int,   unique ID for object in table
     42FIELD catID,          CAT_ID,    unsigned int,   unique ID for table in which object was first realized
    4343
    4444# this structure should only be used for internal representations

  • branches/eam_branch_20080223/Ohana/src/libautocode/def/image-ps1-dev-2.d

    r16632 r16699  
    1 STRUCT       Image_PS1_DEV_1
    2 EXTNAME      DVO_IMAGE_PS1_DEV_1
     1STRUCT       Image_PS1_DEV_2
     2EXTNAME      DVO_IMAGE_PS1_DEV_2
    33TYPE         BINTABLE
    4 SIZE         288
     4SIZE         280
    55DESCRIPTION  DVO Image Table
    66
    … …  
    2626FIELD     nstar,            NSTAR,                unsigned int,   number of stars on image
    2727FIELD     secz,             SECZ,                 float,          airmass,                   mag
    28 FIELD     NX,               NX,                   short,          image width
    29 FIELD     NY,               NY,                   short,          image height
     28FIELD     NX,               NX,                   unsigned short, image width
     29FIELD     NY,               NY,                   unsigned short, image height
    3030FIELD     apmifit,          APMIFIT,              float,          aperture correction,       mag
    3131FIELD     dapmifit,         DAPMIFIT,             float,          apmifit error,             mag
    … …  
    4848FIELD     code,             CODE,                 char,           image quality flag
    4949FIELD     ccdnum,           CCDNUM,               unsigned char,  CCD ID number
    50 FIELD     imageID,          IMAGE_ID,             unsigned int,   image ID
    51 # 44 bytes
     50FIELD     imageID,          IMAGE_ID,             unsigned int,   internal image ID
     51FIELD     externID,         EXTERN_ID,            unsigned int,   external image ID
     52FIELD     sourceID,         SOURCE_ID,            unsigned short, analysis source ID
     53# 48 bytes
    5254
    53 FIELD     dummy,            DUMMY,                char[14],       unused
    5455FIELD     order,            ORDER,                short,          Mrel 2D polynomical order
    5556FIELD     Mx,               MX,                   short,          Mrel polyterm

  • branches/eam_branch_20080223/Ohana/src/libautocode/def/image.d

    r16634 r16699  
    22EXTNAME      DVO_IMAGE
    33TYPE         BINTABLE
    4 SIZE         288
     4SIZE         280
    55DESCRIPTION  DVO Image Table
    66
    … …  
    5353# 48 bytes
    5454
    55 FIELD     dummy,            DUMMY,                char[14],       unused
    5655FIELD     order,            ORDER,                short,          Mrel 2D polynomical order
    5756FIELD     Mx,               MX,                   short,          Mrel polyterm

  • branches/eam_branch_20080223/Ohana/src/libautocode/def/measure-ps1-dev-1.d

    r15511 r16699  
    3434# do we need more resolution than a short? should this be a log?
    3535FIELD qPSF,           PSF_QF,       float,          psf coverage/quality factor
    36 FIELD psfProb,        PSF_PROB,     float,          psf coverage/quality factor
     36FIELD psfChisq,       PSF_CHISQ,    float,          psf coverage/quality factor
    3737FIELD crNsigma,       CR_NSIGMA,    float,          psf coverage/quality factor
    3838FIELD extNsigma,      EXT_NSIGMA,   float,          psf coverage/quality factor

  • branches/eam_branch_20080223/Ohana/src/libautocode/def/measure-ps1-dev-2.d

    r16632 r16699  
    1 STRUCT       Measure_PS1_DEV_1
    2 EXTNAME      DVO_MEASURE_PS1_DEV_1
     1STRUCT       Measure_PS1_DEV_2
     2EXTNAME      DVO_MEASURE_PS1_DEV_2
    33TYPE         BINTABLE
    4 SIZE         104
     4SIZE         112
    55DESCRIPTION  DVO Detection Measurement Table
    66
    … …  
    99FIELD M,              MAG,          float,          catalog mag,                  mag
    1010FIELD Mcal,           M_CAL,        float,          image cal mag,                mag
    11 FIELD Mgal,           M_GAL,        float,          galaxy mag,                   mag
     11FIELD Map,            M_APER,       float,          aperture mag,                 mag
    1212FIELD dM,             MAG_ERR,      float,          mag error,                    mag
     13FIELD dMcal,          MAG_CAL_ERR,  float,          systematic calibration error, mag
    1314FIELD dt,             M_TIME,       float,          exposure time,                2.5*log(exptime)
    1415
    … …  
    3031# Pan-STARRS uses a 64-bit detection ID.  keep this in two 32 bit ints for backwards compatibility?
    3132FIELD detID,          DET_ID,       unsigned int,   detection ID
    32 FIELD imageID,        IMAGE_ID,     unsigned int,   reference to image
     33FIELD imageID,        IMAGE_ID,     unsigned int,   reference to DVO image ID
    3334
    3435# do we need more resolution than a short? should this be a log?
    3536FIELD qPSF,           PSF_QF,       float,          psf coverage/quality factor
    36 FIELD psfProb,        PSF_PROB,     float,          psf coverage/quality factor
    37 FIELD crNsigma,       CR_NSIGMA,    float,          psf coverage/quality factor
    38 FIELD extNsigma,      EXT_NSIGMA,   float,          psf coverage/quality factor
     37FIELD psfChisq,       PSF_CHISQ,    float,          psf fit chisq
     38FIELD crNsigma,       CR_NSIGMA,    float,          Nsigma deviation towards CR
     39FIELD extNsigma,      EXT_NSIGMA,   float,          Nsigma deviation towards EXT
    3940
    4041FIELD FWx,            FWHM_MAJOR,   short,          object fwhm major axis,       1/100 of arcsec
    … …  
    5455FIELD dophot,         DOPHOT,       char,           dophot type
    5556
    56 FIELD dummy,          DUMMY,        char[2],        padding
     57FIELD dummy,          DUMMY,        char[6],        padding

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

    r16634 r16699  
    22EXTNAME      DVO_MEASURE
    33TYPE         BINTABLE
    4 SIZE         104
     4SIZE         112
    55DESCRIPTION  DVO Detection Measurement Table
    66
    … …  
    99FIELD M,              MAG,          float,          catalog mag,                  mag
    1010FIELD Mcal,           M_CAL,        float,          image cal mag,                mag
    11 FIELD Mgal,           M_GAL,        float,          galaxy mag,                   mag
     11FIELD Map,            M_APER,       float,          aperture mag,                 mag
    1212FIELD dM,             MAG_ERR,      float,          mag error,                    mag
     13FIELD dMcal,          MAG_CAL_ERR,  float,          systematic calibration error, mag
    1314FIELD dt,             M_TIME,       float,          exposure time,                2.5*log(exptime)
    1415
    … …  
    3435# do we need more resolution than a short? should this be a log?
    3536FIELD qPSF,           PSF_QF,       float,          psf coverage/quality factor
    36 FIELD psfProb,        PSF_PROB,     float,          psf coverage/quality factor
    37 FIELD crNsigma,       CR_NSIGMA,    float,          psf coverage/quality factor
    38 FIELD extNsigma,      EXT_NSIGMA,   float,          psf coverage/quality factor
     37FIELD psfChisq,       PSF_CHISQ,    float,          psf fit chisq
     38FIELD crNsigma,       CR_NSIGMA,    float,          Nsigma deviation towards CR
     39FIELD extNsigma,      EXT_NSIGMA,   float,          Nsigma deviation towards EXT
    3940
    4041FIELD FWx,            FWHM_MAJOR,   short,          object fwhm major axis,       1/100 of arcsec
    … …  
    5455FIELD dophot,         DOPHOT,       char,           dophot type
    5556
    56 FIELD dummy,          DUMMY,        char[2],        padding
     57FIELD dummy,          DUMMY,        char[6],        padding

  • branches/eam_branch_20080223/Ohana/src/libautocode/def/photcode-ps1-dev-2.d

    r16632 r16699  
    1 STRUCT       PhotCode_PS1_DEV_1
    2 EXTNAME      DVO_PHOTCODE_PS1_DEV_1
     1STRUCT       PhotCode_PS1_DEV_2
     2EXTNAME      DVO_PHOTCODE_PS1_DEV_2
    33TYPE         BINTABLE
    44SIZE         104

  • branches/eam_branch_20080223/Ohana/src/libautocode/def/ps1_dev_0.d

    r12461 r16699  
    1616FIELD sky,      SKY,              float,    sky flux,             cnts/sec
    1717FIELD dSky,     SKY_SIG,          float,    sky flux errorf       cnts/sec
    18 FIELD psfProb,  PSF_PROBABILITY,  float,    psf probability
     18FIELD psfChisq, PSF_CHISQ,        float,    psf fit chisq
    1919FIELD fx,       PSF_WIDTH_X,      float,    semi-major,           pixels
    2020FIELD fy,       PSF_WIDTH_Y,      float,    semi-minor,           pixels

  • branches/eam_branch_20080223/Ohana/src/libautocode/def/ps1_dev_1.d

    r15038 r16699  
    1616FIELD sky,       SKY,              float,    sky flux,             cnts/sec
    1717FIELD dSky,      SKY_SIG,          float,    sky flux errorf       cnts/sec
    18 FIELD psfProb,   PSF_PROBABILITY,  float,    psf probability
     18FIELD psfChisq,  PSF_CHISQ,        float,    psf fit chisq
    1919FIELD crNsigma,  CR_NSIGMA,        float,    Nsigma deviations from PSF to CF
    2020FIELD extNsigma, EXT_NSIGMA,       float,    Nsigma deviations from PSF to EXT

  • branches/eam_branch_20080223/Ohana/src/libautocode/def/secfilt-ps1-dev-2.d

    r16632 r16699  
    1 STRUCT       SecFilt_PS1_DEV_1
    2 EXTNAME      DVO_SECFILT_PS1_DEV_1
     1STRUCT       SecFilt_PS1_DEV_2
     2EXTNAME      DVO_SECFILT_PS1_DEV_2
    33TYPE         BINTABLE
    44SIZE         16

  • branches/eam_branch_20080223/Ohana/src/libdvo/Makefile

    r16139 r16699  
    2929$(DESTINC)/panstarrs_dev_0_defs.h \
    3030$(DESTINC)/panstarrs_dev_1_defs.h \
    31 $(DESTINC)/ps1_dev_1_defs.h
     31$(DESTINC)/ps1_dev_1_defs.h \
     32$(DESTINC)/ps1_dev_2_defs.h
    3233
    3334INCS = $(DEFS) $(DESTINC)/dvo.h $(DESTINC)/autocode.h
    … …  
    3738$(SRC)/coordops.$(ARCH).o        \
    3839$(SRC)/dvosorts.$(ARCH).o        \
    39 $(SRC)/dvo_photcode_ops.$(ARCH).o \
    40 $(SRC)/dvo_photcode_convert_elixir.$(ARCH).o \
    41 $(SRC)/dvo_photcode_convert_ps1_dev_1.$(ARCH).o \
    4240$(SRC)/dvo_photcode_ops.$(ARCH).o \
    4341$(SRC)/LoadPhotcodes.$(ARCH).o   \
    … …  
    6462$(SRC)/dvo_convert_panstarrs_DEV_1.$(ARCH).o \
    6563$(SRC)/dvo_convert_PS1_DEV_1.$(ARCH).o \
     64$(SRC)/dvo_convert_PS1_DEV_2.$(ARCH).o \
    6665$(SRC)/skyregion_io.$(ARCH).o    \
    6766$(SRC)/skyregion_gsc.$(ARCH).o    \

  • branches/eam_branch_20080223/Ohana/src/libdvo/include/dvo.h

    r16057 r16699  
    1616              DVO_FORMAT_PANSTARRS_DEV_0,
    1717              DVO_FORMAT_PANSTARRS_DEV_1,
    18               DVO_FORMAT_PS1_DEV_1
     18              DVO_FORMAT_PS1_DEV_1,
     19              DVO_FORMAT_PS1_DEV_2
    1920} DVOTableFormat;
    2021
    … …  
    215216  struct Catalog *secfilt_catalog;              /* secfilt catalog data (split) */
    216217
     218  unsigned int objID;
     219  unsigned int catID;
     220
    217221  /* extra catalog information */
    218222  int lockmode;
    … …  
    383387# include "panstarrs_dev_1_defs.h"
    384388# include "ps1_dev_1_defs.h"
     389# include "ps1_dev_2_defs.h"
    385390
    386391/*** DVO image db I/O Functions ***/

  • branches/eam_branch_20080223/Ohana/src/libdvo/src/LoadPhotcodesFITS.c

    r15694 r16699  
    5050    photcode = PhotCode_PS1_DEV_1_To_Internal (photcode_ps1_dev_1, Ncode);
    5151    free (photcode_ps1_dev_1);
     52  }
     53
     54  if (!strcmp (extname, "DVO_PHOTCODE_PS1_DEV_2")) {
     55    PhotCode_PS1_DEV_2 *photcode_ps1_dev_2 = gfits_table_get_PhotCode_PS1_DEV_2 (&db.ftable, &Ncode, &db.swapped);
     56    photcode = PhotCode_PS1_DEV_2_To_Internal (photcode_ps1_dev_2, Ncode);
     57    free (photcode_ps1_dev_2);
    5258  }
    5359

  • branches/eam_branch_20080223/Ohana/src/libdvo/src/SavePhotcodesFITS.c

    r15694 r16699  
    2929  // for the moment, we simply support the latest photcode format for output
    3030  // XXX update this as needed as new formats are defined
    31   PhotCode_PS1_DEV_1 *photcode_output = PhotCode_Internal_To_PS1_DEV_1 (table[0].code, table[0].Ncode);
     31  PhotCode_PS1_DEV_2 *photcode_output = PhotCode_Internal_To_PS1_DEV_2 (table[0].code, table[0].Ncode);
    3232
    3333  /* convert FITS format data to internal format (byteswaps & EXTNAME) */
    3434  gfits_db_create (&db);
    35   gfits_table_set_PhotCode_PS1_DEV_1 (&db.ftable, photcode_output, table[0].Ncode);
     35  gfits_table_set_PhotCode_PS1_DEV_2 (&db.ftable, photcode_output, table[0].Ncode);
    3636  gfits_db_save (&db);
    3737  gfits_db_close (&db);

  • branches/eam_branch_20080223/Ohana/src/libdvo/src/dvo_catalog.c

    r16057 r16699  
    5151  if (!strcasecmp (catformat, "PANSTARRS_DEV_1")) return (DVO_FORMAT_PANSTARRS_DEV_1);
    5252  if (!strcasecmp (catformat, "PS1_DEV_1"))       return (DVO_FORMAT_PS1_DEV_1);
     53  if (!strcasecmp (catformat, "PS1_DEV_2"))       return (DVO_FORMAT_PS1_DEV_2);
    5354  return (DVO_FORMAT_UNDEF);
    5455}

  • branches/eam_branch_20080223/Ohana/src/libdvo/src/dvo_catalog_raw.c

    r16633 r16699  
    7373      FORMAT_CASE (PANSTARRS_DEV_1, Panstarrs_DEV_1);
    7474      FORMAT_CASE (PS1_DEV_1, PS1_DEV_1);
     75      FORMAT_CASE (PS1_DEV_2, PS1_DEV_2);
    7576
    7677    default:
    … …  
    256257  if (catalog[0].catformat == DVO_FORMAT_PANSTARRS_DEV_1) gfits_modify (&catalog[0].header, "FORMAT", "%s", 1, "PANSTARRS_DEV_1");
    257258  if (catalog[0].catformat == DVO_FORMAT_PS1_DEV_1)       gfits_modify (&catalog[0].header, "FORMAT", "%s", 1, "PS1_DEV_1");
     259  if (catalog[0].catformat == DVO_FORMAT_PS1_DEV_2)       gfits_modify (&catalog[0].header, "FORMAT", "%s", 1, "PS1_DEV_2");
    258260
    259261  /* rewind file pointers and truncate file */
    … …  
    350352      FORMAT_CASE (PANSTARRS_DEV_1, Panstarrs_DEV_1);
    351353      FORMAT_CASE (PS1_DEV_1, PS1_DEV_1);
     354      FORMAT_CASE (PS1_DEV_2, PS1_DEV_2);
    352355
    353356    default:
    … …  
    395398      FORMAT_CASE (PANSTARRS_DEV_1, Panstarrs_DEV_1);
    396399      FORMAT_CASE (PS1_DEV_1, PS1_DEV_1);
     400      FORMAT_CASE (PS1_DEV_2, PS1_DEV_2);
    397401
    398402    default:
    … …  
    444448      FORMAT_CASE (PANSTARRS_DEV_1, Panstarrs_DEV_1);
    445449      FORMAT_CASE (PS1_DEV_1, PS1_DEV_1);
     450      FORMAT_CASE (PS1_DEV_2, PS1_DEV_2);
    446451
    447452    default:
    … …  
    489494      FORMAT_CASE (PANSTARRS_DEV_1, Panstarrs_DEV_1);
    490495      FORMAT_CASE (PS1_DEV_1, PS1_DEV_1);
     496      FORMAT_CASE (PS1_DEV_2, PS1_DEV_2);
    491497
    492498    default:
    … …  
    538544      FORMAT_CASE (PANSTARRS_DEV_1, Panstarrs_DEV_1);
    539545      FORMAT_CASE (PS1_DEV_1, PS1_DEV_1);
     546      FORMAT_CASE (PS1_DEV_2, PS1_DEV_2);
    540547
    541548    default:
    … …  
    583590      FORMAT_CASE (PANSTARRS_DEV_1, Panstarrs_DEV_1);
    584591      FORMAT_CASE (PS1_DEV_1, PS1_DEV_1);
     592      FORMAT_CASE (PS1_DEV_2, PS1_DEV_2);
    585593
    586594    default:

  • branches/eam_branch_20080223/Ohana/src/libdvo/src/dvo_convert.c

    r15487 r16699  
    4848  CONVERT_FORMAT ("DVO_AVERAGE_PANSTARRS_DEV_1", PANSTARRS_DEV_1, Panstarrs_DEV_1);
    4949  CONVERT_FORMAT ("DVO_AVERAGE_PS1_DEV_1",       PS1_DEV_1,       PS1_DEV_1);
     50  CONVERT_FORMAT ("DVO_AVERAGE_PS1_DEV_2",       PS1_DEV_2,       PS1_DEV_2);
    5051# undef CONVERT_FORMAT
    5152
    … …  
    7778      FORMAT_CASE (PANSTARRS_DEV_1, Panstarrs_DEV_1);
    7879      FORMAT_CASE (PS1_DEV_1,       PS1_DEV_1);
     80      FORMAT_CASE (PS1_DEV_2,       PS1_DEV_2);
    7981# undef FORMAT_CASE
    8082
    … …  
    119121  CONVERT_FORMAT ("DVO_MEASURE_PANSTARRS_DEV_1", PANSTARRS_DEV_1, Panstarrs_DEV_1);
    120122  CONVERT_FORMAT ("DVO_MEASURE_PS1_DEV_1",       PS1_DEV_1,       PS1_DEV_1);
     123  CONVERT_FORMAT ("DVO_MEASURE_PS1_DEV_2",       PS1_DEV_2,       PS1_DEV_2);
    121124# undef CONVERT_FORMAT
    122125
    … …  
    148151      FORMAT_CASE (PANSTARRS_DEV_1, Panstarrs_DEV_1);
    149152      FORMAT_CASE (PS1_DEV_1,       PS1_DEV_1);
     153      FORMAT_CASE (PS1_DEV_2,       PS1_DEV_2);
    150154# undef FORMAT_CASE
    151155
    … …  
    190194  CONVERT_FORMAT ("DVO_SECFILT_PANSTARRS_DEV_1", PANSTARRS_DEV_1, Panstarrs_DEV_1);
    191195  CONVERT_FORMAT ("DVO_SECFILT_PS1_DEV_1",       PS1_DEV_1,       PS1_DEV_1);
     196  CONVERT_FORMAT ("DVO_SECFILT_PS1_DEV_2",       PS1_DEV_2,       PS1_DEV_2);
    192197# undef CONVERT_FORMAT
    193198
    … …  
    219224      FORMAT_CASE (PANSTARRS_DEV_1, Panstarrs_DEV_1);
    220225      FORMAT_CASE (PS1_DEV_1,       PS1_DEV_1);
     226      FORMAT_CASE (PS1_DEV_2,       PS1_DEV_2);
    221227# undef FORMAT_CASE
    222228
    … …  
    281287  CONVERT_FORMAT ("DVO_IMAGE_PANSTARRS_DEV_1", PANSTARRS_DEV_1, Panstarrs_DEV_1);
    282288  CONVERT_FORMAT ("DVO_IMAGE_PS1_DEV_1",       PS1_DEV_1,       PS1_DEV_1);
     289  CONVERT_FORMAT ("DVO_IMAGE_PS1_DEV_2",       PS1_DEV_2,       PS1_DEV_2);
    283290# undef CONVERT_FORMAT
    284291
    … …  
    313320      FORMAT_CASE (PANSTARRS_DEV_1, Panstarrs_DEV_1);
    314321      FORMAT_CASE (PS1_DEV_1,       PS1_DEV_1);
     322      FORMAT_CASE (PS1_DEV_2,       PS1_DEV_2);
    315323# undef FORMAT_CASE
    316324
    … …  
    361369      FORMAT_CASE (PANSTARRS_DEV_1, Panstarrs_DEV_1);
    362370      FORMAT_CASE (PS1_DEV_1,       PS1_DEV_1);
     371      FORMAT_CASE (PS1_DEV_2,       PS1_DEV_2);
    363372# undef FORMAT_CASE
    364373

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

    r16633 r16699  
    11# include <dvo.h>
    22
    3 // XXX these functions ahve to be adjusted to agree with the new definition of PS1_DEV_1
    4 
    5 /* convert panstarrs-format measures to internal measures */
     3/* convert PS1_DEV_1 formats to internal formats */
     4
    65Measure *Measure_PS1_DEV_1_ToInternal (Measure_PS1_DEV_1 *in, int Nvalues) {
    76
    … …  
    1615    out[i].M          = in[i].M;
    1716    out[i].Mcal       = in[i].Mcal;
    18     out[i].Mgal       = in[i].Mgal;
     17    out[i].Map        = in[i].Mgal;
    1918    out[i].dM         = in[i].dM;
    2019    out[i].dt         = in[i].dt;
    … …  
    3029    out[i].imageID    = in[i].imageID;
    3130    out[i].qPSF       = in[i].qPSF;
    32     out[i].psfProb    = in[i].psfProb;
     31    out[i].psfChisq   = in[i].psfChisq;
    3332    out[i].crNsigma   = in[i].crNsigma;
    3433    out[i].extNsigma  = in[i].extNsigma;
    … …  
    4746}
    4847
    49 /* convert internal measures to panstarrs-format measures */
    5048Measure_PS1_DEV_1 *MeasureInternalTo_PS1_DEV_1 (Measure *in, int Nvalues) {
    5149
    … …  
    6058    out[i].M          = in[i].M;
    6159    out[i].Mcal       = in[i].Mcal;
    62     out[i].Mgal       = in[i].Mgal;
     60    out[i].Mgal       = in[i].Map;
    6361    out[i].dM         = in[i].dM;
    6462    out[i].dt         = in[i].dt;
    … …  
    7472    out[i].imageID    = in[i].imageID;
    7573    out[i].qPSF       = in[i].qPSF;
    76     out[i].psfProb    = in[i].psfProb;
     74    out[i].psfChisq   = in[i].psfChisq;
    7775    out[i].crNsigma   = in[i].crNsigma;
    7876    out[i].extNsigma  = in[i].extNsigma;
    … …  
    9189}
    9290
    93 /* convert panstarrs-format averages to internal averages */
    94 // 'primary is needed to conform with the API for Loneos and Elixir, but is not used
     91// 'primary' is needed to conform with the API for Loneos and Elixir, but is not used
    9592Average *Average_PS1_DEV_1_ToInternal (Average_PS1_DEV_1 *in, int Nvalues, SecFilt **primary) {
    9693
    … …  
    117114    out[i].P             = in[i].P;
    118115    out[i].dP            = in[i].dP;
    119     out[i].objID_hi      = in[i].objID_hi;
    120     out[i].objID_lo      = in[i].objID_lo;
    121   }
    122   return (out);
    123 }
    124 
    125 /* convert internal averages to panstarrs-format averages */
    126 // 'primary is needed to conform with the API for Loneos and Elixir, but is not used
     116    out[i].objID         = in[i].objID;
     117    out[i].catID         = in[i].catID;
     118  }
     119  return (out);
     120}
     121
     122// 'primary' is needed to conform with the API for Loneos and Elixir, but is not used
    127123Average_PS1_DEV_1 *AverageInternalTo_PS1_DEV_1 (Average *in, int Nvalues, SecFilt *primary) {
    128124
    … …  
    149145    out[i].P        = in[i].P;
    150146    out[i].dP       = in[i].dP;
    151     out[i].objID_hi = in[i].objID_hi;
    152     out[i].objID_lo = in[i].objID_lo;
    153   }
    154   return (out);
    155 }
    156 
    157 /* convert panstarrs-format secfilts to internal secfilts */
     147    out[i].objID    = in[i].objID;
     148    out[i].catID    = in[i].catID;
     149  }
     150  return (out);
     151}
     152
    158153SecFilt *SecFilt_PS1_DEV_1_ToInternal (SecFilt_PS1_DEV_1 *in, int Nvalues) {
    159154
    … …  
    173168}
    174169
    175 /* convert internal secfilts to panstarrs-format secfilts */
    176170SecFilt_PS1_DEV_1 *SecFiltInternalTo_PS1_DEV_1 (SecFilt *in, int Nvalues) {
    177171
    … …  
    191185}
    192186
    193 /* convert panstarrs-format images to internal images */
    194187Image *Image_PS1_DEV_1_ToInternal (Image_PS1_DEV_1 *in, int Nvalues) {
    195188
    … …  
    300293  return (out);
    301294}
     295
     296PhotCode_PS1_DEV_1 *PhotCode_Internal_To_PS1_DEV_1 (PhotCode *in, int Nvalues) {
     297
     298  int i;
     299  PhotCode_PS1_DEV_1 *out;
     300
     301  ALLOCATE (out, PhotCode_PS1_DEV_1, Nvalues);
     302
     303  for (i = 0; i < Nvalues; i++) {
     304    strncpy (out[i].name, in[i].name, 31); // out[32], in[32]
     305    out[i].name[31] = 0; // force termination
     306
     307    out[i].code = in[i].code;         
     308    out[i].type = in[i].type;         
     309    out[i].C = in[i].C;           
     310    out[i].dC = in[i].dC;           
     311    out[i].dX = in[i].dX;           
     312    out[i].K = in[i].K;           
     313    out[i].c1 = in[i].c1;           
     314    out[i].c2 = in[i].c2;           
     315    out[i].equiv = in[i].equiv;       
     316    out[i].Nc = in[i].Nc;           
     317    memcpy (out[i].X, in[i].X, 4*sizeof(float));           
     318
     319    out[i].astromScale = in[i].astromScale; 
     320    out[i].photSysErr = in[i].photSysErr;   
     321  }
     322  return (out);
     323}
     324
     325PhotCode *PhotCode_PS1_DEV_1_To_Internal (PhotCode_PS1_DEV_1 *in, int Nvalues) {
     326
     327  int i;
     328  PhotCode *out;
     329
     330  ALLOCATE (out, PhotCode, Nvalues);
     331
     332  for (i = 0; i < Nvalues; i++) {
     333    strncpy (out[i].name, in[i].name, 31); // out[32], in[32]
     334    out[i].name[31] = 0; // force termination
     335
     336    out[i].code = in[i].code;         
     337    out[i].type = in[i].type;         
     338    out[i].C = in[i].C;           
     339    out[i].dC = in[i].dC;           
     340    out[i].dX = in[i].dX;           
     341    out[i].K = in[i].K;           
     342    out[i].c1 = in[i].c1;           
     343    out[i].c2 = in[i].c2;           
     344    out[i].equiv = in[i].equiv;       
     345    out[i].Nc = in[i].Nc;           
     346    memcpy (out[i].X, in[i].X, 4*sizeof(float));           
     347
     348    out[i].astromScale = in[i].astromScale; 
     349    out[i].photSysErr = in[i].photSysErr;   
     350  }
     351  return (out);
     352}

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

    r16633 r16699  
    1616    out[i].dt       = (in[i].dt      == NAN_S_SHORT) ? NAN : in[i].dt     * 0.001;
    1717    out[i].Mcal     = (in[i].Mcal    == NAN_S_SHORT) ? NAN : in[i].Mcal   * 0.001;
    18     out[i].Mgal     = (in[i].Mgal    == NAN_S_SHORT) ? NAN : in[i].Mgal   * 0.001;
     18
     19    // 2008.02.26 : I've renamed Mgal to Map, and intend it to be used per aperture
     20    // magnitudes.  Most uses of Mgal in the past were actually aperture (isophotal) mags
     21    out[i].Map      = (in[i].Mgal    == NAN_S_SHORT) ? NAN : in[i].Mgal   * 0.001;
    1922    out[i].airmass  = (in[i].airmass == NAN_S_SHORT) ? NAN : in[i].airmass* 0.001;
    2023    out[i].FWx      = in[i].FWx;
    … …  
    3942    out[i].dSky      = 0;
    4043    out[i].qPSF      = 0;
    41     out[i].psfProb   = 0;
     44    out[i].psfChisq  = 0;
    4245    out[i].crNsigma  = 0;
    4346    out[i].extNsigma = 0;
    … …  
    6669    out[i].dt       = isnan(in[i].dt     ) ? NAN_S_SHORT : in[i].dt      * 1000.0;
    6770    out[i].Mcal     = isnan(in[i].Mcal   ) ? NAN_S_SHORT : in[i].Mcal    * 1000.0;
    68     out[i].Mgal     = isnan(in[i].Mgal   ) ? NAN_S_SHORT : in[i].Mgal    * 1000.0;
     71    out[i].Mgal     = isnan(in[i].Map    ) ? NAN_S_SHORT : in[i].Map     * 1000.0;
    6972    out[i].airmass  = isnan(in[i].airmass) ? NAN_S_SHORT : in[i].airmass * 1000.0;
    7073
    … …  
    115118
    116119    /* XXX add these later */
    117     out[i].objID_hi = 0;
    118     out[i].objID_lo = 0;
     120    out[i].objID  = 0;
     121    out[i].catID  = 0;
    119122
    120123    primary[0][i].M     = (in[i].M  == NAN_S_SHORT) ? NAN : in[i].M  * 0.001;     
    … …  
    297300  return (out);
    298301}
     302
     303PhotCode_Elixir *PhotCode_Internal_To_Elixir (PhotCode *in, int Nvalues) {
     304
     305  int i;
     306  PhotCode_Elixir *out;
     307
     308  ALLOCATE (out, PhotCode_Elixir, Nvalues);
     309
     310  for (i = 0; i < Nvalues; i++) {
     311    strncpy (out[i].name, in[i].name, 31); // out[32], in[32]
     312    out[i].name[31] = 0; // force termination
     313
     314    out[i].code = in[i].code;         
     315    out[i].type = in[i].type;         
     316    out[i].C = in[i].C;           
     317    out[i].dC = in[i].dC;           
     318    out[i].dX = in[i].dX;           
     319    out[i].K = in[i].K;           
     320    out[i].c1 = in[i].c1;           
     321    out[i].c2 = in[i].c2;           
     322    out[i].equiv = in[i].equiv;       
     323    out[i].Nc = in[i].Nc;           
     324    memcpy (out[i].X, in[i].X, 4*sizeof(float));           
     325  }
     326  return (out);
     327}
     328
     329PhotCode *PhotCode_Elixir_To_Internal (PhotCode_Elixir *in, int Nvalues) {
     330
     331  int i;
     332  PhotCode *out;
     333
     334  ALLOCATE (out, PhotCode, Nvalues);
     335
     336  for (i = 0; i < Nvalues; i++) {
     337    strncpy (out[i].name, in[i].name, 31); // out[32], in[32]
     338    out[i].name[31] = 0; // force termination
     339
     340    out[i].code = in[i].code;         
     341    out[i].type = in[i].type;         
     342    out[i].C = in[i].C;           
     343    out[i].dC = in[i].dC;           
     344    out[i].dX = in[i].dX;           
     345    out[i].K = in[i].K;           
     346    out[i].c1 = in[i].c1;           
     347    out[i].c2 = in[i].c2;           
     348    out[i].equiv = in[i].equiv;       
     349    out[i].Nc = in[i].Nc;           
     350    memcpy (out[i].X, in[i].X, 4*sizeof(float));           
     351
     352    // not defined in Elixir:
     353    out[i].astromScale = 1.0;
     354    out[i].photSysErr = 1.0;
     355  }
     356  return (out);
     357}

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

    r16633 r16699  
    2424
    2525    /* these values don't exist in the Loneos format */
    26     out[i].Mgal     = out[i].M;
    27     out[i].dt       = 0;
    28     out[i].airmass  = 0;
    29     out[i].az       = 0;
    30     out[i].FWx      = 0;
    31     out[i].FWy      = 0;
    32     out[i].theta    = 0;
    33     out[i].stargal  = 0;
    34     out[i].Sky      = 0;
    35     out[i].dSky     = 0;
    36     out[i].qPSF     = 0;
    37     out[i].psfProb   = 0;
     26
     27    // 2008.02.26 : I've renamed Mgal to Map, and intend it to be used per aperture
     28    // magnitudes.  Most uses of Mgal in the past were actually aperture (isophotal) mags
     29    out[i].Map       = out[i].M;
     30    out[i].dt        = 0;
     31    out[i].airmass   = 0;
     32    out[i].az        = 0;
     33    out[i].FWx       = 0;
     34    out[i].FWy       = 0;
     35    out[i].theta     = 0;
     36    out[i].stargal   = 0;
     37    out[i].Sky       = 0;
     38    out[i].dSky      = 0;
     39    out[i].qPSF      = 0;
     40    out[i].psfChisq  = 0;
    3841    out[i].crNsigma  = 0;
    3942    out[i].extNsigma = 0;
    … …  
    107110
    108111    /* XXX add these later */
    109     out[i].objID_hi = 0;
    110     out[i].objID_lo = 0;
     112    out[i].objID  = 0;
     113    out[i].catID  = 0;
    111114
    112115    primary[0][i].M  = (in[i].M  == NAN_S_SHORT) ? NAN : in[i].M  * 0.001;     

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

    r16633 r16699  
    1515    out[i].dM         = in[i].dM;
    1616    out[i].Mcal       = in[i].Mcal;
    17     out[i].Mgal       = in[i].Mgal;
     17
     18    // 2008.02.26 : I've renamed Mgal to Map, and intend it to be used per aperture
     19    // magnitudes.  Most uses of Mgal in the past were actually aperture (isophotal) mags
     20    out[i].Map        = in[i].Mgal;
    1821    out[i].airmass    = in[i].airmass;
    1922    out[i].az         = in[i].az;
    … …  
    3942
    4043    // these don't have a correspondence
    41     out[i].psfProb   = 0;
     44    out[i].psfChisq  = 0;
    4245    out[i].crNsigma  = 0;
    4346    out[i].extNsigma = 0;
    … …  
    6164    out[i].dM         = in[i].dM;
    6265    out[i].Mcal       = in[i].Mcal;
    63     out[i].Mgal       = in[i].Mgal;
     66    out[i].Mgal       = in[i].Map;
    6467    out[i].airmass    = in[i].airmass;
    6568    out[i].az         = in[i].az;
    … …  
    115118    out[i].P             = in[i].P;
    116119    out[i].dP            = in[i].dP;
    117     out[i].objID_hi      = in[i].objID_hi;
    118     out[i].objID_lo      = in[i].objID_lo;
     120    out[i].objID         = in[i].objID;
     121    out[i].catID         = in[i].catID;
    119122  }
    120123  return (out);
    … …  
    147150    out[i].P        = in[i].P;
    148151    out[i].dP       = in[i].dP;
    149     out[i].objID_hi = in[i].objID_hi;
    150     out[i].objID_lo = in[i].objID_lo;
     152    out[i].objID    = in[i].objID;
     153    out[i].catID    = in[i].catID;
    151154  }
    152155  return (out);

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

    r16633 r16699  
    1515    out[i].dM         = in[i].dM;
    1616    out[i].Mcal       = in[i].Mcal;
    17     out[i].Mgal       = in[i].Mgal;
     17
     18    // 2008.02.26 : I've renamed Mgal to Map, and intend it to be used per aperture
     19    // magnitudes.  Most uses of Mgal in the past were actually aperture (isophotal) mags
     20    out[i].Map        = in[i].Mgal;
    1821    out[i].airmass    = in[i].airmass;
    1922    out[i].az         = in[i].az;
    … …  
    3942
    4043    // these don't have a correspondence
    41     out[i].psfProb   = 0;
     44    out[i].psfChisq  = 0;
    4245    out[i].crNsigma  = 0;
    4346    out[i].extNsigma = 0;
    … …  
    6164    out[i].dM         = in[i].dM;
    6265    out[i].Mcal       = in[i].Mcal;
    63     out[i].Mgal       = in[i].Mgal;
     66    out[i].Mgal       = in[i].Map;
    6467    out[i].airmass    = in[i].airmass;
    6568    out[i].az         = in[i].az;
    … …  
    115118    out[i].P             = in[i].P;
    116119    out[i].dP            = in[i].dP;
    117     out[i].objID_hi      = in[i].objID_hi;
    118     out[i].objID_lo      = in[i].objID_lo;
     120    out[i].objID         = in[i].objID;
     121    out[i].catID         = in[i].catID;
    119122  }
    120123  return (out);
    … …  
    147150    out[i].P        = in[i].P;
    148151    out[i].dP       = in[i].dP;
    149     out[i].objID_hi = in[i].objID_hi;
    150     out[i].objID_lo = in[i].objID_lo;
     152    out[i].objID    = in[i].objID;
     153    out[i].catID    = in[i].catID;
    151154  }
    152155  return (out);

  • branches/eam_branch_20080223/Ohana/src/libdvo/src/dvo_image.c

    r15749 r16699  
    194194  if (db[0].format == DVO_FORMAT_PANSTARRS_DEV_1) gfits_modify (&db[0].header, "FORMAT", "%s", 1, "PANSTARRS_DEV_1");
    195195  if (db[0].format == DVO_FORMAT_PS1_DEV_1)       gfits_modify (&db[0].header, "FORMAT", "%s", 1, "PS1_DEV_1");
     196  if (db[0].format == DVO_FORMAT_PS1_DEV_2)       gfits_modify (&db[0].header, "FORMAT", "%s", 1, "PS1_DEV_2");
    196197 
    197198  return;

  • branches/eam_branch_20080223/Ohana/src/libdvo/src/dvo_image_raw.c

    r15487 r16699  
    5353  if (db[0].format == DVO_FORMAT_PANSTARRS_DEV_1) ImageSize = sizeof(Image_Panstarrs_DEV_1);
    5454  if (db[0].format == DVO_FORMAT_PS1_DEV_1)       ImageSize = sizeof(Image_PS1_DEV_1);
     55  if (db[0].format == DVO_FORMAT_PS1_DEV_2)       ImageSize = sizeof(Image_PS1_DEV_2);
    5556
    5657  /* check that filesize makes sense */
    … …  
    7677  if (db[0].format == DVO_FORMAT_PANSTARRS_DEV_1) gfits_table_mkheader_Image_Panstarrs_DEV_1 (&db[0].theader);
    7778  if (db[0].format == DVO_FORMAT_PS1_DEV_1)       gfits_table_mkheader_Image_PS1_DEV_1 (&db[0].theader);
     79  if (db[0].format == DVO_FORMAT_PS1_DEV_2)       gfits_table_mkheader_Image_PS1_DEV_2 (&db[0].theader);
    7880   
    7981  /* read data from file */
Note: See TracChangeset for help on using the changeset viewer.