IPP Software Navigation Tools IPP Links Communication Pan-STARRS Links

Changeset 17199


Ignore:
Timestamp:
Mar 28, 2008, 3:33:54 PM (18 years ago)
Author:
eugene
Message:

add field to return distance from model fits

Location:
trunk/Ohana/src/opihi
Files:
3 edited

Legend:

Unmodified
Added
Removed

  • trunk/Ohana/src/opihi/dvo/dbExtractMeasures.c

    r16936 r17199  
    1010static int TimeFormat;
    1111
     12static time_t TimeRefPM;
     13
    1214static CoordTransform *celestial_to_galactic = NULL;
    1315static CoordTransform *celestial_to_ecliptic = NULL;
    … …  
    3032
    3133void dbExtractMeasuresInit () {
     34  TimeRefPM = ohana_date_to_sec ("2000/01/01");
    3235  GetTimeFormat (&TimeReference, &TimeFormat);
    3336}
    … …  
    7174  int Nsec;
    7275  double value;
    73   double ra, dec, x, y;
     76  double ra, dec, x, y, dT;
    7477
    7578  Image *image;
    … …  
    111114          break;
    112115        case MAG_ERR:
    113           value = PhotdM  (GetPhotcodeEquivbyCode (measure[0].photcode), average, secfilt);
     116          if (field->photcode->type == PHOT_SEC) {
     117            value = PhotdM  (GetPhotcodeEquivbyCode (measure[0].photcode), average, secfilt);
     118          } else {
     119            value = measure[0].dM;
     120          }
    114121          break;
    115122        case MAG_CHISQ:
    … …  
    242249    case MEAS_DEC_OFFSET: /* OK */
    243250      value = measure[0].dD;
     251      break;
     252    case MEAS_RA_FIT_OFFSET: /* OK */
     253      dT = (measure[0].t - TimeRefPM) / (86400*365.25);
     254      value = average[0].uR * dT + measure[0].dR;
     255      break;
     256    case MEAS_DEC_FIT_OFFSET: /* OK */
     257      dT = (measure[0].t - TimeRefPM) / (86400*365.25);
     258      value = average[0].uD * dT + measure[0].dD;
    244259      break;
    245260    case MEAS_RA_OFFSET_ERR: /* OK */

  • trunk/Ohana/src/opihi/dvo/dbFields.c

    r16936 r17199  
    152152  if (!strcasecmp (fieldName, "dR"))         ESCAPE (MEAS_RA_OFFSET,    MAG_NONE);
    153153  if (!strcasecmp (fieldName, "dD"))         ESCAPE (MEAS_DEC_OFFSET,   MAG_NONE);
     154  if (!strcasecmp (fieldName, "dR:FIT"))     ESCAPE (MEAS_RA_FIT_OFFSET,  MAG_NONE);
     155  if (!strcasecmp (fieldName, "dD:FIT"))     ESCAPE (MEAS_DEC_FIT_OFFSET, MAG_NONE);
    154156  if (!strcasecmp (fieldName, "dR:ERR"))     ESCAPE (MEAS_RA_OFFSET_ERR,  MAG_NONE);
    155157  if (!strcasecmp (fieldName, "dD:ERR"))     ESCAPE (MEAS_DEC_OFFSET_ERR, MAG_NONE);

  • trunk/Ohana/src/opihi/include/dvoshell.h

    r16936 r17199  
    4545      MEAS_RA_OFFSET,
    4646      MEAS_DEC_OFFSET,
     47      MEAS_RA_FIT_OFFSET,
     48      MEAS_DEC_FIT_OFFSET,
    4749      MEAS_RA_OFFSET_ERR,
    4850      MEAS_DEC_OFFSET_ERR,
Note: See TracChangeset for help on using the changeset viewer.