Index: trunk/Ohana/src/opihi/dvo/imdata.c
===================================================================
--- trunk/Ohana/src/opihi/dvo/imdata.c	(revision 5945)
+++ trunk/Ohana/src/opihi/dvo/imdata.c	(revision 6683)
@@ -122,8 +122,8 @@
     catalog.filename = skylist[0].filename[j];
     switch (lock_catalog (&catalog, LCK_SOFT)) {
-    case 2:
-      unlock_catalog (&catalog);
-    case 0:
-      continue;
+      case 2:
+	unlock_catalog (&catalog);
+      case 0:
+	continue;
     }
     catalog.catflags = LOAD_AVES;
@@ -136,70 +136,70 @@
     /* assign vector values */
     switch (mode) {
-    case (1):  /* ra */
-      for (i = 0; i < catalog.Nmeasure; i++) {
-	if ((catalog.measure[i].t < start) || (catalog.measure[i].t > stop)) continue;
-	n = catalog.measure[i].averef;
-	vec[0].elements[N] = catalog.average[n].R_PS - catalog.measure[i].dR_PS / 3600.0;
-	N++;
-	CHECK_REALLOCATE (vec[0].elements, float, NPTS, N, 1000);
-      }
-      break;
-    case (2):  /* dec */
-      for (i = 0; i < catalog.Nmeasure; i++) {
-	if ((catalog.measure[i].t < start) || (catalog.measure[i].t > stop)) continue;
-	n = catalog.measure[i].averef;
-	vec[0].elements[N] = catalog.average[n].D_PS - catalog.measure[i].dD_PS / 3600.0;
-	N++;
-	CHECK_REALLOCATE (vec[0].elements, float, NPTS, N, 1000);
-      }
-      break;
-    case (3):  /* mag */
-      for (i = 0; i < catalog.Nmeasure; i++) {
-	if ((catalog.measure[i].t < start) || (catalog.measure[i].t > stop)) continue;
-	vec[0].elements[N] = catalog.measure[i].M_PS;
-	N++;
-	CHECK_REALLOCATE (vec[0].elements, float, NPTS, N, 1000);
-      }
-      break;
-    case (4):  /* dmag */
-      for (i = 0; i < catalog.Nmeasure; i++) {
-	if ((catalog.measure[i].t < start) || (catalog.measure[i].t > stop)) continue;
-	vec[0].elements[N] = catalog.measure[i].dM_PS;
-	N++;
-	CHECK_REALLOCATE (vec[0].elements, float, NPTS, N, 1000);
-      }
-      break;
-    case (5):  /* Mcal */
-      for (i = 0; i < catalog.Nmeasure; i++) {
-	if ((catalog.measure[i].t < start) || (catalog.measure[i].t > stop)) continue;
-	vec[0].elements[N] = catalog.measure[i].Mcal_PS;
-	N++;
-	CHECK_REALLOCATE (vec[0].elements, float, NPTS, N, 1000);
-      }
-      break;
-    case (6):  /* Mrel */
-      for (i = 0; i < catalog.Nmeasure; i++) {
-	if ((catalog.measure[i].t < start) || (catalog.measure[i].t > stop)) continue;
-	n = catalog.measure[i].averef;
-	vec[0].elements[N] = catalog.average[n].M_PS;
-	N++;
-      }
-      break;
-    case (7):  /* source */
-      for (i = 0; i < catalog.Nmeasure; i++) {
-	if ((catalog.measure[i].t < start) || (catalog.measure[i].t > stop)) continue;
-	vec[0].elements[N] = catalog.measure[i].source;
-	N++;
-	CHECK_REALLOCATE (vec[0].elements, float, NPTS, N, 1000);
-      }
-      break;
-    case (10):  /* time */
-      for (i = 0; i < catalog.Nmeasure; i++) {
-	if ((catalog.measure[i].t < start) || (catalog.measure[i].t > stop)) continue;
-	vec[0].elements[N] = TimeValue (catalog.measure[i].t, TimeReference, TimeFormat);
-	N++;
-	CHECK_REALLOCATE (vec[0].elements, float, NPTS, N, 1000);
-      }
-      break;
+      case (1):  /* ra */
+	for (i = 0; i < catalog.Nmeasure; i++) {
+	  if ((catalog.measure[i].t < start) || (catalog.measure[i].t > stop)) continue;
+	  n = catalog.measure[i].averef;
+	  vec[0].elements[N] = catalog.average[n].R - catalog.measure[i].dR_PS / 3600.0;
+	  N++;
+	  CHECK_REALLOCATE (vec[0].elements, float, NPTS, N, 1000);
+	}
+	break;
+      case (2):  /* dec */
+	for (i = 0; i < catalog.Nmeasure; i++) {
+	  if ((catalog.measure[i].t < start) || (catalog.measure[i].t > stop)) continue;
+	  n = catalog.measure[i].averef;
+	  vec[0].elements[N] = catalog.average[n].D - catalog.measure[i].dD_PS / 3600.0;
+	  N++;
+	  CHECK_REALLOCATE (vec[0].elements, float, NPTS, N, 1000);
+	}
+	break;
+      case (3):  /* mag */
+	for (i = 0; i < catalog.Nmeasure; i++) {
+	  if ((catalog.measure[i].t < start) || (catalog.measure[i].t > stop)) continue;
+	  vec[0].elements[N] = catalog.measure[i].M_PS;
+	  N++;
+	  CHECK_REALLOCATE (vec[0].elements, float, NPTS, N, 1000);
+	}
+	break;
+      case (4):  /* dmag */
+	for (i = 0; i < catalog.Nmeasure; i++) {
+	  if ((catalog.measure[i].t < start) || (catalog.measure[i].t > stop)) continue;
+	  vec[0].elements[N] = catalog.measure[i].dM_PS;
+	  N++;
+	  CHECK_REALLOCATE (vec[0].elements, float, NPTS, N, 1000);
+	}
+	break;
+      case (5):  /* Mcal */
+	for (i = 0; i < catalog.Nmeasure; i++) {
+	  if ((catalog.measure[i].t < start) || (catalog.measure[i].t > stop)) continue;
+	  vec[0].elements[N] = catalog.measure[i].Mcal_PS;
+	  N++;
+	  CHECK_REALLOCATE (vec[0].elements, float, NPTS, N, 1000);
+	}
+	break;
+      case (6):  /* Mrel */
+	for (i = 0; i < catalog.Nmeasure; i++) {
+	  if ((catalog.measure[i].t < start) || (catalog.measure[i].t > stop)) continue;
+	  n = catalog.measure[i].averef;
+	  vec[0].elements[N] = catalog.average[n].M;
+	  N++;
+	}
+	break;
+      case (7):  /* source */
+	for (i = 0; i < catalog.Nmeasure; i++) {
+	  if ((catalog.measure[i].t < start) || (catalog.measure[i].t > stop)) continue;
+	  vec[0].elements[N] = catalog.measure[i].source;
+	  N++;
+	  CHECK_REALLOCATE (vec[0].elements, float, NPTS, N, 1000);
+	}
+	break;
+      case (10):  /* time */
+	for (i = 0; i < catalog.Nmeasure; i++) {
+	  if ((catalog.measure[i].t < start) || (catalog.measure[i].t > stop)) continue;
+	  vec[0].elements[N] = TimeValue (catalog.measure[i].t, TimeReference, TimeFormat);
+	  N++;
+	  CHECK_REALLOCATE (vec[0].elements, float, NPTS, N, 1000);
+	}
+	break;
     }
     if (catalog.average != 0) {