Changeset 37403 for branches/eam_branches/ps2-tc3-20130727/Ohana/src/opihi/dvo/lightcurve.c

Timestamp:

Sep 19, 2014, 4:05:27 PM (12 years ago)

Author:

eugene

Message:

merge changes from trunk

Location:

branches/eam_branches/ps2-tc3-20130727

Files:

• . (modified) (1 prop)
• Ohana (modified) (1 prop)
• Ohana/src/opihi/dvo/lightcurve.c (modified) (1 diff)

branches/eam_branches/ps2-tc3-20130727/Ohana/src/opihi/dvo/lightcurve.c

@@ -121 +121 @@
         dmvec[0].elements.Flt[N] = catalog.measure[m].dM;
         if (RELPHOT) {
-          mvec[0].elements.Flt[N] = PhotCat (&catalog.measure[m]);
+          mvec[0].elements.Flt[N] = PhotCat (&catalog.measure[m], MAG_CLASS_PSF);
         } else {
-          mvec[0].elements.Flt[N] = PhotRel (&catalog.measure[m], &catalog.average[k], &catalog.secfilt[k*Nsecfilt]);
+          mvec[0].elements.Flt[N] = PhotRel (&catalog.measure[m], &catalog.average[k], &catalog.secfilt[k*Nsecfilt], MAG_CLASS_PSF);
         }
         N++;