IPP Software Navigation Tools IPP Links Communication Pan-STARRS Links

Changeset 40214


Ignore:
Timestamp:
Nov 25, 2017, 12:09:16 PM (9 years ago)
Author:
eugene
Message:

add Mkron to MeasureTiny; use McalAPER to calibrate zpAper for stacks

Location:
branches/eam_branches/ohana.20170822/src
Files:
3 edited

Legend:

Unmodified
Added
Removed

  • branches/eam_branches/ohana.20170822/src/libdvo/include/dvo.h

    r40211 r40214  
    502502  double         R;
    503503  double         D;
    504   float          M;
     504  float          M; // change to Mpsf eventually to disambiguate
     505  float          Mkron;
    505506  float          Mcal;
    506507  float          Mflat;

  • branches/eam_branches/ohana.20170822/src/libdvo/src/dvo_photcode_ops.c

    r40212 r40214  
    16491649      break;
    16501650    case MAG_CLASS_KRON:
    1651       // Mraw = measure[0].Mkron;
     1651      Mraw = measure[0].Mkron;
    16521652      break;
    16531653    case MAG_CLASS_APER:
    1654       // Mraw = measure[0].Map;
     1654      // Mraw = measure[0].Map; // MeasureTiny does not have Map
    16551655      break;
    16561656    default:
    … …  
    16771677      break;
    16781678    case MAG_CLASS_KRON:
    1679       // Mraw = measure[0].Mkron;
     1679      Mraw = measure[0].Mkron;
    16801680      break;
    16811681    case MAG_CLASS_APER:
    1682       // Mraw = measure[0].Map;
     1682      // Mraw = measure[0].Map; // MeasureTiny does not have Map
    16831683      break;
    16841684    default:
    … …  
    17061706      break;
    17071707    case MAG_CLASS_KRON:
    1708       // Mraw = measure[0].Mkron;
     1708      Mraw = measure[0].Mkron;
    17091709      break;
    17101710    case MAG_CLASS_APER:
    1711       // Mraw = measure[0].Map;
     1711      // Mraw = measure[0].Map; // MeasureTiny does not have Map
    17121712      break;
    17131713    default:
    … …  
    17471747      break;
    17481748    case MAG_CLASS_KRON:
    1749       // Mraw = measure[0].Mkron;
     1749      Mraw = measure[0].Mkron;
    17501750      break;
    17511751    case MAG_CLASS_APER:
    1752       // Mraw = measure[0].Map;
     1752      // Mraw = measure[0].Map; // MeasureTiny does not have Map
    17531753      break;
    17541754    default:
    … …  
    17991799        break;
    18001800      case MAG_CLASS_KRON:
    1801         // Mraw = thisone[0].Mkron;
     1801        Mraw = thisone[0].Mkron;
    18021802        break;
    18031803      case MAG_CLASS_APER:
    1804         // Mraw = thisone[0].Map;
     1804        // Mraw = thisone[0].Map; // MeasureTiny does not have Map
    18051805        break;
    18061806      default:

  • branches/eam_branches/ohana.20170822/src/relphot/src/setMrelCatalog.c

    r40213 r40214  
    529529  off_t k;
    530530
    531   float McalPSF = 0, McalAPER = 0, Mmos = 0, Mgrid = 0, Finst = 0;
     531  float McalPSF = 0, McalAPER = 0, Mmos = 0, Mgrid = 0;
    532532
    533533  // set the primary projection cell and skycell for this coordinate
    … …  
    635635        if (isnan(McalPSF))  SKIP_THIS_MEAS_STACK(Ncal); // XXX really skip?
    636636
    637         McalAPER  = getMcal  (meas, cat, MAG_CLASS_PSF);
     637        McalAPER  = getMcal  (meas, cat, MAG_CLASS_KRON);
    638638        if (isnan(McalAPER))  SKIP_THIS_MEAS_STACK(Ncal); // XXX really skip?
    639639
    … …  
    645645
    646646      // NOTE: negative and insignificant flux values are allowed, but not NAN flux values
    647       Finst = PhotFluxInst (&measure[k], MAG_CLASS_PSF);
     647      float Finst = PhotFluxInst (&measure[k], MAG_CLASS_PSF);
    648648      if (isnan(Finst)) SKIP_THIS_MEAS_STACK(Ninst);
    649649
Note: See TracChangeset for help on using the changeset viewer.