IPP Software Navigation Tools IPP Links Communication Pan-STARRS Links

Ignore:
Timestamp:
Mar 23, 2015, 8:13:04 AM (11 years ago)
Author:
eugene
Message:

adding lensing ps1_v5_r2

Location:
trunk/Ohana/src/libdvo
Files:
3 edited
4 moved

Legend:

Unmodified
Added
Removed

  • trunk/Ohana/src/libdvo/Makefile

    r37807 r37992  
    4343$(DESTINC)/cmf-ps1-sv3.h \
    4444$(DESTINC)/cmf-ps1-sv4.h \
    45 $(DESTINC)/cmf-ps1-v5-lensing.h \
    46 $(DESTINC)/cmf-ps1-v5-lensing-alt.h
     45$(DESTINC)/cmf-ps1-v5-r0-lensing.h \
     46$(DESTINC)/cmf-ps1-v5-r1-lensing.h \
     47$(DESTINC)/cmf-ps1-v5-r2-lensing.h
    4748
    4849INCS = $(DEFS) $(DESTINC)/dvo.h $(DESTINC)/autocode.h $(DESTINC)/dvo_util.h $(DESTINC)/dvodb.h $(DESTINC)/libdvo_astro.h $(DESTINC)/convert.h $(DESTINC)/get_graphdata.h
    … …  
    102103$(SRC)/cmf-ps1-sv4.$(ARCH).o \
    103104$(SRC)/cmf-ps1-v5.$(ARCH).o \
    104 $(SRC)/cmf-ps1-v5-lensing.$(ARCH).o \
    105 $(SRC)/cmf-ps1-v5-lensing-alt.$(ARCH).o \
     105$(SRC)/cmf-ps1-v5-r0-lensing.$(ARCH).o \
     106$(SRC)/cmf-ps1-v5-r1-lensing.$(ARCH).o \
     107$(SRC)/cmf-ps1-v5-r2-lensing.$(ARCH).o \
    106108$(SRC)/dvo_util.$(ARCH).o \
    107109$(SRC)/dbBooleanCond.$(ARCH).o          \

  • trunk/Ohana/src/libdvo/include/cmf-ps1-v5-r0-lensing.h

    r37985 r37992  
    8484  short            nFrames;              // images overlapping peak
    8585  short            padding;              // padding for 8byte records
    86 } CMF_PS1_V5_Lensing_Alt;
     86} CMF_PS1_V5_R0_Lensing;
    8787
    88 CMF_PS1_V5_Lensing_Alt *gfits_table_get_CMF_PS1_V5_Lensing_Alt (FTable *table, off_t *Ndata, char *swapped);
    89 int      gfits_table_set_CMF_PS1_V5_Lensing_Alt (FTable *ftable, CMF_PS1_V5_Lensing_Alt *data, off_t Ndata);
    90 int      gfits_table_mkheader_CMF_PS1_V5_Lensing_Alt (Header *header);
    91 int      gfits_convert_CMF_PS1_V5_Lensing_Alt (unsigned char *data, off_t size, off_t nitems, char toStruct);
    92 int      Send_CMF_PS1_V5_Lensing_Alt (int device, CMF_PS1_V5_Lensing_Alt *data, int Ndata, int copy);
    93 int      Recv_CMF_PS1_V5_Lensing_Alt (int device, CMF_PS1_V5_Lensing_Alt **data, int *Ndata);
     88CMF_PS1_V5_R0_Lensing *gfits_table_get_CMF_PS1_V5_R0_Lensing (FTable *table, off_t *Ndata, char *swapped);
     89int      gfits_table_set_CMF_PS1_V5_R0_Lensing (FTable *ftable, CMF_PS1_V5_R0_Lensing *data, off_t Ndata);
     90int      gfits_table_mkheader_CMF_PS1_V5_R0_Lensing (Header *header);
     91int      gfits_convert_CMF_PS1_V5_R0_Lensing (unsigned char *data, off_t size, off_t nitems, char toStruct);
     92int      Send_CMF_PS1_V5_R0_Lensing (int device, CMF_PS1_V5_R0_Lensing *data, int Ndata, int copy);
     93int      Recv_CMF_PS1_V5_R0_Lensing (int device, CMF_PS1_V5_R0_Lensing **data, int *Ndata);

  • trunk/Ohana/src/libdvo/include/cmf-ps1-v5-r1-lensing.h

    r37985 r37992  
    7474  short            srcChipX;
    7575  short            srcChipY;
     76  short            padding3;
    7677
    7778  float            Mr1;                  // first radial moment (pixels)
    … …  
    8889  short            nFrames;              // images overlapping peak
    8990  short            padding;              // padding for 8byte records
    90 } CMF_PS1_V5_Lensing;
     91} CMF_PS1_V5_R1_Lensing;
    9192
    92 CMF_PS1_V5_Lensing *gfits_table_get_CMF_PS1_V5_Lensing (FTable *table, off_t *Ndata, char *swapped);
    93 int      gfits_table_set_CMF_PS1_V5_Lensing (FTable *ftable, CMF_PS1_V5_Lensing *data, off_t Ndata);
    94 int      gfits_table_mkheader_CMF_PS1_V5_Lensing (Header *header);
    95 int      gfits_convert_CMF_PS1_V5_Lensing (unsigned char *data, off_t size, off_t nitems, char toStruct);
    96 int      Send_CMF_PS1_V5_Lensing (int device, CMF_PS1_V5_Lensing *data, int Ndata, int copy);
    97 int      Recv_CMF_PS1_V5_Lensing (int device, CMF_PS1_V5_Lensing **data, int *Ndata);
     93CMF_PS1_V5_R1_Lensing *gfits_table_get_CMF_PS1_V5_R1_Lensing (FTable *table, off_t *Ndata, char *swapped);
     94int      gfits_table_set_CMF_PS1_V5_R1_Lensing (FTable *ftable, CMF_PS1_V5_R1_Lensing *data, off_t Ndata);
     95int      gfits_table_mkheader_CMF_PS1_V5_R1_Lensing (Header *header);
     96int      gfits_convert_CMF_PS1_V5_R1_Lensing (unsigned char *data, off_t size, off_t nitems, char toStruct);
     97int      Send_CMF_PS1_V5_R1_Lensing (int device, CMF_PS1_V5_R1_Lensing *data, int Ndata, int copy);
     98int      Recv_CMF_PS1_V5_R1_Lensing (int device, CMF_PS1_V5_R1_Lensing **data, int *Ndata);

  • trunk/Ohana/src/libdvo/include/dvo.h

    r37807 r37992  
    334334# include "cmf-ps1-sv4.h"
    335335# include "cmf-ps1-v5.h"
    336 # include "cmf-ps1-v5-lensing.h"
    337 # include "cmf-ps1-v5-lensing-alt.h"
     336# include "cmf-ps1-v5-r0-lensing.h"
     337# include "cmf-ps1-v5-r1-lensing.h"
     338# include "cmf-ps1-v5-r2-lensing.h"
    338339
    339340typedef struct {

  • trunk/Ohana/src/libdvo/src/cmf-ps1-v5-r0-lensing.c

    r37985 r37992  
    33
    44// this function is based on the one generated by the autocode of cmf-ps1-v5.d
    5 int gfits_convert_CMF_PS1_V5_Lensing_Alt (unsigned char *data, off_t size, off_t nitems, char toStruct) {
     5int gfits_convert_CMF_PS1_V5_R0_Lensing (unsigned char *data, off_t size, off_t nitems, char toStruct) {
    66
    77  off_t i;
    … …  
    99
    1010  if (size != ST_SIZE) {
    11     fprintf (stderr, "WARNING: mismatch in data types CMF_PS1_V5_Lensing_Alt: "OFF_T_FMT" vs %d\n",  size,  ST_SIZE);
     11    fprintf (stderr, "WARNING: mismatch in data types CMF_PS1_V5_R0_Lensing: "OFF_T_FMT" vs %d\n",  size,  ST_SIZE);
    1212    return (FALSE);
    1313  }
    … …  
    191191/*** add test of EXTNAME and header-defined columns? ***/
    192192/* return internal structure representation */
    193 CMF_PS1_V5_Lensing_Alt *gfits_table_get_CMF_PS1_V5_Lensing_Alt (FTable *ftable, off_t *Ndata, char *swapped) {
     193CMF_PS1_V5_R0_Lensing *gfits_table_get_CMF_PS1_V5_R0_Lensing (FTable *ftable, off_t *Ndata, char *swapped) {
    194194
    195195  int Ncols;
    196   CMF_PS1_V5_Lensing_Alt *data;
     196  CMF_PS1_V5_R0_Lensing *data;
    197197
    198198  Ncols = ftable[0].header[0].Naxis[0];
    … …  
    203203
    204204  *Ndata = ftable[0].header[0].Naxis[1];
    205   data = (CMF_PS1_V5_Lensing_Alt *) ftable[0].buffer;
     205  data = (CMF_PS1_V5_R0_Lensing *) ftable[0].buffer;
    206206  if ((swapped == NULL) || (*swapped == FALSE)) {
    207     if (!gfits_convert_CMF_PS1_V5_Lensing_Alt ((unsigned char *) data, sizeof (CMF_PS1_V5_Lensing_Alt), *Ndata, TRUE)) {
     207    if (!gfits_convert_CMF_PS1_V5_R0_Lensing ((unsigned char *) data, sizeof (CMF_PS1_V5_R0_Lensing), *Ndata, TRUE)) {
    208208      return NULL;
    209209    }
    … …  
    214214}
    215215
    216 int gfits_table_set_CMF_PS1_V5_Lensing_Alt (FTable *ftable, CMF_PS1_V5_Lensing_Alt *data, off_t Ndata) {
     216int gfits_table_set_CMF_PS1_V5_R0_Lensing (FTable *ftable, CMF_PS1_V5_R0_Lensing *data, off_t Ndata) {
    217217
    218218  Header *header;
    … …  
    221221
    222222  /* create table header */
    223   if (!gfits_create_table_header (header, "BINTABLE", "CMF_PS1_V5_Lensing_Alt")) return (FALSE);
     223  if (!gfits_create_table_header (header, "BINTABLE", "CMF_PS1_V5_R0_Lensing")) return (FALSE);
    224224
    225225  /* define table layout */
    … …  
    308308  /* add data values */
    309309  if (!gfits_table_scale_data (ftable)) return (FALSE);
    310   if (!gfits_convert_CMF_PS1_V5_Lensing_Alt ((unsigned char *) data, sizeof (CMF_PS1_V5_Lensing_Alt), Ndata, FALSE)) return (FALSE);
    311   if (!gfits_add_rows (ftable, (char *) data, Ndata, sizeof (CMF_PS1_V5_Lensing_Alt))) return (FALSE);
     310  if (!gfits_convert_CMF_PS1_V5_R0_Lensing ((unsigned char *) data, sizeof (CMF_PS1_V5_R0_Lensing), Ndata, FALSE)) return (FALSE);
     311  if (!gfits_add_rows (ftable, (char *) data, Ndata, sizeof (CMF_PS1_V5_R0_Lensing))) return (FALSE);
    312312
    313313  return (TRUE);
    314314}
    315315
    316 int gfits_table_mkheader_CMF_PS1_V5_Lensing_Alt (Header *header) {
     316int gfits_table_mkheader_CMF_PS1_V5_R0_Lensing (Header *header) {
    317317
    318318  /* create table header */
    319   if (!gfits_create_table_header (header, "BINTABLE", "CMF_PS1_V5_Lensing_Alt")) return (FALSE);
     319  if (!gfits_create_table_header (header, "BINTABLE", "CMF_PS1_V5_R0_Lensing")) return (FALSE);
    320320
    321321  /* define table layout */
    … …  
    402402}
    403403
    404 int Send_CMF_PS1_V5_Lensing_Alt (int device, CMF_PS1_V5_Lensing_Alt *data, int Ndata, int copy) {
     404int Send_CMF_PS1_V5_R0_Lensing (int device, CMF_PS1_V5_R0_Lensing *data, int Ndata, int copy) {
    405405
    406406  int Nwrite, Nbytes;
    407   CMF_PS1_V5_Lensing_Alt *tmpdata;
    408 
    409   Nbytes = Ndata * sizeof (CMF_PS1_V5_Lensing_Alt);
     407  CMF_PS1_V5_R0_Lensing *tmpdata;
     408
     409  Nbytes = Ndata * sizeof (CMF_PS1_V5_R0_Lensing);
    410410
    411411  if (copy) {
    412     ALLOCATE (tmpdata, CMF_PS1_V5_Lensing_Alt, Ndata);
     412    ALLOCATE (tmpdata, CMF_PS1_V5_R0_Lensing, Ndata);
    413413    memcpy (tmpdata, data, Nbytes);
    414414  } else {
    … …  
    416416  }
    417417
    418   if (!gfits_convert_CMF_PS1_V5_Lensing_Alt ((unsigned char *) tmpdata, sizeof (CMF_PS1_V5_Lensing_Alt), Ndata, FALSE)) return (FALSE);
     418  if (!gfits_convert_CMF_PS1_V5_R0_Lensing ((unsigned char *) tmpdata, sizeof (CMF_PS1_V5_R0_Lensing), Ndata, FALSE)) return (FALSE);
    419419
    420420  SendCommand (device, 16, "NVALUE: %6d", Ndata);
    … …  
    430430}
    431431
    432 int Recv_CMF_PS1_V5_Lensing_Alt (int device, CMF_PS1_V5_Lensing_Alt **data, int *Ndata) {
     432int Recv_CMF_PS1_V5_R0_Lensing (int device, CMF_PS1_V5_R0_Lensing **data, int *Ndata) {
    433433
    434434  int ndata;
    435435  IOBuffer message;
    436   CMF_PS1_V5_Lensing_Alt *tmpdata;
     436  CMF_PS1_V5_R0_Lensing *tmpdata;
    437437
    438438  ExpectCommand (device, 16, 1.0, &message);
    … …  
    443443  ExpectMessage (device, 1.0, &message);
    444444 
    445   tmpdata = (CMF_PS1_V5_Lensing_Alt *) message.buffer;
    446   if (!gfits_convert_CMF_PS1_V5_Lensing_Alt ((unsigned char *) tmpdata, sizeof (CMF_PS1_V5_Lensing_Alt), ndata, TRUE)) return (FALSE);
     445  tmpdata = (CMF_PS1_V5_R0_Lensing *) message.buffer;
     446  if (!gfits_convert_CMF_PS1_V5_R0_Lensing ((unsigned char *) tmpdata, sizeof (CMF_PS1_V5_R0_Lensing), ndata, TRUE)) return (FALSE);
    447447
    448448  /* double-check data length? */

  • trunk/Ohana/src/libdvo/src/cmf-ps1-v5-r2-lensing.c

    r37985 r37992  
    11# include "dvo.h"
    2 # define ST_SIZE 320
     2# define ST_SIZE 328
    33
    44// this function is based on the one generated by the autocode of cmf-ps1-v5.d
    5 int gfits_convert_CMF_PS1_V5_Lensing (unsigned char *data, off_t size, off_t nitems, char toStruct) {
     5int gfits_convert_CMF_PS1_V5_R2_Lensing (unsigned char *data, off_t size, off_t nitems, char toStruct) {
    66
    77  off_t i;
    … …  
    99
    1010  if (size != ST_SIZE) {
    11     fprintf (stderr, "WARNING: mismatch in data types CMF_PS1_V5_Lensing: "OFF_T_FMT" vs %d\n",  size,  ST_SIZE);
     11    fprintf (stderr, "WARNING: mismatch in data types CMF_PS1_V5_R2_Lensing: "OFF_T_FMT" vs %d\n",  size,  ST_SIZE);
    1212    return (FALSE);
    1313  }
    … …  
    101101    SWAP_WORD (260); // E2_SH_PSF
    102102
    103     SWAP_BYTE (264); // SRC_CHIP_NUM
    104     SWAP_BYTE (266); // SRC_CHIP_X
    105     SWAP_BYTE (268); // SRC_CHIP_Y
    106 
    107     SWAP_WORD (272); // MOMENTS_R1
    108     SWAP_WORD (276); // MOMENTS_RH
    109     SWAP_WORD (280); // KRON_FLUX
    110     SWAP_WORD (284); // KRON_FLUX_ERR
    111     SWAP_WORD (288); // KRON_FLUX_INNER
    112     SWAP_WORD (292); // KRON_FLUX_OUTER
    113     SWAP_WORD (296); // SKY_LIMIT_RAD
    114     SWAP_WORD (300); // SKY_LIMIT_FLUX
    115     SWAP_WORD (304); // SKY_LIMIT_SLOPE
    116     SWAP_WORD (308); // FLAGS
    117     SWAP_WORD (312); // FLAGS2
    118     SWAP_BYTE (316); // N_FRAMES
    119     SWAP_BYTE (318); // PADDING                       
     103    SWAP_WORD (264); // E1_PSF
     104    SWAP_WORD (268); // E2_PSF
     105
     106    SWAP_BYTE (272); // SRC_CHIP_NUM
     107    SWAP_BYTE (274); // SRC_CHIP_X
     108    SWAP_BYTE (276); // SRC_CHIP_Y
     109    // SWAP_BYTE (278); // PADDING3, not swapped
     110
     111    SWAP_WORD (280); // MOMENTS_R1
     112    SWAP_WORD (284); // MOMENTS_RH
     113    SWAP_WORD (288); // KRON_FLUX
     114    SWAP_WORD (292); // KRON_FLUX_ERR
     115    SWAP_WORD (296); // KRON_FLUX_INNER
     116    SWAP_WORD (300); // KRON_FLUX_OUTER
     117    SWAP_WORD (304); // SKY_LIMIT_RAD
     118    SWAP_WORD (308); // SKY_LIMIT_FLUX
     119    SWAP_WORD (312); // SKY_LIMIT_SLOPE
     120    SWAP_WORD (316); // FLAGS
     121    SWAP_WORD (320); // FLAGS2
     122    SWAP_BYTE (324); // N_FRAMES
     123    // SWAP_BYTE (326); // PADDING, not swapped                       
    120124  }
    121125# endif 
    … …  
    196200/*** add test of EXTNAME and header-defined columns? ***/
    197201/* return internal structure representation */
    198 CMF_PS1_V5_Lensing *gfits_table_get_CMF_PS1_V5_Lensing (FTable *ftable, off_t *Ndata, char *swapped) {
     202CMF_PS1_V5_R2_Lensing *gfits_table_get_CMF_PS1_V5_R2_Lensing (FTable *ftable, off_t *Ndata, char *swapped) {
    199203
    200204  int Ncols;
    201   CMF_PS1_V5_Lensing *data;
     205  CMF_PS1_V5_R2_Lensing *data;
    202206
    203207  Ncols = ftable[0].header[0].Naxis[0];
    … …  
    208212
    209213  *Ndata = ftable[0].header[0].Naxis[1];
    210   data = (CMF_PS1_V5_Lensing *) ftable[0].buffer;
     214  data = (CMF_PS1_V5_R2_Lensing *) ftable[0].buffer;
    211215  if ((swapped == NULL) || (*swapped == FALSE)) {
    212     if (!gfits_convert_CMF_PS1_V5_Lensing ((unsigned char *) data, sizeof (CMF_PS1_V5_Lensing), *Ndata, TRUE)) {
     216    if (!gfits_convert_CMF_PS1_V5_R2_Lensing ((unsigned char *) data, sizeof (CMF_PS1_V5_R2_Lensing), *Ndata, TRUE)) {
    213217      return NULL;
    214218    }
    … …  
    219223}
    220224
    221 int gfits_table_set_CMF_PS1_V5_Lensing (FTable *ftable, CMF_PS1_V5_Lensing *data, off_t Ndata) {
     225int gfits_table_set_CMF_PS1_V5_R2_Lensing (FTable *ftable, CMF_PS1_V5_R2_Lensing *data, off_t Ndata) {
    222226
    223227  Header *header;
    … …  
    226230
    227231  /* create table header */
    228   if (!gfits_create_table_header (header, "BINTABLE", "CMF_PS1_V5_Lensing")) return (FALSE);
     232  if (!gfits_create_table_header (header, "BINTABLE", "CMF_PS1_V5_R2_Lensing")) return (FALSE);
    229233
    230234  /* define table layout */
    … …  
    294298  gfits_define_bintable_column (header, "E",    "E1_SH_PSF",        "lensing shear",                   "",                  1.0, 0.0);
    295299  gfits_define_bintable_column (header, "E",    "E2_SH_PSF",        "lensing shear",                   "",                  1.0, 0.0);
     300  gfits_define_bintable_column (header, "E",    "E1_PSF",           "psf polarization",                "",                  1.0, 0.0);
     301  gfits_define_bintable_column (header, "E",    "E2_PSF",           "psf polarization",                "",                  1.0, 0.0);
    296302
    297303  gfits_define_bintable_column (header, "I",    "SRC_CHIP_NUM",     "number of source chip for warp",  "",                  1.0, 0.0);
    … …  
    319325  /* add data values */
    320326  if (!gfits_table_scale_data (ftable)) return (FALSE);
    321   if (!gfits_convert_CMF_PS1_V5_Lensing ((unsigned char *) data, sizeof (CMF_PS1_V5_Lensing), Ndata, FALSE)) return (FALSE);
    322   if (!gfits_add_rows (ftable, (char *) data, Ndata, sizeof (CMF_PS1_V5_Lensing))) return (FALSE);
     327  if (!gfits_convert_CMF_PS1_V5_R2_Lensing ((unsigned char *) data, sizeof (CMF_PS1_V5_R2_Lensing), Ndata, FALSE)) return (FALSE);
     328  if (!gfits_add_rows (ftable, (char *) data, Ndata, sizeof (CMF_PS1_V5_R2_Lensing))) return (FALSE);
    323329
    324330  return (TRUE);
    325331}
    326332
    327 int gfits_table_mkheader_CMF_PS1_V5_Lensing (Header *header) {
     333int gfits_table_mkheader_CMF_PS1_V5_R2_Lensing (Header *header) {
    328334
    329335  /* create table header */
    330   if (!gfits_create_table_header (header, "BINTABLE", "CMF_PS1_V5_Lensing")) return (FALSE);
     336  if (!gfits_create_table_header (header, "BINTABLE", "CMF_PS1_V5_R2_Lensing")) return (FALSE);
    331337
    332338  /* define table layout */
    … …  
    396402  gfits_define_bintable_column (header, "E",    "E1_SH_PSF",        "lensing shear",                   "",                  1.0, 0.0);
    397403  gfits_define_bintable_column (header, "E",    "E2_SH_PSF",        "lensing shear",                   "",                  1.0, 0.0);
     404  gfits_define_bintable_column (header, "E",    "E1_PSF",           "psf polarization",                "",                  1.0, 0.0);
     405  gfits_define_bintable_column (header, "E",    "E2_PSF",           "psf polarization",                "",                  1.0, 0.0);
    398406
    399407  gfits_define_bintable_column (header, "I",    "SRC_CHIP_NUM",     "number of source chip for warp",  "",                  1.0, 0.0);
    … …  
    419427}
    420428
    421 int Send_CMF_PS1_V5_Lensing (int device, CMF_PS1_V5_Lensing *data, int Ndata, int copy) {
     429int Send_CMF_PS1_V5_R2_Lensing (int device, CMF_PS1_V5_R2_Lensing *data, int Ndata, int copy) {
    422430
    423431  int Nwrite, Nbytes;
    424   CMF_PS1_V5_Lensing *tmpdata;
    425 
    426   Nbytes = Ndata * sizeof (CMF_PS1_V5_Lensing);
     432  CMF_PS1_V5_R2_Lensing *tmpdata;
     433
     434  Nbytes = Ndata * sizeof (CMF_PS1_V5_R2_Lensing);
    427435
    428436  if (copy) {
    429     ALLOCATE (tmpdata, CMF_PS1_V5_Lensing, Ndata);
     437    ALLOCATE (tmpdata, CMF_PS1_V5_R2_Lensing, Ndata);
    430438    memcpy (tmpdata, data, Nbytes);
    431439  } else {
    … …  
    433441  }
    434442
    435   if (!gfits_convert_CMF_PS1_V5_Lensing ((unsigned char *) tmpdata, sizeof (CMF_PS1_V5_Lensing), Ndata, FALSE)) return (FALSE);
     443  if (!gfits_convert_CMF_PS1_V5_R2_Lensing ((unsigned char *) tmpdata, sizeof (CMF_PS1_V5_R2_Lensing), Ndata, FALSE)) return (FALSE);
    436444
    437445  SendCommand (device, 16, "NVALUE: %6d", Ndata);
    … …  
    447455}
    448456
    449 int Recv_CMF_PS1_V5_Lensing (int device, CMF_PS1_V5_Lensing **data, int *Ndata) {
     457int Recv_CMF_PS1_V5_R2_Lensing (int device, CMF_PS1_V5_R2_Lensing **data, int *Ndata) {
    450458
    451459  int ndata;
    452460  IOBuffer message;
    453   CMF_PS1_V5_Lensing *tmpdata;
     461  CMF_PS1_V5_R2_Lensing *tmpdata;
    454462
    455463  ExpectCommand (device, 16, 1.0, &message);
    … …  
    460468  ExpectMessage (device, 1.0, &message);
    461469 
    462   tmpdata = (CMF_PS1_V5_Lensing *) message.buffer;
    463   if (!gfits_convert_CMF_PS1_V5_Lensing ((unsigned char *) tmpdata, sizeof (CMF_PS1_V5_Lensing), ndata, TRUE)) return (FALSE);
     470  tmpdata = (CMF_PS1_V5_R2_Lensing *) message.buffer;
     471  if (!gfits_convert_CMF_PS1_V5_R2_Lensing ((unsigned char *) tmpdata, sizeof (CMF_PS1_V5_R2_Lensing), ndata, TRUE)) return (FALSE);
    464472
    465473  /* double-check data length? */

  • trunk/Ohana/src/libdvo/src/dvo_convert_PS1_V5.c

    r37807 r37992  
    532532    out[i].E2_sh_psf   = in[i].E2_sh_psf;
    533533
     534    out[i].E1_psf      = in[i].E1_psf;
     535    out[i].E2_psf      = in[i].E2_psf;
     536
    534537    out[i].F_ApR5      = in[i].F_ApR5;
    535538    out[i].dF_ApR5     = in[i].dF_ApR5;
    … …  
    580583    out[i].E2_sm_psf   = in[i].E2_sm_psf;     
    581584                                         
     585    out[i].E1_psf      = in[i].E1_psf;
     586    out[i].E2_psf      = in[i].E2_psf;     
     587
    582588    out[i].X11_sh_psf  = in[i].X11_sh_psf;
    583589    out[i].X12_sh_psf  = in[i].X12_sh_psf;
    … …  
    12641270}
    12651271
    1266 
    1267 Lensing *Lensing_PS1_V5_ALT_ToInternal (Lensing_PS1_V5_ALT *in, off_t Nvalues) {
     1272Lensing *Lensing_PS1_V5_R0_ToInternal (Lensing_PS1_V5_R0 *in, off_t Nvalues) {
    12681273
    12691274  off_t i;
    … …  
    13181323}
    13191324
     1325Lensing *Lensing_PS1_V5_R1_ToInternal (Lensing_PS1_V5_R1 *in, off_t Nvalues) {
     1326
     1327  off_t i;
     1328  Lensing *out;
     1329
     1330  ALLOCATE_ZERO (out, Lensing, Nvalues);
     1331
     1332  for (i = 0; i < Nvalues; i++) {
     1333    dvo_lensing_init (&out[i]);
     1334
     1335    out[i].X11_sm_obj  = in[i].X11_sm_obj;     
     1336    out[i].X12_sm_obj  = in[i].X12_sm_obj;     
     1337    out[i].X22_sm_obj  = in[i].X22_sm_obj;     
     1338    out[i].E1_sm_obj   = in[i].E1_sm_obj;     
     1339    out[i].E2_sm_obj   = in[i].E2_sm_obj;     
     1340                                         
     1341    out[i].X11_sh_obj  = in[i].X11_sh_obj;     
     1342    out[i].X12_sh_obj  = in[i].X12_sh_obj;     
     1343    out[i].X22_sh_obj  = in[i].X22_sh_obj;     
     1344    out[i].E1_sh_obj   = in[i].E1_sh_obj;     
     1345    out[i].E2_sh_obj   = in[i].E2_sh_obj;     
     1346                                         
     1347    out[i].X11_sm_psf  = in[i].X11_sm_psf;
     1348    out[i].X12_sm_psf  = in[i].X12_sm_psf;
     1349    out[i].X22_sm_psf  = in[i].X22_sm_psf;
     1350    out[i].E1_sm_psf   = in[i].E1_sm_psf;
     1351    out[i].E2_sm_psf   = in[i].E2_sm_psf;     
     1352                                         
     1353    out[i].X11_sh_psf  = in[i].X11_sh_psf;
     1354    out[i].X12_sh_psf  = in[i].X12_sh_psf;
     1355    out[i].X22_sh_psf  = in[i].X22_sh_psf;
     1356    out[i].E1_sh_psf   = in[i].E1_sh_psf;
     1357    out[i].E2_sh_psf   = in[i].E2_sh_psf;
     1358
     1359    out[i].F_ApR5      = in[i].F_ApR5;
     1360    out[i].dF_ApR5     = in[i].dF_ApR5;
     1361    out[i].sF_ApR5     = in[i].sF_ApR5;
     1362    out[i].fF_ApR5     = in[i].fF_ApR5;
     1363                                   
     1364    out[i].F_ApR6      = in[i].F_ApR6;
     1365    out[i].dF_ApR6     = in[i].dF_ApR6;
     1366    out[i].sF_ApR6     = in[i].sF_ApR6;
     1367    out[i].fF_ApR6     = in[i].fF_ApR6;
     1368                                   
     1369    out[i].detID       = in[i].detID;
     1370    out[i].objID       = in[i].objID;
     1371    out[i].catID       = in[i].catID;
     1372
     1373    out[i].averef      = in[i].averef;
     1374  }
     1375  return (out);
     1376}
     1377
Note: See TracChangeset for help on using the changeset viewer.