Changeset 38986 for trunk/Ohana/src/addstar/src/grefstars.c

Timestamp:

Oct 27, 2015, 4:49:06 PM (11 years ago)

Author:

eugene

Message:

extensive work on relphot, relastro, uniphot, dvomerge aiming to the construction and calibration of PV3

Location:

trunk/Ohana

Files:

• . (modified) (1 prop)
• src/addstar/src/grefstars.c (modified) (2 diffs)

trunk/Ohana/src/addstar/src/grefstars.c

@@ -2 +2 @@
 
 /* read ASCII file with ref star data */
-Stars *grefstars (char *file, int photcode, unsigned int *Nstars) {
+Catalog *grefstars (char *file, int photcode) {
 
   FILE *f;
-  int N, NSTARS;
-  Stars *stars;
+  int NSTARS;
   char line[256];
 
@@ -13 +12 @@
   if (f == NULL) Shutdown ("can't read data from %s", file);
 
-  NSTARS = 100;
-  ALLOCATE (stars, Stars, NSTARS);
+  NSTARS = 1000;
+
+  Catalog *catalog = NULL;
+  ALLOCATE (catalog, Catalog, 1);
+  dvo_catalog_init (catalog, TRUE);
+  ALLOCATE (catalog->average, Average, NSTARS);
+  ALLOCATE (catalog->measure, Measure, NSTARS);
 
   /* read in stars line-by-line */
-  for (N = 0; scan_line (f, line) != EOF; N++) {
+  int N = 0;
+  while (scan_line (f, line) != EOF) {
     stripwhite (line);
     if (line[0] == 0) continue;
     if (line[0] == '#') continue;
 
-    InitStar (&stars[N]);
+    dvo_average_init (&catalog->average[N]);
+    dvo_measure_init (&catalog->measure[N]);
 
     int status = sscanf (line, "%lf %lf %f %f %x", 
-                     &stars[N].average.R,  &stars[N].average.D,  
-                     &stars[N].measure.M, &stars[N].measure.dM, 
-                     &stars[N].measure.photFlags);
+                         &catalog->average[N].R, &catalog->average[N].D,  
+                         &catalog->measure[N].M, &catalog->measure[N].dM, 
+                         &catalog->measure[N].photFlags);
+
     if ((status != 4) && (status != 5)) {
       fprintf (stderr, "error reading line: %s\n", line);
-      N --;
       continue;
     }
-    stars[N].average.R = ohana_normalize_angle (stars[N].average.R);
+    catalog->average[N].R = ohana_normalize_angle (catalog->average[N].R);
 
-    stars[N].measure.R = stars[N].average.R;
-    stars[N].measure.D = stars[N].average.D;
+    catalog->measure[N].R = catalog->average[N].R;
+    catalog->measure[N].D = catalog->average[N].D;
 
-    stars[N].measure.photcode = photcode;
+    catalog->measure[N].photcode = photcode;
 
-    CHECK_REALLOCATE (stars, Stars, NSTARS, N+1, 100);
+    catalog->average[N].Nmeasure = 1;
+    catalog->average[N].measureOffset = N;
+
+    N++;
+    CHECK_REALLOCATE (catalog->average, Average, NSTARS, N, 1000);
+    CHECK_REALLOCATE (catalog->measure, Measure, NSTARS, N, 1000);
   }
-  *Nstars = N;
-  return (stars);
+  catalog->Naverage = N;
+  catalog->Nmeasure = N;
+  return (catalog);
 }