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

Timestamp:

Mar 8, 2007, 12:21:18 PM (19 years ago)

Author:

eugene

Message:

complete merge from branch dvo-mods-2007-02

File:

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

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

@@ -197 +197 @@
         dparse (&D, Ad, tbuffer);
         dparse (&M, Am, tbuffer);
-        catalog.average[nstar].R_PS = R;
-        catalog.average[nstar].D_PS = D;
-        catalog.average[nstar].M_PS = M;
+        catalog.average[nstar].R = R;
+        catalog.average[nstar].D = D;
+        catalog.average[nstar].M = M;
         nstar++;
         if (nstar == NSTARS - 1) {
@@ -239 +239 @@
           dparse (&D, Ad, &tbuffer[i*Bytes_Star]);
           dparse (&M, Am, &tbuffer[i*Bytes_Star]);
-          catalog.average[nstar].R_PS = R;
-          catalog.average[nstar].D_PS = D;
-          catalog.average[nstar].M_PS = M;
+          catalog.average[nstar].R = R;
+          catalog.average[nstar].D = D;
+          catalog.average[nstar].M = M;
           nstar++;
           if (nstar == NSTARS - 1) {
@@ -289 +289 @@
           dparse (&D, 2, &tbuffer[i*BYTES_STAR]);
           dparse (&M, 3, &tbuffer[i*BYTES_STAR]);
-          catalog.average[nstar].R_PS = R;
-          catalog.average[nstar].D_PS = D;
-          catalog.average[nstar].M_PS = M;
+          catalog.average[nstar].R = R;
+          catalog.average[nstar].D = D;
+          catalog.average[nstar].M = M;
           nstar++;
           if (nstar == NSTARS - 1) {
@@ -342 +342 @@
         if (IDclip && (catalog.average[i].code != IDchoice))
           continue;
-        Zvec.elements[N] = MIN (1.0, MAX (0.01, (catalog.average[i].M_PS - Mz) / Mr));
+        Zvec.elements[N] = MIN (1.0, MAX (0.01, (catalog.average[i].M - Mz) / Mr));
         if (LimExclude && (Zvec.elements[N] > 0.99)) continue;
         if (Zvec.elements[N] < 0.011) continue;
-        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 ++;
+        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 ++;
       }
       break;
     case (NUMSCALE):
       for (N = i = 0; i < catalog.Naverage; i++) {
-        if (clip && ((catalog.average[i].M_PS > Mz) || (catalog.average[i].M_PS < Mr+Mz))) 
+        if (clip && ((catalog.average[i].M > Mz) || (catalog.average[i].M < Mr+Mz))) 
           continue;
         if (IDclip && (catalog.average[i].code != IDchoice))
@@ -360 +360 @@
         if (Zvec.elements[N] == 0.01) 
           continue;
-        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++;
+        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++;
       }
       break;
     case (MISSCALE):
       for (N = i = 0; i < catalog.Naverage; i++) {
-        if (clip && ((catalog.average[i].M_PS > Mz) || (catalog.average[i].M_PS < Mr+Mz))) 
+        if (clip && ((catalog.average[i].M > Mz) || (catalog.average[i].M < Mr+Mz))) 
           continue;
         if (IDclip && (catalog.average[i].code != IDchoice))
@@ -375 +375 @@
         if (Zvec.elements[N] == 0.01) 
           continue;
-        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++;
+        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++;
       }
       break;