Changeset 21444 for branches/eam_branch_20090208/Ohana/src/addstar/src/getusno.c

Timestamp:

Feb 11, 2009, 6:39:57 PM (17 years ago)

Author:

eugene

Message:

working on the new PS1_V1 CMF and DVO formats; removing autocode type Stars; using Average and Measure in addstar to carry new detection info (replacing autocode Stars)

File:

• branches/eam_branch_20090208/Ohana/src/addstar/src/getusno.c (modified) (1 diff)

branches/eam_branch_20090208/Ohana/src/addstar/src/getusno.c

@@ -110 +110 @@
       if (buf[1] > iDEC1) continue;
 
-      memset (&stars[Nusno], 0, sizeof(Stars));
-      stars[Nusno].R     = buf[0]/360000.0;
-      stars[Nusno].D     = buf[1]/360000.0 - 90.0;
-      stars[Nusno].dM    = NAN;
-      stars[Nusno].t     = 0;
-      stars[Nusno].found = -1;
+      InitStar (&stars[Nusno]);
 
-      stars[Nusno].detID   = 0;
-      stars[Nusno].imageID = 0;
-
-      stars[Nusno].Xccd  = 0;
-      stars[Nusno].Yccd  = 0;
-      stars[Nusno].fx = 0;
-      stars[Nusno].fy = 0;
-      stars[Nusno].df = 0;
+      stars[Nusno].average.R     = buf[0]/360000.0;
+      stars[Nusno].average.D     = buf[1]/360000.0 - 90.0;
+      stars[Nusno].measure.dM    = NAN;
 
       /* one pass of addstar does either r or b */
       if (photcode == USNO_RED) {
-        stars[Nusno].photcode  = USNO_RED;
-        stars[Nusno].M     = fabs (0.1*(buf[2] - 1000*((int)(buf[2]/1000))));
+        stars[Nusno].measure.photcode = USNO_RED;
+        stars[Nusno].measure.M        = fabs (0.1*(buf[2] - 1000*((int)(buf[2]/1000))));
       } 
       if (photcode == USNO_BLUE) {      
-        stars[Nusno].photcode  = USNO_BLUE;
-        stars[Nusno].M     = fabs (0.1*((int)(buf[2] - 1000000*((int)(buf[2]/1000000))) / 1000));
+        stars[Nusno].measure.photcode = USNO_BLUE;
+        stars[Nusno].measure.M        = fabs (0.1*((int)(buf[2] - 1000000*((int)(buf[2]/1000000))) / 1000));
       }
       Nusno ++;