Changeset 39604 for trunk

Timestamp:

Jun 20, 2016, 3:19:17 PM (10 years ago)

Author:

eugene

Message:

save cpt stats to variables in gcat; gstar reports chip stdev; fix problem with host operations

Location:

trunk/Ohana/src/opihi/dvo

Files:

• gcat.c (modified) (2 diffs)
• gstar.c (modified) (5 diffs)
• hosts.c (modified) (3 diffs)

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

@@ -85 +85 @@
     SkyRegion *region = skylist[0].regions[i];
 
+    int isLast = (i == skylist[0].Nregions - 1);
+
     char hostfile[1024];
     if (table) {
@@ -132 +134 @@
     }
     gprint (GP_ERR, "\n");
-    set_str_variable ("CATNAME", hostfile);
+
+    if (isLast) {
+      set_variable ("CPT_RMIN", region->Rmin);
+      set_variable ("CPT_RMAX", region->Rmax);
+      set_variable ("CPT_DMIN", region->Dmin);
+      set_variable ("CPT_DMAX", region->Dmax);
+      set_variable ("CPT_CATID", region->index);
+      set_str_variable ("CATNAME", hostfile);
+    }
   }
 

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

@@ -14 +14 @@
   GSTAR_AVE_MAG_ERR,
   GSTAR_AVE_MAG_CHISQ,
+  GSTAR_AVE_MAG_STDEV,
   GSTAR_AVE_AP_MAG,
   GSTAR_AVE_AP_MAG_ERR,
   GSTAR_AVE_AP_MAG_CHISQ,
+  GSTAR_AVE_AP_MAG_STDEV,
   GSTAR_AVE_MAG_MIN,
   GSTAR_AVE_MAG_MAX,
@@ -22 +24 @@
   GSTAR_AVE_KRON_MAG_ERR,
   GSTAR_AVE_KRON_MAG_CHISQ,
+  GSTAR_AVE_KRON_MAG_STDEV,
   GSTAR_AVE_NCODE,
   GSTAR_AVE_NUSED,
@@ -952 +955 @@
       break;
 
+    case GSTAR_AVE_MAG_STDEV: /* average mag chisq */
+      if (seq == -1) {
+        print_double (NAN);
+      } else {
+        print_double_exp (secfilt[seq].Mstdev);
+      }
+      break;
+
     case GSTAR_FILTER_NAMES: /* filter names */
       code = GetPhotcodebyNsec (seq);
@@ -1047 +1058 @@
       break;
 
+    case GSTAR_AVE_AP_MAG_STDEV: /* average ap mags */
+      if (seq == -1) {
+        print_double (NAN);
+      } else {
+        print_double_exp (secfilt[seq].dMap);
+      }
+      break;
+
     case GSTAR_AVE_KRON_MAG: /* average ap mags */
       if (seq == -1) {
@@ -1071 +1090 @@
       break;
 
+    case GSTAR_AVE_KRON_MAG_STDEV: /* average ap mags */
+      if (seq == -1) {
+        print_double (NAN);
+      } else {
+        print_double_exp (secfilt[seq].dMkron);
+      }
+      break;
+
       /******************* STACK : FLUX **********************/
 

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

@@ -82 +82 @@
       if (!strcasecmp(argv[N], "dvopsps.det"))               TEMP_TYPE = TEMP_DVOPSPS_DET;
       if (!strcasecmp(argv[N], "fixstkids.results"))         TEMP_TYPE = TEMP_FIXSTKIDS_RESULTS;
+      remove_argument (N, &argc, argv);
     }
     if (TEMP_TYPE == TEMP_NONE) {
@@ -90 +91 @@
       gprint (GP_ERR, "    checkastro.catalog, dvopsps.det, fixstkids.results\n");
       return FALSE;
-      remove_argument (N, &argc, argv);
     }
 
@@ -114 +114 @@
       gprint (GP_ERR, "   [-old-pid] [-all-pid] [-v] [-verbose]\n");
       gprint (GP_ERR, "    [-commit] [-age hours]\n");
+      gprint (GP_ERR, "current arguments: ");
+      for (int i = 0; i < argc; i++) { gprint (GP_ERR, "%s ", argv[i]); }
+      gprint (GP_ERR, "\n");
       return FALSE;
     }