IPP Software Navigation Tools IPP Links Communication Pan-STARRS Links

Changeset 40212


Ignore:
Timestamp:
Nov 22, 2017, 10:38:42 AM (9 years ago)
Author:
eugene
Message:

update names for consistency: secfilt.M -> secfilt.MpsfChp, etc

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

Legend:

Unmodified
Added
Removed

  • branches/eam_branches/ohana.20170822/src/addstar/src/FilterStars.c

    r39473 r40212  
    7373    outcat->measure[N].airmass = airmass (image[0].secz, outcat->average[N].R, outcat->average[N].D, image[0].sidtime, image[0].latitude);
    7474    outcat->measure[N].az      = azimuth (15.0*image[0].sidtime - outcat->average[N].R, outcat->average[N].D, image[0].latitude);
    75     outcat->measure[N].Mcal    = image[0].Mcal;
     75    outcat->measure[N].Mcal    = image[0].McalPSF;
    7676    outcat->measure[N].t       = image[0].tzero + 1e-4*outcat->measure[N].Yccd*image[0].trate;  /* trate is in 0.1 msec / row */
    7777    outcat->measure[N].dt      = MTIME;

  • branches/eam_branches/ohana.20170822/src/addstar/src/LoadDataPMM.c

    r38553 r40212  
    234234    // altaz (&alt, &az, 15.0*image[0].sidtime - image[0].coords.crval1, image[0].coords.crval2, Latitude);
    235235
     236    // secz is in units of airmass
    236237    image[0].trate = 0.0;
    237238    image[0].secz = 1.0;
    238239    image[0].ccdnum = 0;
    239240
    240     // secz is in units milli-airmass
    241     image[0].Mcal = 0.0;
    242     image[0].Xm   = NAN_S_SHORT;
    243     image[0].flags = 0;
     241    image[0].McalPSF   = 0.0;
     242    image[0].McalAPER  = 0.0;
     243    image[0].McalChiSq = NAN;
     244    image[0].dMcal     = NAN;
     245    image[0].flags     = 0;
    244246
    245247    image[0].nstar = 0;

  • branches/eam_branches/ohana.20170822/src/addstar/src/ReadImageHeader.c

    r39457 r40212  
    265265  }
    266266
    267   /* secz is in units milli-airmass */
    268   image[0].Mcal = ZERO_POINT_OFFSET;
    269   image[0].dMcal = ZERO_POINT_ERROR;
    270   image[0].Xm   = NAN_S_SHORT;
    271   image[0].flags = 0;
     267  image[0].McalPSF   = ZERO_POINT_OFFSET;
     268  image[0].McalAPER = ZERO_POINT_OFFSET;
     269  image[0].dMcal     = ZERO_POINT_ERROR;
     270  image[0].McalChiSq = NAN;
     271  image[0].flags     = 0;
    272272
    273273  /* find expected number of stars */

  • branches/eam_branches/ohana.20170822/src/addstar/src/ReadSDSSHeader.c

    r16810 r40212  
    4747
    4848  // secz is in units milli-airmass
    49   image[0].Mcal = 0.0;
    50   image[0].Xm   = NAN_S_SHORT;
     49  image[0].McalPSF   = 0.0;
     50  image[0].McalAPER  = 0.0;
     51  image[0].McalChiSq = NAN;
     52  image[0].dMcal     = NAN;
    5153  image[0].code = 0;
    5254  memset (image[0].dummy, 0, sizeof(image[0].dummy));

  • branches/eam_branches/ohana.20170822/src/addstar/src/ReadStarsSDSS.c

    r39161 r40212  
    258258    altaz (&alt, &az, 15.0*images[N].sidtime - images[N].coords.crval1, images[N].coords.crval2, Latitude);
    259259
     260    // secz is in units of airmass
    260261    images[N].trate = clockRate * 1e-4;
    261262    images[N].secz = catalog->measure[0].airmass;
    262263    images[N].ccdnum = camcol;
    263264
    264     // secz is in units milli-airmass
    265     images[N].Mcal = 0.0;
    266     images[N].Xm   = NAN_S_SHORT;
    267     images[N].flags = 0;
     265    images[N].McalPSF   = 0.0;
     266    images[N].McalAPER  = 0.0;
     267    images[N].McalChiSq = NAN;
     268    images[N].dMcal     = NAN;
     269    images[N].flags     = 0;
    268270
    269271    images[N].nstar = Nstars;

  • branches/eam_branches/ohana.20170822/src/addstar/src/ReadStarsUKIRT.c

    r39161 r40212  
    251251
    252252    // secz is in units milli-airmass
    253     images[N].Mcal = Mcal;
    254     images[N].Xm   = NAN_S_SHORT;
    255     images[N].flags = 0;
     253    images[N].McalPSF   = Mcal;
     254    images[N].McalAPER  = Mcal;
     255    images[N].McalChiSq = NAN;
     256    images[N].dMcal     = NAN;
     257    images[N].flags     = 0;
    256258
    257259    images[N].nstar = Nstars;

  • branches/eam_branches/ohana.20170822/src/addstar/src/calibrate.c

    r39457 r40212  
    7474  /* check if this reference code is an average magnitude */
    7575  if (Nsec != -1) {
    76     CalM0 = secfilt[Nsec].M;
    77     dCalM = secfilt[Nsec].dM;
     76    CalM0 = secfilt[Nsec].MpsfChp;
     77    dCalM = secfilt[Nsec].dMpsfChp;
    7878    found0 = TRUE;
    7979  }
    … …  
    8282  Nsec  = GetPhotcodeNsec (CalC1);
    8383  if (Nsec != -1) {
    84     CalM1 = secfilt[Nsec].M;
     84    CalM1 = secfilt[Nsec].MpsfChp;
    8585    found1 = TRUE;
    8686  }
    … …  
    8989  Nsec  = GetPhotcodeNsec (CalC2);
    9090  if (Nsec != -1) {
    91     CalM2 = secfilt[Nsec].M;
     91    CalM2 = secfilt[Nsec].MpsfChp;
    9292    found2 = TRUE;
    9393  }
    … …  
    151151  if (MaxN == -1) {
    152152    fprintf (stderr, "no clean stars\n");
    153     image[0].Mcal = 10.000;
    154     image[0].dMcal = 10.000;
     153    image[0].McalPSF  = 10.000;
     154    image[0].McalAPER = 10.000;
     155    image[0].dMcal    = 10.000;
    155156    return;
    156157  }
    … …  
    187188  if (Nkeep < 5) {
    188189    fprintf (stderr, "too few stars\n");
    189     image[0].Mcal = 10.000;
    190     image[0].dMcal = 10.000;
     190    image[0].McalPSF  = 10.000;
     191    image[0].McalAPER = 10.000;
     192    image[0].dMcal    = 10.000;
    191193    return;
    192194  }
    … …  
    225227    fprintf (stdout, "ZERO_POINT_NSTARS    =    %4.0f\n", N);
    226228    // fprintf (stderr, "N: %.0f, mean: %f, wt mean: %f, stdev: %f, precision: %f\n", N, M1, Mw, M2, M2 / sqrt (N));
    227     image[0].Mcal = M1;
    228     image[0].dMcal = M2 / sqrt (N);
     229    image[0].McalPSF    = M1;
     230    image[0].McalAPER   = M1;
     231    image[0].dMcal      = M2 / sqrt (N);
    229232    image[0].nFitPhotom = N;
    230233  } else {
    231234    fprintf (stderr, "too few stars\n");
    232     image[0].Mcal = 10.000;
    233     image[0].dMcal = 10.000;
     235    image[0].McalPSF    = 10.000;
     236    image[0].McalAPER   = 10.000;
     237    image[0].dMcal      = 10.000;
    234238    image[0].nFitPhotom = 0;
    235239  }

  • branches/eam_branches/ohana.20170822/src/addstar/src/fakeimage.c

    r37807 r40212  
    110110    image[i+1].ccdnum = 0xff;
    111111
    112     image[i+1].Mcal  = 0.0;
    113     image[i+1].Xm    = NAN_S_SHORT;
     112    image[i+1].McalPSF   = 0.0;
     113    image[i+1].McalAPER  = 0.0;
     114    image[i+1].McalChiSq = NAN;
     115    image[i+1].dMcal     = NAN;
    114116    image[i+1].flags = 0;
    115117
    … …  
    165167  image[0].secz = 1.0;
    166168  image[0].ccdnum = 0xff;
    167   image[0].Mcal = 0.0;
    168   image[0].Xm   = NAN_S_SHORT;
     169
     170  image[0].McalPSF   = 0.0;
     171  image[0].McalAPER  = 0.0;
     172  image[0].McalChiSq = NAN;
     173  image[0].dMcal     = NAN;
    169174  image[0].flags = 0;
     175
    170176  image[0].nstar = 0;
    171177

  • branches/eam_branches/ohana.20170822/src/addstar/src/find_matches.c

    r38986 r40212  
    212212        /* in UPDATE mode, this value is not saved; use relphot to recalculate */
    213213        if (Nsec > -1) {
    214           if (isnan(tgtcat[0].secfilt[n*Nsecfilt+Nsec].M)) {
    215             tgtcat[0].secfilt[n*Nsecfilt+Nsec].M = PhotCat (&tgtcat[0].measure[Nmeas], MAG_CLASS_PSF);
     214          if (isnan(tgtcat[0].secfilt[n*Nsecfilt+Nsec].MpsfChp)) {
     215            tgtcat[0].secfilt[n*Nsecfilt+Nsec].MpsfChp = PhotCat (&tgtcat[0].measure[Nmeas], MAG_CLASS_PSF);
    216216          }
    217217        }
    … …  
    305305      /* in UPDATE mode, this value is not saved; use relphot to recalculate */
    306306      if (Nsec > -1) {
    307         tgtcat[0].secfilt[Nave*Nsecfilt+Nsec].M = PhotCat (&tgtcat[0].measure[Nmeas], MAG_CLASS_PSF);
     307        tgtcat[0].secfilt[Nave*Nsecfilt+Nsec].MpsfChp = PhotCat (&tgtcat[0].measure[Nmeas], MAG_CLASS_PSF);
    308308      }
    309309

  • branches/eam_branches/ohana.20170822/src/addstar/src/find_matches_closest.c

    r38986 r40212  
    248248      /* in UPDATE mode, this value is not saved; use relphot to recalculate */
    249249      if (Nsec > -1) {
    250         if (isnan(tgtcat[0].secfilt[n*Nsecfilt+Nsec].M)) {
    251           tgtcat[0].secfilt[n*Nsecfilt+Nsec].M = PhotCat (&tgtcat[0].measure[Nmeas], MAG_CLASS_PSF);
     250        if (isnan(tgtcat[0].secfilt[n*Nsecfilt+Nsec].MpsfChp)) {
     251          tgtcat[0].secfilt[n*Nsecfilt+Nsec].MpsfChp = PhotCat (&tgtcat[0].measure[Nmeas], MAG_CLASS_PSF);
    252252        }
    253253      }
    … …  
    352352      /* in UPDATE mode, this value is not saved; use relphot to recalculate */
    353353      if (Nsec > -1) {
    354         tgtcat[0].secfilt[Nave*Nsecfilt+Nsec].M = PhotCat (&tgtcat[0].measure[Nmeas], MAG_CLASS_PSF);
     354        tgtcat[0].secfilt[Nave*Nsecfilt+Nsec].MpsfChp = PhotCat (&tgtcat[0].measure[Nmeas], MAG_CLASS_PSF);
    355355      }
    356356

  • branches/eam_branches/ohana.20170822/src/addstar/src/find_matches_gaia.c

    r39926 r40212  
    267267    /* in UPDATE mode, this value is not saved; use relphot to recalculate */
    268268    if (Nsec > -1) {
    269       tgtcat[0].secfilt[Nave*Nsecfilt+Nsec].M = PhotCat (&tgtcat[0].measure[Nmeas], MAG_CLASS_PSF);
     269      tgtcat[0].secfilt[Nave*Nsecfilt+Nsec].MpsfChp = PhotCat (&tgtcat[0].measure[Nmeas], MAG_CLASS_PSF);
    270270    }
    271271

  • branches/eam_branches/ohana.20170822/src/addstar/src/loadsupercos_plates.c

    r37807 r40212  
    7272    image[Nimage].apmifit = 0.0;
    7373    image[Nimage].dapmifit = 0.0;
    74     image[Nimage].Mcal = 0.0;
    75     image[Nimage].dMcal = 0.0;
    76     image[Nimage].Xm = 0.0;
     74    image[Nimage].McalPSF   = 0.0;
     75    image[Nimage].McalAPER  = 0.0;
     76    image[Nimage].McalChiSq = 0.0;
     77    image[Nimage].dMcal     = 0.0;
    7778
    7879    char photname[128];

  • branches/eam_branches/ohana.20170822/src/checkastro/src/BrightCatalog.c

    r37043 r40212  
    270270    ALLOCATE (secfilt, SecFilt, Nrow);
    271271    for (i = 0; i < Nrow; i++) {
    272       secfilt[i].M     = M[i];         
    273       secfilt[i].dM    = dM[i];
    274       secfilt[i].Mchisq= Mchisq[i];
    275       secfilt[i].flags = flags[i];
    276       secfilt[i].Ncode = Ncode[i];
    277       secfilt[i].Nused = Nused[i];
    278       secfilt[i].M_20  = M_20[i];
    279       secfilt[i].M_80  = M_80[i];
     272      secfilt[i].MpsfChp  = M[i];         
     273      secfilt[i].dMpsfChp = dM[i];
     274      secfilt[i].Mchisq   = Mchisq[i];
     275      secfilt[i].flags    = flags[i];
     276      secfilt[i].Ncode    = Ncode[i];
     277      secfilt[i].Nused    = Nused[i];
     278      secfilt[i].M_20     = M_20[i];
     279      secfilt[i].M_80     = M_80[i];
    280280    }
    281281    fprintf (stderr, "loaded data for %lld averages\n", (long long) Nrow);
    … …  
    652652    SecFilt *secfilt = catalog->secfilt;
    653653    for (i = 0; i < Nsec; i++) {
    654       M     [i]       = secfilt[i].M      ;
    655       dM    [i]       = secfilt[i].dM     ;
    656       Mchisq[i]       = secfilt[i].Mchisq ;
    657       flags [i]       = secfilt[i].flags  ;
    658       Ncode [i]       = secfilt[i].Ncode  ;
    659       Nused [i]       = secfilt[i].Nused  ;
    660       M_20  [i]       = secfilt[i].M_20   ;
    661       M_80  [i]       = secfilt[i].M_80   ;
     654      M     [i]       = secfilt[i].MpsfChp ;
     655      dM    [i]       = secfilt[i].dMpsfChp;
     656      Mchisq[i]       = secfilt[i].Mchisq  ;
     657      flags [i]       = secfilt[i].flags   ;
     658      Ncode [i]       = secfilt[i].Ncode   ;
     659      Nused [i]       = secfilt[i].Nused   ;
     660      M_20  [i]       = secfilt[i].M_20    ;
     661      M_80  [i]       = secfilt[i].M_80    ;
    662662    }
    663663

  • branches/eam_branches/ohana.20170822/src/delstar/src/gimages.c

    r39457 r40212  
    8888
    8989  /* secz is in units milli-airmass */
    90   image[0].Mcal = ALPHA*(image[0].secz - 1.000);
    91   image[0].Xm   = NAN_S_SHORT;
     90  image[0].McalPSF   = ALPHA*(image[0].secz - 1.000);
     91  image[0].McalAPER  = ALPHA*(image[0].secz - 1.000);
     92  image[0].McalChiSq = NAN_S_SHORT;
    9293
    9394  free (header.buffer);

  • branches/eam_branches/ohana.20170822/src/dvomerge/src/merge_catalogs_old.c

    r39926 r40212  
    367367      // secfilt tables of input and output are the same
    368368      for (k = 0; k < NsecfiltIn; k++) {
    369         if ( isfinite(output[0].secfilt[n*NsecfiltIn+k].M)) continue;
    370         if (!isfinite( input[0].secfilt[N*NsecfiltIn+k].M)) continue;
     369        if ( isfinite(output[0].secfilt[n*NsecfiltIn+k].MpsfChp)) continue;
     370        if (!isfinite( input[0].secfilt[N*NsecfiltIn+k].MpsfChp)) continue;
    371371        output[0].secfilt[n*NsecfiltIn+k] = input[0].secfilt[N*NsecfiltIn+k];
    372372      }
    … …  
    378378        int outputIndex = n * NsecfiltOut + secfiltMap[k];
    379379       
    380         if ( isfinite(output[0].secfilt[outputIndex].M)) continue;
    381         if (!isfinite( input[0].secfilt[N*NsecfiltIn+k].M)) continue;
     380        if ( isfinite(output[0].secfilt[outputIndex].MpsfChp)) continue;
     381        if (!isfinite( input[0].secfilt[N*NsecfiltIn+k].MpsfChp)) continue;
    382382        output[0].secfilt[outputIndex] = input[0].secfilt[N*NsecfiltIn+k];
    383383      }
    … …  
    489489      }
    490490   
    491       if (isfinite(input[0].secfilt[N*NsecfiltIn+j].M)) {
     491      if (isfinite(input[0].secfilt[N*NsecfiltIn+j].MpsfChp)) {
    492492        output[0].secfilt[outputIndex] = input[0].secfilt[N*NsecfiltIn+j];
    493493      }

  • branches/eam_branches/ohana.20170822/src/dvopsps/src/insert_objects_dvopsps_catalog.c

    r39650 r40212  
    372372    float meanPSFMagMin = NAN;
    373373    float meanPSFMagMax = NAN;
    374     if (isfinite(secfilt->dM) && isfinite(secfilt->M)) {
    375       meanPSFMag    = secfilt->M;
    376       meanPSFMagErr = secfilt->dM;
    377       meanPSFMagStd = secfilt->Mstdev;
     374    if (isfinite(secfilt->dMpsfChp) && isfinite(secfilt->MpsfChp)) {
     375      meanPSFMag    = secfilt->MpsfChp;
     376      meanPSFMagErr = secfilt->dMpsfChp;
     377      meanPSFMagStd = secfilt->sMpsfChp;
    378378      meanPSFMagMin = secfilt->Mmin;
    379379      meanPSFMagMax = secfilt->Mmax;
    … …  
    383383    float meanKronMagErr = NAN;
    384384    float meanKronMagStd = NAN;
    385     if (isfinite(secfilt->dMkron) && isfinite(secfilt->Mkron) && (secfilt->dMkron < 0.333)) {
    386       meanKronMag    = secfilt->Mkron;
    387       meanKronMagErr = secfilt->dMkron;
    388       meanKronMagStd = secfilt->sMkron;
     385    if (isfinite(secfilt->dMkronChp) && isfinite(secfilt->MkronChp) && (secfilt->dMkronChp < 0.333)) {
     386      meanKronMag    = secfilt->MkronChp;
     387      meanKronMagErr = secfilt->dMkronChp;
     388      meanKronMagStd = secfilt->sMkronChp;
    389389    }
    390390
    … …  
    392392    float meanApMagErr = NAN;
    393393    float meanApMagStd = NAN;
    394     if (isfinite(secfilt->dMap) && isfinite(secfilt->Map)) {
    395       meanApMag    = secfilt->Map;
    396       meanApMagErr = secfilt->dMap;
    397       meanApMagStd = secfilt->sMap;
     394    if (isfinite(secfilt->dMapChp) && isfinite(secfilt->MapChp)) {
     395      meanApMag    = secfilt->MapChp;
     396      meanApMagErr = secfilt->dMapChp;
     397      meanApMagStd = secfilt->sMapChp;
    398398    }
    399399

  • branches/eam_branches/ohana.20170822/src/fakeastro/src/insert_fakestar.c

    r38469 r40212  
    9393
    9494    // I need a photcode for r-band
    95     catalog[0].secfilt[Nave*Nsecfilt+0].M = m_g;
    96     catalog[0].secfilt[Nave*Nsecfilt+1].M = m_r;
    97     catalog[0].secfilt[Nave*Nsecfilt+2].M = m_i;
    98     catalog[0].secfilt[Nave*Nsecfilt+3].M = m_z;
    99     catalog[0].secfilt[Nave*Nsecfilt+4].M = m_y;
     95    catalog[0].secfilt[Nave*Nsecfilt+0].MpsfChp = m_g;
     96    catalog[0].secfilt[Nave*Nsecfilt+1].MpsfChp = m_r;
     97    catalog[0].secfilt[Nave*Nsecfilt+2].MpsfChp = m_i;
     98    catalog[0].secfilt[Nave*Nsecfilt+3].MpsfChp = m_z;
     99    catalog[0].secfilt[Nave*Nsecfilt+4].MpsfChp = m_y;
    100100
    101101    catalog[0].starpar[Nstarpar]        = stars[i].starpar;

  • branches/eam_branches/ohana.20170822/src/fakeastro/src/load_template_images.c

    r38441 r40212  
    6161
    6262    refimage[Nrefimage].secz     = childImage->secz;
    63     refimage[Nrefimage].Mcal     = childImage->Mcal;
     63    refimage[Nrefimage].McalPSF  = childImage->McalPSF;
     64    refimage[Nrefimage].McalAPER = childImage->McalAPER;
    6465    refimage[Nrefimage].dMcal    = childImage->dMcal;
    6566    refimage[Nrefimage].exptime  = childImage->exptime;

  • branches/eam_branches/ohana.20170822/src/fakeastro/src/make_2mass_measures.c

    r39248 r40212  
    4444
    4545    // make a crude JHK color for now:
    46     double J_PS1 = secfilt[i*Nsecfilt + Nsec].M - 1.0; // make all stars have y-J = 1.0
     46    double J_PS1 = secfilt[i*Nsecfilt + Nsec].MpsfChp - 1.0; // make all stars have y-J = 1.0
    4747    if (J_PS1 > MAX_MAG_2MASS) continue; // only generate 2MASS detections for objects with J_PS1 < 16.0
    4848
    49     if (isnan(secfilt[i*Nsecfilt + Nsec].M)) {
     49    if (isnan(secfilt[i*Nsecfilt + Nsec].MpsfChp)) {
    5050      // look for a non-NAN secfilt mag and just use that (it is not super important)
    5151      int ns;
    5252      for (ns = 0; ns < Nsecfilt; ns++) {
    53         if (!isnan(secfilt[i*Nsecfilt + ns].M)) break;
     53        if (!isnan(secfilt[i*Nsecfilt + ns].MpsfChp)) break;
    5454      }
    5555      if (ns == Nsecfilt) continue; // no non-nan
    5656
    57       J_PS1 = secfilt[i*Nsecfilt + ns].M; // pretend secfilt.M = J
     57      J_PS1 = secfilt[i*Nsecfilt + ns].MpsfChp; // pretend secfilt.MpsfChp = J
    5858      if (J_PS1 > MAX_MAG_2MASS) continue; // only generate 2MASS detections for objects with J_PS1 < 16.0
    5959    }

  • branches/eam_branches/ohana.20170822/src/fakeastro/src/make_fake_stars_catalog.c

    r39926 r40212  
    4242
    4343  // XXX put in airmass?
    44   float ZP  = SCALE*code->C - image->Mcal + Mtime;
    45   float ZPo = 25.0 - image->Mcal + Mtime;
     44  float ZP  = SCALE*code->C - image->McalPSF + Mtime;
     45  float ZPo = 25.0 - image->McalPSF + Mtime;
    4646  // float ZP = code[0].K*(measure[0].airmass - 1.000) + SCALE*code[0].C - measure[0].Mcal;
    4747 
    … …  
    7979    // float Minst = Msky - SCALE*code->C - measure[0].dt
    8080
    81     double Minst = secfilt[i*Nsecfilt + Nsec].M  - ZP;
     81    double Minst = secfilt[i*Nsecfilt + Nsec].MpsfChp - ZP;
    8282    double Counts = pow(10.0, -0.4*Minst);
    8383    double SkyCts = sky[Nsec];
    … …  
    175175
    176176    stars[Nstars].measure.az      = azimuth (15.0*image->sidtime - stars[Nstars].average.R, stars[Nstars].average.D, image->latitude);
    177     stars[Nstars].measure.Mcal    = image->Mcal;
     177    stars[Nstars].measure.Mcal    = image->McalPSF;
    178178    stars[Nstars].measure.t       = image->tzero + 1e-4*stars[Nstars].measure.Yccd*image->trate;  // trate is in 0.1 msec / row
    179179    stars[Nstars].measure.dt      = Mtime;

  • branches/eam_branches/ohana.20170822/src/fakeastro/src/make_gaia_measures.c

    r39926 r40212  
    4242
    4343    // make a crude G-i color for now:
    44     double G_PS1 = secfilt[i*Nsecfilt + Nsec].M; // make all stars have G-i = 1.0
     44    double G_PS1 = secfilt[i*Nsecfilt + Nsec].MpsfChp; // make all stars have G-i = 1.0
    4545    if (G_PS1 > MAX_MAG_GAIA) continue; // only generate GAIA detections for objects with G_PS1 < 21.0
    4646
    47     if (isnan(secfilt[i*Nsecfilt + Nsec].M)) {
     47    if (isnan(secfilt[i*Nsecfilt + Nsec].MpsfChp)) {
    4848      // look for a non-NAN secfilt mag and just use that (it is not super important)
    4949      int ns;
    5050      for (ns = 0; ns < Nsecfilt; ns++) {
    51         if (!isnan(secfilt[i*Nsecfilt + ns].M)) break;
     51        if (!isnan(secfilt[i*Nsecfilt + ns].MpsfChp)) break;
    5252      }
    5353      if (ns == Nsecfilt) continue; // no non-nan
    5454
    55       G_PS1 = secfilt[i*Nsecfilt + ns].M; // pretend secfilt.M = G
     55      G_PS1 = secfilt[i*Nsecfilt + ns].MpsfChp; // pretend secfilt.M = G
    5656      if (G_PS1 > MAX_MAG_GAIA) continue; // only generate GAIA detections for objects with G_PS1 < 21.0
    5757    }

  • branches/eam_branches/ohana.20170822/src/getstar/src/ReadImageHeader.c

    r39998 r40212  
    127127
    128128  /* secz is in units milli-airmass */
    129   image[0].Mcal = 0.0;
    130   image[0].Xm   = NAN_S_SHORT;
     129  image[0].McalPSF   = 0.0;
     130  image[0].McalAPER  = 0.0;
     131  image[0].McalChiSq = NAN;
    131132  image[0].flags = 0;
    132133

  • branches/eam_branches/ohana.20170822/src/getstar/src/select_by_region.c

    r38441 r40212  
    7878        }
    7979      } else {
    80         mag = catalog[0].secfilt[i*Nsecfilt + Nsec].M;
     80        mag = catalog[0].secfilt[i*Nsecfilt + Nsec].MpsfChp;
    8181      }
    8282      if (isnan(mag)) continue;
    … …  
    131131        }
    132132      } else {
    133         mag = catalog[0].secfilt[i*Nsecfilt + Nsec].M;
     133        mag = catalog[0].secfilt[i*Nsecfilt + Nsec].MpsfChp;
    134134      }
    135135      if (isnan(mag) || (mag > MagLimitValue)) continue;

  • branches/eam_branches/ohana.20170822/src/getstar/src/write_getstar_ps1_dev_0.c

    r38441 r40212  
    5555    // find primary magnitude
    5656    if (Nsec_c0 != -1) {
    57       output[i].mag = secfilt[i*Nsecfilt + Nsec_c0].M;
     57      output[i].mag = secfilt[i*Nsecfilt + Nsec_c0].MpsfChp;
    5858    } else {
    5959      output[i].mag = NAN;
    … …  
    6969    // find color term 1
    7070    if (Nsec_c1 != -1) {
    71       output[i].c1 = secfilt[i*Nsecfilt + Nsec_c1].M;
     71      output[i].c1 = secfilt[i*Nsecfilt + Nsec_c1].MpsfChp;
    7272    } else {
    7373      output[i].c1 = NAN;
    … …  
    8383    // find color term 2
    8484    if (Nsec_c2 != -1) {
    85       output[i].c2 = secfilt[i*Nsecfilt + Nsec_c2].M;
     85      output[i].c2 = secfilt[i*Nsecfilt + Nsec_c2].MpsfChp;
    8686    } else {
    8787      output[i].c2 = NAN;

  • branches/eam_branches/ohana.20170822/src/getstar/src/write_getstar_ps1_dev_1.c

    r38441 r40212  
    5858    // find primary magnitude
    5959    if (Nsec_c0 != -1) {
    60       output[i].mag = secfilt[i*Nsecfilt + Nsec_c0].M;
     60      output[i].mag = secfilt[i*Nsecfilt + Nsec_c0].MpsfChp;
    6161    } else {
    6262      output[i].mag = NAN;
    … …  
    7272    // find color term 1
    7373    if (Nsec_c1 != -1) {
    74       output[i].c1 = secfilt[i*Nsecfilt + Nsec_c1].M;
     74      output[i].c1 = secfilt[i*Nsecfilt + Nsec_c1].MpsfChp;
    7575    } else {
    7676      output[i].c1 = NAN;
    … …  
    8686    // find color term 2
    8787    if (Nsec_c2 != -1) {
    88       output[i].c2 = secfilt[i*Nsecfilt + Nsec_c2].M;
     88      output[i].c2 = secfilt[i*Nsecfilt + Nsec_c2].MpsfChp;
    8989    } else {
    9090      output[i].c2 = NAN;

  • branches/eam_branches/ohana.20170822/src/getstar/src/write_getstar_ps1_dev_2.c

    r38441 r40212  
    6464    // find primary magnitude
    6565    if (Nsec_c0 != -1) {
    66       output[i].mag = secfilt[i*Nsecfilt + Nsec_c0].M;
     66      output[i].mag = secfilt[i*Nsecfilt + Nsec_c0].MpsfChp;
    6767    } else {
    6868      output[i].mag = NAN;
    … …  
    7878    // find color term 1
    7979    if (Nsec_c1 != -1) {
    80       output[i].c1 = secfilt[i*Nsecfilt + Nsec_c1].M;
     80      output[i].c1 = secfilt[i*Nsecfilt + Nsec_c1].MpsfChp;
    8181    } else {
    8282      output[i].c1 = NAN;
    … …  
    9292    // find color term 2
    9393    if (Nsec_c2 != -1) {
    94       output[i].c2 = secfilt[i*Nsecfilt + Nsec_c2].M;
     94      output[i].c2 = secfilt[i*Nsecfilt + Nsec_c2].MpsfChp;
    9595    } else {
    9696      output[i].c2 = NAN;

  • branches/eam_branches/ohana.20170822/src/imregister/imphot/dumpfits.c

    r38441 r40212  
    114114    startstr = ohana_sec_to_date (subset[0].tzero);
    115115    filtstr  = GetPhotcodeNamebyCode (subset[0].photcode);
    116     zp       = subset[0].Mcal;
     116    zp       = subset[0].McalPSF;
    117117    dzp      = subset[0].dMcal;
    118118    XY_to_RD (&ra, &dec, 0.0, 0.0, &subset[0].coords);

  • branches/eam_branches/ohana.20170822/src/imregister/imphot/output.c

    r34088 r40212  
    3737     
    3838    fprintf (stdout, "%s %s %s  %7.4f %7.4f  %7.4f %5d %02x\n", image[i].name, photstr, timestr,
    39              image[i].Mcal, image[i].dMcal, image[i].secz, image[i].nstar, image[i].flags);
     39             image[i].McalPSF, image[i].dMcal, image[i].secz, image[i].nstar, image[i].flags);
    4040    free (timestr);
    4141  }

  • branches/eam_branches/ohana.20170822/src/kapa2/src/DrawObjects.c

    r40125 r40212  
    9797  switch (object[0].style) {
    9898    case KAPA_PLOT_CONNECT:
     99      // fprintf (stderr, "plot KAPA_PLOT_CONNECT: \n");
    99100      DrawConnect (graphic, graph, object);
    100101      break;
    101102    case KAPA_PLOT_HISTOGRAM:
     103      // fprintf (stderr, "plot KAPA_PLOT_HISTOGRAM:\n");
    102104      DrawHistogram (graphic, graph, object);
    103105      break;
    104106    case KAPA_PLOT_BARS_SOLID:
     107      // fprintf (stderr, "plot KAPA_PLOT_BARS_SOLID:\n");
    105108      DrawBars (graphic, graph, object, KAPA_PLOT_BARS_SOLID);
    106109      break;
    107110    case KAPA_PLOT_BARS_OUTLINE:
     111      // fprintf (stderr, "plot KAPA_PLOT_BARS_OUTLINE:\n");
    108112      DrawBars (graphic, graph, object, KAPA_PLOT_BARS_OUTLINE);
    109113      break;
    110114    case KAPA_PLOT_BARS_OUTFILL:
     115      // fprintf (stderr, "plot KAPA_PLOT_BARS_OUTFILL:\n");
    111116      DrawBars (graphic, graph, object, KAPA_PLOT_BARS_OUTFILL);
    112117      break;
    113118    case KAPA_PLOT_POINTS:
    114119    default:
     120      // fprintf (stderr, "plot KAPA_PLOT_POINTS:\n");
    115121      DrawPoints (graphic, graph, object);
    116122      break;

  • branches/eam_branches/ohana.20170822/src/libautocode/def/secfilt.d

    r37246 r40212  
    55DESCRIPTION  DVO SecFilt : Secondary Filter Data
    66
     7## 2017.11.22 : To clarify the parallel structures, I am explicitly renaming M,Map,Mkron to MpsfChp, MapChp, MkronChp
     8
    79## *** this section is for per-exposure mean values *** (unlabled values are implicitly PSF values)
    8 FIELD  M,             MAG,             float,      average mag in this band,              mags
    9 FIELD  dM,            MAG_ERR,         float,      formal error on average mag,           mags
    10 FIELD  Map,           MAG_AP,          float,      average mag in this band,              mags
    11 FIELD  dMap,          MAG_AP_ERR,      float,      formal error on average mag,           mags
    12 FIELD  sMap,          MAG_AP_STDEV,    float,      standard deviation of ap mags,         mags
    13 FIELD  Mkron,         MAG_KRON,        float,      ave kron mag in this band,             mags
    14 FIELD  dMkron,        MAG_KRON_ERR,    float,      formal error on average kron mag,      mags
    15 FIELD  sMkron,        MAG_KRON_STDEV,  float,      standard deviation of kron mags,       mags
     10FIELD  MpsfChp,       MAG,             float,      average mag in this band,              mags
     11FIELD  dMpsfChp,      MAG_ERR,         float,      formal error on average mag,           mags
     12FIELD  sMpsfChp,      MAG_STDEV,       float,      standard deviation of measurements,    mags
     13
     14FIELD  MapChp,        MAG_AP,          float,      average mag in this band,              mags
     15FIELD  dMapChp,       MAG_AP_ERR,      float,      formal error on average mag,           mags
     16FIELD  sMapChp,       MAG_AP_STDEV,    float,      standard deviation of ap mags,         mags
     17
     18FIELD   MkronChp,     MAG_KRON,        float,      ave kron mag in this band,             mags
     19FIELD  dMkronChp,     MAG_KRON_ERR,    float,      formal error on average kron mag,      mags
     20FIELD  sMkronChp,     MAG_KRON_STDEV,  float,      standard deviation of kron mags,       mags
    1621
    1722# XXX I could add these fields to secfilt or calculate in dvopsps?
    … …  
    2025
    2126# these statistics are PSF-specific     
    22 FIELD  Mstdev,        MAG_STDEV,       float,      standard deviation of measurements,    mags
    2327FIELD  Mmin,          MAG_MIN,         float,      minimum accepted mag,                  mags
    2428FIELD  Mmax,          MAG_MAX,         float,      maximum accepted mag,                  mags

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

    r40211 r40212  
    235235
    236236  if (mode & SECFILT_RESET_CHIP) {
    237     secfilt->M           = NAN;
    238     secfilt->dM          = NAN;
    239     secfilt->Map         = NAN;
    240     secfilt->dMap        = NAN;
    241     secfilt->sMap        = NAN;
    242     secfilt->Mkron       = NAN;
    243     secfilt->dMkron      = NAN;
    244     secfilt->sMkron      = NAN;
     237    secfilt->MpsfChp     = NAN;
     238    secfilt->dMpsfChp    = NAN;
     239    secfilt->sMpsfChp    = NAN;
     240    secfilt->MapChp      = NAN;
     241    secfilt->dMapChp     = NAN;
     242    secfilt->sMapChp     = NAN;
     243    secfilt->MkronChp    = NAN;
     244    secfilt->dMkronChp   = NAN;
     245    secfilt->sMkronChp   = NAN;
    245246
    246247    secfilt->psfQfMax     = NAN;
    247248    secfilt->psfQfPerfMax = NAN;
    248249
    249     secfilt->Mstdev      = NAN;
    250250    secfilt->Mmin        = NAN;
    251251    secfilt->Mmax        = NAN;
    … …  
    923923    for (in = out = i = 0; i < catalog[0].Naverage; i++) {
    924924      for (j = 0; j < catalog[0].Nsecfilt; j++, in++, out++) {
    925         outsec[out].M      = insec[in].M;
    926         outsec[out].dM     = insec[in].dM;
    927         outsec[out].Mchisq = insec[in].Mchisq;
     925        outsec[out].MpsfChp  = insec[in].MpsfChp;
     926        outsec[out].dMpsfChp = insec[in].dMpsfChp;
     927        outsec[out].Mchisq   = insec[in].Mchisq;
    928928      }
    929929      for (j = 0; j < Nextra; j++, out++) {
    930         outsec[out].M      = NAN;
    931         outsec[out].dM    = NAN;
    932         outsec[out].Mchisq = NAN;
     930        outsec[out].MpsfChp  = NAN;
     931        outsec[out].dMpsfChp = NAN;
     932        outsec[out].Mchisq   = NAN;
    933933      }
    934934    }

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

    r40210 r40212  
    182182    dvo_secfilt_init (&out[i], SECFILT_RESET_ALL);
    183183
    184     out[i].M     = in[i].M;     
    185     out[i].dM    = in[i].dM;     
     184    out[i].MpsfChp     = in[i].M;     
     185    out[i].dMpsfChp    = in[i].dM;     
     186
    186187    out[i].Mchisq= pow (10.0, 0.01*in[i].Xm);     
    187188    out[i].Ncode = in[i].Ncode;
    … …  
    199200
    200201  for (i = 0; i < Nvalues; i++) {
    201     out[i].M     = in[i].M;     
    202     out[i].dM    = in[i].dM;     
     202    out[i].M             = in[i].MpsfChp;     
     203    out[i].dM            = in[i].dMpsfChp;     
     204
    203205    out[i].Xm    = 100.0*log10(in[i].Mchisq);     
    204206    out[i].Ncode = in[i].Ncode;

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

    r40210 r40212  
    177177    dvo_secfilt_init (&out[i], SECFILT_RESET_ALL);
    178178
    179     out[i].M     = in[i].M;     
    180     out[i].dM    = in[i].dM;     
     179    out[i].MpsfChp     = in[i].M;     
     180    out[i].dMpsfChp    = in[i].dM;     
     181
    181182    out[i].Mchisq= pow (10.0, 0.01*in[i].Xm);     
    182183    out[i].Ncode = in[i].Ncode;
    … …  
    194195
    195196  for (i = 0; i < Nvalues; i++) {
    196     out[i].M     = in[i].M;     
    197     out[i].dM    = in[i].dM;     
     197    out[i].M             = in[i].MpsfChp;     
     198    out[i].dM            = in[i].dMpsfChp;     
     199
    198200    out[i].Xm    = 100.0*log10(in[i].Mchisq);     
    199201    out[i].Ncode = in[i].Ncode;

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

    r40210 r40212  
    114114    dvo_secfilt_init (&out[i], SECFILT_RESET_ALL);
    115115
    116     out[i].M     = in[i].M;     
    117     out[i].dM    = in[i].dM;     
     116    out[i].MpsfChp     = in[i].M;     
     117    out[i].dMpsfChp    = in[i].dM;     
    118118 }
    119119  return (out);
    … …  
    128128
    129129  for (i = 0; i < Nvalues; i++) {
    130     out[i].M     = in[i].M;     
    131     out[i].dM    = in[i].dM;     
     130    out[i].M             = in[i].MpsfChp;     
     131    out[i].dM            = in[i].dMpsfChp;     
    132132  }
    133133  return (out);

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

    r40210 r40212  
    199199    dvo_secfilt_init (&out[i], SECFILT_RESET_ALL);
    200200
    201     out[i].M             = in[i].M;     
    202     out[i].dM            = in[i].dM;     
     201    out[i].MpsfChp     = in[i].M;     
     202    out[i].dMpsfChp    = in[i].dM;     
     203
    203204    out[i].Ncode         = in[i].Ncode;
    204205    out[i].Nused         = in[i].Nused;
    … …  
    217218  for (i = 0; i < Nvalues; i++) {
    218219
    219     out[i].M             = in[i].M;     
    220     out[i].dM            = in[i].dM;     
     220    out[i].M             = in[i].MpsfChp;     
     221    out[i].dM            = in[i].dMpsfChp;     
     222
    221223    out[i].Ncode         = in[i].Ncode;
    222224    out[i].Nused         = in[i].Nused;

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

    r40210 r40212  
    197197    dvo_secfilt_init (&out[i], SECFILT_RESET_ALL);
    198198
    199     out[i].M     = in[i].M;     
    200     out[i].dM    = in[i].dM;     
     199    out[i].MpsfChp     = in[i].M;     
     200    out[i].dMpsfChp    = in[i].dM;     
     201
    201202    out[i].Mchisq= in[i].Mchisq;     
    202203    out[i].Ncode = in[i].Ncode;
    … …  
    216217
    217218  for (i = 0; i < Nvalues; i++) {
    218     out[i].M     = in[i].M;     
    219     out[i].dM    = in[i].dM;     
     219    out[i].M             = in[i].MpsfChp;     
     220    out[i].dM            = in[i].dMpsfChp;     
     221
    220222    out[i].Mchisq= in[i].Mchisq;     
    221223    out[i].Ncode = in[i].Ncode;

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

    r40210 r40212  
    206206    dvo_secfilt_init (&out[i], SECFILT_RESET_ALL);
    207207
    208     out[i].M     = in[i].M;     
    209     out[i].dM    = in[i].dM;     
     208    out[i].MpsfChp     = in[i].M;     
     209    out[i].dMpsfChp    = in[i].dM;     
     210
    210211    out[i].Mchisq= in[i].Mchisq;     
    211212    out[i].flags = in[i].flags;     
    … …  
    226227
    227228  for (i = 0; i < Nvalues; i++) {
    228     out[i].M     = in[i].M;     
    229     out[i].dM    = in[i].dM;     
     229    out[i].M             = in[i].MpsfChp;     
     230    out[i].dM            = in[i].dMpsfChp;     
     231
    230232    out[i].Mchisq= in[i].Mchisq;     
    231233    out[i].flags = in[i].flags;     

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

    r40210 r40212  
    210210    dvo_secfilt_init (&out[i], SECFILT_RESET_ALL);
    211211
    212     out[i].M           = in[i].M;     
    213     out[i].Map         = in[i].Map;     
    214     out[i].dM          = in[i].dM;     
     212    out[i].MpsfChp     = in[i].M;     
     213    out[i].sMpsfChp    = in[i].Mstdev;     
     214    out[i].dMpsfChp    = in[i].dM;     
     215    out[i].MapChp      = in[i].Map;     
     216
    215217    out[i].Mchisq      = in[i].Mchisq;     
    216218    out[i].flags       = in[i].flags;     
    … …  
    219221    out[i].Mmin        = in[i].M_20*0.001;     
    220222    out[i].Mmax        = in[i].M_80*0.001;     
    221     out[i].Mstdev      = in[i].Mstdev;     
    222223    out[i].ubercalDist = in[i].ubercalDist;     
    223224 }
    … …  
    233234
    234235  for (i = 0; i < Nvalues; i++) {
    235     out[i].M           = in[i].M;     
    236     out[i].Map         = in[i].Map;     
    237     out[i].dM          = in[i].dM;     
     236    out[i].M             = in[i].MpsfChp;     
     237    out[i].dM            = in[i].dMpsfChp;     
     238    out[i].Mstdev        = in[i].sMpsfChp;     
     239    out[i].Map           = in[i].MapChp;     
     240
    238241    out[i].Mchisq      = in[i].Mchisq;     
    239242    out[i].flags       = in[i].flags;     
    … …  
    242245    out[i].M_20        = in[i].Mmin*1000.0;     
    243246    out[i].M_80        = in[i].Mmax*1000.0;     
    244     out[i].Mstdev      = in[i].Mstdev;     
    245247    out[i].ubercalDist = in[i].ubercalDist;     
    246248  }

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

    r40210 r40212  
    234234    dvo_secfilt_init (&out[i], SECFILT_RESET_ALL);
    235235
    236     out[i].M             = in[i].M;     
    237     out[i].Map           = in[i].Map;     
    238     out[i].Mkron         = in[i].Mkron;     
    239     out[i].dMkron        = in[i].dMkron;     
    240     out[i].dM            = in[i].dM;     
     236    out[i].MpsfChp       = in[i].M;     
     237    out[i].sMpsfChp      = in[i].Mstdev;     
     238    out[i].dMpsfChp      = in[i].dM;     
     239    out[i].MapChp        = in[i].Map;     
     240    out[i].MkronChp      = in[i].Mkron;     
     241
    241242    out[i].Mchisq        = in[i].Mchisq;     
    242243    out[i].FpsfStk       = in[i].FluxPSF;
    … …  
    249250    out[i].Mmin          = in[i].M_20*0.001;     
    250251    out[i].Mmax          = in[i].M_80*0.001;     
    251     out[i].Mstdev        = in[i].Mstdev;     
    252252    out[i].ubercalDist   = in[i].ubercalDist;     
    253253    out[i].stackPrmryOff = in[i].stackPrmryOff;     
    … …  
    265265
    266266  for (i = 0; i < Nvalues; i++) {
    267     out[i].M             = in[i].M;     
    268     out[i].Map           = in[i].Map;     
    269     out[i].Mkron         = in[i].Mkron;     
    270     out[i].dMkron        = in[i].dMkron;     
    271     out[i].dM            = in[i].dM;     
     267    out[i].M             = in[i].MpsfChp;     
     268    out[i].dM            = in[i].dMpsfChp;     
     269    out[i].Mstdev        = in[i].sMpsfChp;     
     270    out[i].Map           = in[i].MapChp;     
     271    out[i].Mkron         = in[i].MkronChp;     
     272
    272273    out[i].Mchisq        = in[i].Mchisq;
    273274    out[i].FluxPSF       = in[i].FpsfStk;
    … …  
    280281    out[i].M_20          = in[i].Mmin*1000.0;     
    281282    out[i].M_80          = in[i].Mmax*1000.0;     
    282     out[i].Mstdev        = in[i].Mstdev;     
    283283    out[i].ubercalDist   = in[i].ubercalDist;     
    284284    out[i].stackPrmryOff = in[i].stackPrmryOff;     

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

    r40210 r40212  
    311311    dvo_secfilt_init (&out[i], SECFILT_RESET_ALL);
    312312
    313     out[i].M             = in[i].M;     
    314     out[i].dM            = in[i].dM;     
    315     out[i].Map           = in[i].Map;     
    316     out[i].dMap          = in[i].dMap;     
    317     out[i].sMap          = in[i].sMap;     
    318     out[i].Mkron         = in[i].Mkron;     
    319     out[i].dMkron        = in[i].dMkron;     
    320     out[i].sMkron        = in[i].sMkron;     
     313    out[i].MpsfChp       = in[i].M;     
     314    out[i].sMpsfChp      = in[i].Mstdev;     
     315    out[i].dMpsfChp      = in[i].dM;     
     316    out[i].MapChp        = in[i].Map;     
     317    out[i].dMapChp       = in[i].dMap;     
     318    out[i].sMapChp       = in[i].sMap;     
     319    out[i].MkronChp      = in[i].Mkron;     
     320    out[i].dMkronChp     = in[i].dMkron;     
     321    out[i].sMkronChp     = in[i].sMkron;     
    321322
    322323    out[i].psfQfMax      = in[i].psfQfMax;     
    323324    out[i].psfQfPerfMax  = in[i].psfQfPerfMax;     
    324325
    325     out[i].Mstdev        = in[i].Mstdev;     
    326326    out[i].Mmin          = in[i].Mmin;     
    327327    out[i].Mmax          = in[i].Mmax;     
    … …  
    389389  for (i = 0; i < Nvalues; i++) {
    390390
    391     out[i].M             = in[i].M;     
    392     out[i].dM            = in[i].dM;     
    393     out[i].Map           = in[i].Map;     
    394     out[i].dMap          = in[i].dMap;     
    395     out[i].sMap          = in[i].sMap;     
    396     out[i].Mkron         = in[i].Mkron;     
    397     out[i].dMkron        = in[i].dMkron;     
    398     out[i].sMkron        = in[i].sMkron;     
     391    out[i].M             = in[i].MpsfChp;     
     392    out[i].dM            = in[i].dMpsfChp;     
     393    out[i].Mstdev        = in[i].sMpsfChp;     
     394    out[i].Map           = in[i].MapChp;     
     395    out[i].dMap          = in[i].dMapChp;     
     396    out[i].sMap          = in[i].sMapChp;     
     397    out[i].Mkron         = in[i].MkronChp;     
     398    out[i].dMkron        = in[i].dMkronChp;     
     399    out[i].sMkron        = in[i].sMkronChp;     
    399400
    400401    out[i].psfQfMax      = in[i].psfQfMax;     
    401402    out[i].psfQfPerfMax  = in[i].psfQfPerfMax;     
    402403
    403     out[i].Mstdev        = in[i].Mstdev;     
    404404    out[i].Mmin          = in[i].Mmin;     
    405405    out[i].Mmax          = in[i].Mmax;     
    … …  
    15001500    dvo_secfilt_init (&out[i], SECFILT_RESET_ALL);
    15011501
    1502     out[i].M             = in[i].M;     
    1503     out[i].dM            = in[i].dM;     
    1504     out[i].Map           = in[i].Map;     
    1505     out[i].dMap          = in[i].dMap;     
    1506     out[i].sMap          = in[i].sMap;     
    1507     out[i].Mkron         = in[i].Mkron;     
    1508     out[i].dMkron        = in[i].dMkron;     
    1509 
    1510     out[i].Mstdev        = in[i].Mstdev;     
     1502    out[i].MpsfChp       = in[i].M;     
     1503    out[i].dMpsfChp      = in[i].dM;     
     1504    out[i].sMpsfChp      = in[i].Mstdev;     
     1505    out[i].MapChp        = in[i].Map;     
     1506    out[i].dMapChp       = in[i].dMap;     
     1507    out[i].sMapChp       = in[i].sMap;     
     1508    out[i].MkronChp      = in[i].Mkron;     
     1509    out[i].dMkronChp     = in[i].dMkron;     
     1510    out[i].sMkronChp     = in[i].sMkron;     
     1511
    15111512    out[i].Mmin          = in[i].Mmin;     
    15121513    out[i].Mmax          = in[i].Mmax;     

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

    r40210 r40212  
    221221    dvo_secfilt_init (&out[i], SECFILT_RESET_ALL);
    222222
    223     out[i].M             = in[i].M;     
     223    out[i].MpsfChp       = in[i].M;     
    224224    out[i].Ncode         = in[i].Ncode;
    225225    out[i].Nused         = in[i].Nused;
    … …  
    237237  for (i = 0; i < Nvalues; i++) {
    238238
    239     out[i].M             = in[i].M;     
     239    out[i].M             = in[i].MpsfChp;     
    240240    out[i].Ncode         = in[i].Ncode;
    241241    out[i].Nused         = in[i].Nused;

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

    r40210 r40212  
    311311    dvo_secfilt_init (&out[i], SECFILT_RESET_ALL);
    312312
    313     out[i].M             = in[i].M;     
    314     out[i].dM            = in[i].dM;     
    315     out[i].Map           = in[i].Map;     
    316     out[i].dMap          = in[i].dMap;     
    317     out[i].sMap          = in[i].sMap;     
    318     out[i].Mkron         = in[i].Mkron;     
    319     out[i].dMkron        = in[i].dMkron;     
    320     out[i].sMkron        = in[i].sMkron;     
     313    out[i].MpsfChp       = in[i].M;     
     314    out[i].sMpsfChp      = in[i].Mstdev;     
     315    out[i].dMpsfChp      = in[i].dM;     
     316    out[i].MapChp        = in[i].Map;     
     317    out[i].dMapChp       = in[i].dMap;     
     318    out[i].sMapChp       = in[i].sMap;     
     319    out[i].MkronChp      = in[i].Mkron;     
     320    out[i].dMkronChp     = in[i].dMkron;     
     321    out[i].sMkronChp     = in[i].sMkron;     
    321322
    322323    out[i].psfQfMax      = in[i].psfQfMax;     
    323324    out[i].psfQfPerfMax  = in[i].psfQfPerfMax;     
    324325
    325     out[i].Mstdev        = in[i].Mstdev;     
    326326    out[i].Mmin          = in[i].Mmin;     
    327327    out[i].Mmax          = in[i].Mmax;     
    … …  
    389389  for (i = 0; i < Nvalues; i++) {
    390390
    391     out[i].M             = in[i].M;     
    392     out[i].dM            = in[i].dM;     
    393     out[i].Map           = in[i].Map;     
    394     out[i].dMap          = in[i].dMap;     
    395     out[i].sMap          = in[i].sMap;     
    396     out[i].Mkron         = in[i].Mkron;     
    397     out[i].dMkron        = in[i].dMkron;     
    398     out[i].sMkron        = in[i].sMkron;     
     391    out[i].M             = in[i].MpsfChp;     
     392    out[i].dM            = in[i].dMpsfChp;     
     393    out[i].Mstdev        = in[i].sMpsfChp;     
     394    out[i].Map           = in[i].MapChp;     
     395    out[i].dMap          = in[i].dMapChp;     
     396    out[i].sMap          = in[i].sMapChp;     
     397    out[i].Mkron         = in[i].MkronChp;     
     398    out[i].dMkron        = in[i].dMkronChp;     
     399    out[i].sMkron        = in[i].sMkronChp;     
    399400
    400401    out[i].psfQfMax      = in[i].psfQfMax;     
    401402    out[i].psfQfPerfMax  = in[i].psfQfPerfMax;     
    402403
    403     out[i].Mstdev        = in[i].Mstdev;     
    404404    out[i].Mmin          = in[i].Mmin;     
    405405    out[i].Mmax          = in[i].Mmax;     

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

    r40210 r40212  
    109109
    110110    // changed for PANSTARRS_DEV_0 (moved from Average to Measure)
    111     primary[0][i].M     = (in[i].M  == NAN_S_SHORT) ? NAN : in[i].M  * 0.001;     
    112     primary[0][i].dM    = (in[i].dM == NAN_S_SHORT) ? NAN : in[i].dM * 0.001;     
     111    primary[0][i].MpsfChp  = (in[i].M  == NAN_S_SHORT) ? NAN : in[i].M  * 0.001;     
     112    primary[0][i].dMpsfChp = (in[i].dM == NAN_S_SHORT) ? NAN : in[i].dM * 0.001;     
    113113    primary[0][i].Mchisq= pow (10.0, 0.01*in[i].Xm);     
    114114
    … …  
    142142
    143143    // changed for PANSTARRS_DEV_0 (moved from Average to Measure)
    144     out[i].M       = isnan(primary[i].M)  ? NAN_S_SHORT : primary[i].M   * 1000.0;
    145     out[i].dM      = isnan(primary[i].dM) ? NAN_S_SHORT : primary[i].dM  * 1000.0;
     144    out[i].M       = isnan(primary[i].MpsfChp)  ? NAN_S_SHORT : primary[i].MpsfChp   * 1000.0;
     145    out[i].dM      = isnan(primary[i].dMpsfChp) ? NAN_S_SHORT : primary[i].dMpsfChp  * 1000.0;
    146146    out[i].Xm      = 100.0*log10(primary[i].Mchisq);     
    147147
    … …  
    172172
    173173    // added or changed for PANSTARRS_DEV_0
    174     out[i].M     = (in[i].M  == NAN_S_SHORT) ? NAN : in[i].M   * 0.001;
    175     out[i].dM    = (in[i].dM == NAN_S_SHORT) ? NAN : in[i].dM  * 0.001;
     174    out[i].MpsfChp     = (in[i].M  == NAN_S_SHORT) ? NAN : in[i].M   * 0.001;
     175    out[i].dMpsfChp    = (in[i].dM == NAN_S_SHORT) ? NAN : in[i].dM  * 0.001;
    176176  }
    177177  return (out);
    … …  
    190190
    191191    // added or changed for PANSTARRS_DEV_0
    192     out[i].M     = isnan(in[i].M)  ? NAN_S_SHORT : in[i].M   * 1000.0;
    193     out[i].dM    = isnan(in[i].dM) ? NAN_S_SHORT : in[i].dM  * 1000.0;
     192    out[i].M     = isnan(in[i].MpsfChp)  ? NAN_S_SHORT : in[i].MpsfChp   * 1000.0;
     193    out[i].dM    = isnan(in[i].dMpsfChp) ? NAN_S_SHORT : in[i].dMpsfChp  * 1000.0;
    194194  }
    195195  return (out);

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

    r40210 r40212  
    8989
    9090    // changed for PANSTARRS_DEV_0 (moved from Average to Measure)
    91     primary[0][i].M    = (in[i].M  == NAN_S_SHORT) ? NAN : in[i].M  * 0.001;     
    92     primary[0][i].Mchisq= pow (10.0, 0.01*in[i].Xm);     
     91    primary[0][i].MpsfChp = (in[i].M  == NAN_S_SHORT) ? NAN : in[i].M  * 0.001;     
     92    primary[0][i].Mchisq  = pow (10.0, 0.01*in[i].Xm);     
    9393
    9494    // added for PANSTARRS_DEV_0
    … …  
    123123
    124124    // changed for PANSTARRS_DEV_0 (moved from Average to Measure)
    125     out[i].M       = isnan(primary[i].M)  ? NAN_S_SHORT : primary[i].M   * 1000.0;
     125    out[i].M       = isnan(primary[i].MpsfChp)  ? NAN_S_SHORT : primary[i].MpsfChp   * 1000.0;
    126126    out[i].Xm      = 100.0*log10(primary[i].Mchisq);     
    127127
    … …  
    152152
    153153    // added or changed for PANSTARRS_DEV_0
    154     out[i].M    = (in[i].M  == NAN_S_SHORT) ? NAN : in[i].M * 0.001;
     154    out[i].MpsfChp = (in[i].M  == NAN_S_SHORT) ? NAN : in[i].M * 0.001;
    155155  }
    156156  return (out);
    … …  
    169169
    170170    // added or changed for PANSTARRS_DEV_0
    171     out[i].M    = isnan(in[i].M)  ? NAN_S_SHORT : in[i].M * 1000.0;
     171    out[i].M    = isnan(in[i].MpsfChp)  ? NAN_S_SHORT : in[i].MpsfChp * 1000.0;
    172172  }
    173173  return (out);

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

    r40210 r40212  
    188188    dvo_secfilt_init (&out[i], SECFILT_RESET_ALL);
    189189
    190     out[i].M     = in[i].M;     
    191     out[i].dM    = in[i].dM;     
     190    out[i].MpsfChp     = in[i].M;     
     191    out[i].dMpsfChp    = in[i].dM;     
     192
    192193    out[i].Mchisq= pow (10.0, 0.01*in[i].Xm);     
    193194    out[i].Ncode = in[i].Ncode;
    … …  
    206207
    207208  for (i = 0; i < Nvalues; i++) {
    208     out[i].M     = in[i].M;     
    209     out[i].dM    = in[i].dM;     
     209    out[i].M             = in[i].MpsfChp;     
     210    out[i].dM            = in[i].dMpsfChp;     
     211
    210212    out[i].Xm    = 100.0*log10(in[i].Mchisq);     
    211213    out[i].Ncode = in[i].Ncode;

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

    r40210 r40212  
    188188    dvo_secfilt_init (&out[i], SECFILT_RESET_ALL);
    189189
    190     out[i].M     = in[i].M;     
    191     out[i].dM    = in[i].dM;     
     190    out[i].MpsfChp     = in[i].M;     
     191    out[i].dMpsfChp    = in[i].dM;     
     192
    192193    out[i].Mchisq= pow (10.0, 0.01*in[i].Xm);     
    193194    out[i].Ncode = in[i].Ncode;
    … …  
    206207
    207208  for (i = 0; i < Nvalues; i++) {
    208     out[i].M     = in[i].M;     
    209     out[i].dM    = in[i].dM;     
     209    out[i].M             = in[i].MpsfChp;     
     210    out[i].dM            = in[i].dMpsfChp;     
     211
    210212    out[i].Xm    = 100.0*log10(in[i].Mchisq);     
    211213    out[i].Ncode = in[i].Ncode;

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

    r39670 r40212  
    479479      switch (class) {
    480480        case MAG_CLASS_PSF:
    481           Mave = secfilt[Ns].M;
     481          Mave = secfilt[Ns].MpsfChp;
    482482          break;
    483483        case MAG_CLASS_KRON:
    484           Mave = secfilt[Ns].Mkron;
     484          Mave = secfilt[Ns].MkronChp;
    485485          break;
    486486        case MAG_CLASS_APER:
    487           Mave = secfilt[Ns].Map;
     487          Mave = secfilt[Ns].MapChp;
    488488          break;
    489489        default:
    … …  
    592592      switch (class) {
    593593        case MAG_CLASS_PSF:
    594           dMave = secfilt[Ns].dM;
     594          dMave = secfilt[Ns].dMpsfChp;
    595595          break;
    596596        case MAG_CLASS_KRON:
    597           dMave = secfilt[Ns].dMkron;
     597          dMave = secfilt[Ns].dMkronChp;
    598598          break;
    599599        case MAG_CLASS_APER:
    600           dMave = secfilt[Ns].dMap;
     600          dMave = secfilt[Ns].dMapChp;
    601601          break;
    602602        default:
    … …  
    677677    Ns2 = photcodes[0].hashNsec[code[0].c2];
    678678 
    679     m1 = (Ns1 == -1) ? NAN : secfilt[Ns1].M;
    680     m2 = (Ns2 == -1) ? NAN : secfilt[Ns2].M;
     679    m1 = (Ns1 == -1) ? NAN : secfilt[Ns1].MpsfChp;
     680    m2 = (Ns2 == -1) ? NAN : secfilt[Ns2].MpsfChp;
    681681    mc = (isnan(m1) || isnan(m2)) ? NAN : (m1 - m2);
    682682    return (mc);
    … …  
    694694  } else {
    695695    Ns = photcodes[0].hashNsec[color[0].code];
    696     m1 = (Ns == -1) ? NAN : secfilt[Ns].M;
     696    m1 = (Ns == -1) ? NAN : secfilt[Ns].MpsfChp;
    697697  }     
    698698
    … …  
    708708  } else {
    709709    Ns = photcodes[0].hashNsec[color[0].code];
    710     m2 = (Ns == -1) ? NAN : secfilt[Ns].M;
     710    m2 = (Ns == -1) ? NAN : secfilt[Ns].MpsfChp;
    711711  }     
    712712  mc = (isnan(m1) || isnan(m2)) ? NAN : (m1 - m2);
    … …  
    727727      switch (class) {
    728728        case MAG_CLASS_PSF:
    729           Mstdev = secfilt[Ns].Mstdev;
     729          Mstdev = secfilt[Ns].sMpsfChp;
    730730          break;
    731731        case MAG_CLASS_KRON:
    732           Mstdev = secfilt[Ns].sMkron;
     732          Mstdev = secfilt[Ns].sMkronChp;
    733733          break;
    734734        case MAG_CLASS_APER:
    735           Mstdev = secfilt[Ns].sMap;
     735          Mstdev = secfilt[Ns].sMapChp;
    736736          break;
    737737        default:
    … …  
    10401040  } else {
    10411041    Ns = photcodes[0].hashNsec[code[0].code];
    1042     M1 = (Ns == -1) ? NAN : secfilt[Ns].M;
     1042    M1 = (Ns == -1) ? NAN : secfilt[Ns].MpsfChp;
    10431043  }     
    10441044
    … …  
    10561056  } else {
    10571057    Ns = photcodes[0].hashNsec[code[0].code];
    1058     M2 = (Ns == -1) ? NAN : secfilt[Ns].M;
     1058    M2 = (Ns == -1) ? NAN : secfilt[Ns].MpsfChp;
    10591059  }     
    10601060 
    … …  
    12891289      switch (class) {
    12901290        case MAG_CLASS_PSF:
    1291           Fave = MagToFlux(secfilt[Ns].M - 8.9);
     1291          Fave = MagToFlux(secfilt[Ns].MpsfChp - 8.9);
    12921292          break;
    12931293        case MAG_CLASS_KRON:
    1294           Fave = MagToFlux(secfilt[Ns].Mkron - 8.9);
     1294          Fave = MagToFlux(secfilt[Ns].MkronChp - 8.9);
    12951295          break;
    12961296        case MAG_CLASS_APER:
    1297           Fave = MagToFlux(secfilt[Ns].Map - 8.9);
     1297          Fave = MagToFlux(secfilt[Ns].MapChp - 8.9);
    12981298          break;
    12991299        default:
    … …  
    13501350      switch (class) {
    13511351        case MAG_CLASS_PSF:
    1352           dFave = secfilt[Ns].dM * MagToFlux(secfilt[Ns].M - 8.9);
     1352          dFave = secfilt[Ns].dMpsfChp * MagToFlux(secfilt[Ns].MpsfChp - 8.9);
    13531353          break;
    13541354        case MAG_CLASS_KRON:
    1355           dFave = secfilt[Ns].dMkron * MagToFlux(secfilt[Ns].Mkron - 8.9);
     1355          dFave = secfilt[Ns].dMkronChp * MagToFlux(secfilt[Ns].MkronChp - 8.9);
    13561356          break;
    13571357        case MAG_CLASS_APER:
    1358           dFave = secfilt[Ns].dMap * MagToFlux(secfilt[Ns].Map - 8.9);
     1358          dFave = secfilt[Ns].dMapChp * MagToFlux(secfilt[Ns].MapChp - 8.9);
    13591359          break;
    13601360        default:
    … …  
    18401840      switch (class) {
    18411841        case MAG_CLASS_PSF:
    1842           Mave = secfilt[Ns].M;
     1842          Mave = secfilt[Ns].MpsfChp;
    18431843          break;
    18441844        case MAG_CLASS_KRON:
    1845           Mave = secfilt[Ns].Mkron;
     1845          Mave = secfilt[Ns].MkronChp;
    18461846          break;
    18471847        case MAG_CLASS_APER:
    1848           Mave = secfilt[Ns].Map;
     1848          Mave = secfilt[Ns].MapChp;
    18491849          break;
    18501850        default:
    … …  
    19271927    Ns2 = photcodes[0].hashNsec[code[0].c2];
    19281928 
    1929     m1 = (Ns1 == -1) ? NAN : secfilt[Ns1].M;
    1930     m2 = (Ns2 == -1) ? NAN : secfilt[Ns2].M;
     1929    m1 = (Ns1 == -1) ? NAN : secfilt[Ns1].MpsfChp;
     1930    m2 = (Ns2 == -1) ? NAN : secfilt[Ns2].MpsfChp;
    19311931    mc = (isnan(m1) || isnan(m2)) ? NAN : (m1 - m2);
    19321932    return (mc);
    … …  
    19441944  } else {
    19451945    Ns = photcodes[0].hashNsec[color[0].code];
    1946     m1 = (Ns == -1) ? NAN : secfilt[Ns].M;
     1946    m1 = (Ns == -1) ? NAN : secfilt[Ns].MpsfChp;
    19471947  }     
    19481948
    … …  
    19581958  } else {
    19591959    Ns = photcodes[0].hashNsec[color[0].code];
    1960     m2 = (Ns == -1) ? NAN : secfilt[Ns].M;
     1960    m2 = (Ns == -1) ? NAN : secfilt[Ns].MpsfChp;
    19611961  }     
    19621962  mc = (isnan(m1) || isnan(m2)) ? NAN : (m1 - m2);
    … …  
    19731973
    19741974  Ns = photcodes[0].hashNsec[code[0].code];
    1975   dM  = (Ns == -1) ? NAN : secfilt[Ns].dM;
     1975  dM  = (Ns == -1) ? NAN : secfilt[Ns].dMpsfChp;
    19761976  return (dM);
    19771977}
    … …  
    20102010  } else {
    20112011    Ns = photcodes[0].hashNsec[code[0].code];
    2012     M1 = (Ns == -1) ? NAN : secfilt[Ns].M;
     2012    M1 = (Ns == -1) ? NAN : secfilt[Ns].MpsfChp;
    20132013  }     
    20142014
    … …  
    20262026  } else {
    20272027    Ns = photcodes[0].hashNsec[code[0].code];
    2028     M2 = (Ns == -1) ? NAN : secfilt[Ns].M;
     2028    M2 = (Ns == -1) ? NAN : secfilt[Ns].MpsfChp;
    20292029  }     
    20302030 

  • branches/eam_branches/ohana.20170822/src/opihi/dvo/gimages.c

    r39347 r40212  
    214214    if (PixelCoords) {
    215215      gprint (GP_LOG, "%3d %5d %s %6.1f %6.1f %20s %5d %2d %4.2f %6.3f %5.3f %5.3f %4x %7d\n",
    216               Nfound, (int) i, image[i].name, X, Y, date, image[i].nstar, image[i].photcode, image[i].secz, image[i].Mcal, image[i].dMcal, image[i].exptime, image[i].flags, image[i].imageID);
     216              Nfound, (int) i, image[i].name, X, Y, date, image[i].nstar, image[i].photcode, image[i].secz, image[i].McalPSF, image[i].dMcal, image[i].exptime, image[i].flags, image[i].imageID);
    217217    } else {
    218218      XY_to_RD (&ra, &dec, 0.5*image[i].NX, 0.5*image[i].NY, &image[i].coords);
    219219      gprint (GP_LOG, "%3d %5d %s %8.4f %8.4f %20s %5d %2d %4.2f %6.3f %5.3f %5.3f %4x %7d\n",
    220               Nfound, (int) i, image[i].name, ra, dec, date, image[i].nstar, image[i].photcode, image[i].secz, image[i].Mcal, image[i].dMcal, image[i].exptime, image[i].flags, image[i].imageID);
     220              Nfound, (int) i, image[i].name, ra, dec, date, image[i].nstar, image[i].photcode, image[i].secz, image[i].McalPSF, image[i].dMcal, image[i].exptime, image[i].flags, image[i].imageID);
    221221    }
    222222    sprintf (name, "IMAGEx:%d", Nfound);

  • branches/eam_branches/ohana.20170822/src/opihi/dvo/gstar.c

    r39634 r40212  
    960960        print_double (NAN);
    961961      } else {
    962         print_double_exp (secfilt[seq].Mstdev);
     962        print_double_exp (secfilt[seq].sMpsfChp);
    963963      }
    964964      break;
    … …  
    10231023        print_double (NAN);
    10241024      } else {
    1025         print_double (secfilt[seq].M);
     1025        print_double (secfilt[seq].MpsfChp);
    10261026      }
    10271027      break;
    … …  
    10311031        print_double (NAN);
    10321032      } else {
    1033         print_double (secfilt[seq].dM);
     1033        print_double (secfilt[seq].dMpsfChp);
    10341034      }
    10351035      break;
    … …  
    10391039        print_double (NAN);
    10401040      } else {
    1041         print_double (secfilt[seq].Map);
     1041        print_double (secfilt[seq].MapChp);
    10421042      }
    10431043      break;
    … …  
    10471047        print_double (NAN);
    10481048      } else {
    1049         print_double (secfilt[seq].dMap);
     1049        print_double (secfilt[seq].dMapChp);
    10501050      }
    10511051      break;
    … …  
    10551055        print_double (NAN);
    10561056      } else {
    1057         print_double_exp (secfilt[seq].sMap);
     1057        print_double_exp (secfilt[seq].sMapChp);
    10581058      }
    10591059      break;
    … …  
    10631063        print_double (NAN);
    10641064      } else {
    1065         print_double_exp (secfilt[seq].dMap);
     1065        print_double_exp (secfilt[seq].dMapChp);
    10661066      }
    10671067      break;
    … …  
    10711071        print_double (NAN);
    10721072      } else {
    1073         print_double (secfilt[seq].Mkron);
     1073        print_double (secfilt[seq].MkronChp);
    10741074      }
    10751075      break;
    … …  
    10791079        print_double (NAN);
    10801080      } else {
    1081         print_double (secfilt[seq].dMkron);
     1081        print_double (secfilt[seq].dMkronChp);
    10821082      }
    10831083      break;
    … …  
    10871087        print_double (NAN);
    10881088      } else {
    1089         print_double_exp (secfilt[seq].sMkron);
     1089        print_double_exp (secfilt[seq].sMkronChp);
    10901090      }
    10911091      break;
    … …  
    10951095        print_double (NAN);
    10961096      } else {
    1097         print_double_exp (secfilt[seq].dMkron);
     1097        print_double_exp (secfilt[seq].dMkronChp);
    10981098      }
    10991099      break;

  • branches/eam_branches/ohana.20170822/src/opihi/dvo/imlist.c

    r39310 r40212  
    141141    if (VERBOSE) {
    142142      gprint (GP_LOG, "%3lld %s %8lld %8.4f %8.4f %f %5d %2d %4.2f %5.3f %5.3f",
    143                          (long long) i, image[i].name, (long long) image[i].imageID, r, d, t, image[i].nstar, image[i].photcode, image[i].secz, image[i].Mcal, image[i].dMcal);
     143                         (long long) i, image[i].name, (long long) image[i].imageID, r, d, t, image[i].nstar, image[i].photcode, image[i].secz, image[i].McalPSF, image[i].dMcal);
    144144
    145145      if (showUR) {

  • branches/eam_branches/ohana.20170822/src/opihi/dvo/imphot.c

    r39233 r40212  
    6464      for (x = 0; x < 100; x+=1.0, p++) {
    6565        // *p = applyMcal (&image[subset[0]], (fx*x), (fy*y));
    66         *p = image[subset[0]].Mcal;
     66        *p = image[subset[0]].McalPSF;
    6767      }
    6868    }
    … …  
    7171  for (j = 0; j < Nsubset; j++) {
    7272    i = subset[j];
    73     gprint (GP_ERR, "%s: %f\n", image[i].name, image[i].Mcal);
     73    gprint (GP_ERR, "%s: %f\n", image[i].name, image[i].McalPSF);
    7474
    7575// XXX old code when we had the option of a 2D zero point model
    … …  
    7777    switch (image[i].order) {
    7878    case 0:
    79       gprint (GP_ERR, "%s: %d - %f\n", image[i].name, image[i].order, image[i].Mcal);
     79      gprint (GP_ERR, "%s: %d - %f\n", image[i].name, image[i].order, image[i].McalPSF);
    8080      break;
    8181    case 1:
    82       gprint (GP_ERR, "%s: %d - %f, %d %d\n", image[i].name, image[i].order, image[i].Mcal, image[i].Mx, image[i].My);
     82      gprint (GP_ERR, "%s: %d - %f, %d %d\n", image[i].name, image[i].order, image[i].McalPSF, image[i].Mx, image[i].My);
    8383      break;
    8484    case 2:
    85       gprint (GP_ERR, "%s: %d - %f, %d %d, %d %d %d\n", image[i].name, image[i].order, image[i].Mcal, image[i].Mx, image[i].My, image[i].Mxx, image[i].Mxy, image[i].Myy);
     85      gprint (GP_ERR, "%s: %d - %f, %d %d, %d %d %d\n", image[i].name, image[i].order, image[i].McalPSF, image[i].Mx, image[i].My, image[i].Mxx, image[i].Mxy, image[i].Myy);
    8686      break;
    8787    case 3:
    88       gprint (GP_ERR, "%s: %d - %f, %d %d, %d %d %d, %d %d %d %d\n", image[i].name, image[i].order, image[i].Mcal, image[i].Mx, image[i].My,
     88      gprint (GP_ERR, "%s: %d - %f, %d %d, %d %d %d, %d %d %d %d\n", image[i].name, image[i].order, image[i].McalPSF, image[i].Mx, image[i].My,
    8989               image[i].Mxx, image[i].Mxy, image[i].Myy, image[i].Mxxx, image[i].Mxxy, image[i].Mxyy, image[i].Myyy);
    9090      break;
    9191    case 4:
    92       gprint (GP_ERR, "%s: %d - %f, %d %d, %d %d %d, %d %d %d %d, %d %d %d %d %d\n", image[i].name, image[i].order, image[i].Mcal, image[i].Mx, image[i].My,
     92      gprint (GP_ERR, "%s: %d - %f, %d %d, %d %d %d, %d %d %d %d, %d %d %d %d %d\n", image[i].name, image[i].order, image[i].McalPSF, image[i].Mx, image[i].My,
    9393               image[i].Mxx, image[i].Mxy, image[i].Myy, image[i].Mxxx, image[i].Mxxy, image[i].Mxyy, image[i].Myyy,
    9494               image[i].Mxxxx, image[i].Mxxxy, image[i].Mxxyy, image[i].Mxyyy, image[i].Myyyy);

  • branches/eam_branches/ohana.20170822/src/opihi/dvo/imstats.c

    r40156 r40212  
    4141    Xvec.elements.Flt[i] = image[i].secz;
    4242    if (Mcal)
    43       Yvec.elements.Flt[i] = image[i].Mcal;
     43      Yvec.elements.Flt[i] = image[i].McalPSF;
    4444    else
    4545      Yvec.elements.Flt[i] = image[i].dMcal;
    … …  
    4747    gprint (GP_ERR, "%d %8.4f %8.4f %10d %6d  %5.3f %6.3f %6.3f\n",
    4848             i, r, d, image[i].tzero, image[i].nstar, Xvec.elements.Flt[i],
    49              image[i].Mcal, image[i].dMcal);
     49             image[i].McalPSF, image[i].dMcal);
    5050  }
    5151  if (AutoLimits) SetLimits (&Xvec, &Yvec, &graphmode);

  • branches/eam_branches/ohana.20170822/src/opihi/dvo/objectcoverage.c

    r39457 r40212  
    203203        if (catalog.secfilt[j*Nsecfilt+Nsec].Ncode < 2) { continue; }
    204204
    205         invalid = ((catalog.secfilt[j*Nsecfilt + Nsec].M < 1.0) || (isnan(catalog.secfilt[j*Nsecfilt + Nsec].M)));
     205        invalid = ((catalog.secfilt[j*Nsecfilt + Nsec].MpsfChp < 1.0) || (isnan(catalog.secfilt[j*Nsecfilt + Nsec].MpsfChp)));
    206206        if (invalid) continue;
    207207       

  • branches/eam_branches/ohana.20170822/src/opihi/dvo/paverage.c

    r40156 r40212  
    125125      while (average[i].R > Rmax) average[i].R -= 360.0;
    126126
    127       mag = secfilt[i*Nsecfilt+Nsec].M;
     127      mag = secfilt[i*Nsecfilt+Nsec].MpsfChp;
    128128      Zvec[Npts] = MIN (1.0, MAX (0.01, (mag - Mz) / Mr));
    129129      if (LimExclude && (Zvec[Npts] > 0.99)) continue;

  • branches/eam_branches/ohana.20170822/src/opihi/dvo/skycoverage.c

    r39233 r40212  
    330330              break;
    331331            case MIN_MCAL:
    332               V[ys*Nx + xs] = MIN(V[ys*Nx + xs], image[i].Mcal);
     332              V[ys*Nx + xs] = MIN(V[ys*Nx + xs], image[i].McalPSF);
    333333              break;
    334334            case MAX_MCAL:
    335               V[ys*Nx + xs] = MAX(V[ys*Nx + xs], image[i].Mcal);
     335              V[ys*Nx + xs] = MAX(V[ys*Nx + xs], image[i].McalPSF);
    336336              break;
    337337            case MIN_TIME: {

  • branches/eam_branches/ohana.20170822/src/opihi/lib.shell/evaluate_stack.c

    r40168 r40212  
    188188          snprintf (line, 512, "syntax error: invalid operand for binary operation: %s or %s\n", stack[i-1].name, stack[i-2].name);
    189189          push_error (line);
     190          if (strchr(stack[i-1].name, ':') || strchr(stack[i-2].name, ':')) {
     191            snprintf (line, 512, "syntax error: invalid operand for binary operation: %s or %s\n(Note that the : in a trinary operation must be protected by spaces)\n", stack[i-1].name, stack[i-2].name);
     192            push_error (line);
     193          }
    190194          clear_stack (&tmp_stack);
    191195          return (FALSE);

  • branches/eam_branches/ohana.20170822/src/photdbc/src/get_mags.c

    r37045 r40212  
    2020    Nlist = MAX (Nlist, catalog[0].average[i].Nm);
    2121    for (j = 0; j < Nsecfilt; j++) {
    22       catalog[0].secfilt[i*Nsecfilt+j].M  = NAN;
    23       catalog[0].secfilt[i*Nsecfilt+j].dM = NAN;
    24       catalog[0].secfilt[i*Nsecfilt+j].Mchisq = NAN;
     22      catalog[0].secfilt[i*Nsecfilt+j].MpsfChp  = NAN;
     23      catalog[0].secfilt[i*Nsecfilt+j].dMpsfChp = NAN;
     24      catalog[0].secfilt[i*Nsecfilt+j].Mchisq   = NAN;
    2525    }
    2626  }
    … …  
    5252      if (N < 1) continue;
    5353   
    54       Mval = (Nsec == -1) ? &catalog[0].average[i].M : &catalog[0].secfilt[i*Nsecfilt+Nsec].M;
     54      Mval = (Nsec == -1) ? &catalog[0].average[i].M : &catalog[0].secfilt[i*Nsecfilt+Nsec].MpsfChp;
    5555      *Mval = stats.mean;
    56       Mval = (Nsec == -1) ? &catalog[0].average[i].dM : &catalog[0].secfilt[i*Nsecfilt+Nsec].dM;
     56      Mval = (Nsec == -1) ? &catalog[0].average[i].dM : &catalog[0].secfilt[i*Nsecfilt+Nsec].dMpsfChp;
    5757      *Mval = stats.sigma;
    5858      Mval = (Nsec == -1) ? &catalog[0].average[i].Mchisq : &catalog[0].secfilt[i*Nsecfilt+Nsec].Mchisq;

  • branches/eam_branches/ohana.20170822/src/photdbc/src/join_stars.c

    r38441 r40212  
    8787
    8888    // require base star to meet certain conditions:
    89     if (isnan(secfilt[Ni*Nsecfilt + baseNsec].M)) {
     89    if (isnan(secfilt[Ni*Nsecfilt + baseNsec].MpsfChp)) {
    9090      i++;
    9191      continue;

  • branches/eam_branches/ohana.20170822/src/photdbc/src/make_subcatalog.c

    r39926 r40212  
    6363      keep = FALSE;
    6464      for (j = 0; !keep && (j < Nsecfilt); j++) {
    65         if (catalog[0].secfilt[Nsecfilt*i+j].dM < AVE_SIGMA_LIM) {
     65        if (catalog[0].secfilt[Nsecfilt*i+j].dMpsfChp < AVE_SIGMA_LIM) {
    6666          keep = TRUE;
    6767        }

  • branches/eam_branches/ohana.20170822/src/relastro/include/relastro.h

    r39926 r40212  
    215215  unsigned int stop;
    216216  off_t myImage;
    217   float Mcal;
     217  float McalPSF;
     218  float McalAPER;
    218219  float dMcal;
    219   short Xm;
     220  float McalChiSq;
    220221  float secz;
    221222  char flags;

  • branches/eam_branches/ohana.20170822/src/relastro/src/BrightCatalog.c

    r39995 r40212  
    285285    ALLOCATE (secfilt, SecFilt, Nrow);
    286286    for (i = 0; i < Nrow; i++) {
    287       secfilt[i].M      = M[i];         
    288       secfilt[i].dM    = dM[i];
    289       secfilt[i].Mchisq = Mchisq[i];
    290       secfilt[i].flags  = flags[i];
    291       secfilt[i].Ncode  = Ncode[i];
    292       secfilt[i].Nused  = Nused[i];
    293       secfilt[i].Mmin   = Mmin[i];
    294       secfilt[i].Mmax   = Mmax[i];
     287      secfilt[i].MpsfChp  = M[i];         
     288      secfilt[i].dMpsfChp = dM[i];
     289      secfilt[i].Mchisq   = Mchisq[i];
     290      secfilt[i].flags    = flags[i];
     291      secfilt[i].Ncode    = Ncode[i];
     292      secfilt[i].Nused    = Nused[i];
     293      secfilt[i].Mmin     = Mmin[i];
     294      secfilt[i].Mmax     = Mmax[i];
    295295    }
    296296    // fprintf (stderr, "loaded data for %lld secfilt\n", (long long) Nrow);
    … …  
    694694    SecFilt *secfilt = catalog->secfilt;
    695695    for (i = 0; i < Nsec; i++) {
    696       M     [i]       = secfilt[i].M      ;
    697       dM    [i]       = secfilt[i].dM     ;
    698       Mchisq[i]       = secfilt[i].Mchisq ;
    699       flags [i]       = secfilt[i].flags  ;
    700       Ncode [i]       = secfilt[i].Ncode  ;
    701       Nused [i]       = secfilt[i].Nused  ;
    702       Mmin  [i]       = secfilt[i].Mmin   ;
    703       Mmax  [i]       = secfilt[i].Mmax   ;
     696      M     [i]       = secfilt[i].MpsfChp ;
     697      dM    [i]       = secfilt[i].dMpsfChp;
     698      Mchisq[i]       = secfilt[i].Mchisq  ;
     699      flags [i]       = secfilt[i].flags   ;
     700      Ncode [i]       = secfilt[i].Ncode   ;
     701      Nused [i]       = secfilt[i].Nused   ;
     702      Mmin  [i]       = secfilt[i].Mmin    ;
     703      Mmax  [i]       = secfilt[i].Mmax    ;
    704704    }
    705705

  • branches/eam_branches/ohana.20170822/src/relastro/src/ImageOps.c

    r39926 r40212  
    431431  /**** dMcal vs airmass ****/
    432432  for (i = 0; i < Nimage; i++) {
    433     Mlist[i] = image[i].Mcal;
     433    Mlist[i] = image[i].McalPSF;
    434434    dlist[i] = image[i].dMcal;
    435435    xlist[i] = image[i].secz;
    … …  
    819819
    820820    if ((DCR_BLUE_NSEC_POS >= 0) && (DCR_BLUE_NSEC_NEG >= -1)) {
    821       ref[i].ColorBlue = catalog[c].secfilt[n*Nsecfilt + DCR_BLUE_NSEC_POS].M - catalog[c].secfilt[n*Nsecfilt + DCR_BLUE_NSEC_NEG].M;
     821      ref[i].ColorBlue = catalog[c].secfilt[n*Nsecfilt + DCR_BLUE_NSEC_POS].MpsfChp - catalog[c].secfilt[n*Nsecfilt + DCR_BLUE_NSEC_NEG].MpsfChp;
    822822    }
    823823    if ((DCR_RED_NSEC_POS >= 0) && (DCR_RED_NSEC_NEG >= -1)) {
    824       ref[i].ColorRed = catalog[c].secfilt[n*Nsecfilt + DCR_RED_NSEC_POS].M - catalog[c].secfilt[n*Nsecfilt + DCR_RED_NSEC_NEG].M;
     824      ref[i].ColorRed = catalog[c].secfilt[n*Nsecfilt + DCR_RED_NSEC_POS].MpsfChp - catalog[c].secfilt[n*Nsecfilt + DCR_RED_NSEC_NEG].MpsfChp;
    825825    }
    826826

  • branches/eam_branches/ohana.20170822/src/relastro/src/MosaicOps.c

    r39457 r40212  
    9797
    9898    /* a new mosaic, define ranges */
    99     mosaic[Nmosaic].start   = start;
    100     mosaic[Nmosaic].stop    = stop;
    101     mosaic[Nmosaic].Mcal    = 0.0;
    102     mosaic[Nmosaic].dMcal   = 0.0;
    103     mosaic[Nmosaic].Xm      = 0.0;
    104     mosaic[Nmosaic].flags   = image[i].flags;
    105     mosaic[Nmosaic].secz    = image[i].secz;
    106     mosaic[Nmosaic].coords  = image[i].coords;
    107     mosaic[Nmosaic].myImage = i;
     99    mosaic[Nmosaic].start     = start;
     100    mosaic[Nmosaic].stop      = stop;
     101    mosaic[Nmosaic].McalPSF   = 0.0;
     102    mosaic[Nmosaic].McalAPER  = 0.0;
     103    mosaic[Nmosaic].dMcal     = 0.0;
     104    mosaic[Nmosaic].McalChiSq = 0.0;
     105    mosaic[Nmosaic].flags     = image[i].flags;
     106    mosaic[Nmosaic].secz      = image[i].secz;
     107    mosaic[Nmosaic].coords    = image[i].coords;
     108    mosaic[Nmosaic].myImage   = i;
    108109
    109110    // init the mosaic_own_images array data

  • branches/eam_branches/ohana.20170822/src/relphot/include/relphot.h

    r39926 r40212  
    7777  unsigned int stop;
    7878  short photcode;
    79   float Mcal;
     79  float McalPSF;
     80  float McalAPER;
    8081  float dMcal;
    8182  float dMsys;
    82   unsigned short nFitPhotom;
    83   short Xm;
     83  float McalChiSq;
    8484  float secz;
    8585  float ubercalDist;
     86  unsigned short nFitPhotom;
    8687  unsigned int flags;
    8788  char skipCal;               // if TRUE, this mosaic is incomplete and should not be calibrated
    … …  
    201202
    202203typedef struct {
    203   float Mcal;
     204  float McalPSF;
     205  float McalAPER;
    204206  float dMcal;
    205207  float dMagSys;
    206   short Xm;
     208  float McalChiSq;
    207209  int nFitPhotom;
    208210  int flags;
    … …  
    220222
    221223typedef struct {
    222   float Mcal;
     224  float McalPSF;
     225  float McalAPER;
    223226  float dMcal;
    224227  unsigned int imageID;
    … …  
    427430float         getMgrid            PROTO((off_t meas, int cat));
    428431float         getMmos             PROTO((off_t meas, int cat));
    429 float         getMrel             PROTO((Catalog *catalog, off_t meas, int cat));
     432float         getMrel             PROTO((Catalog *catalog, off_t meas, int cat, dvoMagClassType class, dvoMagSourceType source));
    430433short         getUbercalDist      PROTO((off_t meas, int cat));
    431434float         getCenterOffset     PROTO((off_t meas, int cat, Measure *measure, unsigned int *myID));

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

    r39478 r40212  
    199199    ALLOCATE (secfilt, SecFilt, Nrow);
    200200    for (i = 0; i < Nrow; i++) {
    201       secfilt[i].M      = M[i];         
    202       secfilt[i].dM    = dM[i];
    203       secfilt[i].Mchisq = Mchisq[i];
    204       secfilt[i].flags  = flags[i];
    205       secfilt[i].Ncode  = Ncode[i];
    206       secfilt[i].Nused  = Nused[i];
    207       secfilt[i].Mmin   = Mmin[i];
    208       secfilt[i].Mmax   = Mmax[i];
     201      secfilt[i].MpsfChp  = M[i];         
     202      secfilt[i].dMpsfChp = dM[i];
     203      secfilt[i].Mchisq   = Mchisq[i];
     204      secfilt[i].flags    = flags[i];
     205      secfilt[i].Ncode    = Ncode[i];
     206      secfilt[i].Nused    = Nused[i];
     207      secfilt[i].Mmin     = Mmin[i];
     208      secfilt[i].Mmax     = Mmax[i];
    209209    }
    210210    fprintf (stderr, "loaded data for %lld secfilt\n", (long long) Nrow);
    … …  
    465465    SecFilt *secfilt = catalog->secfilt;
    466466    for (i = 0; i < Nsec; i++) {
    467       M     [i]       = secfilt[i].M      ;
    468       dM    [i]       = secfilt[i].dM     ;
    469       Mchisq[i]       = secfilt[i].Mchisq ;
    470       flags [i]       = secfilt[i].flags  ;
    471       Ncode [i]       = secfilt[i].Ncode  ;
    472       Nused [i]       = secfilt[i].Nused  ;
    473       Mmin  [i]       = secfilt[i].Mmin   ;
    474       Mmax  [i]       = secfilt[i].Mmax   ;
     467      M     [i]       = secfilt[i].MpsfChp ;
     468      dM    [i]       = secfilt[i].dMpsfChp;
     469      Mchisq[i]       = secfilt[i].Mchisq  ;
     470      flags [i]       = secfilt[i].flags   ;
     471      Ncode [i]       = secfilt[i].Ncode   ;
     472      Nused [i]       = secfilt[i].Nused   ;
     473      Mmin  [i]       = secfilt[i].Mmin    ;
     474      Mmax  [i]       = secfilt[i].Mmax    ;
    475475    }
    476476

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

    r39632 r40212  
    568568        continue;
    569569      }
    570       Mrel  = getMrel  (catalog, m, c);
     570      Mrel  = getMrel  (catalog, m, c, MAG_CLASS_PSF, MAG_SRC_CHP);
    571571      if (isnan(Mrel)) {
    572572        Nrel ++;
    … …  
    649649      Mmos  = getMmos  (m, c);
    650650      if (isnan(Mmos)) continue;
    651       Mrel  = getMrel  (catalog, m, c);
     651      Mrel  = getMrel  (catalog, m, c, MAG_CLASS_PSF, MAG_SRC_CHP);
    652652      if (isnan(Mrel)) continue;
    653653

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

    r37037 r40212  
    5858  char type[16];
    5959
    60   GET_COLUMN (Mcal,              "MCAL",           float);
     60  GET_COLUMN (McalPSF,           "MCAL_PSF",       float);
     61  GET_COLUMN (McalAPER,          "MCAL_APER",      float);
    6162  GET_COLUMN (dMcal,             "MCAL_ERR",       float);
    6263  GET_COLUMN (dMagSys,           "MCAL_SYSERR",    float);
    63   GET_COLUMN (nFitPhotom,        "NFIT",             int);
    64   GET_COLUMN (flags,             "FLAGS",            int);
    65   GET_COLUMN (ubercalDist,       "UDIST",            int);
    66   GET_COLUMN (imageID,           "ID",               int);
    67   GET_COLUMN (Xm,                "CHISQ",          short);
     64  GET_COLUMN (McalChiSq,         "MCAL_CHISQ",     float);
     65  GET_COLUMN (nFitPhotom,        "NFIT",           int);
     66  GET_COLUMN (flags,             "FLAGS",          int);
     67  GET_COLUMN (ubercalDist,       "UDIST",          int);
     68  GET_COLUMN (imageID,           "ID",             int);
    6869
    6970  // free the memory associated with the FITS files
    … …  
    7576  ALLOCATE (image_mags, ImageMag, Nrow);
    7677  for (i = 0; i < Nrow; i++) {
    77     image_mags[i].Mcal                      = Mcal       [i];
     78    image_mags[i].McalPSF                   = McalPSF    [i];
     79    image_mags[i].McalAPER                  = McalAPER   [i];
    7880    image_mags[i].dMcal                     = dMcal      [i];
    7981    image_mags[i].dMagSys                   = dMagSys    [i];
    80     image_mags[i].Xm                        = Xm         [i];
     82    image_mags[i].McalChiSq                 = McalChiSq  [i];
    8183    image_mags[i].nFitPhotom                = nFitPhotom [i];
    8284    image_mags[i].flags                     = flags      [i];
    … …  
    8688  fprintf (stderr, "loaded data for %lld images\n", (long long) Nrow);
    8789
    88   free (Mcal       );
     90  free (McalPSF    );
     91  free (McalAPER   );
    8992  free (dMcal      );
    9093  free (dMagSys    );
    91   free (Xm         );
     94  free (McalChiSq  );
    9295  free (nFitPhotom );
    9396  free (flags      );
    … …  
    121124  gfits_create_table_header (&theader, "BINTABLE", "IMAGE_MAGS");
    122125
    123   gfits_define_bintable_column (&theader, "E", "MCAL",           "cal offset",                 "magnitudes", 1.0, 0.0);
     126  gfits_define_bintable_column (&theader, "E", "MCAL_PSF",       "PSF cal offset",             "magnitudes", 1.0, 0.0);
     127  gfits_define_bintable_column (&theader, "E", "MCAL_APER",      "APER cal offset",            "magnitudes", 1.0, 0.0);
    124128  gfits_define_bintable_column (&theader, "E", "MCAL_ERR",       "cal error",                  "magnitudes", 1.0, 0.0);
    125129  gfits_define_bintable_column (&theader, "E", "MCAL_SYSERR",    "systematic error",           "magnitudes", 1.0, 0.0);
     130  gfits_define_bintable_column (&theader, "E", "MCAL_CHISQ",     "cal chisq",                  "unitless",   1.0, 0.0);
    126131  gfits_define_bintable_column (&theader, "J", "NFIT",           "number of fitted stars",     "unitless",   1.0, 0.0);
    127132  gfits_define_bintable_column (&theader, "J", "FLAGS",          "analysis flags",             "unitless",   1.0, 0.0);
    128133  gfits_define_bintable_column (&theader, "J", "UDIST",          "distance to ubercal images", "images",     1.0, 0.0);
    129134  gfits_define_bintable_column (&theader, "J", "ID",             "image ID",                   "unitless",   1.0, 0.0);
    130   gfits_define_bintable_column (&theader, "I", "CHISQ",          "cal chisq",                  "unitless",   1.0, FT_BZERO_INT16);
    131135
    132136  // generate the output array that carries the data
    133137  gfits_create_table (&theader, &ftable);
    134138
    135   float *Mcal        ;
     139  float *McalPSF     ;
     140  float *McalAPER    ;
    136141  float *dMcal       ;
    137142  float *dMagSys     ;
    138   float *Xm          ;
     143  float *McalChiSq   ;
    139144  int   *nFitPhotom  ;
    140145  int   *flags       ;
    … …  
    143148
    144149  // create intermediate storage arrays
    145   ALLOCATE (Mcal        ,         float,          Nimage_mags);
     150  ALLOCATE (McalPSF     ,         float,          Nimage_mags);
     151  ALLOCATE (McalAPER    ,         float,          Nimage_mags);
    146152  ALLOCATE (dMcal       ,         float,          Nimage_mags);
    147153  ALLOCATE (dMagSys     ,         float,          Nimage_mags);
    148   ALLOCATE (Xm          ,         float,          Nimage_mags);
     154  ALLOCATE (McalChiSq   ,         float,          Nimage_mags);
    149155  ALLOCATE (nFitPhotom  ,           int,          Nimage_mags);
    150156  ALLOCATE (flags       ,           int,          Nimage_mags);
    … …  
    154160  // assign the storage arrays
    155161  for (i = 0; i < Nimage_mags; i++) {
    156     Mcal       [i]   = image_mags[i].Mcal       ;
     162    McalPSF    [i]   = image_mags[i].McalPSF    ;
     163    McalAPER   [i]   = image_mags[i].McalAPER   ;
    157164    dMcal      [i]   = image_mags[i].dMcal      ;
    158165    dMagSys    [i]   = image_mags[i].dMagSys    ;
    159     Xm         [i]   = image_mags[i].Xm         ;
     166    McalChiSq  [i]   = image_mags[i].McalChiSq  ;
    160167    nFitPhotom [i]   = image_mags[i].nFitPhotom ;
    161168    flags      [i]   = image_mags[i].flags      ;
    … …  
    165172
    166173  // add the columns to the output array
    167   gfits_set_bintable_column (&theader, &ftable, "MCAL",           Mcal       ,         Nimage_mags);
     174  gfits_set_bintable_column (&theader, &ftable, "MCAL_PSF",       McalPSF    ,         Nimage_mags);
     175  gfits_set_bintable_column (&theader, &ftable, "MCAL_APER",      McalAPER   ,         Nimage_mags);
    168176  gfits_set_bintable_column (&theader, &ftable, "MCAL_ERR",       dMcal      ,         Nimage_mags);
    169177  gfits_set_bintable_column (&theader, &ftable, "MCAL_SYSERR",    dMagSys    ,         Nimage_mags);
    170   gfits_set_bintable_column (&theader, &ftable, "CHISQ",          Xm         ,         Nimage_mags);
     178  gfits_set_bintable_column (&theader, &ftable, "MCAL_CHISQ",     McalChiSq  ,         Nimage_mags);
    171179  gfits_set_bintable_column (&theader, &ftable, "NFIT",           nFitPhotom ,         Nimage_mags);
    172180  gfits_set_bintable_column (&theader, &ftable, "FLAGS",          flags      ,         Nimage_mags);
    … …  
    174182  gfits_set_bintable_column (&theader, &ftable, "ID",             imageID    ,         Nimage_mags);
    175183
    176   free (Mcal       );
     184  free (McalPSF    );
     185  free (McalAPER   );
    177186  free (dMcal      );
    178187  free (dMagSys    );
    179   free (Xm         );
     188  free (McalChiSq  );
    180189  free (nFitPhotom );
    181190  free (flags      );

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

    r39643 r40212  
    143143    image[i].photom_map_id = input[i].photom_map_id;
    144144    image[i].flags         = input[i].flags        ;
    145     image[i].Mcal          = input[i].Mcal         ;
     145    image[i].McalPSF       = input[i].McalPSF      ;
     146    image[i].McalAPER      = input[i].McalAPER     ;
    146147    image[i].dMcal         = input[i].dMcal        ;
    147148    image[i].tzero         = input[i].tzero        ;
    … …  
    179180    subset[i].photom_map_id = image[i].photom_map_id;
    180181    subset[i].flags         = image[i].flags        ;
    181     subset[i].Mcal          = image[i].Mcal         ;
     182    subset[i].McalPSF       = image[i].McalPSF      ;
     183    subset[i].McalAPER      = image[i].McalAPER     ;
    182184    subset[i].dMcal         = image[i].dMcal        ;
    183185    subset[i].tzero         = image[i].tzero        ;
    … …  
    443445
    444446  if (image[i].flags & IMAGE_BAD) return (NAN); 
    445   value = image[i].Mcal;
     447  value = image[i].McalPSF;
    446448
    447449  // to do this, I need to pass in the catalog and flatcorr pointers
    … …  
    470472
    471473  if (image[i].flags & IMAGE_BAD) return (NAN); 
    472   value = image[i].Mcal;
     474  value = image[i].McalPSF;
    473475
    474476  // to do this, I need to pass in the catalog and flatcorr pointers
    … …  
    483485}
    484486
    485 // returns image.Mcal - ff(x,y)
    486487short getUbercalDist (off_t meas, int cat) {
    487488
    … …  
    499500}
    500501
    501 // returns image.Mcal - ff(x,y)
    502502float getCenterOffset (off_t meas, int cat, Measure *measure, unsigned int *myID) {
    503503
    … …  
    519519}
    520520
    521 // returns image.Mcal - ff(x,y)
    522521int MatchImageName (off_t meas, int cat, char *name) {
    523522
    … …  
    542541}
    543542
    544 // returns image.Mcal - ff(x,y)
    545543int MatchImageSkycellID (off_t meas, int cat, int myTessID, int myProjectionID, int mySkycellID) {
    546544
    … …  
    563561}
    564562
    565 // returns image.Mcal - ff(x,y)
    566563int FindImageSkycellID (off_t meas, int cat, int *myTessID, int *myProjectionID, int *mySkycellID) {
    567564
    … …  
    703700          continue;
    704701      }
    705       Mrel  = getMrel  (catalog, m, c);
     702
     703      // Mrel is the average magnitude for this star.  For PS1 stacks, we have too much
     704      // PSF variability.  We need to calibrate the PSF magnitudes separately from the
     705      // Aperture-like magnitues.  (We have an option to use the kron magnitudes or the
     706      // other apertures here).  I basically need to do this analysis separately for each
     707      // magnitude type
     708
     709      Mrel  = getMrel  (catalog, m, c, MAG_CLASS_PSF, MAG_SRC_CHP);
    706710      if (isnan(Mrel)) {
    707711          Nrel ++;
    … …  
    774778    liststats_irls (refStars, Nref, &stats);
    775779# endif
    776     image[i].Mcal       = stats.mean;
     780    image[i].McalPSF    = stats.mean;
     781    image[i].McalAPER   = stats.mean;
    777782    image[i].dMcal      = stats.error;
    778783    image[i].nFitPhotom = Nref;
    779     image[i].Xm         = 100.0*log10(stats.chisq);
     784    image[i].McalChiSq  = stats.chisq;
    780785    Ncalibrated ++;
    781786
    … …  
    787792
    788793    if ((image[i].imageID == TEST_IMAGE1) || (image[i].imageID == TEST_IMAGE2)) {
    789       fprintf (stderr, "Mcal for : %s : %7.4f %7.4f\n", image[i].name, image[i].Mcal, image[i].dMcal);
     794      fprintf (stderr, "Mcal for : %s : %7.4f %7.4f\n", image[i].name, image[i].McalPSF, image[i].dMcal);
    790795    }
    791796
    792797    if (!mark && VERBOSE_IMAGE) {
    793       fprintf (stderr, "Mcal for : %s : %7.4f %7.4f\n", image[i].name, image[i].Mcal, image[i].dMcal);
     798      fprintf (stderr, "Mcal for : %s : %7.4f %7.4f\n", image[i].name, image[i].McalPSF, image[i].dMcal);
    794799    }
    795800
    796801    if (PLOTSTUFF) {
    797       fprintf (stderr, "Mcal for : %s : %7.4f %7.4f\n", image[i].name, image[i].Mcal, image[i].dMcal);
     802      fprintf (stderr, "Mcal for : %s : %7.4f %7.4f\n", image[i].name, image[i].McalPSF, image[i].dMcal);
    798803      plot_setMcal (refStars->flxlist, Nref, &stats, CLOUD_TOLERANCE);
    799804    }
    … …  
    803808    image[i].dMagSys = stats.sigma;
    804809
    805     if (image[i].Mcal < -CLOUD_TOLERANCE) {
    806       image[i].Mcal = 0.0;
     810    if (image[i].McalPSF < -CLOUD_TOLERANCE) {
     811      image[i].McalPSF = 0.0;
    807812    }
    808813
    … …  
    848853    if (FREEZE_IMAGES && isGPC1chip(image[i].photcode)) continue;
    849854
    850     mlist[N] = image[i].Mcal;
     855    mlist[N] = image[i].McalPSF;
    851856    slist[N] = image[i].dMcal;
    852857    dlist[N] = 1;
    … …  
    873878    mark = FALSE;
    874879    image[i].flags &= ~ID_IMAGE_PHOTOM_POOR;
    875     mark = (image[i].dMcal > MaxScatter) || (fabs(image[i].Mcal - MedOffset) > MaxOffset);
     880    mark = (image[i].dMcal > MaxScatter) || (fabs(image[i].McalPSF - MedOffset) > MaxOffset);
    876881    if (mark) {
    877882      Nmark ++;
    … …  
    961966    if (FREEZE_IMAGES && isGPC1chip(image[i].photcode)) continue;
    962967
    963     Mlist[Nplot] = image[i].Mcal;
     968    Mlist[Nplot] = image[i].McalPSF;
    964969    dlist[Nplot] = image[i].dMcal;
    965970    xlist[Nplot] = image[i].secz;
    966971    minAirmass = MIN (image[i].secz, minAirmass);
    967972    maxAirmass = MAX (image[i].secz, maxAirmass);
    968     minMcal = MIN (image[i].Mcal, minMcal);
    969     maxMcal = MAX (image[i].Mcal, maxMcal);
     973    minMcal = MIN (image[i].McalPSF, minMcal);
     974    maxMcal = MAX (image[i].McalPSF, maxMcal);
    970975    mindMcal = MIN (image[i].dMcal, mindMcal);
    971976    maxdMcal = MAX (image[i].dMcal, maxdMcal);
    … …  
    10921097    if (FREEZE_IMAGES && isGPC1chip(image[i].photcode)) continue;
    10931098
    1094     list[n] = pow (10.0, 0.01*image[i].Xm);
     1099    list[n] = image[i].McalChiSq;
    10951100    dlist[n] = 1;
    10961101    n++;
    … …  
    11251130    if (FREEZE_IMAGES && isGPC1chip(image[i].photcode)) continue;
    11261131
    1127     list[n] = image[i].Mcal;
     1132    list[n] = image[i].McalPSF;
    11281133    dlist[n] = 1;
    11291134    n++;

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

    r39478 r40212  
    6363  char type[16];
    6464
    65   GET_COLUMN (Mcal,      "MCAL",         float);
     65  GET_COLUMN (McalPSF,   "MCAL_PSF",     float);
     66  GET_COLUMN (McalAPER,  "MCAL_APER",    float);
    6667  GET_COLUMN (dMcal,     "MCAL_ERR",     float);
    6768  GET_COLUMN (imageID,   "IMAGE_ID",     int);
    … …  
    7980  ALLOCATE (image, ImageSubset, Nrow);
    8081  for (i = 0; i < Nrow; i++) {
    81     image[i].Mcal          = Mcal[i];
     82    image[i].McalPSF       = McalPSF[i];
     83    image[i].McalAPER      = McalAPER[i];
    8284    image[i].dMcal         = dMcal[i];
    8385    image[i].imageID       = imageID[i];
    … …  
    9395  fprintf (stderr, "loaded data for %lld images\n", (long long) Nrow);
    9496
    95   free (Mcal);
     97  free (McalPSF);
     98  free (McalAPER);
    9699  free (dMcal);
    97100  free (imageID);
    … …  
    151154  gfits_create_table (&theader, &ftable);
    152155
    153   float *Mcal, *dMcal;
     156  float *McalPSF, *McalAPER, *dMcal;
    154157  unsigned int *imageID, *map, *flags, *tzero;
    155158  int *tessID, *projID, *skycellID;
    … …  
    158161
    159162  // create intermediate storage arrays
    160   ALLOCATE (Mcal,      float,          Nimage);
     163  ALLOCATE (McalPSF,   float,          Nimage);
     164  ALLOCATE (McalAPER,  float,          Nimage);
    161165  ALLOCATE (dMcal,     float,          Nimage);
    162166  ALLOCATE (imageID,   unsigned int,   Nimage);
    … …  
    172176  // assign the storage arrays
    173177  for (i = 0; i < Nimage; i++) {
    174     Mcal[i]      = image[i].Mcal;
     178    McalPSF[i]   = image[i].McalPSF;
     179    McalAPER[i]  = image[i].McalAPER;
    175180    dMcal[i]     = image[i].dMcal;
    176181    imageID[i]   = image[i].imageID;
    … …  
    186191
    187192  // add the columns to the output array
    188   gfits_set_bintable_column (&theader, &ftable, "MCAL",         Mcal,      Nimage);
     193  gfits_set_bintable_column (&theader, &ftable, "MCAL_PSF",     McalPSF,   Nimage);
     194  gfits_set_bintable_column (&theader, &ftable, "MCAL_APER",    McalAPER,  Nimage);
    189195  gfits_set_bintable_column (&theader, &ftable, "MCAL_ERR",     dMcal,     Nimage);
    190196  gfits_set_bintable_column (&theader, &ftable, "IMAGE_ID",     imageID,   Nimage);
    … …  
    198204  gfits_set_bintable_column (&theader, &ftable, "UBERCAL_DIST", ucdist,    Nimage);
    199205
    200   free (Mcal);
     206  free (McalPSF);
     207  free (McalAPER);
    201208  free (dMcal);
    202209  free (imageID);

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

    r39632 r40212  
    111111   
    112112    /* a new mosaic, define ranges -- preserve the original values incase this image is not used */
    113     mosaic[Nmosaic].start  = start;
    114     mosaic[Nmosaic].stop   = stop;
    115     mosaic[Nmosaic].Mcal   = 0.0; // note : mosaic stores only offsets relative to the original image values
    116     mosaic[Nmosaic].dMcal  = 0.0; // note : at the end, mosaic.Mcal is added back to the input images
    117     mosaic[Nmosaic].dMsys  = 0.0;
    118     mosaic[Nmosaic].Xm = 0.0;
    119     mosaic[Nmosaic].flags  = image[i].flags;
    120     mosaic[Nmosaic].secz   = image[i].secz;
    121     mosaic[Nmosaic].photcode = GetPhotcodeEquivCodebyCode (image[i].photcode);
     113    mosaic[Nmosaic].start     = start;
     114    mosaic[Nmosaic].stop      = stop;
     115    mosaic[Nmosaic].McalPSF   = 0.0; // note : at the end, mosaic.Mcal is added back to the input images
     116    mosaic[Nmosaic].McalAPER  = 0.0; // note : mosaic stores only offsets relative to the original image values
     117    mosaic[Nmosaic].dMcal     = 0.0; // note : at the end, mosaic.Mcal is added back to the input images
     118    mosaic[Nmosaic].dMsys     = 0.0;
     119    mosaic[Nmosaic].McalChiSq = 0.0;// NAN or 0.0?
     120    mosaic[Nmosaic].flags     = image[i].flags;
     121    mosaic[Nmosaic].secz      = image[i].secz;
     122    mosaic[Nmosaic].photcode  = GetPhotcodeEquivCodebyCode (image[i].photcode);
    122123
    123124    // XXX do we need to do something about flag consistency across a mosaic?
    … …  
    208209  for (i = 0; i < Nmosaic; i++) {
    209210    /* a new mosaic, define ranges */
    210     mosaic[i].start    = startTimesMosaic[i];
    211     mosaic[i].stop     = 0;
    212     mosaic[i].Mcal     = 0.0;
    213     mosaic[i].dMcal    = 0.0;
    214     mosaic[i].dMsys    = 0.0;
    215     mosaic[i].Xm       = 0.0;
    216     mosaic[i].flags    = 0;
    217     mosaic[i].secz     = NAN;
    218     mosaic[i].photcode = 0;
    219     mosaic[i].skipCal  = FALSE;
     211    mosaic[i].start     = startTimesMosaic[i];
     212    mosaic[i].stop      = 0;
     213    mosaic[i].McalPSF   = 0.0; // note : at the end, mosaic.Mcal is added back to the input images
     214    mosaic[i].McalAPER  = 0.0; // note : mosaic stores only offsets relative to the original image values
     215    mosaic[i].dMcal     = 0.0; // note : at the end, mosaic.Mcal is added back to the input images
     216    mosaic[i].dMsys     = 0.0;
     217    mosaic[i].McalChiSq = 0.0;// NAN or 0.0?
     218    mosaic[i].flags     = 0;
     219    mosaic[i].secz      = NAN;
     220    mosaic[i].photcode  = 0;
     221    mosaic[i].skipCal   = FALSE;
    220222   
    221223    memset (&mosaic[i].coords, 0, sizeof(Coords));
    … …  
    294296      abort();
    295297    }
    296     mosaic[j].stop     = stop;
    297     mosaic[j].Mcal     = 0.0;
    298     mosaic[j].dMcal    = 0.0;
    299     mosaic[j].Xm       = 0.0;
    300     mosaic[j].dMsys    = subset[i].flags;
    301     mosaic[j].flags    = subset[i].flags;
    302     mosaic[j].secz     = subset[i].secz;
    303     mosaic[j].photcode = GetPhotcodeEquivCodebyCode (subset[i].photcode);
     298    mosaic[j].stop      = stop;
     299
     300    mosaic[j].McalPSF   = 0.0;
     301    mosaic[j].McalAPER  = 0.0;
     302    mosaic[j].dMcal     = 0.0;
     303    mosaic[j].McalChiSq = 0.0;
     304
     305    mosaic[j].dMsys     = subset[i].flags;
     306    mosaic[j].flags     = subset[i].flags;
     307    mosaic[j].secz      = subset[i].secz;
     308    mosaic[j].photcode  = GetPhotcodeEquivCodebyCode (subset[i].photcode);
    304309  }
    305310
    … …  
    377382  // init the mosaic array values
    378383  for (i = 0; i < Nmosaic; i++) {
    379     mosaic[i].start    = startTimesMosaic[i];
    380     mosaic[i].stop     = 0;
    381     mosaic[i].Mcal     = 0.0;
    382     mosaic[i].dMcal    = 0.0;
    383     mosaic[i].dMsys    = 0.0;
    384     mosaic[i].Xm       = 0.0;
    385     mosaic[i].flags    = 0;
    386     mosaic[i].secz     = NAN;
    387     mosaic[i].photcode = 0;
    388     mosaic[i].skipCal  = FALSE;
     384    mosaic[i].start     = startTimesMosaic[i];
     385    mosaic[i].stop      = 0;
     386    mosaic[i].McalPSF   = 0.0; // note : at the end, mosaic.Mcal is added back to the input images
     387    mosaic[i].McalAPER  = 0.0; // note : mosaic stores only offsets relative to the original image values
     388    mosaic[i].dMcal     = 0.0; // note : at the end, mosaic.Mcal is added back to the input images
     389    mosaic[i].dMsys     = 0.0;
     390    mosaic[i].McalChiSq = 0.0;// NAN or 0.0?
     391    mosaic[i].flags     = 0;
     392    mosaic[i].secz      = NAN;
     393    mosaic[i].photcode  = 0;
     394    mosaic[i].skipCal   = FALSE;
    389395   
    390396    memset (&mosaic[i].coords, 0, sizeof(Coords));
    … …  
    438444    }
    439445    mosaic[j].stop     = stop;
    440     mosaic[j].Mcal     = 0.0;
    441     mosaic[j].dMcal    = 0.0;
    442     mosaic[j].Xm       = 0.0;
    443     mosaic[j].dMsys    = image[i].flags;
    444     mosaic[j].flags    = image[i].flags;
    445     mosaic[j].secz     = image[i].secz;
    446     mosaic[j].photcode = GetPhotcodeEquivCodebyCode (image[i].photcode);
     446    mosaic[j].McalPSF   = 0.0;
     447    mosaic[j].McalAPER  = 0.0;
     448    mosaic[j].dMcal     = 0.0;
     449    mosaic[j].McalChiSq = 0.0;
     450    mosaic[j].dMsys     = image[i].flags;
     451    mosaic[j].flags     = image[i].flags;
     452    mosaic[j].secz      = image[i].secz;
     453    mosaic[j].photcode  = GetPhotcodeEquivCodebyCode (image[i].photcode);
    447454  }
    448455  MARKTIME("assign images to mosaic: %f sec\n", dtime);
    … …  
    594601    mosaic[i].coords.cdelt2 = 1.0 / 3600.0;
    595602
    596     mosaic[i].Mcal   = 0.0;
    597     mosaic[i].dMcal  = 0.0;
    598     mosaic[i].Xm     = 0.0;
     603    mosaic[i].McalPSF   = 0.0;
     604    mosaic[i].McalAPER  = 0.0;
     605    mosaic[i].dMcal     = 0.0;
     606    mosaic[i].dMsys     = 0.0;
     607    mosaic[i].McalChiSq = 0.0;
    599608  }
    600609  return;
    … …  
    612621  double dS, dX, dY;
    613622  double R, D, Rmin, Rmax, Dmin, Dmax;
    614   double Mcal, dMcal, Xm;
     623  double McalPSF, McalAPER, dMcal, McalChiSq;
    615624
    616625  fprintf (stderr, "*** moving Mcal from image.Mcal to mosaic.Mcal ***\n");
    … …  
    621630    Dmax = Rmax = -360.0;
    622631    dS = 0.0;
    623     Mcal = dMcal = Xm = 0;
     632    McalPSF = McalAPER = dMcal = McalChiSq = 0;
    624633    for (j = 0; j < MosaicN_Image[i]; j++) {
    625634      m = MosaicToImage[i][j];
    … …  
    678687      // if it helps, note that ubercal uses a single zp per exposure, so the mean of those values is the same as the value
    679688
    680       Mcal  += image[m].Mcal;
    681       dMcal += image[m].dMcal;
    682       Xm    += image[m].Xm;
    683 
    684       image[m].Mcal   = 0.0;
    685       image[m].dMcal  = NAN;
    686       image[m].Xm     = NAN_S_SHORT;
     689      McalPSF   += image[m].McalPSF;
     690      McalAPER  += image[m].McalAPER;
     691      dMcal     += image[m].dMcal;
     692      McalChiSq += image[m].McalChiSq;
     693
     694      image[m].McalPSF   = 0.0;
     695      image[m].McalAPER  = 0.0;
     696      image[m].dMcal     = NAN;
     697      image[m].McalChiSq = NAN;
    687698    }
    688699    dS /= MosaicN_Image[i];
    … …  
    696707    RD_to_XY (&dX, &dY, Rmax, Dmax, &mosaic[i].coords);
    697708
    698     mosaic[i].Mcal   = Mcal / MosaicN_Image[i];
    699     mosaic[i].dMcal  = dMcal / MosaicN_Image[i];
    700     mosaic[i].Xm     = Xm / MosaicN_Image[i];
     709    mosaic[i].McalPSF   = McalPSF / MosaicN_Image[i];
     710    mosaic[i].McalAPER  = McalAPER / MosaicN_Image[i];
     711    mosaic[i].dMcal     = dMcal / MosaicN_Image[i];
     712    mosaic[i].McalChiSq = McalChiSq / MosaicN_Image[i];
    701713  }
    702714  if (!USE_GRID) return;
    … …  
    724736    for (j = 0; j < MosaicN_Image[i]; j++) {
    725737      im = MosaicToImage[i][j];
    726       image[im].Mcal += mosaic[i].Mcal;
    727       image[im].dMcal = mosaic[i].dMcal;
    728       image[im].Xm = mosaic[i].Xm;
     738      image[im].McalPSF    += mosaic[i].McalPSF;
     739      image[im].McalAPER   += mosaic[i].McalAPER;
     740      image[im].dMcal       = mosaic[i].dMcal;
     741      image[im].McalChiSq   = mosaic[i].McalChiSq;
    729742      image[im].ubercalDist = mosaic[i].ubercalDist;
    730       image[im].dMagSys = mosaic[i].dMsys;
    731       image[im].nFitPhotom = mosaic[i].nFitPhotom;
    732       image[im].flags |= (mosaic[i].flags & ID_IMAGE_PHOTOM_FEW);
    733       image[im].flags |= (mosaic[i].flags & ID_IMAGE_PHOTOM_POOR);
    734     }
    735     mosaic[i].Mcal = 0.0;
     743      image[im].dMagSys     = mosaic[i].dMsys;
     744      image[im].nFitPhotom  = mosaic[i].nFitPhotom;
     745      image[im].flags      |= (mosaic[i].flags & ID_IMAGE_PHOTOM_FEW);
     746      image[im].flags      |= (mosaic[i].flags & ID_IMAGE_PHOTOM_POOR);
     747    }
     748    mosaic[i].McalPSF  = 0.0;
     749    mosaic[i].McalAPER = 0.0;
    736750  }     
    737751}
    … …  
    886900
    887901  if (mosaic[i].flags & IMAGE_BAD) return (NAN); 
    888   value = mosaic[i].Mcal;
     902  value = mosaic[i].McalPSF;
    889903  return (value);
    890904}
    … …  
    11301144    off_t c = MosaicToCatalog[Nmos][j];
    11311145     
     1146    // NOTE : we are only using Mcal == McalPSF in this function; we set McalAPER to McalPSF
    11321147    if (fout) {
    11331148      Mcal  = getMcal  (m, c, flatcorr, catalog);
    11341149      Mgrid = getMgrid (m, c);
    1135       Mrel  = getMrel  (catalog, m, c);
     1150      Mrel  = getMrel  (catalog, m, c, MAG_CLASS_PSF, MAG_SRC_CHP);
    11361151      Mflat = getMflat (m, c, flatcorr, catalog);
    11371152
    … …  
    11601175      continue;
    11611176    }
    1162     Mrel  = getMrel  (catalog, m, c);
     1177    Mrel  = getMrel  (catalog, m, c, MAG_CLASS_PSF, MAG_SRC_CHP);
    11631178    if (isnan(Mrel)) {
    11641179      info->Nrel ++;
    … …  
    12261241  if (VERBOSE2 && info->PoorImages) fprintf (stderr, "Mmos: %f %f %d %d\n", stats.mean, stats.sigma, stats.Nmeas, N);
    12271242
    1228   myMosaic[0].Mcal  = stats.mean;
    1229   myMosaic[0].dMcal = stats.error;
     1243  // for now, I have no reason to measure these separately for camera-level images
     1244  myMosaic[0].McalPSF    = stats.mean;
     1245  myMosaic[0].McalAPER   = stats.mean;
     1246  myMosaic[0].dMcal      = stats.error;
     1247  myMosaic[0].McalChiSq  = stats.chisq;
    12301248  myMosaic[0].nFitPhotom = N;
    1231   myMosaic[0].Xm    = 100.0*log10(stats.chisq);
    12321249
    12331250  if (testImage) {
    … …  
    12441261  myMosaic[0].dMsys = stats.sigma;
    12451262
    1246   if (myMosaic[0].Mcal < -CLOUD_TOLERANCE) {
    1247     myMosaic[0].Mcal = 0.0;
     1263  if (myMosaic[0].McalPSF < -CLOUD_TOLERANCE) {
     1264    myMosaic[0].McalPSF = 0.0;
    12481265  }
    12491266
    12501267  if (testImage) {
    1251     fprintf (stderr, "%f %f  :  %f\n", myMosaic[0].Mcal, myMosaic[0].dMsys, pow (10.0, 0.01*myMosaic[0].Xm));
     1268    fprintf (stderr, "%f %f  :  %f\n", myMosaic[0].McalPSF, myMosaic[0].dMsys, myMosaic[0].McalChiSq);
    12521269  }
    12531270
    … …  
    14271444    imageOffset[i] = 0.0;
    14281445
    1429     if (VERBOSE2 && (fabs(mosaic[i].Mcal) < CLOUD_TOLERANCE)) {
    1430       fprintf (stderr, "cloud-free: %s : %f\n", image[MosaicToImage[i][0]].name, mosaic[i].Mcal);
     1446    if (VERBOSE2 && (fabs(mosaic[i].McalPSF) < CLOUD_TOLERANCE)) {
     1447      fprintf (stderr, "cloud-free: %s : %f\n", image[MosaicToImage[i][0]].name, mosaic[i].McalPSF);
    14311448    }
    1432     if (VERBOSE2 && (mosaic[i].Mcal < -CLOUD_TOLERANCE)) {
    1433       imageOffset[i] = -mosaic[i].Mcal;
    1434       // NOTE the negative sign: down below, we are going to add in the negative of Mcal
     1449    if (VERBOSE2 && (mosaic[i].McalPSF < -CLOUD_TOLERANCE)) {
     1450      imageOffset[i] = -mosaic[i].McalPSF;
     1451      // NOTE the negative sign: down below, we are going to add in the negative of McalPSF
    14351452      // to this image, and the propagated mean values for other images
    1436       fprintf (stderr, "anti-clouds: %s : %f\n", image[MosaicToImage[i][0]].name, mosaic[i].Mcal);
     1453      fprintf (stderr, "anti-clouds: %s : %f\n", image[MosaicToImage[i][0]].name, mosaic[i].McalPSF);
    14371454    }
    1438     if (VERBOSE2 && (mosaic[i].Mcal > CLOUD_TOLERANCE)) {
    1439       fprintf (stderr, "cloudy    : %s : %f\n", image[MosaicToImage[i][0]].name, mosaic[i].Mcal);
     1455    if (VERBOSE2 && (mosaic[i].McalPSF > CLOUD_TOLERANCE)) {
     1456      fprintf (stderr, "cloudy    : %s : %f\n", image[MosaicToImage[i][0]].name, mosaic[i].McalPSF);
    14401457    }
    14411458  }
    … …  
    15401557    }
    15411558
    1542     // a negative cloud image (cloud: Mcal > 0; anti-clouds: Mcal < 0; imageOffset = -Mcal)
     1559    // a negative cloud image (cloud: McalPSF > 0; anti-clouds: McalPSF < 0; imageOffset = -McalPSF)
    15431560    if (imageOffset[i] > 0.0) continue;
    15441561
    … …  
    15641581  // find the images / mosaics with negative clouds and save their offset
    15651582  for (i = 0; i < Nmosaic; i++) {
    1566     mosaic[i].Mcal += imageOffset[i];
     1583    mosaic[i].McalPSF += imageOffset[i];
    15671584  }
    15681585
    … …  
    16051622    if (KEEP_UBERCAL && (mosaic[i].flags & ID_IMAGE_PHOTOM_UBERCAL)) continue;
    16061623
    1607     list[n] = mosaic[i].Mcal;
     1624    list[n] = mosaic[i].McalPSF;
    16081625    dlist[n] = 1;
    16091626    n++;
    … …  
    16811698      Mgrid = getMgrid (m, c);
    16821699      if (isnan(Mgrid)) continue;
    1683       Mrel = getMrel  (catalog, m, c);
     1700      Mrel = getMrel  (catalog, m, c, MAG_CLASS_PSF, MAG_SRC_CHP);
    16841701      if (isnan(Mrel)) continue;
    16851702      N++;
    … …  
    17191736    if (KEEP_UBERCAL && (mosaic[i].flags & ID_IMAGE_PHOTOM_UBERCAL)) continue;
    17201737
    1721     list[n]  = pow (10.0, 0.01*mosaic[i].Xm);
     1738    list[n]  = mosaic[i].McalChiSq;
    17221739    dlist[n] = 1;
    17231740    n++;
    … …  
    17511768    if (mosaic[i].flags & IMAGE_BAD) continue;
    17521769    if (mosaic[i].skipCal) continue;
    1753     mlist[N] = mosaic[i].Mcal;
     1770    mlist[N] = mosaic[i].McalPSF;
    17541771    slist[N] = mosaic[i].dMcal;
    17551772    dlist[N] = 1;
    … …  
    17811798      Nscatter ++;
    17821799    }
    1783     if (fabs(mosaic[i].Mcal - MedOffset) > MaxOffset) {
     1800    if (fabs(mosaic[i].McalPSF - MedOffset) > MaxOffset) {
    17841801      mark = TRUE;
    17851802      Noffset ++;
    … …  
    18581875
    18591876  for (i = 0; i < Nmosaic; i++) {
    1860     Mlist[i] = mosaic[i].Mcal;
     1877    Mlist[i] = mosaic[i].McalPSF;
    18611878    dlist[i] = mosaic[i].dMcal;
    18621879    xlist[i] = mosaic[i].secz;

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

    r40019 r40212  
    3434} 
    3535
    36 float getMrel (Catalog *catalog, off_t meas, int cat) {
    37 
    38   int Nsec, Nsecfilt, photcode;
    39   int ave;
    40   float value;
    41 
    42   ave = catalog[cat].measureT[meas].averef;
    43   photcode = catalog[cat].measureT[meas].photcode;
     36//
     37float getMrel (Catalog *catalog, off_t meas, int cat, dvoMagClassType class, dvoMagSourceType source) {
     38
     39  int ave = catalog[cat].measureT[meas].averef;
     40  int photcode = catalog[cat].measureT[meas].photcode;
    4441
    4542  int ecode = GetPhotcodeEquivCodebyCode (photcode);
    46   Nsec = GetPhotcodeNsec(ecode);
    47   Nsecfilt = GetPhotcodeNsecfilt ();
     43  int Nsec = GetPhotcodeNsec(ecode);
     44  int Nsecfilt = GetPhotcodeNsecfilt ();
     45
     46  int entry = Nsecfilt*ave+Nsec;
     47
     48  SecFilt *secfilt = &catalog[cat].secfilt[entry];
    4849
    4950  // is this star OK?
    50   if (catalog[cat].secfilt[Nsecfilt*ave+Nsec].flags & STAR_BAD) return (NAN); 
    51  
    52   value = catalog[cat].secfilt[Nsecfilt*ave+Nsec].M;
    53   return (value);
     51  if (secfilt->flags & STAR_BAD) return (NAN); 
     52
     53  switch (class) {
     54    case MAG_CLASS_PSF:
     55      switch (source) {
     56        case MAG_SRC_CHP:
     57          return secfilt->MpsfChp;
     58        case MAG_SRC_WRP:
     59          return secfilt->MpsfWrp;
     60        case MAG_SRC_STK:
     61          return secfilt->MpsfStk;
     62        default:
     63          return NAN;
     64      }
     65      break;
     66    case MAG_CLASS_KRON:
     67      switch (source) {
     68        case MAG_SRC_CHP:
     69          return secfilt->MkronChp;
     70        case MAG_SRC_WRP:
     71          return secfilt->MkronWrp;
     72        case MAG_SRC_STK:
     73          return secfilt->MkronStk;
     74        default:
     75          return NAN;
     76      }
     77      break;
     78    case MAG_CLASS_APER:
     79      switch (source) {
     80        case MAG_SRC_CHP:
     81          return secfilt->MapChp;
     82        case MAG_SRC_WRP:
     83          return secfilt->MapWrp;
     84        case MAG_SRC_STK:
     85          return secfilt->MapStk;
     86        default:
     87          return NAN;
     88      }
     89      break;
     90    case MAG_CLASS_NONE:
     91    case MAG_CLASS_DEV: // DeVaucouleur Model (only for galphot)
     92    case MAG_CLASS_EXP: // Exponential Model (only for galphot)
     93    case MAG_CLASS_SER: // Sersic Model (only for galphot)
     94      return NAN;
     95      break;
     96  }
     97  return NAN; // should not be able to reach here
    5498}
    5599
    … …  
    513557  if (VERBOSE) fprintf (stderr, "marking poor stars\n");
    514558
    515   /* find Xm median -> ChiSq lim must be > median */
     559  /* find Mchisq median -> ChiSq lim must be > median */
    516560  for (i = Ntot = 0; i < Ncatalog; i++) {
    517561    Ntot += catalog[i].Naverage;
    … …  
    535579        if (isnan(Mchisq)) continue;
    536580        xlist[Ntot] = Mchisq;
    537         slist[Ntot] = catalog[i].secfilt[Nsecfilt*j+Nsec].dM;
     581        slist[Ntot] = catalog[i].secfilt[Nsecfilt*j+Nsec].dMpsfChp;
    538582        dlist[Ntot] = 1;
    539583        Ntot ++;
    … …  
    551595    for (i = 0; i < Ncatalog; i++) {
    552596      for (j = 0; j < catalog[i].Naverage; j++) {
    553         dM = catalog[i].secfilt[Nsecfilt*j+Nsec].dM;
     597        dM = catalog[i].secfilt[Nsecfilt*j+Nsec].dMpsfChp;
    554598        float Mchisq = catalog[i].secfilt[Nsecfilt*j+Nsec].Mchisq;
    555599        mark = (dM > MaxScatter) || (isnan(Mchisq)) || (Mchisq > MaxChisq);
    … …  
    865909      if (catalog[i].secfilt[Nsecfilt*j+Nsec].flags & STAR_BAD) continue; 
    866910
    867       dM = catalog[i].secfilt[Nsecfilt*j+Nsec].dM;
     911      dM = catalog[i].secfilt[Nsecfilt*j+Nsec].dMpsfChp;
    868912      if (isnan(dM)) continue;
    869913      list[n] = dM;
    … …  
    906950      for (j = 0; j < catalog[i].Naverage; j++) {
    907951        if (catalog[i].secfilt[Nsecfilt*j+Nsec].flags & STAR_BAD) continue; 
    908         dMrel = catalog[i].secfilt[Nsecfilt*j+Nsec].dM;
     952        dMrel = catalog[i].secfilt[Nsecfilt*j+Nsec].dMpsfChp;
    909953        bin = dMrel / 0.00025;
    910954        bin = MAX (0, MIN (NBIN-1, bin));
    … …  
    946990      for (j = 0; j < catalog[i].Naverage; j++) {
    947991        if (catalog[i].secfilt[Nsecfilt*j+Nsec].flags & STAR_BAD) continue;
    948         xlist[N] = catalog[i].secfilt[Nsecfilt*j+Nsec].M;
     992        xlist[N] = catalog[i].secfilt[Nsecfilt*j+Nsec].MpsfChp;
    949993        value    = catalog[i].secfilt[Nsecfilt*j+Nsec].Mchisq;
    950994        if (isnan((double)(value))) continue;

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

    r37037 r40212  
    4747                if (isnan(Mgrid)) continue;
    4848
    49                 Mrel = catalog[i].secfilt[Nsecfilt*j+Nsec].M;
     49                Mrel = catalog[i].secfilt[Nsecfilt*j+Nsec].MpsfChp;
    5050                if (isnan(Mrel)) continue;
    5151

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

    r38062 r40212  
    9292      float *value = (float *) zpts->matrix[Nsec].buffer;
    9393      float ZP = !isnan(value[Npix]) ? value[Npix] : 0.0;
    94       secfilt[Nsec].M    = measure[measSYN[i]].M + ZP;
    95       secfilt[Nsec].dM  = 0.6;
    96       secfilt[Nsec].Mchisq = NAN;
    97       secfilt[Nsec].flags |= ID_SECF_USE_SYNTH;
     94      secfilt[Nsec].MpsfChp = measure[measSYN[i]].M + ZP;
     95      secfilt[Nsec].dMpsfChp = 0.6;
     96      secfilt[Nsec].Mchisq   = NAN;
     97      secfilt[Nsec].flags   |= ID_SECF_USE_SYNTH;
    9898    }
    9999  }

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

    r39648 r40212  
    259259      if (RESET_ZEROPTS) {
    260260        if (!KEEP_UBERCAL || !(image[nimage].flags & ID_IMAGE_PHOTOM_UBERCAL)) {
    261           image[nimage].Mcal = 0.0;
    262           image[nimage].dMcal = NAN;
    263           image[nimage].flags &= ~ID_IMAGE_PHOTOM_UBERCAL;
     261          image[nimage].McalPSF  = 0.0;
     262          image[nimage].McalAPER = 0.0;
     263          image[nimage].dMcal    = NAN;
     264          image[nimage].flags   &= ~ID_IMAGE_PHOTOM_UBERCAL;
    264265        }
    265266      }

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

    r39926 r40212  
    377377        }
    378378      }
    379       secfilt[Nsec].M      = Mpsf + ZP;
    380       secfilt[Nsec].dM    = 0.6;
    381       secfilt[Nsec].Mchisq = 0.0;
    382       secfilt[Nsec].flags |= ID_SECF_USE_SYNTH;
     379      secfilt[Nsec].MpsfChp  = Mpsf + ZP;
     380      secfilt[Nsec].dMpsfChp = 0.6;
     381      secfilt[Nsec].Mchisq   = 0.0;
     382      secfilt[Nsec].flags   |= ID_SECF_USE_SYNTH;
    383383      continue;
    384384    }
    … …  
    390390      secfilt[Nsec].flags |= ID_OBJ_FEW;
    391391    } else {
    392       secfilt[Nsec].M    = psfstats->mean;
    393       secfilt[Nsec].dM  = psfstats->error;
    394       secfilt[Nsec].Mchisq = (psfstats->Nmeas > 1) ? psfstats->chisq : NAN;
     392      secfilt[Nsec].MpsfChp = psfstats->mean;
     393      secfilt[Nsec].dMpsfChp = psfstats->error;
     394      secfilt[Nsec].Mchisq   = (psfstats->Nmeas > 1) ? psfstats->chisq : NAN;
    395395    }
    396396    int minRankPSF = (Nranking > 0) ? results->psfData[Nsec].ranking[0] : 10;
    … …  
    410410
    411411      if (Nranking) {
    412         secfilt[Nsec].Mstdev = psfstats->sigma;
    413         secfilt[Nsec].Nused  = psfstats->Nmeas;
    414         secfilt[Nsec].Mmax   = psfstats->max;
    415         secfilt[Nsec].Mmin   = psfstats->min;
     412        secfilt[Nsec].sMpsfChp = psfstats->sigma;
     413        secfilt[Nsec].Nused    = psfstats->Nmeas;
     414        secfilt[Nsec].Mmax     = psfstats->max;
     415        secfilt[Nsec].Mmin     = psfstats->min;
    416416      }
    417417      secfilt[Nsec].psfQfMax     = results->psfQfMax[Nsec];
    … …  
    424424      Nranking = MAG_STATS_BY_RANKING (&results->aperData[Nsec], apstats);
    425425      if (Nranking) {
    426         secfilt[Nsec].Map     = apstats->mean;
    427         secfilt[Nsec].dMap    = apstats->error;
    428         secfilt[Nsec].sMap    = apstats->sigma;
     426        secfilt[Nsec].MapChp  = apstats->mean;
     427        secfilt[Nsec].dMapChp = apstats->error;
     428        secfilt[Nsec].sMapChp = apstats->sigma;
    429429        secfilt[Nsec].NusedAp = Nranking;
    430430      }
    … …  
    435435      Nranking = MAG_STATS_BY_RANKING (&results->kronData[Nsec], kronstats);
    436436      if (Nranking) {
    437         secfilt[Nsec].Mkron     = kronstats->mean;
    438         secfilt[Nsec].dMkron    = kronstats->error;
    439         secfilt[Nsec].sMkron    = kronstats->sigma;
     437        secfilt[Nsec].MkronChp  = kronstats->mean;
     438        secfilt[Nsec].dMkronChp = kronstats->error;
     439        secfilt[Nsec].sMkronChp = kronstats->sigma;
    440440        secfilt[Nsec].NusedKron = Nranking;
    441441      }

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

    r39632 r40212  
    105105  ALLOCATE (catalog[0].measureRank, char, catalog[0].Nmeasure);
    106106  setMeasureRank (catalog);
    107   setMrelOutput (catalog, 1, flatcorr); // sets the values secfilt.M = <measure.M + measure.Mflat - image.Mcal>
     107  setMrelOutput (catalog, 1, flatcorr); // sets the values secfilt.MpsfChp = <measure.M + measure.Mflat - image.Mcal>
    108108  setMcalOutput (catalog, 1, flatcorr); // sets measure.Mcal = image.Mcal
    109109

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

    r36630 r40212  
    7474      continue;
    7575    }
    76     images[seq].Mcal        = image_mags[i].Mcal;
     76    images[seq].McalPSF     = image_mags[i].McalPSF;
     77    images[seq].McalAPER    = image_mags[i].McalAPER;
    7778    images[seq].dMcal       = image_mags[i].dMcal;
    7879    images[seq].dMagSys     = image_mags[i].dMagSys;
    79     images[seq].Xm          = image_mags[i].Xm;
     80    images[seq].McalChiSq   = image_mags[i].McalChiSq;
    8081    images[seq].nFitPhotom  = image_mags[i].nFitPhotom;
    8182    images[seq].flags       = image_mags[i].flags;
    … …  
    9192int set_image_mags (ImageMag *image_mags, Image *image) {
    9293
    93   image_mags->Mcal        = image->Mcal;
     94  image_mags->McalPSF     = image->McalPSF;
     95  image_mags->McalAPER    = image->McalAPER;
    9496  image_mags->dMcal       = image->dMcal;
    9597  image_mags->dMagSys     = image->dMagSys;
    96   image_mags->Xm          = image->Xm;
     98  image_mags->McalChiSq   = image->McalChiSq;
    9799  image_mags->nFitPhotom  = image->nFitPhotom;
    98100  image_mags->flags       = image->flags;

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

    r39457 r40212  
    111111    if (Nsec < 0) continue;
    112112
    113     catalog[catSeq].secfilt[objSeq*Nsecfilt + Nsec].M = meanmags[i].M;
     113    catalog[catSeq].secfilt[objSeq*Nsecfilt + Nsec].MpsfChp = meanmags[i].M;
    114114  }
    115115  free (meanmags);
    … …  
    122122int set_mean_mags (MeanMag *meanmags, AverageTiny *average, SecFilt *secfilt, int Nsec) {
    123123
    124   meanmags->M  = secfilt->M;
    125   meanmags->dM = secfilt->dM;
     124  meanmags->M  = secfilt->MpsfChp;
     125  meanmags->dM = secfilt->dMpsfChp;
    126126  meanmags->Mchisq = secfilt->Mchisq;
    127127  meanmags->Nsec = Nsec; // key to secfilt entry

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

    r39457 r40212  
    3737  // (r - i > 0.5) : w = r + 0.268 - 0.435 (r-i) - 0.078(r-i)^2
    3838
    39   float Mr = secfilt[NSr].M;
    40   float Mi = secfilt[NSi].M;
     39  float Mr = secfilt[NSr].MpsfChp;
     40  float Mi = secfilt[NSi].MpsfChp;
    4141
    4242  if (!isfinite(Mr)) return FALSE;

  • branches/eam_branches/ohana.20170822/src/uniphot/include/setphot.h

    r39926 r40212  
    1111
    1212typedef struct {
    13   float Mcal;
     13  float McalPSF;
     14  float McalAPER;
    1415  float dMcal;
    1516  unsigned int imageID;

  • branches/eam_branches/ohana.20170822/src/uniphot/src/ImageSubset.c

    r37043 r40212  
    5656  char type[16];
    5757
    58   GET_COLUMN (Mcal,    "MCAL",       float);
    59   GET_COLUMN (dMcal,   "MCAL_ERR",   float);
    60   GET_COLUMN (imageID, "IMAGE_ID",   int);
    61   GET_COLUMN (map,     "PHOTOM_MAP", int);
    62   GET_COLUMN (flags,   "FLAGS",      int);
     58  GET_COLUMN (McalPSF,  "MCAL_PSF",   float);
     59  GET_COLUMN (McalAPER, "MCAL_APER",  float);
     60  GET_COLUMN (dMcal,    "MCAL_ERR",   float);
     61  GET_COLUMN (imageID,  "IMAGE_ID",   int);
     62  GET_COLUMN (map,      "PHOTOM_MAP", int);
     63  GET_COLUMN (flags,    "FLAGS",      int);
    6364
    6465  // XXX free the fits table data here
    … …  
    6970    image[i].photom_map_id = map[i];
    7071    image[i].flags         = flags[i];
    71     image[i].Mcal          = Mcal[i];
     72    image[i].McalPSF       = McalPSF[i];
     73    image[i].McalAPER      = McalAPER[i];
    7274    image[i].dMcal         = dMcal[i];
    7375  }
    7476  fprintf (stderr, "loaded data for %lld images\n", (long long) Nrow);
    7577
    76   free (Mcal);
     78  free (McalPSF);
     79  free (McalAPER);
    7780  free (dMcal);
    7881  free (imageID);
    … …  
    108111  gfits_create_table (&theader, &ftable);
    109112
    110   float *Mcal, *dMcal;
    111   unsigned int *imageID, *map, *flags;
    112 
    113113  // create intermediate storage arrays
    114   ALLOCATE (Mcal,    float,        Nimage);
    115   ALLOCATE (dMcal,   float,        Nimage);
    116   ALLOCATE (imageID, unsigned int, Nimage);
    117   ALLOCATE (map,     unsigned int, Nimage);
    118   ALLOCATE (flags,   unsigned int, Nimage);
     114  ALLOCATE_PTR (McalPSF,  float,        Nimage);
     115  ALLOCATE_PTR (McalAPER, float,        Nimage);
     116  ALLOCATE_PTR (dMcal,    float,        Nimage);
     117  ALLOCATE_PTR (imageID,  unsigned int, Nimage);
     118  ALLOCATE_PTR (map,      unsigned int, Nimage);
     119  ALLOCATE_PTR (flags,    unsigned int, Nimage);
    119120
    120121  // assign the storage arrays
    121122  for (i = 0; i < Nimage; i++) {
    122     imageID[i] = image[i].imageID;
    123     map[i]     = image[i].photom_map_id;
    124     flags[i]   = image[i].flags;
    125     Mcal[i]    = image[i].Mcal;
    126     dMcal[i]   = image[i].dMcal;
     123    imageID[i]  =  image[i].imageID;
     124    map[i]      =  image[i].photom_map_id;
     125    flags[i]    =  image[i].flags;
     126    McalPSF[i]  =  image[i].McalPSF;
     127    McalAPER[i] =  image[i].McalAPER;
     128    dMcal[i]    =  image[i].dMcal;
    127129  }
    128130
    129131  // add the columns to the output array
    130   gfits_set_bintable_column (&theader, &ftable, "MCAL",       Mcal,    Nimage);
    131   gfits_set_bintable_column (&theader, &ftable, "MCAL_ERR",   dMcal,   Nimage);
    132   gfits_set_bintable_column (&theader, &ftable, "IMAGE_ID",   imageID, Nimage);
    133   gfits_set_bintable_column (&theader, &ftable, "PHOTOM_MAP", map,     Nimage);
    134   gfits_set_bintable_column (&theader, &ftable, "FLAGS",      flags,   Nimage);
     132  gfits_set_bintable_column (&theader, &ftable, "MCAL_PSF",   McalPSF,  Nimage);
     133  gfits_set_bintable_column (&theader, &ftable, "MCAL_APER",  McalAPER, Nimage);
     134  gfits_set_bintable_column (&theader, &ftable, "MCAL_ERR",   dMcal,    Nimage);
     135  gfits_set_bintable_column (&theader, &ftable, "IMAGE_ID",   imageID,  Nimage);
     136  gfits_set_bintable_column (&theader, &ftable, "PHOTOM_MAP", map,      Nimage);
     137  gfits_set_bintable_column (&theader, &ftable, "FLAGS",      flags,    Nimage);
    135138
    136   free (Mcal);
     139  free (McalPSF);
     140  free (McalAPER);
    137141  free (dMcal);
    138142  free (imageID);
    … …  
    174178    image[i].photom_map_id = subset[i].photom_map_id;
    175179    image[i].flags         = subset[i].flags        ;
    176     image[i].Mcal          = subset[i].Mcal         ;
     180    image[i].McalPSF       = subset[i].McalPSF      ;
     181    image[i].McalAPER      = subset[i].McalAPER     ;
    177182    image[i].dMcal         = subset[i].dMcal        ;
    178183  }

  • branches/eam_branches/ohana.20170822/src/uniphot/src/dumpresult.c

    r31160 r40212  
    22
    33void dumpresult () {
    4   short Mcal, Mgrp, Mset;
     4  float Mcal, Mgrp, Mset;
    55  FILE *f;
    66  char outfile[64];
    … …  
    1313      if (sgroup[i].image[j][0].code & IMAGE_BAD) continue;
    1414      tgrp = (Group *) sgroup[i].imlink[j][0].tgroup;
    15       Mcal = sgroup[i].image[j][0].Mcal;
     15      Mcal = sgroup[i].image[j][0].McalPSF;
    1616      Mset = sgroup[i].M;
    1717      Mgrp = tgrp[0].M;

  • branches/eam_branches/ohana.20170822/src/uniphot/src/fit_groups.c

    r31160 r40212  
    1818      if (tgroup[i].image[j][0].flags & IMAGE_BAD) continue;
    1919      sgroup = (Group *) tgroup[i].imlink[j][0].sgroup;
    20       Mcal = tgroup[i].image[j][0].Mcal;
     20      Mcal = tgroup[i].image[j][0].McalPSF;
    2121      Mgrp = sgroup[0].M;
    2222      mlist[Nlist] = (Mcal - Mgrp);
    … …  
    5858      if (sgroup[i].image[j][0].flags & IMAGE_BAD) continue;
    5959      tgroup = (Group *) sgroup[i].imlink[j][0].tgroup;
    60       Mcal = sgroup[i].image[j][0].Mcal;
     60      Mcal = sgroup[i].image[j][0].McalPSF;
    6161      Mgrp = tgroup[0].M;
    6262      mlist[Nlist] = (Mcal - Mgrp);

  • branches/eam_branches/ohana.20170822/src/uniphot/src/match_zpts_to_images.c

    r37807 r40212  
    4141  if (RESET) {
    4242    for (i = 0; i < Nimage; i++) {
    43       image[i].Mcal = 0.0;
    44       image[i].dMcal = NAN;
    45       image[i].flags &= ~ID_IMAGE_PHOTOM_NOCAL; // clear the NOCAL flag
     43      image[i].McalPSF  = 0.0;
     44      image[i].McalAPER = 0.0;
     45      image[i].dMcal    = NAN;
     46      image[i].flags   &= ~ID_IMAGE_PHOTOM_NOCAL; // clear the NOCAL flag
    4647      if (UBERCAL) {
    4748        image[i].flags &= ~ID_IMAGE_PHOTOM_UBERCAL; // clear the UBERCAL flag
    … …  
    107108    // UBERCAL includes 2.5log(exptime) + K*airmass in the zero point
    108109    if (UBERCAL) {
    109       image[Ni].Mcal = SCALE*code[0].C - zpts[Nz].zpt + 2.5*log10(image[Ni].exptime) + code[0].K*(image[Ni].secz - 1.000);
    110       myAssert (isfinite(image[Ni].Mcal), "oops, ubercal made a nan image");
     110      image[Ni].McalPSF  = SCALE*code[0].C - zpts[Nz].zpt + 2.5*log10(image[Ni].exptime) + code[0].K*(image[Ni].secz - 1.000);
     111      image[Ni].McalAPER = SCALE*code[0].C - zpts[Nz].zpt + 2.5*log10(image[Ni].exptime) + code[0].K*(image[Ni].secz - 1.000);
     112      myAssert (isfinite(image[Ni].McalPSF), "oops, ubercal made a nan image");
    111113    } else {
    112       image[Ni].Mcal = SCALE*code[0].C - zpts[Nz].zpt;
     114      image[Ni].McalPSF  = SCALE*code[0].C - zpts[Nz].zpt;
     115      image[Ni].McalAPER = SCALE*code[0].C - zpts[Nz].zpt;
    113116    }
    114117
    … …  
    116119    float offset = apply_zpt_offset (code[0].equiv);
    117120    assert (isfinite(offset));
    118     image[Ni].Mcal += offset;
     121    image[Ni].McalPSF  += offset;
     122    image[Ni].McalAPER += offset;
    119123
    120124    image[Ni].dMcal = zpts[Nz].zpt_err;

  • branches/eam_branches/ohana.20170822/src/uniphot/src/update_catalog_setastrom.c

    r39288 r40212  
    153153        case 101:
    154154        case 102: {
    155           float gmag = secfilt[Nsec_g].M;
    156           float imag = secfilt[Nsec_i].M;
     155          float gmag = secfilt[Nsec_g].MpsfChp;
     156          float imag = secfilt[Nsec_i].MpsfChp;
    157157          dColor = average->refColorBlue - (gmag - imag);
    158158          break;
    … …  
    160160        case 103:
    161161        case 104: {
    162           float zmag = secfilt[Nsec_z].M;
    163           float ymag = secfilt[Nsec_y].M;
     162          float zmag = secfilt[Nsec_z].MpsfChp;
     163          float ymag = secfilt[Nsec_y].MpsfChp;
    164164          dColor = average->refColorRed - (zmag - ymag);
    165165          break;

  • branches/eam_branches/ohana.20170822/src/uniphot/src/update_catalog_setphot.c

    r39926 r40212  
    3939    if (id < 0) continue;
    4040
    41     float Mcal = image[id].Mcal;
     41    float Mcal  = image[id].McalPSF;
    4242    float dMcal = image[id].dMcal;
    4343    float Mflat = 0.0;

  • branches/eam_branches/ohana.20170822/src/uniphot/src/update_catalog_uniphot.c

    r33654 r40212  
    1414  for (i = 0; i < catalog[0].Naverage; i++) {
    1515   
    16     if (!isnan(catalog[0].secfilt[i*Nsecfilt+Nsec].M)) {
    17       catalog[0].secfilt[i*Nsecfilt+Nsec].M += sgroup[0].M;
     16    if (!isnan(catalog[0].secfilt[i*Nsecfilt+Nsec].MpsfChp)) {
     17      catalog[0].secfilt[i*Nsecfilt+Nsec].MpsfChp += sgroup[0].M;
    1818    }
    1919

  • branches/eam_branches/ohana.20170822/src/uniphot/src/update_dvo_uniphot.c

    r38986 r40212  
    3737  for (i = 0; i < Nsgroup; i++) {
    3838    for (j = 0; j < sgroup[i].Nimage; j++) {
    39       sgroup[i].image[j][0].Mcal -= sgroup[i].M;
     39      sgroup[i].image[j][0].McalPSF  -= sgroup[i].M;
     40      sgroup[i].image[j][0].McalAPER -= sgroup[i].M;
    4041    }
    4142  }
Note: See TracChangeset for help on using the changeset viewer.