Changeset 37049 for trunk/Ohana/src/opihi/dvo/gstar.c

Timestamp:

Jul 17, 2014, 10:21:10 AM (12 years ago)

Author:

eugene

Message:

various changes due to mods to average.d and measure.d; new parsing concept for photocode-related fields

File:

• trunk/Ohana/src/opihi/dvo/gstar.c (modified) (11 diffs)

trunk/Ohana/src/opihi/dvo/gstar.c

@@ -15 +15 @@
   GSTAR_UCDIST,
   GSTAR_AVE_AP_MAG,
-  GSTAR_AVE_MAG_20,
-  GSTAR_AVE_MAG_80,
+  GSTAR_AVE_MAG_MIN,
+  GSTAR_AVE_MAG_MAX,
   GSTAR_AVE_KRON_MAG,
   GSTAR_AVE_KRON_MAG_ERR,
@@ -307 +307 @@
           gprint (GP_LOG, "\n");
 
-          /* M_20 */
-          for (j = 0; j < Nsecfilt; j++) printPhotcodeSequence (&catalog.average[k], &catalog.secfilt[Nsecfilt*k], j, GSTAR_AVE_MAG_20);
-          gprint (GP_LOG, "\n");
-
-          /* M_80 */
-          for (j = 0; j < Nsecfilt; j++) printPhotcodeSequence (&catalog.average[k], &catalog.secfilt[Nsecfilt*k], j, GSTAR_AVE_MAG_80);;
+          /* Mmin */
+          for (j = 0; j < Nsecfilt; j++) printPhotcodeSequence (&catalog.average[k], &catalog.secfilt[Nsecfilt*k], j, GSTAR_AVE_MAG_MIN);
+          gprint (GP_LOG, "\n");
+
+          /* Mmax */
+          for (j = 0; j < Nsecfilt; j++) printPhotcodeSequence (&catalog.average[k], &catalog.secfilt[Nsecfilt*k], j, GSTAR_AVE_MAG_MAX);;
           gprint (GP_LOG, "\n");
 
@@ -374 +374 @@
           int Nv = index[j];
 
-          Mcat = PhotCat (&catalog.measure[Nv]);
+          Mcat = PhotCat (&catalog.measure[Nv], MAG_CLASS_PSF);
           if (INST) {
-            Mrel = PhotInst (&catalog.measure[Nv]);
+            Mrel = PhotInst (&catalog.measure[Nv], MAG_CLASS_PSF);
           } else {
-            Mrel = PhotRel (&catalog.measure[Nv], &catalog.average[k], &catalog.secfilt[k*Nsecfilt]);
+            Mrel = PhotRel (&catalog.measure[Nv], &catalog.average[k], &catalog.secfilt[k*Nsecfilt], MAG_CLASS_PSF);
           }
+
+          float dRoff = dvoOffsetR(&catalog.measure[Nv], &catalog.average[k]);
+          float dDoff = dvoOffsetD(&catalog.measure[Nv], &catalog.average[k]);
 
           if (GetMeasures && !QUIET) {
@@ -387 +390 @@
             gprint (GP_LOG, "%6.3f  ", catalog.measure[Nv].dM);
             gprint (GP_LOG, "%20s  ",  date);
-            gprint (GP_LOG, "%7.4f ",  catalog.measure[Nv].dR);
-            gprint (GP_LOG, "%7.4f ",  catalog.measure[Nv].dD);
+            
+            gprint (GP_LOG, "%7.4f ",  dRoff);
+            gprint (GP_LOG, "%7.4f ",  dDoff);
             gprint (GP_LOG, "0x%08x ", catalog.measure[Nv].photFlags);
             gprint (GP_LOG, "0x%08x ", catalog.measure[Nv].dbFlags);
@@ -447 +451 @@
             vec3[0].elements.Flt[N] = catalog.measure[Nv].airmass;
             vec4[0].elements.Flt[N] = catalog.measure[Nv].photcode;
-            vec5[0].elements.Flt[N] = catalog.measure[Nv].dR;
-            vec6[0].elements.Flt[N] = catalog.measure[Nv].dD;
+            vec5[0].elements.Flt[N] = dRoff;
+            vec6[0].elements.Flt[N] = dDoff;
             N ++;
             if (N == NPTS - 1) {
@@ -561 +565 @@
     case GSTAR_AVE_MAG_CHISQ: /* average mag chisq */
       if (seq == -1) {
-        print_short (NAN_S_SHORT, NAN_S_SHORT);
-      } else {
-        print_short (pow (10.0, 0.01*secfilt[seq].Xm), secfilt[seq].Xm);
+        print_double (NAN);
+      } else {
+        print_double (secfilt[seq].Mchisq);
       }
       break;
@@ -596 +600 @@
       break;
 
-    case GSTAR_AVE_MAG_20: /* average ap mags */
-      if (seq == -1) {
-        print_double (NAN);
-      } else {
-        print_short (0.001*secfilt[seq].M_20, secfilt[seq].M_20);
-      }
-      break;
-
-    case GSTAR_AVE_MAG_80: /* average ap mags */
-      if (seq == -1) {
-        print_double (NAN);
-      } else {
-        print_short (0.001*secfilt[seq].M_80, secfilt[seq].M_80);
+    case GSTAR_AVE_MAG_MIN: /* average ap mags */
+      if (seq == -1) {
+        print_double (NAN);
+      } else {
+        print_double (secfilt[seq].Mmin);
+      }
+      break;
+
+    case GSTAR_AVE_MAG_MAX: /* average ap mags */
+      if (seq == -1) {
+        print_double (NAN);
+      } else {
+        print_double (secfilt[seq].Mmax);
       }
       break;
@@ -632 +636 @@
         print_double (NAN);
       } else {
-        print_double_exp (secfilt[seq].FluxPSF);
+        print_double_exp (secfilt[seq].FpsfStk);
       }
       break;
@@ -640 +644 @@
         print_double (NAN);
       } else {
-        print_double_exp (secfilt[seq].dFluxPSF);
+        print_double_exp (secfilt[seq].dFpsfStk);
       }
       break;
@@ -648 +652 @@
         print_double (NAN);
       } else {
-        print_double_exp (secfilt[seq].FluxKron);
+        print_double_exp (secfilt[seq].FkronStk);
       }
       break;
@@ -656 +660 @@
         print_double (NAN);
       } else {
-        print_double_exp (secfilt[seq].dFluxKron);
-      }
-      break;
-
-  }
-}
+        print_double_exp (secfilt[seq].dFkronStk);
+      }
+      break;
+
+  }
+}