IPP Software Navigation Tools IPP Links Communication Pan-STARRS Links

Ignore:
Timestamp:
Aug 4, 2007, 10:15:51 AM (19 years ago)
Author:
eugene
Message:

extensive updates to the avextract / mextract / skyregion system

File:
1 edited

Legend:

Unmodified
Added
Removed

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

    r14379 r14401  
    1212double dbExtractMeasures (Average *average, SecFilt *secfilt, Measure *measure, dbField *field) {
    1313
    14   int i;
     14  int i, Nsec;
    1515  double value;
    1616  double ra, dec, x, y;
    … …  
    2727      if ((field->photcode->type == PHOT_REF) && (measure[0].photcode == field->photcode->code)) goto valid_photcode;
    2828      if ((field->photcode->type == PHOT_DEP) && (measure[0].photcode == field->photcode->code)) goto valid_photcode;
    29       if ((field->photcode->type == PHOT_SEC) && (GetPhotcodeEquivbyCode (measure[0].photcode) == field->photcode->code)) goto valid_photcode;
     29      if ((field->photcode->type == PHOT_SEC) && (GetPhotcodeEquivCodebyCode (measure[0].photcode) == field->photcode->code)) goto valid_photcode;
    3030      break;
    3131
    … …  
    5353          value = PhotRef  (GetPhotcodeEquivbyCode (measure[0].photcode), average, secfilt, measure);
    5454          break;
     55        case MAG_ERR:
     56          value = PhotdM  (GetPhotcodeEquivbyCode (measure[0].photcode), average, secfilt);
     57          break;
     58        case MAG_CHISQ:
     59          value = PhotXm  (GetPhotcodeEquivbyCode (measure[0].photcode), average, secfilt);
     60          break;
     61        case MAG_NCODE:
     62          Nsec = GetPhotcodeNsec (GetPhotcodeEquivCodebyCode (measure[0].photcode));
     63          if (Nsec == -1) break;
     64          value = secfilt[Nsec].Ncode;
     65          break;
     66        case MAG_NPHOT:
     67          Nsec = GetPhotcodeNsec (GetPhotcodeEquivCodebyCode (measure[0].photcode));
     68          if (Nsec == -1) break;
     69          value = secfilt[Nsec].Nused;
     70          break;
    5571      }
    5672      break;
    … …  
    6783      value = average[0].D;
    6884      break;
    69     case MEAS_dMAG: /* OK */
    70       value = measure[0].dM;
     85    case MEAS_RA_AVE_ERR: /* OK */
     86      value = average[0].dR;
     87      break;
     88    case MEAS_DEC_AVE_ERR: /* OK */
     89      value = average[0].dD;
     90      break;
     91    case MEAS_U_RA: /* OK */
     92      value = average[0].uR;
     93      break;
     94    case MEAS_U_DEC: /* OK */
     95      value = average[0].uD;
     96      break;
     97    case MEAS_U_RA_ERR: /* OK */
     98      value = average[0].duR;
     99      break;
     100    case MEAS_U_DEC_ERR: /* OK */
     101      value = average[0].duD;
     102      break;
     103    case MEAS_PAR: /* OK */
     104      value = average[0].R;
     105      break;
     106    case MEAS_PAR_ERR: /* OK */
     107      value = average[0].D;
     108      break;
     109    case MEAS_XP: /* OK */
     110      value = average[0].Xp;
     111      break;
     112    case MEAS_NMEAS: /* OK */
     113      value = average[0].Nm;
     114      break;
     115    case MEAS_NMISS: /* OK */
     116      value = average[0].Nn;
     117      break;
     118    case MEAS_NPHOT: /* OK */
     119      Nsec = f(measure[0].photcode);
     120      value = secfilt[Nsec].Nused;
     121      break;
     122    case MEAS_NCODE: /* OK */
     123      Nsec = f(measure[0].photcode);
     124      value = secfilt[Nsec].Ncode;
     125      break;
     126    case MEAS_OBJFLAGS: /* OK */
     127      value = average[0].code;
     128      break;
     129//    case MEAS_dMAG: /* OK */
     130//      value = measure[0].dM;
     131//      break;
     132    // note that these represent the ra displacement relative to the average, not
     133    // the error.
     134    case MEAS_RA_OFFSET: /* OK */
     135      value = measure[0].dR;
     136      break;
     137    case MEAS_DEC_OFFSET: /* OK */
     138      value = measure[0].dD;
     139      break;
     140    case MEAS_RA_OFFSET_ERR: /* OK */
     141      value = NO_MAG;
     142      break;
     143    case MEAS_DEC_OFFSET_ERR: /* OK */
     144      value = NO_MAG;
    71145      break;
    72146    case MEAS_AIRMASS: /* OK */
    … …  
    82156      value = TimeValue (measure[0].t, TimeReference, TimeFormat);
    83157      break;
    84     // note that these represent the ra displacement relative to the average, not
    85     // the error.
    86     case MEAS_dR: /* OK */
    87       value = measure[0].dR;
    88       break;
    89     case MEAS_dD: /* OK */
    90       value = measure[0].dD;
    91       break;
    92158    case MEAS_FWHM: /* OK */
     159      value = 0.01*(measure[0].FWx + measure[0].FWy);
     160      break;
     161    case MEAS_FWHM_MAJ: /* OK */
    93162      value = 0.01*measure[0].FWx;
    94163      break;
    95     case MEAS_DOPHOT: /* OK */
    96       value = measure[0].dophot;
    97       break;
     164    case MEAS_FWHM_MIN: /* OK */
     165      value = 0.01*measure[0].FWy;
     166      break;
     167    case MEAS_THETA: /* OK */
     168      value = measure[0].theta;
     169      break;
     170//    case MEAS_DOPHOT: /* OK */
     171//      value = measure[0].dophot;
     172//      break;
    98173    case MEAS_FLAGS: /* ? */
    99174      value = measure[0].flags;
Note: See TracChangeset for help on using the changeset viewer.