Changeset 40291 for trunk/Ohana/src/libdvo/src/dvo_convert_PS1_DEV_2.c

Timestamp:

Dec 13, 2017, 10:53:48 AM (9 years ago)

Author:

eugene

Message:

merge EAM development branch changes for DR2 into trunk (add PS1_V6 dvo format; change Mcal to McalPSF, McalAPER; change opihi int vectors to 64bit)

Location:

trunk/Ohana

Files:

• . (modified) (1 prop)
• src/libdvo/src/dvo_convert_PS1_DEV_2.c (modified) (6 diffs)

trunk/Ohana/src/libdvo/src/dvo_convert_PS1_DEV_2.c

@@ -17 +17 @@
     out[i].D          = ave[averef].D - in[i].dD / 3600.0;
     out[i].M          = in[i].M;
-    out[i].Mcal       = in[i].Mcal;
+    out[i].McalPSF    = in[i].Mcal;
+    out[i].McalAPER   = in[i].Mcal;
     out[i].Map        = in[i].Map;
     out[i].dM         = in[i].dM;
@@ -62 +63 @@
     out[i].dD         = 3600.0*(ave[averef].D - in[i].D);
     out[i].M          = in[i].M;
-    out[i].Mcal       = in[i].Mcal;
+    out[i].Mcal       = in[i].McalPSF;
     out[i].Map        = in[i].Map;
     out[i].dM         = in[i].dM;
@@ -177 +178 @@
     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 +196 @@
 
   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;
@@ -232 +235 @@
     out[i].apmifit          = in[i].apmifit;
     out[i].dapmifit         = in[i].dapmifit;
-    out[i].Mcal             = in[i].Mcal;
+
+    out[i].McalPSF          = in[i].Mcal;
+    out[i].McalAPER         = in[i].Mcal;
     out[i].dMcal            = in[i].dMcal;
-    out[i].Xm               = in[i].Xm;
+    out[i].McalChiSq        = pow(10.0, 0.01*in[i].Xm);
+
     out[i].photcode         = in[i].photcode;
     out[i].exptime          = in[i].exptime;
@@ -298 +304 @@
     out[i].apmifit          = in[i].apmifit;
     out[i].dapmifit         = in[i].dapmifit;
-    out[i].Mcal             = in[i].Mcal;
+
+    out[i].Mcal             = in[i].McalPSF;
     out[i].dMcal            = in[i].dMcal;
-    out[i].Xm               = in[i].Xm;
+    out[i].Xm               = 100.0*log10(in[i].McalChiSq);
+
     out[i].photcode         = in[i].photcode;
     out[i].exptime          = in[i].exptime;