IPP Software Navigation Tools IPP Links Communication Pan-STARRS Links

Ignore:
Timestamp:
Mar 26, 2006, 10:46:32 AM (20 years ago)
Author:
eugene
Message:

adding proper motion and parallax to addstar, dropping _PS from RA and DEC in average

Location:
trunk/Ohana/src/libdvo
Files:
1 added
8 edited

Legend:

Unmodified
Added
Removed

  • trunk/Ohana/src/libdvo/Makefile

    r5441 r6683  
    4141$(SRC)/dvo_convert_loneos.$(ARCH).o    \
    4242$(SRC)/dvo_convert_panstarrs.$(ARCH).o \
     43$(SRC)/dvo_convert_pmtest.$(ARCH).o \
    4344$(SRC)/skyregion_io.$(ARCH).o    \
    4445$(SRC)/skyregion_gsc.$(ARCH).o    \
    … …  
    5152$(ASRC)/average-elixir.$(ARCH).o \
    5253$(ASRC)/average-panstarrs.$(ARCH).o \
     54$(ASRC)/average-pmtest.$(ARCH).o \
    5355$(ASRC)/secfilt.$(ARCH).o \
    5456$(ASRC)/secfilt-loneos.$(ARCH).o \

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

    r6643 r6683  
    66# define DVO_H
    77
    8 # define ELIXIR 1
    9 # define PANSTARRS 0
    10 # define LONEOS 0
     8/*
     9  # define ELIXIR 1
     10  # define PANSTARRS 0
     11  # define LONEOS 0
     12*/
    1113
    1214/*** named data values (convert all to enums?) ***/
    … …  
    1618
    1719/* DVO table formats */
    18 enum {DVO_FORMAT_UNDEF, DVO_FORMAT_INTERNAL, DVO_FORMAT_ELIXIR, DVO_FORMAT_LONEOS, DVO_FORMAT_PANSTARRS} DVOTableFormat;
     20enum {DVO_FORMAT_UNDEF, DVO_FORMAT_INTERNAL, DVO_FORMAT_ELIXIR, DVO_FORMAT_LONEOS, DVO_FORMAT_PANSTARRS, DVO_FORMAT_PMTEST} DVOTableFormat;
    1921
    2022/* image data modes in RegImage */
    … …  
    6365/* some subtle distinctions between the blend flags:
    6466   BLEND_IMAGE: the star on an image is matched with more
    65       than one star in the catalog (image has worse seeing than catalog)
     67   than one star in the catalog (image has worse seeing than catalog)
    6668   BLEND_CATALOG: the star in the catalog is matched with more
    67       than one star on the image (image has better seeing than catalog)
     69   than one star on the image (image has better seeing than catalog)
    6870   CALIBRATED: relative photometry has been performed on this measurement
    6971   BLEND_IMAGE_NEIGHBOR: the star on an image is matched with more
    70       than one star in the catalog, but not in the same catalog file.
     72   than one star in the catalog, but not in the same catalog file.
    7173*/
    7274
    … …  
    285287Average *AverageElixirToInternal (AverageElixir *in, int Nvalues);
    286288Average *AveragePanstarrsToInternal (AveragePanstarrs *in, int Nvalues);
     289Average *AveragePMtestToInternal (AveragePMtest *in, int Nvalues);
    287290AverageLoneos *AverageInternalToLoneos (Average *in, int Nvalues);
    288291AverageElixir *AverageInternalToElixir (Average *in, int Nvalues);
    289292AveragePanstarrs *AverageInternalToPanstarrs (Average *in, int Nvalues);
     293AveragePMtest *AverageInternalToPMtest (Average *in, int Nvalues);
    290294
    291295Measure *FtableToMeasure (FTable *ftable, int *Nmeasure, int *format);

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

    r5241 r6683  
    630630    Ns2 = photcodes[0].hashNsec[code[0].c2];
    631631 
    632     m1 = (Ns1 == -1) ? average[0].M_PS : secfilt[Ns1].M_PS;
    633     m2 = (Ns2 == -1) ? average[0].M_PS : secfilt[Ns2].M_PS;
     632    m1 = (Ns1 == -1) ? average[0].M : secfilt[Ns1].M_PS;
     633    m2 = (Ns2 == -1) ? average[0].M : secfilt[Ns2].M_PS;
    634634    mc = ((m1 == NO_MAG_PS) || (m2 == NO_MAG_PS)) ? NO_MAG_PS : (m1 - m2);
    635635    return (mc);
    … …  
    647647  } else {
    648648    Ns = photcodes[0].hashNsec[color[0].code];
    649     m1 = (Ns == -1) ? average[0].M_PS : secfilt[Ns].M_PS;
     649    m1 = (Ns == -1) ? average[0].M : secfilt[Ns].M_PS;
    650650  }     
    651651
    … …  
    661661  } else {
    662662    Ns = photcodes[0].hashNsec[color[0].code];
    663     m2 = (Ns == -1) ? average[0].M_PS : secfilt[Ns].M_PS;
     663    m2 = (Ns == -1) ? average[0].M : secfilt[Ns].M_PS;
    664664  }     
    665665  mc = ((m1 == NO_MAG_PS) || (m2 == NO_MAG_PS)) ? NO_MAG_PS : (m1 - m2);
    … …  
    675675
    676676  Ns = photcodes[0].hashNsec[code[0].code];
    677   Mave = (Ns == -1) ? average[0].M_PS : secfilt[Ns].M_PS;
     677  Mave = (Ns == -1) ? average[0].M : secfilt[Ns].M_PS;
    678678  Mref = Mave + F_PS*code[0].C;
    679679
    … …  
    699699
    700700  Ns = photcodes[0].hashNsec[code[0].code];
    701   Mave = (Ns == -1) ? average[0].M_PS : secfilt[Ns].M_PS;
     701  Mave = (Ns == -1) ? average[0].M : secfilt[Ns].M_PS;
    702702  return (Mave);
    703703}
    … …  
    710710
    711711  Ns = photcodes[0].hashNsec[code[0].code];
    712   dM  = (Ns == -1) ? average[0].dM_PS : secfilt[Ns].dM_PS;
     712  dM  = (Ns == -1) ? average[0].dM : secfilt[Ns].dM_PS;
    713713  return (dM);
    714714}
    … …  
    746746  } else {
    747747    Ns = photcodes[0].hashNsec[code[0].code];
    748     M1 = (Ns == -1) ? average[0].M_PS : secfilt[Ns].M_PS;
     748    M1 = (Ns == -1) ? average[0].M : secfilt[Ns].M_PS;
    749749  }     
    750750
    751  filter1:
     751filter1:
    752752  code = GetPhotcodebyCode (c2);
    753753  if (code == NULL) return (FALSE);
    … …  
    762762  } else {
    763763    Ns = photcodes[0].hashNsec[code[0].code];
    764     M2 = (Ns == -1) ? average[0].M_PS : secfilt[Ns].M_PS;
     764    M2 = (Ns == -1) ? average[0].M : secfilt[Ns].M_PS;
    765765  }     
    766766 
    767  filter2:
     767filter2:
    768768
    769769  dM = M1 - M2;
    … …  
    776776
    777777# code name     type  zero  airmass  offset  c1 c2  slope  <color>  primary
    778   1    B        pri   24.0  0.15     -       -  -   -      -        -
    779   2    B        pri   24.0  0.15     -       -  -   -      -        -
    780   3    B1       sec   22.5  0.18     0.15    1  2   0.10   0.50     1
    781   1000 USNO_B   ref   -     -        -       -  -   -      -        -
     7781    B        pri   24.0  0.15     -       -  -   -      -        -
     7792    B        pri   24.0  0.15     -       -  -   -      -        -
     7803    B1       sec   22.5  0.18     0.15    1  2   0.10   0.50     1
     7811000 USNO_B   ref   -     -        -       -  -   -      -        -
    782782
    783783*/

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

    r5320 r6683  
    3232    if (!strcmp (format, "ELIXIR")) catalog[0].catformat = DVO_FORMAT_ELIXIR;
    3333    if (!strcmp (format, "PANSTARRS")) catalog[0].catformat = DVO_FORMAT_PANSTARRS;
     34    if (!strcmp (format, "PMTEST")) catalog[0].catformat = DVO_FORMAT_PMTEST;
    3435    if (catalog[0].catformat != DVO_FORMAT_UNDEF) goto got_format;
    3536  }
    … …  
    7172    case DVO_FORMAT_PANSTARRS:
    7273      AverageSize = sizeof(AveragePanstarrs);
     74      MeasureSize = sizeof(MeasurePanstarrs);
     75      SecFiltSize = sizeof (SecFiltPanstarrs);
     76      break;
     77    case DVO_FORMAT_PMTEST:
     78      AverageSize = sizeof(AveragePMtest);
    7379      MeasureSize = sizeof(MeasurePanstarrs);
    7480      SecFiltSize = sizeof (SecFiltPanstarrs);
    … …  
    157163
    158164  if (VERBOSE) fprintf (stderr, "read %d stars from catalog file %s (%d measurements, %d missing, %d secondary filters)\n",
    159            catalog[0].Naverage, catalog[0].filename, catalog[0].Nmeasure, catalog[0].Nmissing, catalog[0].Nsecfilt);
     165                        catalog[0].Naverage, catalog[0].filename, catalog[0].Nmeasure, catalog[0].Nmissing, catalog[0].Nsecfilt);
    160166
    161167  /* check data integrity */
    … …  
    198204  if (catalog[0].catformat == DVO_FORMAT_ELIXIR)    fits_modify (&catalog[0].header, "FORMAT", "%s", 1, "ELIXIR");
    199205  if (catalog[0].catformat == DVO_FORMAT_PANSTARRS) fits_modify (&catalog[0].header, "FORMAT", "%s", 1, "PANSTARRS");
     206  if (catalog[0].catformat == DVO_FORMAT_PMTEST)    fits_modify (&catalog[0].header, "FORMAT", "%s", 1, "PMTEST");
    200207
    201208  /* rewind file pointers and truncate file */
    … …  
    243250  AverageLoneos *tmpAverageLoneos;
    244251  AveragePanstarrs *tmpAveragePanstarrs;
     252  AveragePMtest *tmpAveragePMtest;
    245253
    246254  switch (format) {
    … …  
    287295      free (tmpAveragePanstarrs);
    288296      break;
     297    case DVO_FORMAT_PMTEST:
     298      ALLOCATE (tmpAveragePMtest, AveragePMtest, MAX (Naverage, 1));
     299      nitems = fread (tmpAveragePMtest, sizeof(AveragePMtest), Naverage, f);
     300      if (nitems != Naverage) {
     301        fprintf (stderr, "failed to read averages (%d vs %d)\n", nitems, Naverage);
     302        return (NULL);
     303      }
     304      fits_convert_AveragePMtest (tmpAveragePMtest, sizeof(AveragePMtest), Naverage);
     305      average = AveragePMtestToInternal (tmpAveragePMtest, Naverage);
     306      free (tmpAveragePMtest);
     307      break;
    289308    default:
    290309      fprintf (stderr, "error reading measures\n");
    … …  
    302321  AverageLoneos *tmpAverageLoneos;
    303322  AveragePanstarrs *tmpAveragePanstarrs;
     323  AveragePMtest *tmpAveragePMtest;
    304324
    305325  switch (format) {
    … …  
    342362      }
    343363      break;
     364    case DVO_FORMAT_PMTEST:
     365      tmpAveragePMtest = AverageInternalToPMtest (average, Naverage);
     366      fits_convert_AveragePMtest (tmpAveragePMtest, sizeof(AveragePMtest), Naverage);
     367      nitems = fwrite (tmpAveragePMtest, sizeof(AveragePMtest), Naverage, f);
     368      free (tmpAveragePMtest);
     369      if (nitems != Naverage) {
     370        fprintf (stderr, "failed to write averages (%d vs %d)\n", nitems, Naverage);
     371        return (FALSE);
     372      }
     373      break;
    344374    default:
    345375      fprintf (stderr, "error writing averages\n");
    … …  
    392422      break;
    393423    case DVO_FORMAT_PANSTARRS:
     424    case DVO_FORMAT_PMTEST:
    394425      ALLOCATE (tmpMeasurePanstarrs, MeasurePanstarrs, MAX (Nmeasure, 1));
    395426      nitems = fread (tmpMeasurePanstarrs, sizeof(MeasurePanstarrs), Nmeasure, f);
    … …  
    448479      break;
    449480    case DVO_FORMAT_PANSTARRS:
     481    case DVO_FORMAT_PMTEST:
    450482      tmpMeasurePanstarrs = MeasureInternalToPanstarrs (measure, Nmeasure);
    451483      fits_convert_MeasurePanstarrs (tmpMeasurePanstarrs, sizeof(MeasurePanstarrs), Nmeasure);
    … …  
    507539      break;
    508540    case DVO_FORMAT_PANSTARRS:
     541    case DVO_FORMAT_PMTEST:
    509542      ALLOCATE (tmpSecFiltPanstarrs, SecFiltPanstarrs, MAX (Nsecfilt, 1));
    510543      nitems = fread (tmpSecFiltPanstarrs, sizeof(SecFiltPanstarrs), Nsecfilt, f);
    … …  
    563596      break;
    564597    case DVO_FORMAT_PANSTARRS:
     598    case DVO_FORMAT_PMTEST:
    565599      tmpSecFiltPanstarrs = SecFiltInternalToPanstarrs (secfilt, Nsecfilt);
    566600      fits_convert_SecFiltPanstarrs (tmpSecFiltPanstarrs, sizeof(SecFiltPanstarrs), Nsecfilt);

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

    r5241 r6683  
    66   The TYPE-Ftable conversions functions create output tables in the format requested
    77   by the 'format' function parameter.
    8  */
     8*/
    99
    1010/** this file might be more readable if I use macros for the repetative
    … …  
    5252    return (average);
    5353  }
     54  if (!strcmp (extname, "DVO_AVERAGE_PMTEST")) {
     55    AveragePMtest *tmpAverage;
     56    tmpAverage = fits_table_get_AveragePMtest (ftable, Naverage, NULL);
     57    average = AveragePMtestToInternal (tmpAverage, *Naverage);
     58    free (tmpAverage);
     59    *format = DVO_FORMAT_PMTEST;
     60    return (average);
     61  }
    5462
    5563  fprintf (stderr, "table format unknown: %s\n", extname);
    … …  
    6472  AverageLoneos *tmpAverageLoneos ;
    6573  AveragePanstarrs *tmpAveragePanstarrs;
     74  AveragePMtest *tmpAveragePMtest;
    6675
    6776  /* convert from the internal format */
    … …  
    8493      fits_table_set_AveragePanstarrs (ftable, tmpAveragePanstarrs, Naverage);
    8594      free (tmpAveragePanstarrs);
     95      break;
     96    case DVO_FORMAT_PMTEST:
     97      tmpAveragePMtest = AverageInternalToPMtest (average, Naverage);
     98      fits_table_set_AveragePMtest (ftable, tmpAveragePMtest, Naverage);
     99      free (tmpAveragePMtest);
    86100      break;
    87101    default:
    … …  
    125139    return (measure);
    126140  }
    127   if (!strcmp (extname, "DVO_MEASURE_PANSTARRS")) {
     141  if (!strcmp (extname, "DVO_MEASURE_PANSTARRS") || !strcmp (extname, "DVO_MEASURE_PMTEST")) {
    128142    MeasurePanstarrs *tmpMeasure;
    129143    tmpMeasure = fits_table_get_MeasurePanstarrs (ftable, Nmeasure, NULL);
    … …  
    162176      break;
    163177    case DVO_FORMAT_PANSTARRS:
     178    case DVO_FORMAT_PMTEST:
    164179      tmpMeasurePanstarrs = MeasureInternalToPanstarrs (measure, Nmeasure);
    165180      fits_table_set_MeasurePanstarrs (ftable, tmpMeasurePanstarrs, Nmeasure);
    … …  
    206221    return (secfilt);
    207222  }
    208   if (!strcmp (extname, "DVO_SECFILT_PANSTARRS")) {
     223  if (!strcmp (extname, "DVO_SECFILT_PANSTARRS") || !strcmp (extname, "DVO_SECFILT_PMTEST")) {
    209224    SecFiltPanstarrs *tmpSecFilt;
    210225    tmpSecFilt = fits_table_get_SecFiltPanstarrs (ftable, Nsecfilt, NULL);
    … …  
    243258      break;
    244259    case DVO_FORMAT_PANSTARRS:
     260    case DVO_FORMAT_PMTEST:
    245261      tmpSecFiltPanstarrs = SecFiltInternalToPanstarrs (secfilt, Nsecfilt);
    246262      fits_table_set_SecFiltPanstarrs (ftable, tmpSecFiltPanstarrs, Nsecfilt);
    … …  
    297313    goto set_header;
    298314  }
    299   if (!strcmp (extname, "DVO_IMAGE_PANSTARRS")) {
     315  if (!strcmp (extname, "DVO_IMAGE_PANSTARRS") || !strcmp (extname, "DVO_IMAGE_PMTEST")) {
    300316    ImagePanstarrs *tmpimage;
    301317    *format = DVO_FORMAT_PANSTARRS;
    … …  
    344360      break;
    345361    case DVO_FORMAT_PANSTARRS:
     362    case DVO_FORMAT_PMTEST:
    346363      tmpImagePanstarrs = ImageInternalToPanstarrs ((Image *) ftable[0].buffer, Nimage);
    347364      free (ftable[0].buffer);
    … …  
    358375int ImageToVtable (VTable *vtable, Header *theader, int format) {
    359376
     377  ImageElixir *tmpImageElixir;
     378  ImageLoneos *tmpImageLoneos;
     379  ImagePanstarrs *tmpImagePanstarrs;
    360380  int i, Nrow, Nimage;
    361381
    … …  
    363383
    364384  /* convert from the internal format */
    365   if (format == DVO_FORMAT_INTERNAL) {
    366     for (i = 0; i < Nrow; i++) {
    367       fits_convert_Image ((Image *) vtable[0].buffer[i], sizeof(Image), 1);
    368     }
    369     return (TRUE);
    370   }
    371   if (format == DVO_FORMAT_ELIXIR) {
    372     ImageElixir *tmpImage;
    373 
    374     /* convert table rows from internal to external format */
    375     for (i = 0; i < Nrow; i++) {
    376       tmpImage = ImageInternalToElixir ((Image *) vtable[0].buffer[i], 1);
    377       fits_convert_ImageElixir (tmpImage, sizeof(ImageElixir), 1);
    378       free (vtable[0].buffer[i]);
    379       vtable[0].buffer[i] = (char *) tmpImage;
    380     }
    381 
    382     /* convert header from old format to new format */
    383     fits_scan (theader, "NAXIS2", "%d", 1, &Nimage);
    384 
    385     fits_free_header (theader);
    386     fits_table_mkheader_ImageElixir (theader);
    387 
    388     fits_modify (theader, "NAXIS2", "%d", 1, Nimage);
    389     theader[0].Naxis[1] = Nimage;
    390     vtable[0].size = fits_matrix_size (theader);
    391     return (TRUE);
    392   }
    393   if (format == DVO_FORMAT_LONEOS) {
    394     ImageLoneos *tmpImage;
    395 
    396     /* convert table rows from internal to external format */
    397     for (i = 0; i < Nrow; i++) {
    398       tmpImage = ImageInternalToLoneos ((Image *) vtable[0].buffer[i], 1);
    399       fits_convert_ImageLoneos (tmpImage, sizeof(ImageLoneos), 1);
    400       free (vtable[0].buffer[i]);
    401       vtable[0].buffer[i] = (char *) tmpImage;
    402     }
    403 
    404     /* convert header from old format to new format */
    405     fits_scan (theader, "NAXIS2", "%d", 1, &Nimage);
    406 
    407     fits_free_header (theader);
    408     fits_table_mkheader_ImageLoneos (theader);
    409 
    410     fits_modify (theader, "NAXIS2", "%d", 1, Nimage);
    411     theader[0].Naxis[1] = Nimage;
    412     vtable[0].size = fits_matrix_size (theader);
    413     return (TRUE);
    414   }
    415   if (format == DVO_FORMAT_PANSTARRS) {
    416     ImagePanstarrs *tmpImage;
    417 
    418     /* convert table rows from internal to external format */
    419     for (i = 0; i < Nrow; i++) {
    420       tmpImage = ImageInternalToPanstarrs ((Image *) vtable[0].buffer[i], 1);
    421       fits_convert_ImagePanstarrs (tmpImage, sizeof(ImagePanstarrs), 1);
    422       free (vtable[0].buffer[i]);
    423       vtable[0].buffer[i] = (char *) tmpImage;
    424     }
    425 
    426     /* convert header from old format to new format */
    427     fits_scan (theader, "NAXIS2", "%d", 1, &Nimage);
    428     fits_free_header (theader);
    429     fits_table_mkheader_ImagePanstarrs (theader);
    430     fits_modify (theader, "NAXIS2", "%d", 1, Nimage);
    431     theader[0].Naxis[1] = Nimage;
    432     vtable[0].size = fits_matrix_size (theader);
    433     return (TRUE);
     385  switch (format) {
     386    case DVO_FORMAT_INTERNAL:
     387      for (i = 0; i < Nrow; i++) {
     388        fits_convert_Image ((Image *) vtable[0].buffer[i], sizeof(Image), 1);
     389      }
     390      return (TRUE);
     391    case DVO_FORMAT_ELIXIR:
     392      /* convert table rows from internal to external format */
     393      for (i = 0; i < Nrow; i++) {
     394        tmpImageElixir = ImageInternalToElixir ((Image *) vtable[0].buffer[i], 1);
     395        fits_convert_ImageElixir (tmpImageElixir, sizeof(ImageElixir), 1);
     396        free (vtable[0].buffer[i]);
     397        vtable[0].buffer[i] = (char *) tmpImageElixir;
     398      }
     399
     400      /* convert header from old format to new format */
     401      fits_scan (theader, "NAXIS2", "%d", 1, &Nimage);
     402
     403      fits_free_header (theader);
     404      fits_table_mkheader_ImageElixir (theader);
     405
     406      fits_modify (theader, "NAXIS2", "%d", 1, Nimage);
     407      theader[0].Naxis[1] = Nimage;
     408      vtable[0].size = fits_matrix_size (theader);
     409      return (TRUE);
     410    case DVO_FORMAT_LONEOS:
     411      /* convert table rows from internal to external format */
     412      for (i = 0; i < Nrow; i++) {
     413        tmpImageLoneos = ImageInternalToLoneos ((Image *) vtable[0].buffer[i], 1);
     414        fits_convert_ImageLoneos (tmpImageLoneos, sizeof(ImageLoneos), 1);
     415        free (vtable[0].buffer[i]);
     416        vtable[0].buffer[i] = (char *) tmpImageLoneos;
     417      }
     418
     419      /* convert header from old format to new format */
     420      fits_scan (theader, "NAXIS2", "%d", 1, &Nimage);
     421
     422      fits_free_header (theader);
     423      fits_table_mkheader_ImageLoneos (theader);
     424
     425      fits_modify (theader, "NAXIS2", "%d", 1, Nimage);
     426      theader[0].Naxis[1] = Nimage;
     427      vtable[0].size = fits_matrix_size (theader);
     428      return (TRUE);
     429    case DVO_FORMAT_PANSTARRS:
     430      /* convert table rows from internal to external format */
     431      for (i = 0; i < Nrow; i++) {
     432        tmpImagePanstarrs = ImageInternalToPanstarrs ((Image *) vtable[0].buffer[i], 1);
     433        fits_convert_ImagePanstarrs (tmpImagePanstarrs, sizeof(ImagePanstarrs), 1);
     434        free (vtable[0].buffer[i]);
     435        vtable[0].buffer[i] = (char *) tmpImagePanstarrs;
     436      }
     437
     438      /* convert header from old format to new format */
     439      fits_scan (theader, "NAXIS2", "%d", 1, &Nimage);
     440      fits_free_header (theader);
     441      fits_table_mkheader_ImagePanstarrs (theader);
     442      fits_modify (theader, "NAXIS2", "%d", 1, Nimage);
     443      theader[0].Naxis[1] = Nimage;
     444      vtable[0].size = fits_matrix_size (theader);
     445      return (TRUE);
     446    default:
     447      break;
    434448  }
    435449  fprintf (stderr, "table format unknown (image vtable)\n");

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

    r5241 r6683  
    6868
    6969  for (i = 0; i < Nvalues; i++) {
    70     out[i].R_PS    = in[i].R;     
    71     out[i].D_PS    = in[i].D;     
    72     out[i].M_PS    = in[i].M  * 0.001;     
    73     out[i].dM_PS   = in[i].dM * 0.001;     
     70    out[i].R       = in[i].R;     
     71    out[i].D       = in[i].D;     
     72    out[i].M       = in[i].M  * 0.001;     
     73    out[i].dM      = in[i].dM * 0.001;     
    7474    out[i].Xp      = in[i].Xp;     
    7575    out[i].Xm      = in[i].Xm;     
    … …  
    8080    out[i].missing = in[i].missing;
    8181    out[i].Xg      = in[i].Xg;
     82
     83    /* these don't exist in Elixir */
     84    out[i].dR      = 0;
     85    out[i].dD      = 0;
     86    out[i].uR      = 0;
     87    out[i].uD      = 0;
     88    out[i].duR     = 0;
     89    out[i].duD     = 0;
     90    out[i].P       = 0;
     91    out[i].dP      = 0;
    8292  }
    8393  return (out);
    … …  
    93103
    94104  for (i = 0; i < Nvalues; i++) {
    95     out[i].R       = in[i].R_PS;     
    96     out[i].D       = in[i].D_PS;     
    97     out[i].M       = in[i].M_PS  * 1000.0;     
    98     out[i].dM      = in[i].dM_PS * 1000.0;
     105    out[i].R       = in[i].R;     
     106    out[i].D       = in[i].D;     
     107    out[i].M       = in[i].M  * 1000.0;     
     108    out[i].dM      = in[i].dM * 1000.0;
    99109    out[i].Xp      = in[i].Xp;     
    100110    out[i].Xm      = in[i].Xm;     

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

    r5241 r6683  
    6767
    6868  for (i = 0; i < Nvalues; i++) {
    69     out[i].R_PS    = in[i].R;     
    70     out[i].D_PS    = in[i].D;     
    71     out[i].M_PS    = in[i].M * 0.001;     
     69    out[i].R       = in[i].R;     
     70    out[i].D       = in[i].D;     
     71    out[i].M       = in[i].M * 0.001;     
    7272    out[i].Xp      = in[i].Xp;     
    7373    out[i].Xm      = in[i].Xm;     
    … …  
    7979
    8080    /* these don't exist in Loneos */
    81     out[i].dM_PS   = 0xffff;
     81    out[i].dR      = 0;
     82    out[i].dD      = 0;
     83    out[i].uR      = 0;
     84    out[i].uD      = 0;
     85    out[i].duR     = 0;
     86    out[i].duD     = 0;
     87    out[i].P       = 0;
     88    out[i].dP      = 0;
     89    out[i].dM      = 0xffff;
    8290    out[i].Xg      = 0xffff;
    8391  }
    … …  
    94102
    95103  for (i = 0; i < Nvalues; i++) {
    96     out[i].R       = in[i].R_PS;     
    97     out[i].D       = in[i].D_PS;     
    98     out[i].M       = in[i].M_PS * 1000.0;     
     104    out[i].R       = in[i].R;     
     105    out[i].D       = in[i].D;     
     106    out[i].M       = in[i].M * 1000.0;     
    99107    out[i].Xp      = in[i].Xp;     
    100108    out[i].Xm      = in[i].Xm;     

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

    r5241 r6683  
    7070
    7171  for (i = 0; i < Nvalues; i++) {
    72     out[i].R_PS    = in[i].R;     
    73     out[i].D_PS    = in[i].D;     
    74     out[i].M_PS    = in[i].M;     
    75     out[i].dM_PS   = in[i].dM;
     72    out[i].R       = in[i].R;     
     73    out[i].D       = in[i].D;     
     74    out[i].M       = in[i].M;     
     75    out[i].dM      = in[i].dM;
    7676    out[i].Xp      = in[i].Xp;     
    7777    out[i].Xm      = in[i].Xm;     
    … …  
    8282    out[i].offset  = in[i].offset;
    8383    out[i].missing = in[i].missing;
     84
     85    /* these don't exist in Panstarrs */
     86    out[i].dR      = 0;
     87    out[i].dD      = 0;
     88    out[i].uR      = 0;
     89    out[i].uD      = 0;
     90    out[i].duR     = 0;
     91    out[i].duD     = 0;
     92    out[i].P       = 0;
     93    out[i].dP      = 0;
    8494  }
    8595  return (out);
    … …  
    95105
    96106  for (i = 0; i < Nvalues; i++) {
    97     out[i].R       = in[i].R_PS;     
    98     out[i].D       = in[i].D_PS;     
    99     out[i].M       = in[i].M_PS;     
    100     out[i].dM      = in[i].dM_PS;
     107    out[i].R       = in[i].R;     
     108    out[i].D       = in[i].D;     
     109    out[i].M       = in[i].M;     
     110    out[i].dM      = in[i].dM;
    101111    out[i].Xp      = in[i].Xp;     
    102112    out[i].Xm      = in[i].Xm;     
Note: See TracChangeset for help on using the changeset viewer.