Index: /branches/eam_branches/ipp-20140206/Ohana/src/libdvo/src/dbExtractMeasures.c
===================================================================
--- /branches/eam_branches/ipp-20140206/Ohana/src/libdvo/src/dbExtractMeasures.c	(revision 36625)
+++ /branches/eam_branches/ipp-20140206/Ohana/src/libdvo/src/dbExtractMeasures.c	(revision 36626)
@@ -597,7 +597,8 @@
 	  fieldc = MatchFieldMetadata (measure[0].imageID);
 	} else {
-	  fprintf (stderr, "non-parallel Xmos broken\n");
-	  abort();
+	  // fprintf (stderr, "non-parallel Xmos broken\n");
+	  // abort();
 	  // fieldc = MatchField (measure[0].t, measure[0].photcode);
+	  fieldc = MatchFieldMetadata (measure[0].imageID);
 	}
 	if (fieldc == NULL) break;
@@ -613,7 +614,8 @@
 	  fieldc = MatchFieldMetadata (measure[0].imageID);
 	} else {
-	  fprintf (stderr, "non-parallel Xmos broken\n");
-	  abort();
+	  // fprintf (stderr, "non-parallel Xmos broken\n");
+	  // abort();
 	  // fieldc = MatchField (measure[0].t, measure[0].photcode);
+	  fieldc = MatchFieldMetadata (measure[0].imageID);
 	}
 	if (fieldc == NULL) break;
@@ -630,7 +632,8 @@
 	  mosaic = MatchMosaicMetadata (measure[0].imageID);
 	} else {
-	  fprintf (stderr, "non-parallel Xmos broken\n");
-	  abort();
-	  mosaic = MatchMosaic (measure[0].t, measure[0].photcode);
+	  // fprintf (stderr, "non-parallel Xmos broken\n");
+	  // abort();
+	  // mosaic = MatchMosaic (measure[0].t, measure[0].photcode);
+	  mosaic = MatchMosaicMetadata (measure[0].imageID);
 	}
 	if (mosaic == NULL) break;
@@ -646,7 +649,8 @@
 	  mosaic = MatchMosaicMetadata (measure[0].imageID);
 	} else {
-	  fprintf (stderr, "non-parallel Xmos broken\n");
-	  abort();
-	  mosaic = MatchMosaic (measure[0].t, measure[0].photcode);
+	  // fprintf (stderr, "non-parallel Xmos broken\n");
+	  // abort();
+	  // mosaic = MatchMosaic (measure[0].t, measure[0].photcode);
+	  mosaic = MatchMosaicMetadata (measure[0].imageID);
 	}
 	if (mosaic == NULL) break;
Index: /branches/eam_branches/ipp-20140206/Ohana/src/opihi/include/pantasks.h
===================================================================
--- /branches/eam_branches/ipp-20140206/Ohana/src/opihi/include/pantasks.h	(revision 36625)
+++ /branches/eam_branches/ipp-20140206/Ohana/src/opihi/include/pantasks.h	(revision 36626)
@@ -116,5 +116,5 @@
 
   int active;
-  int priority;
+  int nicelevel;
 
 } Task;
@@ -161,5 +161,5 @@
 
   JobMode     mode;			/* local or controller? */
-  int     priority;
+  int     nicelevel;
   char   *realhost;
 
Index: /branches/eam_branches/ipp-20140206/Ohana/src/opihi/include/pcontrol.h
===================================================================
--- /branches/eam_branches/ipp-20140206/Ohana/src/opihi/include/pcontrol.h	(revision 36625)
+++ /branches/eam_branches/ipp-20140206/Ohana/src/opihi/include/pcontrol.h	(revision 36626)
@@ -120,5 +120,5 @@
   int          exit_status;
   int          Reset;
-  int          priority;
+  int          nicelevel;
   JobMode      mode;
   JobStat      state;
@@ -315,5 +315,5 @@
 Job   *PullJobByID (IDtype JobID, int *StackID);
 Job   *PullJobFromStackByID (int StackID, int ID);
