IPP Software Navigation Tools IPP Links Communication Pan-STARRS Links

Changeset 36905


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

various changes to deal with new dvo structure names

Location:
branches/eam_branches/ipp-20140610/Ohana/src
Files:
11 edited

Legend:

Unmodified
Added
Removed

  • branches/eam_branches/ipp-20140610/Ohana/src/delstar/src/delete_fix_LAP_edges.c

    r35805 r36905  
    206206  double Dgapmin = Dmin + dD;
    207207  double Dgapmax = Dmax - dD;
     208 
     209  float cosDec = cos(RAD_DEG * 0.5 * (Dmin + Dmax));
    208210
    209211  // XXX should deal with pole, but not yet...
    … …  
    218220    float maxOff = 0.0;
    219221    m = catalog[0].average[i].measureOffset;
     222
    220223    for (j = 0; j < catalog[0].average[i].Nmeasure; j++) {
    221       float dRoff = catalog[0].measure[m+j].dR * cos(RAD_DEG * 0.5 * (Dmin + Dmax));
    222       float dDoff = catalog[0].measure[m+j].dD;
     224
     225      float dRoff = dvoOffsetR(&catalog[0].measure[m+j], &catalog[0].average[i])*cosDec;
     226      float dDoff = dvoOffsetD(&catalog[0].measure[m+j], &catalog[0].average[i]);
    223227      float dOff = hypot (dRoff, dDoff);
    224228      maxOff = MAX (maxOff, dOff);

  • branches/eam_branches/ipp-20140610/Ohana/src/dvopsps/src/insert_detections_dvopsps_catalog.c

    r36375 r36905  
    6868      detections[Ndetections].airMass      = measure->airmass;
    6969      detections[Ndetections].expTime      = pow(10.0, 0.4 * measure->dt);    // expTime
    70       detections[Ndetections].ra           = average->R - measure->dR / 3600.;    // ra
    71       detections[Ndetections].dec          = average->D - measure->dD / 3600.;    // dec
     70      detections[Ndetections].ra           = measure->R;    // ra
     71      detections[Ndetections].dec          = measure->D;    // dec
    7272      detections[Ndetections].raErr        = measure->dXccd * 0.01 * fabs(measure->pltscale); // estimate of raErr
    7373      detections[Ndetections].decErr       = measure->dYccd * 0.01 * fabs(measure->pltscale); // estimate of decErr
    … …  
    226226  float zp = code->C * 0.001 + code->K * (measure->airmass - 1) - measure->Mcal;
    227227  float exptime = pow(10.0, 0.4 * measure->dt);
    228   double ra  = average->R - measure->dR / 3600.0;
    229   double dec = average->D - measure->dD / 3600.0;
     228  double ra  = measure->R;
     229  double dec = measure->D;
    230230  double dR = measure->dXccd * 0.01 * fabs(measure->pltscale);
    231231  double dD = measure->dYccd * 0.01 * fabs(measure->pltscale);

  • branches/eam_branches/ipp-20140610/Ohana/src/dvopsps/src/insert_objects_dvopsps_catalog.c

    r36833 r36905  
    323323    float stackPSFMag    = -999.0;
    324324    float stackPSFMagErr = -999.0;
    325     if (isfinite(secfilt->dFluxPSF) && isfinite(secfilt->FluxPSF) && (secfilt->dFluxPSF > 0.0)) {
    326       float SN = secfilt->FluxPSF / secfilt->dFluxPSF;
     325    if (isfinite(secfilt->dFpsfStk) && isfinite(secfilt->FpsfStk) && (secfilt->dFpsfStk > 0.0)) {
     326      float SN = secfilt->FpsfStk / secfilt->dFpsfStk;
    327327      if (SN > 3.0) {
    328         stackPSFMag = -2.5 * log10(secfilt->FluxPSF) + 8.9;
    329         stackPSFMagErr = secfilt->dFluxPSF / secfilt->FluxPSF;
     328        stackPSFMag = -2.5 * log10(secfilt->FpsfStk) + 8.9;
     329        stackPSFMagErr = secfilt->dFpsfStk / secfilt->FpsfStk;
    330330      }
    331331    }
    … …  
    333333    float stackKronMag    = -999.0;
    334334    float stackKronMagErr = -999.0;
    335     if (isfinite(secfilt->dFluxKron) && isfinite(secfilt->FluxKron) && (secfilt->dFluxKron > 0.0)) {
    336       float SN = secfilt->FluxKron / secfilt->dFluxKron;
     335    if (isfinite(secfilt->dFkronStk) && isfinite(secfilt->FkronStk) && (secfilt->dFkronStk > 0.0)) {
     336      float SN = secfilt->FkronStk / secfilt->dFkronStk;
    337337      if (SN > 3.0) {
    338         stackKronMag = -2.5 * log10(secfilt->FluxKron) + 8.9;
    339         stackKronMagErr = secfilt->dFluxKron / secfilt->FluxKron;
     338        stackKronMag = -2.5 * log10(secfilt->FkronStk) + 8.9;
     339        stackKronMagErr = secfilt->dFkronStk / secfilt->FkronStk;
    340340      }
    341341    }
    … …  
    352352    PRINT_FLOAT(sec_buffer, stackKronMag,    "%.6f, "); // umag precision
    353353    PRINT_FLOAT(sec_buffer, stackKronMagErr, "%.6f, "); // 0.36 umag precision
    354     PrintIOBuffer (sec_buffer, "%u,  ", secfilt->flags);       
    355     PrintIOBuffer (sec_buffer, "%hd, ", secfilt->Ncode);       
    356     PrintIOBuffer (sec_buffer, "%hd, ", secfilt->Nused);       
    357     PrintIOBuffer (sec_buffer, "%hd, ", secfilt->M_20);         
    358     PrintIOBuffer (sec_buffer, "%hd, ", secfilt->M_80);         
     354    PrintIOBuffer (sec_buffer, "%u,   ", secfilt->flags);       
     355    PrintIOBuffer (sec_buffer, "%hd,  ", secfilt->Ncode);       
     356    PrintIOBuffer (sec_buffer, "%hd,  ", secfilt->Nused);       
     357    PrintIOBuffer (sec_buffer, "%.6f, ", secfilt->Mmin);         
     358    PrintIOBuffer (sec_buffer, "%.6f, ", secfilt->Mmax);         
    359359    PrintIOBuffer (sec_buffer, "%hd, ", secfilt->ubercalDist); 
    360     PrintIOBuffer (sec_buffer, "%hd, ", secfilt->Mstdev);       
     360    PrintIOBuffer (sec_buffer, "%.6f, ", secfilt->Mstdev);       
    361361    PrintIOBuffer (sec_buffer, "%lu  ", secfilt->stackDetectID);
    362362    PrintIOBuffer (sec_buffer, "),\n");

  • branches/eam_branches/ipp-20140610/Ohana/src/opihi/dvo/Makefile

    r36833 r36905  
    2525$(SRC)/dvo_host_utils.$(ARCH).o         \
    2626$(SRC)/region_list.$(ARCH).o            \
    27 $(SRC)/find_matches.$(ARCH).o           \
     27$(SRC)/find_matches.$(ARCH).o           \
    2828$(SRC)/photometry.$(ARCH).o             
    2929

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

    r35109 r36905  
    1515  GSTAR_UCDIST,
    1616  GSTAR_AVE_AP_MAG,
    17   GSTAR_AVE_MAG_20,
    18   GSTAR_AVE_MAG_80,
     17  GSTAR_AVE_MAG_MIN,
     18  GSTAR_AVE_MAG_MAX,
    1919  GSTAR_AVE_KRON_MAG,
    2020  GSTAR_AVE_KRON_MAG_ERR,
    … …  
    307307          gprint (GP_LOG, "\n");
    308308
    309           /* M_20 */
    310           for (j = 0; j < Nsecfilt; j++) printPhotcodeSequence (&catalog.average[k], &catalog.secfilt[Nsecfilt*k], j, GSTAR_AVE_MAG_20);
    311           gprint (GP_LOG, "\n");
    312 
    313           /* M_80 */
    314           for (j = 0; j < Nsecfilt; j++) printPhotcodeSequence (&catalog.average[k], &catalog.secfilt[Nsecfilt*k], j, GSTAR_AVE_MAG_80);;
     309          /* Mmin */
     310          for (j = 0; j < Nsecfilt; j++) printPhotcodeSequence (&catalog.average[k], &catalog.secfilt[Nsecfilt*k], j, GSTAR_AVE_MAG_MIN);
     311          gprint (GP_LOG, "\n");
     312
     313          /* Mmax */
     314          for (j = 0; j < Nsecfilt; j++) printPhotcodeSequence (&catalog.average[k], &catalog.secfilt[Nsecfilt*k], j, GSTAR_AVE_MAG_MAX);;
    315315          gprint (GP_LOG, "\n");
    316316
    … …  
    381381          }
    382382
     383          float dRoff = dvoOffsetR(&catalog.measure[Nv], &catalog.average[k]);
     384          float dDoff = dvoOffsetD(&catalog.measure[Nv], &catalog.average[k]);
     385
    383386          if (GetMeasures && !QUIET) {
    384387            date = ohana_sec_to_date (catalog.measure[Nv].t);
    … …  
    387390            gprint (GP_LOG, "%6.3f  ", catalog.measure[Nv].dM);
    388391            gprint (GP_LOG, "%20s  ",  date);
    389             gprint (GP_LOG, "%7.4f ",  catalog.measure[Nv].dR);
    390             gprint (GP_LOG, "%7.4f ",  catalog.measure[Nv].dD);
     392           
     393            gprint (GP_LOG, "%7.4f ",  dRoff);
     394            gprint (GP_LOG, "%7.4f ",  dDoff);
    391395            gprint (GP_LOG, "0x%08x ", catalog.measure[Nv].photFlags);
    392396            gprint (GP_LOG, "0x%08x ", catalog.measure[Nv].dbFlags);
    … …  
    447451            vec3[0].elements.Flt[N] = catalog.measure[Nv].airmass;
    448452            vec4[0].elements.Flt[N] = catalog.measure[Nv].photcode;
    449             vec5[0].elements.Flt[N] = catalog.measure[Nv].dR;
    450             vec6[0].elements.Flt[N] = catalog.measure[Nv].dD;
     453            vec5[0].elements.Flt[N] = dRoff;
     454            vec6[0].elements.Flt[N] = dDoff;
    451455            N ++;
    452456            if (N == NPTS - 1) {
    … …  
    596600      break;
    597601
    598     case GSTAR_AVE_MAG_20: /* average ap mags */
    599       if (seq == -1) {
    600         print_double (NAN);
    601       } else {
    602         print_short (0.001*secfilt[seq].M_20, secfilt[seq].M_20);
    603       }
    604       break;
    605 
    606     case GSTAR_AVE_MAG_80: /* average ap mags */
    607       if (seq == -1) {
    608         print_double (NAN);
    609       } else {
    610         print_short (0.001*secfilt[seq].M_80, secfilt[seq].M_80);
     602    case GSTAR_AVE_MAG_MIN: /* average ap mags */
     603      if (seq == -1) {
     604        print_double (NAN);
     605      } else {
     606        print_double (secfilt[seq].Mmin);
     607      }
     608      break;
     609
     610    case GSTAR_AVE_MAG_MAX: /* average ap mags */
     611      if (seq == -1) {
     612        print_double (NAN);
     613      } else {
     614        print_double (secfilt[seq].Mmax);
    611615      }
    612616      break;
    … …  
    632636        print_double (NAN);
    633637      } else {
    634         print_double_exp (secfilt[seq].FluxPSF);
     638        print_double_exp (secfilt[seq].FpsfStk);
    635639      }
    636640      break;
    … …  
    640644        print_double (NAN);
    641645      } else {
    642         print_double_exp (secfilt[seq].dFluxPSF);
     646        print_double_exp (secfilt[seq].dFpsfStk);
    643647      }
    644648      break;
    … …  
    648652        print_double (NAN);
    649653      } else {
    650         print_double_exp (secfilt[seq].FluxKron);
     654        print_double_exp (secfilt[seq].FkronStk);
    651655      }
    652656      break;
    … …  
    656660        print_double (NAN);
    657661      } else {
    658         print_double_exp (secfilt[seq].dFluxKron);
    659       }
    660       break;
    661 
    662   }
    663 }
     662        print_double_exp (secfilt[seq].dFkronStk);
     663      }
     664      break;
     665
     666  }
     667}

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

    r34088 r36905  
    33int imdata (int argc, char **argv) {
    44 
    5   off_t i, j, k, n, I;
     5  off_t i, j, k, I;
    66  int N, NPTS, found, mode, TimeSelect, TimeFormat;
    77  off_t Nregions, NREGIONS;
    … …  
    152152        for (i = 0; i < catalog.Nmeasure; i++) {
    153153          if ((catalog.measure[i].t < start) || (catalog.measure[i].t > stop)) continue;
    154           n = catalog.measure[i].averef;
    155           vec[0].elements.Flt[N] = catalog.average[n].R - catalog.measure[i].dR / 3600.0;
     154          vec[0].elements.Flt[N] = catalog.measure[i].R;
    156155          N++;
    157156          CHECK_REALLOCATE (vec[0].elements.Flt, opihi_flt, NPTS, N, 1000);
    … …  
    161160        for (i = 0; i < catalog.Nmeasure; i++) {
    162161          if ((catalog.measure[i].t < start) || (catalog.measure[i].t > stop)) continue;
    163           n = catalog.measure[i].averef;
    164           vec[0].elements.Flt[N] = catalog.average[n].D - catalog.measure[i].dD / 3600.0;
     162          vec[0].elements.Flt[N] = catalog.measure[i].D;
    165163          N++;
    166164          CHECK_REALLOCATE (vec[0].elements.Flt, opihi_flt, NPTS, N, 1000);
    … …  
    194192        for (i = 0; i < catalog.Nmeasure; i++) {
    195193          if ((catalog.measure[i].t < start) || (catalog.measure[i].t > stop)) continue;
    196           n = catalog.measure[i].averef;
     194          //n = catalog.measure[i].averef;
    197195          // vec[0].elements.Flt[N] = catalog.average[n].M;
    198196          N++;

  • 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;

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

    r34088 r36905  
    207207        if (LimExclude && (Zvec[Npts] > 0.99)) continue;
    208208        if (Zvec[Npts] < 0.011) continue;
    209         R = catalog.average[i].R - catalog.measure[m+k].dR/3600.0;
    210         D = catalog.average[i].D - catalog.measure[m+k].dD/3600.0;
     209        R = catalog.measure[m+k].R;
     210        D = catalog.measure[m+k].D;
    211211        // XXX drop this check
    212212        if ((R < Rmin) || (R > Rmax) || (D < -90.0) || (D > 90.0)) {
    213213          char *date;
    214214          date = ohana_sec_to_date (catalog.measure[m+k].t);
    215           gprint (GP_LOG, "out: %f, %f : %s : (%f, %f) + (%f, %f)\n", R, D, date, catalog.average[i].R, catalog.average[i].D, catalog.measure[m+k].dR/3600.0, catalog.measure[m+k].dD/3600.0);
     215          gprint (GP_LOG, "out: %f, %f : %s : (%f, %f) + (%f, %f)\n", R, D, date, catalog.average[i].R, catalog.average[i].D, catalog.measure[m+k].R, catalog.measure[m+k].D);
    216216          free (date);
    217217        }

  • branches/eam_branches/ipp-20140610/Ohana/src/photdbc/src/join_stars.c

    r36481 r36905  
    33void join_stars (Catalog *catalog) {
    44
    5   off_t i, j, k, m, M, Ni, Nj, first_j, Nfirst;
     5  off_t i, j, k, m, Ni, Nj, first_j;
    66  off_t Naves, Nmeas, Ncurr;
    77  off_t Naverage, Nmeasure, *index;
    … …  
    109109        mpointer[Nmeas].measure = m;
    110110        mpointer[Nmeas].averef  = Naves;
    111         mpointer[Nmeas].R       = average[Ni].R - measure[m].dR / 3600.0;
    112         mpointer[Nmeas].D       = average[Ni].D - measure[m].dD / 3600.0;
     111        mpointer[Nmeas].R       = measure[m].R;
     112        mpointer[Nmeas].D       = measure[m].D;
    113113        Nmeas ++;
    114114      }
    … …  
    155155          mpointer[Nmeas].measure = m;
    156156          mpointer[Nmeas].averef  = Ncurr;
    157           mpointer[Nmeas].R       = average[Nj].R - measure[m].dR / 3600.0;
    158           mpointer[Nmeas].D       = average[Nj].D - measure[m].dD / 3600.0;
     157          mpointer[Nmeas].R       = measure[m].R;
     158          mpointer[Nmeas].D       = measure[m].D;
    159159          Nmeas ++;
    160160        }
    161         Nfirst = average[Nj].Nmeasure;
    162161        naverage[Ncurr].Nmeasure += average[Nj].Nmeasure;
    163162        found[j] = TRUE;
    … …  
    178177
    179178        /* update original measurement offsets for new detections */
    180         for (k = Nfirst; k < naverage[Ncurr].Nmeasure; k++) {
    181           m = naverage[Ncurr].measureOffset + k;
    182           M = mpointer[m].measure;
    183           measure[M].dR = 3600.0*(Sr - mpointer[m].R);
    184           measure[M].dD = 3600.0*(Sd - mpointer[m].D);
    185         }
     179        // for (k = Nfirst; k < naverage[Ncurr].Nmeasure; k++) {
     180        //   m = naverage[Ncurr].measureOffset + k;
     181        //   M = mpointer[m].measure;
     182        //   measure[M].dR = 3600.0*(Sr - mpointer[m].R);
     183        //   measure[M].dD = 3600.0*(Sd - mpointer[m].D);
     184        // }
    186185
    187186        /* update current reference star position */
    … …  
    189188# else
    190189        /* update original measurement offsets for new detections */
    191         for (k = Nfirst; k < naverage[Ncurr].Nmeasure; k++) {
    192           m = naverage[Ncurr].measureOffset + k;
    193           M = mpointer[m].measure;
    194           measure[M].dR = 3600.0*(naverage[Ncurr].R - mpointer[m].R);
    195           measure[M].dD = 3600.0*(naverage[Ncurr].D - mpointer[m].D);
    196         }
     190        // now not needed measure[M] carries R,D
     191        // for (k = Nfirst; k < naverage[Ncurr].Nmeasure; k++) {
     192        //   m = naverage[Ncurr].measureOffset + k;
     193        //   M = mpointer[m].measure;
     194        //   measure[M].dR = 3600.0*(naverage[Ncurr].R - mpointer[m].R);
     195        //   measure[M].dD = 3600.0*(naverage[Ncurr].D - mpointer[m].D);
     196        // }
    197197# endif
    198198      }

  • branches/eam_branches/ipp-20140610/Ohana/src/relastro/src/ImageOps.c

    r36903 r36905  
    602602
    603603  off_t i, m, c, n;
    604   double X, Y, L, M, P, Q, R, D, dR, dD;
     604  double X, Y, L, M, P, Q, R, D;
    605605
    606606  Mosaic *mosaic;
    … …  
    650650    n = measure[0].averef;
    651651
    652     dR = dD = 0.0;
    653652    if (moscoords == NULL) {
    654653      // this is a Simple image (not a mosaic)
    … …  
    661660      LM_to_RD (&R, &D, P, Q, moscoords);
    662661    }
    663 
    664662    measure[0].R = R;
    665663    measure[0].D = D;
    666664
    667     fprintf (stderr, "redo this\n")
    668     if (dR > +180.0*3600.0) {
     665    float dRoff = dvoOffsetR(measure, &catalog[c].average[n]);
     666
     667    if (dRoff > +180.0*3600.0) {
    669668      // average on high end of boundary, move star up
    670       R += 360.0;
    671       measure[0].R = R;
    672     }
    673     if (dR < -180.0*3600.0) {
    674       // average on low end of boundary, move star down
    675       R -= 360.0;
    676       measure[0].R = R;
     669      measure[0].R += 360.0;
     670      dRoff -= 360.0*3600.0;
     671    }
     672    if (dRoff < -180.0*3600.0) {
     673      measure[0].R -= 360.0;
     674      dRoff += 360.0*3600.0;
    677675    }
    678676  }
    … …  
    983981      // skip measurements based on user selected criteria
    984982      if (!MeasFilterTest(&measure[k], FALSE)) continue;
    985       R[N] = measure[k].dR;
    986       D[N] = measure[k].dD;
     983      R[N] = measure[k].R;
     984      D[N] = measure[k].D;
    987985      dR[N] = GetAstromError(&measure[k], ERROR_MODE_RA);
    988986      dD[N] = GetAstromError(&measure[k], ERROR_MODE_DEC);
    … …  
    10041002      // skip bad measurements
    10051003      if (!MeasFilterTest(&measure[k], FALSE)) continue; 
    1006       x = measure[k].dR - statsR.median;
    1007       y = measure[k].dD - statsD.median;
     1004      x = measure[k].R - statsR.median;
     1005      y = measure[k].D - statsD.median;
    10081006      theta = atan2(y,x);
    10091007      d2[N] = (x*x + y*y) / (SQR(statsR.sigma * Ns * cos(theta)) +
    … …  
    10201018    for (k = 0;  k < N; k++) {
    10211019      off_t ind = (off_t) index[k];
    1022       R[k] = measure[ind].dR;
    1023       D[k] = measure[ind].dD;
     1020      R[k] = measure[ind].R;
     1021      D[k] = measure[ind].D;
    10241022      dR[k] = GetAstromError(&measure[ind], ERROR_MODE_RA);
    10251023      dD[k] = GetAstromError(&measure[ind], ERROR_MODE_DEC);
    … …  
    10351033      //skip bad measurements
    10361034      if (!MeasFilterTest(&measure[k], FALSE)) continue; 
    1037       x = measure[k].dR - statsR.median;
    1038       y = measure[k].dD - statsD.median;
     1035      x = measure[k].R - statsR.median;
     1036      y = measure[k].D - statsD.median;
    10391037      theta = atan2(y,x);
    10401038      d2[N] = (x*x + y*y) / (SQR(statsR.sigma * Ns * cos(theta)) +
    … …  
    10701068  float mag;
    10711069
    1072   if (!finite(measure[0].dR) || !finite(measure[0].dD)) return FALSE;
     1070  if (!finite(measure[0].R) || !finite(measure[0].D)) return FALSE;
    10731071  if (!finite(measure[0].M)) return FALSE; //XXX is this necessary for all relastro tasks?
    10741072  if (!finite(measure[0].dM)) return FALSE; //XXX is this necessary for all relastro tasks?
    … …  
    11371135  float mag;
    11381136
    1139   if (!finite(measure[0].dR) || !finite(measure[0].dD)) return FALSE;
     1137  if (!finite(measure[0].R) || !finite(measure[0].D)) return FALSE;
    11401138  if (!finite(measure[0].M)) return FALSE; //XXX is this necessary for all relastro tasks?
    11411139  if (!finite(measure[0].dM)) return FALSE; //XXX is this necessary for all relastro tasks?

  • branches/eam_branches/ipp-20140610/Ohana/src/relastro/src/relastroVisual.c

    r36903 r36905  
    418418                               StatType statsR, StatType statsD, double thresh) {
    419419   
    420   double *Din, *Rin, *Dout, *Rout;
     420  float *Din, *Rin, *Dout, *Rout;
    421421  double xmin, xmax, ymin, ymax, range;
    422422  float xCirc[100], yCirc[100];
    … …  
    431431 
    432432  // populate vectors
    433   ALLOCATE(Din, float, Nmeasure);
    434   ALLOCATE(Rin, float, Nmeasure);
     433  ALLOCATE(Din,  float, Nmeasure);
     434  ALLOCATE(Rin,  float, Nmeasure);
    435435  ALLOCATE(Dout, float, Nmeasure);
    436436  ALLOCATE(Rout, float, Nmeasure);
Note: See TracChangeset for help on using the changeset viewer.