Changeset 6683 for trunk/Ohana/src/opihi/dvo/imdata.c

Timestamp:

Mar 26, 2006, 10:46:32 AM (20 years ago)

Author:

eugene

Message:

adding proper motion and parallax to addstar, dropping _PS from RA and DEC in average

File:

• trunk/Ohana/src/opihi/dvo/imdata.c (modified) (2 diffs)

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

@@ -122 +122 @@
     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 +136 @@
     /* 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) {