Changeset 4800 for trunk/Ohana/src/addstar

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

Location:

trunk/Ohana/src/addstar

Files:

• doc/Changes.txt (modified) (2 diffs)
• src/find_matches.c (modified) (8 diffs)
• src/find_matches_refstars.c (modified) (4 diffs)
• src/replace_match.c (modified) (1 diff)
• src/update_coords.c (modified) (2 diffs)

trunk/Ohana/src/addstar/doc/Changes.txt

@@ -1 @@
-
-2005.08.15:
-        cleanup of the minor Wall,Werror messages
 
 2005.02.24 : I am adding the mosaic two-level astrometry information to the Image table.
 
 2005.07.06 : current release is addstar-1.1
+
         I have made a variety of fairly substantial changes since
         v1.0.  I have added autocode for the basic DVO data types.  I
@@ -23 +21 @@
         need to know about the mysql backend interface.  
 
-
+2005.08.15:
+        cleanup of the minor Wall,Werror messages

trunk/Ohana/src/addstar/src/find_matches.c

@@ -74 +74 @@
   
   for (i = 0; i < Nave; i++) {
-    fRD_to_XY (&X2[i], &Y2[i], catalog[0].average[i].R, catalog[0].average[i].D, &tcoords);
+    fRD_to_XY (&X2[i], &Y2[i], catalog[0].average[i].R_PS, catalog[0].average[i].D_PS, &tcoords);
     N2[i] = i;
     catalog[0].found[N2[i]] = -1;
@@ -146 +146 @@
       
       /** add measurements for this star **/
-      catalog[0].measure[Nmeas].dR       = 360000.0*(catalog[0].average[n].R - stars[N].R);
-      catalog[0].measure[Nmeas].dD       = 360000.0*(catalog[0].average[n].D - stars[N].D);
+      /** dR,dD now represent arcsec **/
+      catalog[0].measure[Nmeas].dR_PS       = 3600.0*(catalog[0].average[n].R_PS - stars[N].R);
+      catalog[0].measure[Nmeas].dD_PS       = 3600.0*(catalog[0].average[n].D_PS - stars[N].D);
       catalog[0].measure[Nmeas].M        = MIN (1000*stars[N].M + MTIME, NO_MAG);
       catalog[0].measure[Nmeas].dM       = MIN (1000*stars[N].dM, NO_ERR);  /* error in input files stored in thousandths of mag */
@@ -216 +217 @@
     if (catalog[0].found[n] < 0) { 
       /* should the catalog star be on this image? project into image coords */
-      if (!in_image (catalog[0].average[n].R, catalog[0].average[n].D, image)) continue;
+      if (!in_image (catalog[0].average[n].R_PS, catalog[0].average[n].D_PS, image)) continue;
       /* find last missing meas */
       if (catalog[0].average[n].Nn < 1) { /* no previous missing obs */
@@ -234 +235 @@
       }
       /* calculate time of exposure for this coordinate in the image */
-      RD_to_XY (&X, &Y, catalog[0].average[n].R, catalog[0].average[n].D, &image[0].coords);      
+      RD_to_XY (&X, &Y, catalog[0].average[n].R_PS, catalog[0].average[n].D_PS, &image[0].coords);        
       catalog[0].missing[Nmiss].t  = image[0].tzero + 1e-4*Y*image[0].trate;  /* trate is in 0.1 msec / row */
       catalog[0].average[n].Nn ++;
@@ -254 +255 @@
     secz = airmass (image[0].secz, stars[N].R, stars[N].D, SiderealTime, Latitude);
 
-    catalog[0].average[Nave].R         = stars[N].R;
-    catalog[0].average[Nave].D         = stars[N].D;
+    catalog[0].average[Nave].R_PS              = stars[N].R;
+    catalog[0].average[Nave].D_PS              = stars[N].D;
     catalog[0].average[Nave].M         = NO_MAG;
     catalog[0].average[Nave].dM        = NO_MAG;
@@ -273 +274 @@
     }
 
-    catalog[0].measure[Nmeas].dR       = 0.0;
-    catalog[0].measure[Nmeas].dD       = 0.0;
+    catalog[0].measure[Nmeas].dR_PS       = 0.0;
+    catalog[0].measure[Nmeas].dD_PS       = 0.0;
     catalog[0].measure[Nmeas].M        = MIN (1000*stars[N].M + MTIME, NO_MAG);
     catalog[0].measure[Nmeas].dM       = MIN (1000*stars[N].dM, NO_ERR);
@@ -298 +299 @@
     for (j = 0; (j < Noverlap) && !SKIP_MISSED; j++) {
       if (!FindMosaicForImage (overlap, Noverlap, j)) continue;
-      if (!in_image (catalog[0].average[Nave].R, catalog[0].average[Nave].D, &overlap[j])) continue;
+      if (!in_image (catalog[0].average[Nave].R_PS, catalog[0].average[Nave].D_PS, &overlap[j])) continue;
       if (catalog[0].average[Nave].Nn < 1) {
         catalog[0].average[Nave].missing = Nmiss;
@@ -306 +307 @@
       last_miss = Nmiss;
       /* get time of exposure of this portion of the image */
-      RD_to_XY (&X, &Y, catalog[0].average[Nave].R, catalog[0].average[Nave].D, &overlap[j].coords);      
+      RD_to_XY (&X, &Y, catalog[0].average[Nave].R_PS, catalog[0].average[Nave].D_PS, &overlap[j].coords);        
       catalog[0].missing[Nmiss].t  = overlap[j].tzero + 1e-4*Y*overlap[j].trate;  /* rough guess at time */
       catalog[0].average[Nave].Nn ++;

trunk/Ohana/src/addstar/src/find_matches_refstars.c

@@ -62 +62 @@
   
   for (i = 0; i < Nave; i++) {
-    fRD_to_XY (&X2[i], &Y2[i], catalog[0].average[i].R, catalog[0].average[i].D, &tcoords);
+    fRD_to_XY (&X2[i], &Y2[i], catalog[0].average[i].R_PS, catalog[0].average[i].D_PS, &tcoords);
     N2[i] = i;
     catalog[0].found[N2[i]] = -1;
@@ -127 +127 @@
         
       /** add measurements for this star **/
-      catalog[0].measure[Nmeas].dR       = 360000.0*(catalog[0].average[n].R - stars[N][0].R);
-      catalog[0].measure[Nmeas].dD       = 360000.0*(catalog[0].average[n].D - stars[N][0].D);
+      /** *** dR,dD now in arcsec *** **/
+      catalog[0].measure[Nmeas].dR_PS       = 3600.0*(catalog[0].average[n].R_PS - stars[N][0].R);
+      catalog[0].measure[Nmeas].dD_PS       = 3600.0*(catalog[0].average[n].D_PS - stars[N][0].D);
       catalog[0].measure[Nmeas].M        = MIN (1000*stars[N][0].M,  NO_MAG);
       catalog[0].measure[Nmeas].dM       = MIN (1000*stars[N][0].dM, NO_ERR);
@@ -192 +193 @@
     if (stars[N][0].found >= 0) continue;
 
-    catalog[0].average[Nave].R         = stars[N][0].R;
-    catalog[0].average[Nave].D         = stars[N][0].D;
+    catalog[0].average[Nave].R_PS         = stars[N][0].R;
+    catalog[0].average[Nave].D_PS         = stars[N][0].D;
     catalog[0].average[Nave].M         = NO_MAG;
     catalog[0].average[Nave].dM        = NO_MAG;
@@ -211 +212 @@
     }
 
-    catalog[0].measure[Nmeas].dR       = 0.0;
-    catalog[0].measure[Nmeas].dD       = 0.0;
+    catalog[0].measure[Nmeas].dR_PS       = 0.0;
+    catalog[0].measure[Nmeas].dD_PS       = 0.0;
     catalog[0].measure[Nmeas].M        = MIN (1000*stars[N][0].M,  NO_MAG);
     catalog[0].measure[Nmeas].dM       = MIN (1000*stars[N][0].dM, NO_ERR);

trunk/Ohana/src/addstar/src/replace_match.c

@@ -10 +10 @@
   for (i = 0; i < average[0].Nm; i++) {
     if (measure[i].source != thiscode[0].code) continue;
-    measure[i].dR       = 360000.0*(average[0].R - star[0].R);
-    measure[i].dD       = 360000.0*(average[0].D - star[0].D);
+    measure[i].dR_PS       = 3600.0*(average[0].R_PS - star[0].R);
+    measure[i].dD_PS       = 3600.0*(average[0].D_PS - star[0].D);
     measure[i].M        = MIN (1000*star[0].M,  NO_MAG);
     measure[i].dM       = MIN (1000*star[0].dM, NO_ERR);

trunk/Ohana/src/addstar/src/update_coords.c

@@ -19 +19 @@
       continue;
     }
-    R = measure[m].dR;
-    D = measure[m].dD;
+    R = measure[m].dR_PS;
+    D = measure[m].dD_PS;
     r += R;
     d += D;
@@ -33 +33 @@
   r = r / Npt;  /* these are corrections in 1/100 arcsec to RA and DEC */
   d = d / Npt;
-  average[0].R -= r / 360000.0;
-  average[0].D -= d / 360000.0;
+  average[0].R_PS -= r / 3600.0;
+  average[0].D_PS -= d / 3600.0;
   m = average[0].offset;  /* first measurement of this star */
   for (i = 0; i < average[0].Nm; i++) {
-    measure[m].dR -= r;
-    measure[m].dD -= d;
+    measure[m].dR_PS -= r;
+    measure[m].dD_PS -= d;
     m = next[m];
   }