IPP Software Navigation Tools IPP Links Communication Pan-STARRS Links

Ignore:
Timestamp:
Aug 16, 2005, 3:04:36 PM (21 years ago)
Author:
eugene
Message:

moving to internal vs external measure/average: R,D + dR,dD.
NOTE * dR,dD now represent 1.0 arcsec, not 0.01 arcsec.

* all use has been updated to match

File:
1 edited

Legend:

Unmodified
Added
Removed

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

    r4689 r4800  
    564564  switch (param) {
    565565    case AVE_RA:
    566       value = average[0].R;
     566      value = average[0].R_PS;
    567567      break;
    568568    case AVE_DEC:
    569       value = average[0].D;
     569      value = average[0].D_PS;
    570570      break;
    571571    case AVE_NMEAS:
    … …  
    10571057      break;
    10581058    case MEAS_RA: /* OK */
    1059       value = average[0].R - measure[0].dR / 360000.0;
     1059      value = average[0].R_PS - measure[0].dR_PS / 3600.0;
    10601060      break;
    10611061    case MEAS_DEC: /* OK */
    1062       value = average[0].D - measure[0].dD / 360000.0;
     1062      value = average[0].D_PS - measure[0].dD_PS / 3600.0;
    10631063      break;
    10641064    case MEAS_dMAG: /* OK */
    … …  
    10781078      break;
    10791079    case MEAS_dR: /* OK */
    1080       value = 0.01*measure[0].dR;
     1080      value = measure[0].dR_PS;
    10811081      break;
    10821082    case MEAS_dD: /* OK */
    1083       value = 0.01*measure[0].dD;
     1083      value = measure[0].dD_PS;
    10841084      break;
    10851085    case MEAS_FWHM: /* OK */
    … …  
    10931093      break;
    10941094    case MEAS_XCCD: /* OK */
    1095       ra  = average[0].R - measure[0].dR / 360000.0;
    1096       dec = average[0].D - measure[0].dD / 360000.0;
     1095      ra  = average[0].R_PS - measure[0].dR_PS / 3600.0;
     1096      dec = average[0].D_PS - measure[0].dD_PS / 3600.0;
    10971097      image = MatchImage (measure[0].t, measure[0].source);
    10981098      if (image == NULL) break;
    … …  
    11011101      break;
    11021102    case MEAS_YCCD: /* OK */
    1103       ra  = average[0].R - measure[0].dR / 360000.0;
    1104       dec = average[0].D - measure[0].dD / 360000.0;
     1103      ra  = average[0].R_PS - measure[0].dR_PS / 3600.0;
     1104      dec = average[0].D_PS - measure[0].dD_PS / 3600.0;
    11051105      image = MatchImage (measure[0].t, measure[0].source);
    11061106      if (image == NULL) break;
    … …  
    11091109      break;
    11101110    case MEAS_XMOSAIC: /* OK */
    1111       ra  = average[0].R - measure[0].dR / 360000.0;
    1112       dec = average[0].D - measure[0].dD / 360000.0;
     1111      ra  = average[0].R_PS - measure[0].dR_PS / 3600.0;
     1112      dec = average[0].D_PS - measure[0].dD_PS / 3600.0;
    11131113      mosaic = MatchMosaic (measure[0].t, measure[0].source);
    11141114      if (mosaic == NULL) break;
    … …  
    11171117      break;
    11181118    case MEAS_YMOSAIC: /* OK */
    1119       ra  = average[0].R - measure[0].dR / 360000.0;
    1120       dec = average[0].D - measure[0].dD / 360000.0;
     1119      ra  = average[0].R_PS - measure[0].dR_PS / 3600.0;
     1120      dec = average[0].D_PS - measure[0].dD_PS / 3600.0;
    11211121      mosaic = MatchMosaic (measure[0].t, measure[0].source);
    11221122      if (mosaic == NULL) break;
Note: See TracChangeset for help on using the changeset viewer.