Index: /branches/eam_branches/ohana.20170822/src/libdvo/include/dvo.h
===================================================================
--- /branches/eam_branches/ohana.20170822/src/libdvo/include/dvo.h	(revision 40213)
+++ /branches/eam_branches/ohana.20170822/src/libdvo/include/dvo.h	(revision 40214)
@@ -502,5 +502,6 @@
   double         R;
   double         D;
-  float          M;
+  float          M; // change to Mpsf eventually to disambiguate
+  float          Mkron;
   float          Mcal;
   float          Mflat;
Index: /branches/eam_branches/ohana.20170822/src/libdvo/src/dvo_photcode_ops.c
===================================================================
--- /branches/eam_branches/ohana.20170822/src/libdvo/src/dvo_photcode_ops.c	(revision 40213)
+++ /branches/eam_branches/ohana.20170822/src/libdvo/src/dvo_photcode_ops.c	(revision 40214)
@@ -1649,8 +1649,8 @@
       break;
     case MAG_CLASS_KRON:
-      // Mraw = measure[0].Mkron;
+      Mraw = measure[0].Mkron;
       break;
     case MAG_CLASS_APER:
-      // Mraw = measure[0].Map;
+      // Mraw = measure[0].Map; // MeasureTiny does not have Map
       break;
     default:
@@ -1677,8 +1677,8 @@
       break;
     case MAG_CLASS_KRON:
-      // Mraw = measure[0].Mkron;
+      Mraw = measure[0].Mkron;
       break;
     case MAG_CLASS_APER:
-      // Mraw = measure[0].Map;
+      // Mraw = measure[0].Map; // MeasureTiny does not have Map
       break;
     default:
@@ -1706,8 +1706,8 @@
       break;
     case MAG_CLASS_KRON:
-      // Mraw = measure[0].Mkron;
+      Mraw = measure[0].Mkron;
       break;
     case MAG_CLASS_APER:
-      // Mraw = measure[0].Map;
+      // Mraw = measure[0].Map; // MeasureTiny does not have Map
       break;
     default:
@@ -1747,8 +1747,8 @@
       break;
     case MAG_CLASS_KRON:
-      // Mraw = measure[0].Mkron;
+      Mraw = measure[0].Mkron;
       break;
     case MAG_CLASS_APER:
-      // Mraw = measure[0].Map;
+      // Mraw = measure[0].Map; // MeasureTiny does not have Map
       break;
     default:
@@ -1799,8 +1799,8 @@
 	break;
       case MAG_CLASS_KRON:
-	// Mraw = thisone[0].Mkron;
+	Mraw = thisone[0].Mkron;
 	break;
       case MAG_CLASS_APER:
-	// Mraw = thisone[0].Map;
+	// Mraw = thisone[0].Map; // MeasureTiny does not have Map
 	break;
       default:
Index: /branches/eam_branches/ohana.20170822/src/relphot/src/setMrelCatalog.c
===================================================================
--- /branches/eam_branches/ohana.20170822/src/relphot/src/setMrelCatalog.c	(revision 40213)
+++ /branches/eam_branches/ohana.20170822/src/relphot/src/setMrelCatalog.c	(revision 40214)
@@ -529,5 +529,5 @@
   off_t k;
 
-  float McalPSF = 0, McalAPER = 0, Mmos = 0, Mgrid = 0, Finst = 0;
+  float McalPSF = 0, McalAPER = 0, Mmos = 0, Mgrid = 0;
 
   // set the primary projection cell and skycell for this coordinate
@@ -635,5 +635,5 @@
 	if (isnan(McalPSF))  SKIP_THIS_MEAS_STACK(Ncal); // XXX really skip?
 
-	McalAPER  = getMcal  (meas, cat, MAG_CLASS_PSF);
+	McalAPER  = getMcal  (meas, cat, MAG_CLASS_KRON);
 	if (isnan(McalAPER))  SKIP_THIS_MEAS_STACK(Ncal); // XXX really skip?
 
@@ -645,5 +645,5 @@
 
       // NOTE: negative and insignificant flux values are allowed, but not NAN flux values
-      Finst = PhotFluxInst (&measure[k], MAG_CLASS_PSF);
+      float Finst = PhotFluxInst (&measure[k], MAG_CLASS_PSF);
       if (isnan(Finst)) SKIP_THIS_MEAS_STACK(Ninst);