-IDtype AddJob (char *hostname, JobMode mode, int timeout, int priority, int argc, char **argv, int Nxhosts, char **xhosts);
+IDtype AddJob (char *hostname, JobMode mode, int timeout, int nicelevel, int argc, char **argv, int Nxhosts, char **xhosts);
 void   DelJob (Job *job);
 Host  *UnlinkJobAndHost (Job *job);
Index: /branches/eam_branches/ipp-20140206/Ohana/src/opihi/pantasks/ControllerOps.c
===================================================================
--- /branches/eam_branches/ipp-20140206/Ohana/src/opihi/pantasks/ControllerOps.c	(revision 36625)
+++ /branches/eam_branches/ipp-20140206/Ohana/src/opihi/pantasks/ControllerOps.c	(revision 36626)
@@ -259,7 +259,7 @@
   }
   
-  if (job[0].priority) {
+  if (job[0].nicelevel) {
     char tmp[64];
-    snprintf (tmp, 64, " -nice %d", job[0].priority);
+    snprintf (tmp, 64, " -nice %d", job[0].nicelevel);
     strcat (cmd, tmp);
   }
Index: /branches/eam_branches/ipp-20140206/Ohana/src/opihi/pantasks/JobOps.c
===================================================================
--- /branches/eam_branches/ipp-20140206/Ohana/src/opihi/pantasks/JobOps.c	(revision 36625)
+++ /branches/eam_branches/ipp-20140206/Ohana/src/opihi/pantasks/JobOps.c	(revision 36626)
@@ -107,5 +107,5 @@
     job[0].mode = JOB_CONTROLLER;
   }
-  job[0].priority = task[0].priority;
+  job[0].nicelevel = task[0].nicelevel;
 
   /* we need our own copy of task[0].argv argc is the number of valid args, like the usual command line.  we
Index: /branches/eam_branches/ipp-20140206/Ohana/src/opihi/pantasks/LocalJob.c
===================================================================
--- /branches/eam_branches/ipp-20140206/Ohana/src/opihi/pantasks/LocalJob.c	(revision 36625)
+++ /branches/eam_branches/ipp-20140206/Ohana/src/opihi/pantasks/LocalJob.c	(revision 36626)
@@ -162,8 +162,8 @@
 
   /* set nice level for the child process -- maybe I should not exit here... */
