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

Timestamp:

Mar 8, 2007, 12:21:18 PM (19 years ago)

Author:

eugene

Message:

complete merge from branch dvo-mods-2007-02

File:

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

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

@@ -1 +1 @@
 # include "dvoshell.h"
 
-void initPhotcodeSequence (int Nsec);
+void initPhotcodeSequence (int Nsecfilt);
 void freePhotcodeSequence ();
 void printPhotcodeSequence (Average *average, SecFilt *secfilt, int entry, int type);
@@ -11 +11 @@
   double Mcat, Mrel;
   float *RA, *DEC;
-  int i, j, k, m, N, *N1, Nsec, NPTS, QUIET;
+  int i, j, k, m, N, *N1, Nsecfilt, NPTS, QUIET;
   int Nstars, found, GetMeasures, Nlo, Nhi;
   int SaveVectors;
@@ -22 +22 @@
 
   if (!InitPhotcodes ()) return (FALSE);
-  Nsec = GetPhotcodeNsecfilt ();
+  Nsecfilt = GetPhotcodeNsecfilt ();
 
   QUIET = FALSE;
@@ -127 +127 @@
   }
 
-  initPhotcodeSequence (Nsec);
+  initPhotcodeSequence (Nsecfilt);
 
   for (i = Nlo; (i < catalog.Naverage) && !found; i++) {
@@ -139 +139 @@
       if (!QUIET) {
         gprint (GP_LOG, "star: %d\n", k);
-        gprint (GP_LOG, "%9.5f %9.5f %3d of %3d  %4.1f %5d\n", catalog.average[k].R, catalog.average[k].D, 
+        gprint (GP_LOG, "%11.7f %11.7f %3d of %3d  %4.1f %5d\n", catalog.average[k].R, catalog.average[k].D, 
                  catalog.average[k].Nm, catalog.average[k].Nn + catalog.average[k].Nm,
                  0.01*catalog.average[k].Xp, catalog.average[k].code);
       
         /* filter names */
-        for (j = 0; j < Nsec + 1; j++) printPhotcodeSequence (&catalog.average[k], &catalog.secfilt[Nsec*k], j, 3);
+        for (j = 0; j < Nsecfilt; j++) printPhotcodeSequence (&catalog.average[k], &catalog.secfilt[Nsecfilt*k], j, 3);
         gprint (GP_LOG, "\n");
 
         /* average mags */
-        for (j = 0; j < Nsec + 1; j++) printPhotcodeSequence (&catalog.average[k], &catalog.secfilt[Nsec*k], j, 0);
+        for (j = 0; j < Nsecfilt; j++) printPhotcodeSequence (&catalog.average[k], &catalog.secfilt[Nsecfilt*k], j, 0);
         gprint (GP_LOG, "\n");
 
         /* average mag errors */
-        for (j = 0; j < Nsec + 1; j++) printPhotcodeSequence (&catalog.average[k], &catalog.secfilt[Nsec*k], j, 1);
+        for (j = 0; j < Nsecfilt; j++) printPhotcodeSequence (&catalog.average[k], &catalog.secfilt[Nsecfilt*k], j, 1);
         gprint (GP_LOG, "\n");
 
         /* average mag chisq */
-        for (j = 0; j < Nsec + 1; j++) printPhotcodeSequence (&catalog.average[k], &catalog.secfilt[Nsec*k], j, 2);
+        for (j = 0; j < Nsecfilt; j++) printPhotcodeSequence (&catalog.average[k], &catalog.secfilt[Nsecfilt*k], j, 2);
         gprint (GP_LOG, "\n");
       }
@@ -165 +165 @@
 
           Mcat = PhotCat (&catalog.measure[m]);
-          Mrel = PhotRel (&catalog.measure[m], &catalog.average[k], &catalog.secfilt[k*Nsec]);
+          Mrel = PhotRel (&catalog.measure[m], &catalog.average[k], &catalog.secfilt[k*Nsecfilt]);
 
           if (GetMeasures && !QUIET) {
             date = sec_to_date (catalog.measure[m].t);
             gprint (GP_LOG, "%6.3f %6.3f %5.3f  %20s  %5.2f %5.2f %2d %3x %3d %-20s\n", 
-                     Mcat, Mrel, catalog.measure[m].dM_PS,
-                     date, catalog.measure[m].dR_PS, catalog.measure[m].dD_PS,
+                     Mcat, Mrel, catalog.measure[m].dM,
+                     date, catalog.measure[m].dR, catalog.measure[m].dD,
                      catalog.measure[m].dophot, catalog.measure[m].flags,
-                     catalog.measure[m].source, GetPhotcodeNamebyCode (catalog.measure[m].source));
+                     catalog.measure[m].photcode, GetPhotcodeNamebyCode (catalog.measure[m].photcode));
             free (date);
           }
@@ -180 +180 @@
             vec1[0].elements[N] = Mcat;
             vec2[0].elements[N] = TimeValue (catalog.measure[m].t, TimeReference, TimeFormat);
-            vec3[0].elements[N] = catalog.measure[m].airmass_PS;
-            vec4[0].elements[N] = catalog.measure[m].source;
+            vec3[0].elements[N] = catalog.measure[m].airmass;
+            vec4[0].elements[N] = catalog.measure[m].photcode;
             N ++;
             if (N == NPTS - 1) {
@@ -223 +223 @@
 static int *sequence = NULL;
 
-void initPhotcodeSequence (int Nsec) {
+void initPhotcodeSequence (int Nsecfilt) {
 
   int j;
@@ -230 +230 @@
 
   // sequence contains, in desired order, secfilt number (0 == pri)
-  ALLOCATE (sequence, int, Nsec + 1);
-  ALLOCATE (codeNumber, int, Nsec + 1);
+  ALLOCATE (sequence, int, Nsecfilt);
+  ALLOCATE (codeNumber, int, Nsecfilt);
   
   /* filter names -- primary code is 0 in this function */
-  for (j = 0; j < Nsec + 1; j++) {
+  for (j = 0; j < Nsecfilt; j++) {
     code = GetPhotcodebyNsec (j);
     codeNumber[j] = code[0].code;
@@ -240 +240 @@
   }
 
-  isort_pair (codeNumber, sequence, Nsec + 1);
+  isort_pair (codeNumber, sequence, Nsecfilt);
   free (codeNumber);
 }
@@ -254 +254 @@
   PhotCode *code;
 
-  seq = sequence[entry] - 1;
+  seq = sequence[entry];
 
   switch (type) {
     case 0: /* average mags */
       if (seq == -1) {
-        print_value (average[0].M, average[0].M);
+        print_value (NO_MAG, NO_MAG);
       } else {
-        print_value (secfilt[seq].M_PS, secfilt[seq].M_PS);
+        print_value (secfilt[seq].M, secfilt[seq].M);
       }
       break;
@@ -267 +267 @@
     case 1: /* average mags errors */
       if (seq == -1) {
-        print_value (average[0].dM, average[0].dM);
+        print_value (NO_MAG, NO_MAG);
       } else {
-        print_value (secfilt[seq].dM_PS, secfilt[seq].dM_PS);
+        print_value (secfilt[seq].dM, secfilt[seq].dM);
       }
       break;
@@ -275 +275 @@
     case 2: /* average mag chisq */
       if (seq == -1) {
-        print_value (pow (10.0, 0.01*average[0].Xm), average[0].Xm);
+        print_value (NO_MAG, NO_MAG);
       } else {
         print_value (pow (10.0, 0.01*secfilt[seq].Xm), secfilt[seq].Xm);
@@ -282 +282 @@
 
     case 3: /* filter names */
-      code = GetPhotcodebyNsec (seq + 1);
-      gprint (GP_LOG, "%6s ", code[0].name);
-      break;
-  }
-}
+      code = GetPhotcodebyNsec (seq);
+      gprint (GP_LOG, "%-6s ", code[0].name);
+      break;
+  }
+}