Changeset 40291 for trunk/Ohana/src/libdvo/src/dvo_convert_PS1_V4.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_V4.c (modified) (9 diffs)

trunk/Ohana/src/libdvo/src/dvo_convert_PS1_V4.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].Mkron      = in[i].Mkron;
@@ -81 +82 @@
     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].Mkron      = in[i].Mkron;
@@ -234 +235 @@
     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 +251 @@
     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 +266 @@
 
   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 +282 @@
     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;      
@@ -317 +318 @@
     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;
@@ -382 +386 @@
     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;
@@ -513 +519 @@
     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].Mkron      = in[i].Mkron;