Changeset 34041 for branches/meh_branches/ppstack_test/Ohana/src/opihi/dvo/gstar.c

Timestamp:

Jun 19, 2012, 5:24:19 PM (14 years ago)

Author:

mhuber

Message:

merging latest r34040 trunk changes to branch

Location:

branches/meh_branches/ppstack_test

Files:

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

branches/meh_branches/ppstack_test/Ohana/src/opihi/dvo/gstar.c

@@ -68 +68 @@
   }
 
+  int PARALLEL = FALSE;
+  if ((N = get_argument (argc, argv, "-parallel"))) {
+    remove_argument (N, &argc, argv);
+    PARALLEL = TRUE;
+  }
+
   if (argc != 4) {
     gprint (GP_ERR, "USAGE: gstar RA DEC Radius [-m]\n");
@@ -89 +95 @@
   }
 
+  HostTable *table = NULL;  
+  if (PARALLEL) {
+    char *CATDIR = GetCATDIR();
+    table = HostTableLoad (CATDIR, sky->hosts);
+    if (!table) {
+      gprint (GP_ERR, "ERROR: failure reading Host Table %s for database %s\n", sky->hosts, CATDIR);
+      return FALSE;
+    }    
+
+    SkyRegion *region = skylist[0].regions[0];
+    int hostID = (region->hostFlags & DATA_USE_BCK) ? region->backupID : region->hostID;
+    int index = table->index[hostID];
+    
+    char hostfile[1024];
+    snprintf (hostfile, 1024, "%s/%s.cpt", table->hosts[index].pathname, region->name);
+    catalog.filename = hostfile;
+  } else {
+    catalog.filename = skylist[0].filename[0];
+  }
+
   /* lock, load, unlock catalog */
-  catalog.filename = skylist[0].filename[0];
-  catalog.catflags = GetMeasures ? LOAD_AVES | LOAD_MEAS | LOAD_SECF : LOAD_AVES | LOAD_SECF;
+  catalog.catflags = LOAD_AVES | LOAD_SECF;
+  catalog.catflags |= GetMeasures ? LOAD_MEAS : SKIP_MEAS;
   catalog.Nsecfilt = 0;
 
@@ -177 +203 @@
             gprint (GP_LOG, "%f ",     catalog.average[k].duD);
             gprint (GP_LOG, "%f ",     catalog.average[k].P);
-            gprint (GP_LOG, "%f ",     catalog.average[k].dP);
+            gprint (GP_LOG, "%f   ",     catalog.average[k].dP);
+
+            gprint (GP_LOG, "%f   ",     catalog.average[k].ChiSqAve);
+            gprint (GP_LOG, "%f   ",     catalog.average[k].ChiSqPM);
+            gprint (GP_LOG, "%f   ",     catalog.average[k].ChiSqPar);
+
+            date = ohana_sec_to_date (catalog.average[k].Tmean);
+            gprint (GP_LOG, "%20s ",     date);
+            gprint (GP_LOG, "%f   ",     catalog.average[k].Trange / 86400.0);
         }
 
@@ -197 +231 @@
         for (j = 0; j < Nsecfilt; j++) printPhotcodeSequence (&catalog.average[k], &catalog.secfilt[Nsecfilt*k], j, 2);
         gprint (GP_LOG, "\n");
