Changeset 40477 for branches/czw_branch/20170908/Ohana/src/opihi/dvo/gstar.c

Timestamp:

Jun 27, 2018, 3:20:35 PM (8 years ago)

Author:

eugene

Message:

merge changes from trunk

Location:

branches/czw_branch/20170908/Ohana

Files:

• . (modified) (1 prop)
• src/opihi/dvo/gstar.c (modified) (12 diffs)

branches/czw_branch/20170908/Ohana/src/opihi/dvo/gstar.c

@@ -760 +760 @@
 
             if (FULL_OUTPUT) {
-              gprint (GP_LOG, "%6.3f ", catalog.measure[Nv].Mcal);
+              gprint (GP_LOG, "%6.3f ", catalog.measure[Nv].McalPSF);
+              gprint (GP_LOG, "%6.3f ", catalog.measure[Nv].McalAPER);
               gprint (GP_LOG, "%6.3f ", catalog.measure[Nv].Mflat);
-              gprint (GP_LOG, "%6.3f ", catalog.measure[Nv].Map);
-              gprint (GP_LOG, "%6.3f ", catalog.measure[Nv].Mkron);
+              Mrel = PhotRel (&catalog.measure[Nv], &catalog.average[k], &catalog.secfilt[k*Nsecfilt], MAG_CLASS_APER);
+              gprint (GP_LOG, "%6.3f ", Mrel);
+              Mrel = PhotRel (&catalog.measure[Nv], &catalog.average[k], &catalog.secfilt[k*Nsecfilt], MAG_CLASS_KRON);
+              gprint (GP_LOG, "%6.3f ", Mrel);
               gprint (GP_LOG, "%6.3f ", catalog.measure[Nv].dMkron);
               gprint (GP_LOG, "%5.1f ", pow(10.0, 0.4*catalog.measure[Nv].dt));
@@ -960 +963 @@
         print_double (NAN);
       } else {
-        print_double_exp (secfilt[seq].Mstdev);
+        print_double_exp (secfilt[seq].sMpsfChp);
       }
       break;
@@ -1023 +1026 @@
         print_double (NAN);
       } else {
-        print_double (secfilt[seq].M);
+        print_double (secfilt[seq].MpsfChp);
       }
       break;
@@ -1031 +1034 @@
         print_double (NAN);
       } else {
-        print_double (secfilt[seq].dM);
+        print_double (secfilt[seq].dMpsfChp);
       }
       break;
@@ -1039 +1042 @@
         print_double (NAN);
       } else {
-        print_double (secfilt[seq].Map);
+        print_double (secfilt[seq].MapChp);
       }
       break;
@@ -1047 +1050 @@
         print_double (NAN);
       } else {
-        print_double (secfilt[seq].dMap);
+        print_double (secfilt[seq].dMapChp);
       }
       break;
@@ -1055 +1058 @@
         print_double (NAN);
       } else {
-        print_double_exp (secfilt[seq].sMap);
+        print_double_exp (secfilt[seq].sMapChp);
       }
       break;
@@ -1063 +1066 @@
         print_double (NAN);
       } else {
-        print_double_exp (secfilt[seq].dMap);
+        print_double_exp (secfilt[seq].dMapChp);
       }
       break;
@@ -1071 +1074 @@
         print_double (NAN);
       } else {
-        print_double (secfilt[seq].Mkron);
+        print_double (secfilt[seq].MkronChp);
       }
       break;
@@ -1079 +1082 @@
         print_double (NAN);
       } else {
-        print_double (secfilt[seq].dMkron);
+        print_double (secfilt[seq].dMkronChp);
       }
       break;
@@ -1087 +1090 @@
         print_double (NAN);
       } else {
-        print_double_exp (secfilt[seq].sMkron);
+        print_double_exp (secfilt[seq].sMkronChp);
       }
       break;
@@ -1095 +1098 @@
         print_double (NAN);
       } else {
-        print_double_exp (secfilt[seq].dMkron);
+        print_double_exp (secfilt[seq].dMkronChp);
       }
       break;