Changeset 4800 for trunk/Ohana/src/opihi/dvo/catalog.c

Timestamp:

Aug 16, 2005, 3:04:36 PM (21 years ago)

Author:

eugene

Message:

moving to internal vs external measure/average: R,D + dR,dD.
NOTE * dR,dD now represent 1.0 arcsec, not 0.01 arcsec.

* all use has been updated to match

File:

• trunk/Ohana/src/opihi/dvo/catalog.c (modified) (6 diffs)

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

@@ -196 +196 @@
         dparse (&D, Ad, tbuffer);
         dparse (&M, Am, tbuffer);
-        catalog.average[nstar].R = R;
-        catalog.average[nstar].D = D;
+        catalog.average[nstar].R_PS = R;
+        catalog.average[nstar].D_PS = D;
         catalog.average[nstar].M = M * 1000.0;
         nstar++;
@@ -238 +238 @@
           dparse (&D, Ad, &tbuffer[i*Bytes_Star]);
           dparse (&M, Am, &tbuffer[i*Bytes_Star]);
-          catalog.average[nstar].R = R;
-          catalog.average[nstar].D = D;
+          catalog.average[nstar].R_PS = R;
+          catalog.average[nstar].D_PS = D;
           catalog.average[nstar].M = M * 1000.0;
           nstar++;
@@ -288 +288 @@
           dparse (&D, 2, &tbuffer[i*BYTES_STAR]);
           dparse (&M, 3, &tbuffer[i*BYTES_STAR]);
-          catalog.average[nstar].R = R;
-          catalog.average[nstar].D = D;
+          catalog.average[nstar].R_PS = R;
+          catalog.average[nstar].D_PS = D;
           catalog.average[nstar].M = M * 1000.0;
           nstar++;
@@ -347 +347 @@
         if (LimExclude && (Zvec.elements[N] > 0.99)) continue;
         if (Zvec.elements[N] < 0.011) continue;
-        while (catalog.average[i].R < Rmin) catalog.average[i].R += 360.0;
-        while (catalog.average[i].R > Rmax) catalog.average[i].R -= 360.0;
-        if (fRD_to_XY (&Xvec.elements[N], &Yvec.elements[N], catalog.average[i].R, catalog.average[i].D, &graphmode.coords)) N ++;
+        while (catalog.average[i].R_PS < Rmin) catalog.average[i].R_PS += 360.0;
+        while (catalog.average[i].R_PS > Rmax) catalog.average[i].R_PS -= 360.0;
+        if (fRD_to_XY (&Xvec.elements[N], &Yvec.elements[N], catalog.average[i].R_PS, catalog.average[i].D_PS, &graphmode.coords)) N ++;
       }
       break;
@@ -362 +362 @@
         if (Zvec.elements[N] == 0.01) 
           continue;
-        while (catalog.average[i].R < Rmin) catalog.average[i].R += 360.0;
-        while (catalog.average[i].R > Rmax) catalog.average[i].R -= 360.0;
-        if (fRD_to_XY (&Xvec.elements[N], &Yvec.elements[N], catalog.average[i].R, catalog.average[i].D, &graphmode.coords)) N++;
+        while (catalog.average[i].R_PS < Rmin) catalog.average[i].R_PS += 360.0;
+        while (catalog.average[i].R_PS > Rmax) catalog.average[i].R_PS -= 360.0;
+        if (fRD_to_XY (&Xvec.elements[N], &Yvec.elements[N], catalog.average[i].R_PS, catalog.average[i].D_PS, &graphmode.coords)) N++;
       }
       break;
@@ -377 +377 @@
         if (Zvec.elements[N] == 0.01) 
           continue;
-        while (catalog.average[i].R < Rmin) catalog.average[i].R += 360.0;
-        while (catalog.average[i].R > Rmax) catalog.average[i].R -= 360.0;
-        if (fRD_to_XY (&Xvec.elements[N], &Yvec.elements[N], catalog.average[i].R, catalog.average[i].D, &graphmode.coords)) N++;
+        while (catalog.average[i].R_PS < Rmin) catalog.average[i].R_PS += 360.0;
+        while (catalog.average[i].R_PS > Rmax) catalog.average[i].R_PS -= 360.0;
+        if (fRD_to_XY (&Xvec.elements[N], &Yvec.elements[N], catalog.average[i].R_PS, catalog.average[i].D_PS, &graphmode.coords)) N++;
       }
       break;