-  if (job[0].priority) {
-      status = setpriority (PRIO_PROCESS, pid, job[0].priority);
+  if (job[0].nicelevel) {
+      status = setpriority (PRIO_PROCESS, pid, job[0].nicelevel);
       if (status == -1) {
-	  gprint (GP_ERR, "error setting priority\n");
+	  gprint (GP_ERR, "error setting nice level\n");
 	  perror ("setpriority: ");
 	  exit (2);
Index: /branches/eam_branches/ipp-20140206/Ohana/src/opihi/pantasks/TaskOps.c
===================================================================
--- /branches/eam_branches/ipp-20140206/Ohana/src/opihi/pantasks/TaskOps.c	(revision 36625)
+++ /branches/eam_branches/ipp-20140206/Ohana/src/opihi/pantasks/TaskOps.c	(revision 36626)
@@ -487,5 +487,5 @@
 
   NewTask[0].active = TRUE;
-  NewTask[0].priority = 0;
+  NewTask[0].nicelevel = 0;
   return (NewTask);
 }
Index: /branches/eam_branches/ipp-20140206/Ohana/src/opihi/pantasks/init.c
===================================================================
--- /branches/eam_branches/ipp-20140206/Ohana/src/opihi/pantasks/init.c	(revision 36625)
+++ /branches/eam_branches/ipp-20140206/Ohana/src/opihi/pantasks/init.c	(revision 36626)
@@ -34,5 +34,5 @@
   {1, "halt",       halt,          "halt the scheduler (no job harvesting)"},
   {1, "host",       task_host,     "define host machine for a task"},
-  {1, "nice",       task_nice,     "set nice priority level for a task"},
+  {1, "nice",       task_nice,     "set nice level for a task"},
   {1, "ipptool2book", ipptool2book, "convert queue with ipptool output to book"},
   {1, "kill",       kill_job,      "kill job"},
Index: /branches/eam_branches/ipp-20140206/Ohana/src/opihi/pantasks/init_server.c
===================================================================
--- /branches/eam_branches/ipp-20140206/Ohana/src/opihi/pantasks/init_server.c	(revision 36625)
+++ /branches/eam_branches/ipp-20140206/Ohana/src/opihi/pantasks/init_server.c	(revision 36626)
@@ -35,5 +35,5 @@
   {1, "delete",     delete_job,    "delete job"},
   {1, "host",       task_host,     "define host machine for a task"},
-  {1, "nice",       task_nice,     "set nice priority level for a task"},
+  {1, "nice",       task_nice,     "set nice level for a task"},
   {1, "ipptool2book", ipptool2book, "convert queue with ipptool output to book"},
   {1, "kill",       kill_job,      "kill job"},
Index: /branches/eam_branches/ipp-20140206/Ohana/src/opihi/pantasks/task_nice.c
===================================================================
--- /branches/eam_branches/ipp-20140206/Ohana/src/opihi/pantasks/task_nice.c	(revision 36625)
+++ /branches/eam_branches/ipp-20140206/Ohana/src/opihi/pantasks/task_nice.c	(revision 36626)
@@ -4,9 +4,9 @@
 
   char *endptr = NULL;
-  int priority;
+  int nicelevel;
   Task *task;
 
   if (argc != 2) {
-    gprint (GP_ERR, "USAGE: nice (priority)\n");
+    gprint (GP_ERR, "USAGE: nice (nicelevel)\n");
     return (FALSE);
   }
@@ -20,15 +20,15 @@
   }
 
-  priority = strtol (argv[1], &endptr, 10);
+  nicelevel = strtol (argv[1], &endptr, 10);
   if (*endptr) goto fail;
-  if (priority < 0) goto fail;
-  if (priority > 20) goto fail;
+  if (nicelevel < 0) goto fail;
+  if (nicelevel > 20) goto fail;
 
-  task[0].priority = priority;
+  task[0].nicelevel = nicelevel;
   JobTaskUnlock();
   return (TRUE);
 
 fail:
-    gprint (GP_ERR, "ERROR: nice (priority) -- priority must be an integer 0 to 20\n");
+    gprint (GP_ERR, "ERROR: nice (nicelevel) -- nicelevel must be an integer 0 to 20\n");
     return (FALSE);
 }