-      }
-
+
+        if (FULL_OUTPUT) {
+          /* Map */
+          for (j = 0; j < Nsecfilt; j++) printPhotcodeSequence (&catalog.average[k], &catalog.secfilt[Nsecfilt*k], j, 5);
+          gprint (GP_LOG, "\n");
+
+          /* M_20 */
+          for (j = 0; j < Nsecfilt; j++) printPhotcodeSequence (&catalog.average[k], &catalog.secfilt[Nsecfilt*k], j, 6);
+          gprint (GP_LOG, "\n");
+
+          /* M_80 */
+          for (j = 0; j < Nsecfilt; j++) printPhotcodeSequence (&catalog.average[k], &catalog.secfilt[Nsecfilt*k], j, 7);
+          gprint (GP_LOG, "\n");
+
+          /* secfilt flags */
+          for (j = 0; j < Nsecfilt; j++) printPhotcodeSequence (&catalog.average[k], &catalog.secfilt[Nsecfilt*k], j, 4);
+          gprint (GP_LOG, "\n");
+
+        }
+      }
       if (GetMeasures || SaveVectors) {
         m = catalog.average[k].measureOffset;
@@ -218 +270 @@
             gprint (GP_LOG, "%7.4f ",  catalog.measure[m].dR);
             gprint (GP_LOG, "%7.4f ",  catalog.measure[m].dD);
-            gprint (GP_LOG, "%4x ",    catalog.measure[m].photFlags);
-            gprint (GP_LOG, "%3x ",    catalog.measure[m].dbFlags);
+            gprint (GP_LOG, "0x%08x ", catalog.measure[m].photFlags);
+            gprint (GP_LOG, "0x%08x ", catalog.measure[m].dbFlags);
             gprint (GP_LOG, "%5d ",    catalog.measure[m].photcode);
             gprint (GP_LOG, "%-20s ",  GetPhotcodeNamebyCode (catalog.measure[m].photcode));
@@ -226 +278 @@
 
             if (FULL_OUTPUT) {
-                gprint (GP_LOG, "%f ", catalog.measure[m].Mcal);
-                gprint (GP_LOG, "%f ", catalog.measure[m].Map);
-                gprint (GP_LOG, "%f ", pow(10.0, 0.4*catalog.measure[m].dt));
-                gprint (GP_LOG, "%f ", 1.0 + catalog.measure[m].airmass);
-                gprint (GP_LOG, "%f ", catalog.measure[m].az);
-                gprint (GP_LOG, "%f ", catalog.measure[m].Xccd);
-                gprint (GP_LOG, "%f ", catalog.measure[m].Yccd);
-                gprint (GP_LOG, "%f ", FromShortPixels(catalog.measure[m].dXccd));
-                gprint (GP_LOG, "%f ", FromShortPixels(catalog.measure[m].dYccd));
-                gprint (GP_LOG, "%f ", catalog.measure[m].Sky);
-                gprint (GP_LOG, "%f ", catalog.measure[m].dSky);
-                gprint (GP_LOG, "%d ", catalog.measure[m].averef);
-                gprint (GP_LOG, "%d ", catalog.measure[m].detID);
-                gprint (GP_LOG, "%d ", catalog.measure[m].imageID);
-                gprint (GP_LOG, "%f ", catalog.measure[m].psfQual);
-                gprint (GP_LOG, "%f ", catalog.measure[m].psfChisq);
-                gprint (GP_LOG, "%f ", catalog.measure[m].crNsigma);
-                gprint (GP_LOG, "%f ", catalog.measure[m].extNsigma);
-                gprint (GP_LOG, "%f ", FromShortDegrees(catalog.measure[m].theta));
+                gprint (GP_LOG, "%6.3f ", catalog.measure[m].Mcal);
+                gprint (GP_LOG, "%6.3f ", catalog.measure[m].Map);
+                gprint (GP_LOG, "%5.1f ", pow(10.0, 0.4*catalog.measure[m].dt));
+                gprint (GP_LOG, "%5.3f ", catalog.measure[m].airmass);
+                gprint (GP_LOG, "%6.1f ", catalog.measure[m].az);
+                gprint (GP_LOG, "%6.1f ", catalog.measure[m].Xccd);
+                gprint (GP_LOG, "%6.1f ", catalog.measure[m].Yccd);
+                gprint (GP_LOG, "%3.1f ", FromShortPixels(catalog.measure[m].dXccd));
+                gprint (GP_LOG, "%3.1f ", FromShortPixels(catalog.measure[m].dYccd));
+                gprint (GP_LOG, "%6.1f ", catalog.measure[m].Sky);
+                gprint (GP_LOG, "%5.1f ", catalog.measure[m].dSky);
+                gprint (GP_LOG, "%8d ", catalog.measure[m].averef);
+                gprint (GP_LOG, "0x%08x ", catalog.measure[m].detID);
+                gprint (GP_LOG, "0x%08x ", catalog.measure[m].imageID);
+                gprint (GP_LOG, "%.3f ", catalog.measure[m].psfQual);
+                gprint (GP_LOG, "%.1f ", catalog.measure[m].psfChisq);
+                gprint (GP_LOG, "%.1f ", catalog.measure[m].crNsigma);
+                gprint (GP_LOG, "%.1f ", catalog.measure[m].extNsigma);
+                gprint (GP_LOG, "%.1f ", FromShortDegrees(catalog.measure[m].theta));
             }
             gprint (GP_LOG, "\n");
@@ -295 +347 @@
 void print_double (double value) {
   if (isnan(value)) 
-    gprint (GP_LOG, "NaN    ");
+    gprint (GP_LOG, "  NaN    ");
   else 
-    gprint (GP_LOG, "%6.3f ", value);
+    gprint (GP_LOG, "  %6.3f ", value);
 }
 
 void print_short (double value, short int ival) {
   if (ival == NAN_S_SHORT) 
-    gprint (GP_LOG, "NaN    ");
+    gprint (GP_LOG, "  NaN    ");
   else 
-    gprint (GP_LOG, "%6.3f ", value);
+    gprint (GP_LOG, "  %6.3f ", value);
 }
 
@@ -370 +422 @@
     case 3: /* filter names */
       code = GetPhotcodebyNsec (seq);
-      gprint (GP_LOG, "%-6s ", code[0].name);
-      break;
-  }
-}
+      gprint (GP_LOG, "  %-6s ", code[0].name);
+      break;
+
+    case 4: /* secfilt flags */
+      if (seq == -1) {
+        gprint (GP_LOG, "%08x ", 0);
+      } else {
+        gprint (GP_LOG, "%08x ", secfilt[seq].flags);
+      }
+      break;
+
+    case 5: /* average ap mags */
+      if (seq == -1) {
+        print_double (NAN);
+      } else {
+        print_double (secfilt[seq].Map);
+      }
+      break;
+
+    case 6: /* average ap mags */
+      if (seq == -1) {
+        print_double (NAN);
+      } else {
+        print_short (0.001*secfilt[seq].M_20, secfilt[seq].M_20);
+      }
+      break;
+
+    case 7: /* average ap mags */
+      if (seq == -1) {
+        print_double (NAN);
+      } else {
+        print_short (0.001*secfilt[seq].M_20, secfilt[seq].M_80);
+      }
+      break;
+
+  }
+}