IPP Software Navigation Tools IPP Links Communication Pan-STARRS Links

Ignore:
Timestamp:
Jun 18, 2014, 11:20:22 AM (12 years ago)
Author:
eugene
Message:

various changes to deal with new dvo structure names

File:
1 edited

Legend:

Unmodified
Added
Removed

  • branches/eam_branches/ipp-20140610/Ohana/src/opihi/dvo/photometry.c

    r36630 r36905  
    11351135      break;
    11361136    case MEAS_RA: /* OK */
    1137       value = average[0].R - measure[0].dR / 3600.0;
     1137      value = measure[0].R;
    11381138      break;
    11391139    case MEAS_DEC: /* OK */
    1140       value = average[0].D - measure[0].dD / 3600.0;
     1140      value = measure[0].D;
    11411141      break;
    11421142    case MEAS_DOPHOT: /* OK */
    … …  
    11561156      break;
    11571157    case MEAS_RA_OFFSET: /* OK */
    1158       value = measure[0].dR;
     1158      value = dvoOffsetR(measure, average);
    11591159      break;
    11601160    case MEAS_DEC_OFFSET: /* OK */
    1161       value = measure[0].dD;
     1161      value = dvoOffsetD(measure, average);
    11621162      break;
    11631163    case MEAS_FWHM: /* OK */
    … …  
    11721172      value = measure[0].Xccd;
    11731173# else
    1174       ra  = average[0].R - measure[0].dR / 3600.0;
    1175       dec = average[0].D - measure[0].dD / 3600.0;
     1174      ra  = measure[0].R;
     1175      dec = measure[0].D;
    11761176      image = MatchImageDVO (measure[0].t, measure[0].photcode, measure[0].imageID);
    11771177      if (image == NULL) break;
    … …  
    11851185      value = measure[0].Yccd;
    11861186# else
    1187       ra  = average[0].R - measure[0].dR / 3600.0;
    1188       dec = average[0].D - measure[0].dD / 3600.0;
     1187      ra  = measure[0].R;
     1188      dec = measure[0].D;
    11891189      image = MatchImageDVO (measure[0].t, measure[0].photcode, measure[0].imageID);
    11901190      if (image == NULL) break;
    … …  
    11951195# if 0
    11961196    case MEAS_XMOSAIC: /* OK */
    1197       ra  = average[0].R - measure[0].dR / 3600.0;
    1198       dec = average[0].D - measure[0].dD / 3600.0;
     1197      ra  = measure[0].R;
     1198      dec = measure[0].D;
    11991199      mosaic = MatchMosaic (measure[0].t, measure[0].photcode); // XXX not used anymore
    12001200      if (mosaic == NULL) break;
    … …  
    12031203      break;
    12041204    case MEAS_YMOSAIC: /* OK */
    1205       ra  = average[0].R - measure[0].dR / 3600.0;
    1206       dec = average[0].D - measure[0].dD / 3600.0;
     1205      ra  = measure[0].R;
     1206      dec = measure[0].D;
    12071207      mosaic = MatchMosaic (measure[0].t, measure[0].photcode); // XXX not used anymore
    12081208      if (mosaic == NULL) break;
Note: See TracChangeset for help on using the changeset viewer.