Changeset 34260 for trunk/Ohana/src/opihi/dvo/dvo_host_utils.c

Timestamp:

Jul 31, 2012, 4:02:00 PM (14 years ago)

Author:

eugene

Message:

add PS1_V4 schema; add set mean fluxes based on stacks; define the primary image ID (based on distance from center or boundary tree) and set mean flux from stacks based on that info; fix (uniquify) psps ID for stack detections; mean fluxes are in Jy; detection fluxes are instrumental counts per second

File:

• trunk/Ohana/src/opihi/dvo/dvo_host_utils.c (modified) (3 diffs)

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

@@ -15 +15 @@
   snprintf (uniquer, 12, "%05d.%05d", PID, TIME % 100000);
 
+  // write the dvo comment (host independent)
+  char commandBase[DVO_MAX_PATH];
+  snprintf (commandBase, DVO_MAX_PATH, "dvo.command.%s.txt", uniquer);
+  char *commandFile = abspath(commandBase, DVO_MAX_PATH);
+
+  FILE *f = fopen (commandFile, "w");
+  fprintf (f, "%s\n", basecmd);
+  if (fflush (f)) DIE("flush", "failed to flush");
+
+  int fd = fileno (f);
+  if (fsync (fd)) DIE("fsync", "failed to fsync");
+
+  if (fclose (f)) DIE("close", "failed to close");
+
+  // force NFS to write the file to disk
+  int state;
+  f = fsetlockfile (commandFile, 0.5, LCK_XCLD, &state);
+  fclearlockfile (commandFile, f, LCK_XCLD, &state);
+
   int top_status = TRUE;
   int i;
@@ -29 +48 @@
     snprintf (table->hosts[i].results, DVO_MAX_PATH, "%s/dvo.results.%s.fits", table->hosts[i].pathname, uniquer);
 
-    char commandBase[DVO_MAX_PATH];
-    snprintf (commandBase, DVO_MAX_PATH, "dvo.command.%s.txt", uniquer);
-    char *commandFile = abspath(commandBase, DVO_MAX_PATH);
-
-    FILE *f = fopen (commandFile, "w");
-    fprintf (f, "%s\n", basecmd);
-    if (fflush (f)) DIE("flush", "failed to flush");
-
-    int fd = fileno (f);
-    if (fsync (fd)) DIE("fsync", "failed to fsync");
-
-    if (fclose (f)) DIE("close", "failed to close");
-
-    // force NFS to write the file to disk
-    int state;
-    f = fsetlockfile (commandFile, 0.5, LCK_XCLD, &state);
-    fclearlockfile (commandFile, f, LCK_XCLD, &state);
-
     char command[1024];
     snprintf (command, 1024, "dvo_client %s -result %s %s -hostID %d -hostdir %s", commandFile, table->hosts[i].results, options, table->hosts[i].hostID, table->hosts[i].pathname);
-    free (commandFile);
 
     if (VERBOSE) gprint (GP_ERR, "command: %s\n", command);
@@ -75 +75 @@
     }
   }
+  free (commandFile);
   return top_status;
 }