Index: /branches/eam_branches/ipp-20140206/Ohana/src/opihi/pclient/job.c
===================================================================
--- /branches/eam_branches/ipp-20140206/Ohana/src/opihi/pclient/job.c	(revision 36625)
+++ /branches/eam_branches/ipp-20140206/Ohana/src/opihi/pclient/job.c	(revision 36626)
@@ -3,11 +3,11 @@
 int job (int argc, char **argv) {
 
-  int i, N, pid, status, priority;
+  int i, N, pid, status, nicelevel;
   char **targv;
 
-  priority = 0;
+  nicelevel = 0;
   if ((N = get_argument (argc, argv, "-nice"))) {
     remove_argument (N, &argc, argv);
-    priority = atoi (argv[N]);
+    nicelevel = atoi (argv[N]);
     remove_argument (N, &argc, argv);
   }
@@ -62,8 +62,8 @@
 
   /* set nice level for the child process */
-  if (priority) {
-      status = setpriority (PRIO_PROCESS, pid, priority);
+  if (nicelevel) {
+      status = setpriority (PRIO_PROCESS, pid, nicelevel);
       if (status == -1) {
-	  gprint (GP_ERR, "error setting priority\n");
+	  gprint (GP_ERR, "error setting nicelevel\n");
 	  perror ("setpriority: ");
 	  exit (2);
Index: /branches/eam_branches/ipp-20140206/Ohana/src/opihi/pcontrol/JobOps.c
===================================================================
--- /branches/eam_branches/ipp-20140206/Ohana/src/opihi/pcontrol/JobOps.c	(revision 36625)
+++ /branches/eam_branches/ipp-20140206/Ohana/src/opihi/pcontrol/JobOps.c	(revision 36626)
@@ -207,5 +207,5 @@
 }
 
-IDtype AddJob (char *hostname, JobMode mode, int timeout, int priority, int argc, char **argv, int Nxhosts, char **xhosts) {
+IDtype AddJob (char *hostname, JobMode mode, int timeout, int nicelevel, int argc, char **argv, int Nxhosts, char **xhosts) {
 
   int JobID;
@@ -232,5 +232,5 @@
 
   job[0].mode     = mode;
-  job[0].priority = priority;
+  job[0].nicelevel = nicelevel;
 
   job[0].state = 0;
Index: /branches/eam_branches/ipp-20140206/Ohana/src/opihi/pcontrol/StartJob.c
===================================================================
--- /branches/eam_branches/ipp-20140206/Ohana/src/opihi/pcontrol/StartJob.c	(revision 36625)
+++ /branches/eam_branches/ipp-20140206/Ohana/src/opihi/pcontrol/StartJob.c	(revision 36626)
@@ -25,7 +25,7 @@
   bzero (line, Nline);
   strcpy (line, "job");
-  if (job[0].priority) {
+  if (job[0].nicelevel) {
     char tmp[64];
-    snprintf (tmp, 64, " -nice %d", job[0].priority);
+    snprintf (tmp, 64, " -nice %d", job[0].nicelevel);
     strcat (line, tmp);
   }
Index: /branches/eam_branches/ipp-20140206/Ohana/src/opihi/pcontrol/job.c
===================================================================
--- /branches/eam_branches/ipp-20140206/Ohana/src/opihi/pcontrol/job.c	(revision 36625)
+++ /branches/eam_branches/ipp-20140206/Ohana/src/opihi/pcontrol/job.c	(revision 36626)
@@ -5,5 +5,5 @@
   char *Host = NULL;
   char **targv = NULL;
-  int i, N, Mode, targc, Timeout, priority;
+  int i, N, Mode, targc, Timeout, nicelevel;
   IDtype JobID;
   char **xhosts = NULL;
@@ -43,8 +43,8 @@
   }
 
-  priority = 0;
+  nicelevel = 0;
   if ((N = get_argument (argc, argv, "-nice"))) {
     remove_argument (N, &argc, argv);
-    priority = atoi (argv[N]);
+    nicelevel = atoi (argv[N]);
     remove_argument (N, &argc, argv);
   }
@@ -76,5 +76,5 @@
 
   // a JobID < 0 mean the job was not accepted
-  JobID = AddJob (Host, Mode, Timeout, priority, targc, targv, Nxhosts, xhosts);
+  JobID = AddJob (Host, Mode, Timeout, nicelevel, targc, targv, Nxhosts, xhosts);
   gprint (GP_LOG, "JobID: %d\n", (int) JobID);
   return (TRUE);
@@ -82,5 +82,5 @@
  usage:
     gprint (GP_ERR, "USAGE: job [options] (arg0) (arg1) ... (argN)\n");
-    gprint (GP_ERR, "  options: -host, +host, -timeout, -xhost (host)\n");
+    gprint (GP_ERR, "  options: -host, +host, -timeout, -xhost (host) -nice (level)\n");
     gprint (GP_ERR, "  arguments of the form @MAX_THREADS@ will be replaced when the job is launched\n");
 
Index: /branches/eam_branches/ipp-20140206/Ohana/src/opihi/pcontrol/status.c
===================================================================
--- /branches/eam_branches/ipp-20140206/Ohana/src/opihi/pcontrol/status.c	(revision 36625)
+++ /branches/eam_branches/ipp-20140206/Ohana/src/opihi/pcontrol/status.c	(revision 36626)
@@ -154,5 +154,5 @@
 
     PrintID (GP_LOG, job[0].JobID);
-    gprint (GP_LOG, " %2d ", job[0].priority);
+    gprint (GP_LOG, " %2d ", job[0].nicelevel);
     for (j = 0; j < job[0].argc; j++) {
       gprint (GP_LOG, "%s ", job[0].argv[j]);