Index: branches/eam_branches/ohana.20170822/src/libdvo/src/dvo_catalog.c
===================================================================
--- branches/eam_branches/ohana.20170822/src/libdvo/src/dvo_catalog.c	(revision 40211)
+++ branches/eam_branches/ohana.20170822/src/libdvo/src/dvo_catalog.c	(revision 40212)
@@ -235,17 +235,17 @@
 
   if (mode & SECFILT_RESET_CHIP) {
-    secfilt->M           = NAN;
-    secfilt->dM          = NAN;
-    secfilt->Map         = NAN;
-    secfilt->dMap        = NAN;
-    secfilt->sMap        = NAN;
-    secfilt->Mkron       = NAN;
-    secfilt->dMkron      = NAN;
-    secfilt->sMkron      = NAN;
+    secfilt->MpsfChp     = NAN;
+    secfilt->dMpsfChp    = NAN;
+    secfilt->sMpsfChp    = NAN;
+    secfilt->MapChp      = NAN;
+    secfilt->dMapChp     = NAN;
+    secfilt->sMapChp     = NAN;
+    secfilt->MkronChp    = NAN;
+    secfilt->dMkronChp   = NAN;
+    secfilt->sMkronChp   = NAN;
 
     secfilt->psfQfMax     = NAN;
     secfilt->psfQfPerfMax = NAN;
 
-    secfilt->Mstdev      = NAN;
     secfilt->Mmin        = NAN;
     secfilt->Mmax        = NAN;
@@ -923,12 +923,12 @@
     for (in = out = i = 0; i < catalog[0].Naverage; i++) {
       for (j = 0; j < catalog[0].Nsecfilt; j++, in++, out++) {
-	outsec[out].M  	   = insec[in].M;
-	outsec[out].dM 	   = insec[in].dM;
-	outsec[out].Mchisq = insec[in].Mchisq;
+	outsec[out].MpsfChp  = insec[in].MpsfChp;
+	outsec[out].dMpsfChp = insec[in].dMpsfChp;
+	outsec[out].Mchisq   = insec[in].Mchisq;
       }
       for (j = 0; j < Nextra; j++, out++) {
-	outsec[out].M  	   = NAN;
-	outsec[out].dM 	   = NAN;
-	outsec[out].Mchisq = NAN;
+	outsec[out].MpsfChp  = NAN;
+	outsec[out].dMpsfChp = NAN;
+	outsec[out].Mchisq   = NAN;
       }
     }
Index: branches/eam_branches/ohana.20170822/src/libdvo/src/dvo_convert_PS1_DEV_1.c
===================================================================
--- branches/eam_branches/ohana.20170822/src/libdvo/src/dvo_convert_PS1_DEV_1.c	(revision 40211)
+++ branches/eam_branches/ohana.20170822/src/libdvo/src/dvo_convert_PS1_DEV_1.c	(revision 40212)
@@ -182,6 +182,7 @@
     dvo_secfilt_init (&out[i], SECFILT_RESET_ALL);
 
-    out[i].M     = in[i].M;      
-    out[i].dM    = in[i].dM;      
+    out[i].MpsfChp     = in[i].M;      
+    out[i].dMpsfChp    = in[i].dM;      
+
     out[i].Mchisq= pow (10.0, 0.01*in[i].Xm);     
     out[i].Ncode = in[i].Ncode;
@@ -199,6 +200,7 @@
 
   for (i = 0; i < Nvalues; i++) {
-    out[i].M     = in[i].M;      
-    out[i].dM    = in[i].dM;      
+    out[i].M             = in[i].MpsfChp;      
+    out[i].dM            = in[i].dMpsfChp;      
+
     out[i].Xm    = 100.0*log10(in[i].Mchisq);     
     out[i].Ncode = in[i].Ncode;
Index: branches/eam_branches/ohana.20170822/src/libdvo/src/dvo_convert_PS1_DEV_2.c
===================================================================
--- branches/eam_branches/ohana.20170822/src/libdvo/src/dvo_convert_PS1_DEV_2.c	(revision 40211)
+++ branches/eam_branches/ohana.20170822/src/libdvo/src/dvo_convert_PS1_DEV_2.c	(revision 40212)
@@ -177,6 +177,7 @@
     dvo_secfilt_init (&out[i], SECFILT_RESET_ALL);
 
-    out[i].M     = in[i].M;      
-    out[i].dM    = in[i].dM;      
+    out[i].MpsfChp     = in[i].M;      
+    out[i].dMpsfChp    = in[i].dM;      
+
     out[i].Mchisq= pow (10.0, 0.01*in[i].Xm);     
     out[i].Ncode = in[i].Ncode;
@@ -194,6 +195,7 @@
 
   for (i = 0; i < Nvalues; i++) {
-    out[i].M     = in[i].M;      
-    out[i].dM    = in[i].dM;      
+    out[i].M             = in[i].MpsfChp;      
+    out[i].dM            = in[i].dMpsfChp;      
+
     out[i].Xm    = 100.0*log10(in[i].Mchisq);     
     out[i].Ncode = in[i].Ncode;
Index: branches/eam_branches/ohana.20170822/src/libdvo/src/dvo_convert_PS1_REF.c
===================================================================
--- branches/eam_branches/ohana.20170822/src/libdvo/src/dvo_convert_PS1_REF.c	(revision 40211)
+++ branches/eam_branches/ohana.20170822/src/libdvo/src/dvo_convert_PS1_REF.c	(revision 40212)
@@ -114,6 +114,6 @@
     dvo_secfilt_init (&out[i], SECFILT_RESET_ALL);
 
-    out[i].M     = in[i].M;      
-    out[i].dM    = in[i].dM;      
+    out[i].MpsfChp     = in[i].M;      
+    out[i].dMpsfChp    = in[i].dM;      
  }
   return (out);
@@ -128,6 +128,6 @@
 
   for (i = 0; i < Nvalues; i++) {
-    out[i].M     = in[i].M;      
-    out[i].dM    = in[i].dM;      
+    out[i].M             = in[i].MpsfChp;      
+    out[i].dM            = in[i].dMpsfChp;      
   }
   return (out);
Index: branches/eam_branches/ohana.20170822/src/libdvo/src/dvo_convert_PS1_SIM.c
===================================================================
--- branches/eam_branches/ohana.20170822/src/libdvo/src/dvo_convert_PS1_SIM.c	(revision 40211)
+++ branches/eam_branches/ohana.20170822/src/libdvo/src/dvo_convert_PS1_SIM.c	(revision 40212)
@@ -199,6 +199,7 @@
     dvo_secfilt_init (&out[i], SECFILT_RESET_ALL);
 
-    out[i].M             = in[i].M;      
-    out[i].dM            = in[i].dM;      
+    out[i].MpsfChp     = in[i].M;      
+    out[i].dMpsfChp    = in[i].dM;      
+
     out[i].Ncode         = in[i].Ncode;
     out[i].Nused         = in[i].Nused;
@@ -217,6 +218,7 @@
   for (i = 0; i < Nvalues; i++) {
 
-    out[i].M             = in[i].M;      
-    out[i].dM            = in[i].dM;      
+    out[i].M             = in[i].MpsfChp;      
+    out[i].dM            = in[i].dMpsfChp;      
+
     out[i].Ncode         = in[i].Ncode;
     out[i].Nused         = in[i].Nused;
Index: branches/eam_branches/ohana.20170822/src/libdvo/src/dvo_convert_PS1_V1.c
===================================================================
--- branches/eam_branches/ohana.20170822/src/libdvo/src/dvo_convert_PS1_V1.c	(revision 40211)
+++ branches/eam_branches/ohana.20170822/src/libdvo/src/dvo_convert_PS1_V1.c	(revision 40212)
@@ -197,6 +197,7 @@
     dvo_secfilt_init (&out[i], SECFILT_RESET_ALL);
 
-    out[i].M     = in[i].M;      
-    out[i].dM    = in[i].dM;      
+    out[i].MpsfChp     = in[i].M;      
+    out[i].dMpsfChp    = in[i].dM;      
+
     out[i].Mchisq= in[i].Mchisq;     
     out[i].Ncode = in[i].Ncode;
@@ -216,6 +217,7 @@
 
   for (i = 0; i < Nvalues; i++) {
-    out[i].M     = in[i].M;      
-    out[i].dM    = in[i].dM;      
+    out[i].M             = in[i].MpsfChp;      
+    out[i].dM            = in[i].dMpsfChp;      
+
     out[i].Mchisq= in[i].Mchisq;     
     out[i].Ncode = in[i].Ncode;
Index: branches/eam_branches/ohana.20170822/src/libdvo/src/dvo_convert_PS1_V2.c
===================================================================
--- branches/eam_branches/ohana.20170822/src/libdvo/src/dvo_convert_PS1_V2.c	(revision 40211)
+++ branches/eam_branches/ohana.20170822/src/libdvo/src/dvo_convert_PS1_V2.c	(revision 40212)
@@ -206,6 +206,7 @@
     dvo_secfilt_init (&out[i], SECFILT_RESET_ALL);
 
-    out[i].M     = in[i].M;      
-    out[i].dM    = in[i].dM;      
+    out[i].MpsfChp     = in[i].M;      
+    out[i].dMpsfChp    = in[i].dM;      
+
     out[i].Mchisq= in[i].Mchisq;     
     out[i].flags = in[i].flags;     
@@ -226,6 +227,7 @@
 
   for (i = 0; i < Nvalues; i++) {
-    out[i].M     = in[i].M;      
-    out[i].dM    = in[i].dM;      
+    out[i].M             = in[i].MpsfChp;      
+    out[i].dM            = in[i].dMpsfChp;      
+
     out[i].Mchisq= in[i].Mchisq;     
     out[i].flags = in[i].flags;     
Index: branches/eam_branches/ohana.20170822/src/libdvo/src/dvo_convert_PS1_V3.c
===================================================================
--- branches/eam_branches/ohana.20170822/src/libdvo/src/dvo_convert_PS1_V3.c	(revision 40211)
+++ branches/eam_branches/ohana.20170822/src/libdvo/src/dvo_convert_PS1_V3.c	(revision 40212)
@@ -210,7 +210,9 @@
     dvo_secfilt_init (&out[i], SECFILT_RESET_ALL);
 
-    out[i].M           = in[i].M;      
-    out[i].Map         = in[i].Map;      
-    out[i].dM          = in[i].dM;      
+    out[i].MpsfChp     = in[i].M;      
+    out[i].sMpsfChp    = in[i].Mstdev;      
+    out[i].dMpsfChp    = in[i].dM;      
+    out[i].MapChp      = in[i].Map;      
+
     out[i].Mchisq      = in[i].Mchisq;     
     out[i].flags       = in[i].flags;     
@@ -219,5 +221,4 @@
     out[i].Mmin        = in[i].M_20*0.001;      
     out[i].Mmax        = in[i].M_80*0.001;      
-    out[i].Mstdev      = in[i].Mstdev;      
     out[i].ubercalDist = in[i].ubercalDist;      
  }
@@ -233,7 +234,9 @@
 
   for (i = 0; i < Nvalues; i++) {
-    out[i].M           = in[i].M;      
-    out[i].Map         = in[i].Map;      
-    out[i].dM          = in[i].dM;      
+    out[i].M             = in[i].MpsfChp;      
+    out[i].dM            = in[i].dMpsfChp;      
+    out[i].Mstdev        = in[i].sMpsfChp;      
+    out[i].Map           = in[i].MapChp;      
+
     out[i].Mchisq      = in[i].Mchisq;     
     out[i].flags       = in[i].flags;     
@@ -242,5 +245,4 @@
     out[i].M_20        = in[i].Mmin*1000.0;      
     out[i].M_80        = in[i].Mmax*1000.0;      
-    out[i].Mstdev      = in[i].Mstdev;      
     out[i].ubercalDist = in[i].ubercalDist;      
   }
Index: branches/eam_branches/ohana.20170822/src/libdvo/src/dvo_convert_PS1_V4.c
===================================================================
--- branches/eam_branches/ohana.20170822/src/libdvo/src/dvo_convert_PS1_V4.c	(revision 40211)
+++ branches/eam_branches/ohana.20170822/src/libdvo/src/dvo_convert_PS1_V4.c	(revision 40212)
@@ -234,9 +234,10 @@
     dvo_secfilt_init (&out[i], SECFILT_RESET_ALL);
 
-    out[i].M             = in[i].M;      
-    out[i].Map           = in[i].Map;      
-    out[i].Mkron         = in[i].Mkron;      
-    out[i].dMkron        = in[i].dMkron;      
-    out[i].dM            = in[i].dM;      
+    out[i].MpsfChp       = in[i].M;      
+    out[i].sMpsfChp      = in[i].Mstdev;      
+    out[i].dMpsfChp      = in[i].dM;      
+    out[i].MapChp        = in[i].Map;      
+    out[i].MkronChp      = in[i].Mkron;      
+
     out[i].Mchisq        = in[i].Mchisq;     
     out[i].FpsfStk       = in[i].FluxPSF;
@@ -249,5 +250,4 @@
     out[i].Mmin          = in[i].M_20*0.001;      
     out[i].Mmax          = in[i].M_80*0.001;      
-    out[i].Mstdev        = in[i].Mstdev;      
     out[i].ubercalDist   = in[i].ubercalDist;      
     out[i].stackPrmryOff = in[i].stackPrmryOff;      
@@ -265,9 +265,10 @@
 
   for (i = 0; i < Nvalues; i++) {
-    out[i].M           	 = in[i].M;      
-    out[i].Map         	 = in[i].Map;      
-    out[i].Mkron       	 = in[i].Mkron;      
-    out[i].dMkron      	 = in[i].dMkron;      
-    out[i].dM          	 = in[i].dM;      
+    out[i].M             = in[i].MpsfChp;      
+    out[i].dM            = in[i].dMpsfChp;      
+    out[i].Mstdev        = in[i].sMpsfChp;      
+    out[i].Map           = in[i].MapChp;      
+    out[i].Mkron         = in[i].MkronChp;      
+
     out[i].Mchisq        = in[i].Mchisq;
     out[i].FluxPSF     	 = in[i].FpsfStk;
@@ -280,5 +281,4 @@
     out[i].M_20        	 = in[i].Mmin*1000.0;      
     out[i].M_80        	 = in[i].Mmax*1000.0;      
-    out[i].Mstdev      	 = in[i].Mstdev;      
     out[i].ubercalDist 	 = in[i].ubercalDist;      
     out[i].stackPrmryOff = in[i].stackPrmryOff;      
Index: branches/eam_branches/ohana.20170822/src/libdvo/src/dvo_convert_PS1_V5.c
===================================================================
--- branches/eam_branches/ohana.20170822/src/libdvo/src/dvo_convert_PS1_V5.c	(revision 40211)
+++ branches/eam_branches/ohana.20170822/src/libdvo/src/dvo_convert_PS1_V5.c	(revision 40212)
@@ -311,17 +311,17 @@
     dvo_secfilt_init (&out[i], SECFILT_RESET_ALL);
 
-    out[i].M             = in[i].M;      
-    out[i].dM            = in[i].dM;      
-    out[i].Map           = in[i].Map;      
-    out[i].dMap          = in[i].dMap;      
-    out[i].sMap          = in[i].sMap;      
-    out[i].Mkron         = in[i].Mkron;      
-    out[i].dMkron        = in[i].dMkron;      
-    out[i].sMkron        = in[i].sMkron;      
+    out[i].MpsfChp       = in[i].M;      
+    out[i].sMpsfChp      = in[i].Mstdev;      
+    out[i].dMpsfChp      = in[i].dM;      
+    out[i].MapChp        = in[i].Map;      
+    out[i].dMapChp       = in[i].dMap;      
+    out[i].sMapChp       = in[i].sMap;      
+    out[i].MkronChp      = in[i].Mkron;      
+    out[i].dMkronChp     = in[i].dMkron;      
+    out[i].sMkronChp     = in[i].sMkron;      
 
     out[i].psfQfMax      = in[i].psfQfMax;      
     out[i].psfQfPerfMax  = in[i].psfQfPerfMax;      
 
-    out[i].Mstdev        = in[i].Mstdev;      
     out[i].Mmin          = in[i].Mmin;      
     out[i].Mmax          = in[i].Mmax;      
@@ -389,17 +389,17 @@
   for (i = 0; i < Nvalues; i++) {
 
-    out[i].M             = in[i].M;      
-    out[i].dM            = in[i].dM;      
-    out[i].Map           = in[i].Map;      
-    out[i].dMap          = in[i].dMap;      
-    out[i].sMap          = in[i].sMap;      
-    out[i].Mkron         = in[i].Mkron;      
-    out[i].dMkron        = in[i].dMkron;      
-    out[i].sMkron        = in[i].sMkron;      
+    out[i].M             = in[i].MpsfChp;      
+    out[i].dM            = in[i].dMpsfChp;      
+    out[i].Mstdev        = in[i].sMpsfChp;      
+    out[i].Map           = in[i].MapChp;      
+    out[i].dMap          = in[i].dMapChp;      
+    out[i].sMap          = in[i].sMapChp;      
+    out[i].Mkron         = in[i].MkronChp;      
+    out[i].dMkron        = in[i].dMkronChp;      
+    out[i].sMkron        = in[i].sMkronChp;      
 
     out[i].psfQfMax      = in[i].psfQfMax;      
     out[i].psfQfPerfMax  = in[i].psfQfPerfMax;      
 
-    out[i].Mstdev        = in[i].Mstdev;      
     out[i].Mmin          = in[i].Mmin;      
     out[i].Mmax          = in[i].Mmax;      
@@ -1500,13 +1500,14 @@
     dvo_secfilt_init (&out[i], SECFILT_RESET_ALL);
 
-    out[i].M             = in[i].M;      
-    out[i].dM            = in[i].dM;      
-    out[i].Map           = in[i].Map;      
-    out[i].dMap          = in[i].dMap;      
-    out[i].sMap          = in[i].sMap;      
-    out[i].Mkron         = in[i].Mkron;      
-    out[i].dMkron        = in[i].dMkron;      
-
-    out[i].Mstdev        = in[i].Mstdev;      
+    out[i].MpsfChp       = in[i].M;      
+    out[i].dMpsfChp      = in[i].dM;      
+    out[i].sMpsfChp      = in[i].Mstdev;      
+    out[i].MapChp        = in[i].Map;      
+    out[i].dMapChp       = in[i].dMap;      
+    out[i].sMapChp       = in[i].sMap;      
+    out[i].MkronChp      = in[i].Mkron;      
+    out[i].dMkronChp     = in[i].dMkron;      
+    out[i].sMkronChp     = in[i].sMkron;      
+
     out[i].Mmin          = in[i].Mmin;      
     out[i].Mmax          = in[i].Mmax;      
Index: branches/eam_branches/ohana.20170822/src/libdvo/src/dvo_convert_PS1_V5_LOAD.c
===================================================================
--- branches/eam_branches/ohana.20170822/src/libdvo/src/dvo_convert_PS1_V5_LOAD.c	(revision 40211)
+++ branches/eam_branches/ohana.20170822/src/libdvo/src/dvo_convert_PS1_V5_LOAD.c	(revision 40212)
@@ -221,5 +221,5 @@
     dvo_secfilt_init (&out[i], SECFILT_RESET_ALL);
 
-    out[i].M             = in[i].M;      
+    out[i].MpsfChp       = in[i].M;      
     out[i].Ncode         = in[i].Ncode;
     out[i].Nused         = in[i].Nused;
@@ -237,5 +237,5 @@
   for (i = 0; i < Nvalues; i++) {
 
-    out[i].M             = in[i].M;      
+    out[i].M             = in[i].MpsfChp;      
     out[i].Ncode         = in[i].Ncode;
     out[i].Nused         = in[i].Nused;
Index: branches/eam_branches/ohana.20170822/src/libdvo/src/dvo_convert_PS1_V6.c
===================================================================
--- branches/eam_branches/ohana.20170822/src/libdvo/src/dvo_convert_PS1_V6.c	(revision 40211)
+++ branches/eam_branches/ohana.20170822/src/libdvo/src/dvo_convert_PS1_V6.c	(revision 40212)
@@ -311,17 +311,17 @@
     dvo_secfilt_init (&out[i], SECFILT_RESET_ALL);
 
-    out[i].M             = in[i].M;      
-    out[i].dM            = in[i].dM;      
-    out[i].Map           = in[i].Map;      
-    out[i].dMap          = in[i].dMap;      
-    out[i].sMap          = in[i].sMap;      
-    out[i].Mkron         = in[i].Mkron;      
-    out[i].dMkron        = in[i].dMkron;      
-    out[i].sMkron        = in[i].sMkron;      
+    out[i].MpsfChp       = in[i].M;      
+    out[i].sMpsfChp      = in[i].Mstdev;      
+    out[i].dMpsfChp      = in[i].dM;      
+    out[i].MapChp        = in[i].Map;      
+    out[i].dMapChp       = in[i].dMap;      
+    out[i].sMapChp       = in[i].sMap;      
+    out[i].MkronChp      = in[i].Mkron;      
+    out[i].dMkronChp     = in[i].dMkron;      
+    out[i].sMkronChp     = in[i].sMkron;      
 
     out[i].psfQfMax      = in[i].psfQfMax;      
     out[i].psfQfPerfMax  = in[i].psfQfPerfMax;      
 
-    out[i].Mstdev        = in[i].Mstdev;      
     out[i].Mmin          = in[i].Mmin;      
     out[i].Mmax          = in[i].Mmax;      
@@ -389,17 +389,17 @@
   for (i = 0; i < Nvalues; i++) {
 
-    out[i].M             = in[i].M;      
-    out[i].dM            = in[i].dM;      
-    out[i].Map           = in[i].Map;      
-    out[i].dMap          = in[i].dMap;      
-    out[i].sMap          = in[i].sMap;      
-    out[i].Mkron         = in[i].Mkron;      
-    out[i].dMkron        = in[i].dMkron;      
-    out[i].sMkron        = in[i].sMkron;      
+    out[i].M             = in[i].MpsfChp;      
+    out[i].dM            = in[i].dMpsfChp;      
+    out[i].Mstdev        = in[i].sMpsfChp;      
+    out[i].Map           = in[i].MapChp;      
+    out[i].dMap          = in[i].dMapChp;      
+    out[i].sMap          = in[i].sMapChp;      
+    out[i].Mkron         = in[i].MkronChp;      
+    out[i].dMkron        = in[i].dMkronChp;      
+    out[i].sMkron        = in[i].sMkronChp;      
 
     out[i].psfQfMax      = in[i].psfQfMax;      
     out[i].psfQfPerfMax  = in[i].psfQfPerfMax;      
 
-    out[i].Mstdev        = in[i].Mstdev;      
     out[i].Mmin          = in[i].Mmin;      
     out[i].Mmax          = in[i].Mmax;      
Index: branches/eam_branches/ohana.20170822/src/libdvo/src/dvo_convert_elixir.c
===================================================================
--- branches/eam_branches/ohana.20170822/src/libdvo/src/dvo_convert_elixir.c	(revision 40211)
+++ branches/eam_branches/ohana.20170822/src/libdvo/src/dvo_convert_elixir.c	(revision 40212)
@@ -109,6 +109,6 @@
 
     // changed for PANSTARRS_DEV_0 (moved from Average to Measure)
-    primary[0][i].M     = (in[i].M  == NAN_S_SHORT) ? NAN : in[i].M  * 0.001;      
-    primary[0][i].dM    = (in[i].dM == NAN_S_SHORT) ? NAN : in[i].dM * 0.001;      
+    primary[0][i].MpsfChp  = (in[i].M  == NAN_S_SHORT) ? NAN : in[i].M  * 0.001;      
+    primary[0][i].dMpsfChp = (in[i].dM == NAN_S_SHORT) ? NAN : in[i].dM * 0.001;      
     primary[0][i].Mchisq= pow (10.0, 0.01*in[i].Xm);     
 
@@ -142,6 +142,6 @@
 
     // changed for PANSTARRS_DEV_0 (moved from Average to Measure)
-    out[i].M       = isnan(primary[i].M)  ? NAN_S_SHORT : primary[i].M   * 1000.0;
-    out[i].dM      = isnan(primary[i].dM) ? NAN_S_SHORT : primary[i].dM  * 1000.0;
+    out[i].M       = isnan(primary[i].MpsfChp)  ? NAN_S_SHORT : primary[i].MpsfChp   * 1000.0;
+    out[i].dM      = isnan(primary[i].dMpsfChp) ? NAN_S_SHORT : primary[i].dMpsfChp  * 1000.0;
     out[i].Xm      = 100.0*log10(primary[i].Mchisq);     
 
@@ -172,6 +172,6 @@
 
     // added or changed for PANSTARRS_DEV_0
-    out[i].M     = (in[i].M  == NAN_S_SHORT) ? NAN : in[i].M   * 0.001;
-    out[i].dM    = (in[i].dM == NAN_S_SHORT) ? NAN : in[i].dM  * 0.001;
+    out[i].MpsfChp     = (in[i].M  == NAN_S_SHORT) ? NAN : in[i].M   * 0.001;
+    out[i].dMpsfChp    = (in[i].dM == NAN_S_SHORT) ? NAN : in[i].dM  * 0.001;
   }
   return (out);
@@ -190,6 +190,6 @@
 
     // added or changed for PANSTARRS_DEV_0
-    out[i].M     = isnan(in[i].M)  ? NAN_S_SHORT : in[i].M   * 1000.0;
-    out[i].dM    = isnan(in[i].dM) ? NAN_S_SHORT : in[i].dM  * 1000.0;
+    out[i].M     = isnan(in[i].MpsfChp)  ? NAN_S_SHORT : in[i].MpsfChp   * 1000.0;
+    out[i].dM    = isnan(in[i].dMpsfChp) ? NAN_S_SHORT : in[i].dMpsfChp  * 1000.0;
   }
   return (out);
Index: branches/eam_branches/ohana.20170822/src/libdvo/src/dvo_convert_loneos.c
===================================================================
--- branches/eam_branches/ohana.20170822/src/libdvo/src/dvo_convert_loneos.c	(revision 40211)
+++ branches/eam_branches/ohana.20170822/src/libdvo/src/dvo_convert_loneos.c	(revision 40212)
@@ -89,6 +89,6 @@
 
     // changed for PANSTARRS_DEV_0 (moved from Average to Measure)
-    primary[0][i].M     = (in[i].M  == NAN_S_SHORT) ? NAN : in[i].M  * 0.001;      
-    primary[0][i].Mchisq= pow (10.0, 0.01*in[i].Xm);     
+    primary[0][i].MpsfChp = (in[i].M  == NAN_S_SHORT) ? NAN : in[i].M  * 0.001;      
+    primary[0][i].Mchisq  = pow (10.0, 0.01*in[i].Xm);     
 
     // added for PANSTARRS_DEV_0
@@ -123,5 +123,5 @@
 
     // changed for PANSTARRS_DEV_0 (moved from Average to Measure)
-    out[i].M       = isnan(primary[i].M)  ? NAN_S_SHORT : primary[i].M   * 1000.0;
+    out[i].M       = isnan(primary[i].MpsfChp)  ? NAN_S_SHORT : primary[i].MpsfChp   * 1000.0;
     out[i].Xm      = 100.0*log10(primary[i].Mchisq);     
 
@@ -152,5 +152,5 @@
 
     // added or changed for PANSTARRS_DEV_0
-    out[i].M     = (in[i].M  == NAN_S_SHORT) ? NAN : in[i].M * 0.001;
+    out[i].MpsfChp = (in[i].M  == NAN_S_SHORT) ? NAN : in[i].M * 0.001;
   }
   return (out);
@@ -169,5 +169,5 @@
 
     // added or changed for PANSTARRS_DEV_0
-    out[i].M    = isnan(in[i].M)  ? NAN_S_SHORT : in[i].M * 1000.0;
+    out[i].M    = isnan(in[i].MpsfChp)  ? NAN_S_SHORT : in[i].MpsfChp * 1000.0;
   }
   return (out);
Index: branches/eam_branches/ohana.20170822/src/libdvo/src/dvo_convert_panstarrs_DEV_0.c
===================================================================
--- branches/eam_branches/ohana.20170822/src/libdvo/src/dvo_convert_panstarrs_DEV_0.c	(revision 40211)
+++ branches/eam_branches/ohana.20170822/src/libdvo/src/dvo_convert_panstarrs_DEV_0.c	(revision 40212)
@@ -188,6 +188,7 @@
     dvo_secfilt_init (&out[i], SECFILT_RESET_ALL);
 
-    out[i].M     = in[i].M;      
-    out[i].dM    = in[i].dM;      
+    out[i].MpsfChp     = in[i].M;      
+    out[i].dMpsfChp    = in[i].dM;      
+
     out[i].Mchisq= pow (10.0, 0.01*in[i].Xm);     
     out[i].Ncode = in[i].Ncode;
@@ -206,6 +207,7 @@
 
   for (i = 0; i < Nvalues; i++) {
-    out[i].M     = in[i].M;      
-    out[i].dM    = in[i].dM;      
+    out[i].M             = in[i].MpsfChp;      
+    out[i].dM            = in[i].dMpsfChp;      
+
     out[i].Xm    = 100.0*log10(in[i].Mchisq);     
     out[i].Ncode = in[i].Ncode;
Index: branches/eam_branches/ohana.20170822/src/libdvo/src/dvo_convert_panstarrs_DEV_1.c
===================================================================
--- branches/eam_branches/ohana.20170822/src/libdvo/src/dvo_convert_panstarrs_DEV_1.c	(revision 40211)
+++ branches/eam_branches/ohana.20170822/src/libdvo/src/dvo_convert_panstarrs_DEV_1.c	(revision 40212)
@@ -188,6 +188,7 @@
     dvo_secfilt_init (&out[i], SECFILT_RESET_ALL);
 
-    out[i].M     = in[i].M;      
-    out[i].dM    = in[i].dM;      
+    out[i].MpsfChp     = in[i].M;      
+    out[i].dMpsfChp    = in[i].dM;      
+
     out[i].Mchisq= pow (10.0, 0.01*in[i].Xm);     
     out[i].Ncode = in[i].Ncode;
@@ -206,6 +207,7 @@
 
   for (i = 0; i < Nvalues; i++) {
-    out[i].M     = in[i].M;      
-    out[i].dM    = in[i].dM;      
+    out[i].M             = in[i].MpsfChp;      
+    out[i].dM            = in[i].dMpsfChp;      
+
     out[i].Xm    = 100.0*log10(in[i].Mchisq);     
     out[i].Ncode = in[i].Ncode;
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 40211)
+++ branches/eam_branches/ohana.20170822/src/libdvo/src/dvo_photcode_ops.c	(revision 40212)
@@ -479,11 +479,11 @@
       switch (class) {
 	case MAG_CLASS_PSF:
-	  Mave = secfilt[Ns].M;
+	  Mave = secfilt[Ns].MpsfChp;
 	  break;
 	case MAG_CLASS_KRON:
-	  Mave = secfilt[Ns].Mkron;
+	  Mave = secfilt[Ns].MkronChp;
 	  break;
 	case MAG_CLASS_APER:
-	  Mave = secfilt[Ns].Map;
+	  Mave = secfilt[Ns].MapChp;
 	  break;
 	default:
@@ -592,11 +592,11 @@
       switch (class) {
 	case MAG_CLASS_PSF:
-	  dMave = secfilt[Ns].dM;
+	  dMave = secfilt[Ns].dMpsfChp;
 	  break;
 	case MAG_CLASS_KRON:
-	  dMave = secfilt[Ns].dMkron;
+	  dMave = secfilt[Ns].dMkronChp;
 	  break;
 	case MAG_CLASS_APER:
-	  dMave = secfilt[Ns].dMap;
+	  dMave = secfilt[Ns].dMapChp;
 	  break;
 	default:
@@ -677,6 +677,6 @@
     Ns2 = photcodes[0].hashNsec[code[0].c2];
   
-    m1 = (Ns1 == -1) ? NAN : secfilt[Ns1].M;
-    m2 = (Ns2 == -1) ? NAN : secfilt[Ns2].M;
+    m1 = (Ns1 == -1) ? NAN : secfilt[Ns1].MpsfChp;
+    m2 = (Ns2 == -1) ? NAN : secfilt[Ns2].MpsfChp;
     mc = (isnan(m1) || isnan(m2)) ? NAN : (m1 - m2);
     return (mc);
@@ -694,5 +694,5 @@
   } else {
     Ns = photcodes[0].hashNsec[color[0].code];
-    m1 = (Ns == -1) ? NAN : secfilt[Ns].M;
+    m1 = (Ns == -1) ? NAN : secfilt[Ns].MpsfChp;
   }	
 
@@ -708,5 +708,5 @@
   } else {
     Ns = photcodes[0].hashNsec[color[0].code];
-    m2 = (Ns == -1) ? NAN : secfilt[Ns].M;
+    m2 = (Ns == -1) ? NAN : secfilt[Ns].MpsfChp;
   }	
   mc = (isnan(m1) || isnan(m2)) ? NAN : (m1 - m2);
@@ -727,11 +727,11 @@
       switch (class) {
 	case MAG_CLASS_PSF:
-	  Mstdev = secfilt[Ns].Mstdev;
+	  Mstdev = secfilt[Ns].sMpsfChp;
 	  break;
 	case MAG_CLASS_KRON:
-	  Mstdev = secfilt[Ns].sMkron;
+	  Mstdev = secfilt[Ns].sMkronChp;
 	  break;
 	case MAG_CLASS_APER:
-	  Mstdev = secfilt[Ns].sMap;
+	  Mstdev = secfilt[Ns].sMapChp;
 	  break;
 	default:
@@ -1040,5 +1040,5 @@
   } else {
     Ns = photcodes[0].hashNsec[code[0].code];
-    M1 = (Ns == -1) ? NAN : secfilt[Ns].M;
+    M1 = (Ns == -1) ? NAN : secfilt[Ns].MpsfChp;
   }	
 
@@ -1056,5 +1056,5 @@
   } else {
     Ns = photcodes[0].hashNsec[code[0].code];
-    M2 = (Ns == -1) ? NAN : secfilt[Ns].M;
+    M2 = (Ns == -1) ? NAN : secfilt[Ns].MpsfChp;
   }	
   
@@ -1289,11 +1289,11 @@
       switch (class) {
 	case MAG_CLASS_PSF:
-	  Fave = MagToFlux(secfilt[Ns].M - 8.9);
+	  Fave = MagToFlux(secfilt[Ns].MpsfChp - 8.9);
 	  break;
 	case MAG_CLASS_KRON:
-	  Fave = MagToFlux(secfilt[Ns].Mkron - 8.9);
+	  Fave = MagToFlux(secfilt[Ns].MkronChp - 8.9);
 	  break;
 	case MAG_CLASS_APER:
-	  Fave = MagToFlux(secfilt[Ns].Map - 8.9);
+	  Fave = MagToFlux(secfilt[Ns].MapChp - 8.9);
 	  break;
 	default:
@@ -1350,11 +1350,11 @@
       switch (class) {
 	case MAG_CLASS_PSF:
-	  dFave = secfilt[Ns].dM * MagToFlux(secfilt[Ns].M - 8.9);
+	  dFave = secfilt[Ns].dMpsfChp * MagToFlux(secfilt[Ns].MpsfChp - 8.9);
 	  break;
 	case MAG_CLASS_KRON:
-	  dFave = secfilt[Ns].dMkron * MagToFlux(secfilt[Ns].Mkron - 8.9);
+	  dFave = secfilt[Ns].dMkronChp * MagToFlux(secfilt[Ns].MkronChp - 8.9);
 	  break;
 	case MAG_CLASS_APER:
-	  dFave = secfilt[Ns].dMap * MagToFlux(secfilt[Ns].Map - 8.9);
+	  dFave = secfilt[Ns].dMapChp * MagToFlux(secfilt[Ns].MapChp - 8.9);
 	  break;
 	default:
@@ -1840,11 +1840,11 @@
       switch (class) {
 	case MAG_CLASS_PSF:
-	  Mave = secfilt[Ns].M;
+	  Mave = secfilt[Ns].MpsfChp;
 	  break;
 	case MAG_CLASS_KRON:
-	  Mave = secfilt[Ns].Mkron;
+	  Mave = secfilt[Ns].MkronChp;
 	  break;
 	case MAG_CLASS_APER:
-	  Mave = secfilt[Ns].Map;
+	  Mave = secfilt[Ns].MapChp;
 	  break;
 	default:
@@ -1927,6 +1927,6 @@
     Ns2 = photcodes[0].hashNsec[code[0].c2];
   
-    m1 = (Ns1 == -1) ? NAN : secfilt[Ns1].M;
-    m2 = (Ns2 == -1) ? NAN : secfilt[Ns2].M;
+    m1 = (Ns1 == -1) ? NAN : secfilt[Ns1].MpsfChp;
+    m2 = (Ns2 == -1) ? NAN : secfilt[Ns2].MpsfChp;
     mc = (isnan(m1) || isnan(m2)) ? NAN : (m1 - m2);
     return (mc);
@@ -1944,5 +1944,5 @@
   } else {
     Ns = photcodes[0].hashNsec[color[0].code];
-    m1 = (Ns == -1) ? NAN : secfilt[Ns].M;
+    m1 = (Ns == -1) ? NAN : secfilt[Ns].MpsfChp;
   }	
 
@@ -1958,5 +1958,5 @@
   } else {
     Ns = photcodes[0].hashNsec[color[0].code];
-    m2 = (Ns == -1) ? NAN : secfilt[Ns].M;
+    m2 = (Ns == -1) ? NAN : secfilt[Ns].MpsfChp;
   }	
   mc = (isnan(m1) || isnan(m2)) ? NAN : (m1 - m2);
@@ -1973,5 +1973,5 @@
 
   Ns = photcodes[0].hashNsec[code[0].code];
-  dM  = (Ns == -1) ? NAN : secfilt[Ns].dM;
+  dM  = (Ns == -1) ? NAN : secfilt[Ns].dMpsfChp;
   return (dM);
 }
@@ -2010,5 +2010,5 @@
   } else {
     Ns = photcodes[0].hashNsec[code[0].code];
-    M1 = (Ns == -1) ? NAN : secfilt[Ns].M;
+    M1 = (Ns == -1) ? NAN : secfilt[Ns].MpsfChp;
   }	
 
@@ -2026,5 +2026,5 @@
   } else {
     Ns = photcodes[0].hashNsec[code[0].code];
-    M2 = (Ns == -1) ? NAN : secfilt[Ns].M;
+    M2 = (Ns == -1) ? NAN : secfilt[Ns].MpsfChp;
   }