Changeset 38986 for trunk/Ohana/src/addstar/src/getusno.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/getusno.c (modified) (5 diffs)

trunk/Ohana/src/addstar/src/getusno.c

@@ -4 +4 @@
 # define NELEM  3
 
-Stars *getusno (SkyRegion *catstats, int photcode, unsigned int *nstars) {
+Catalog *getusno (SkyRegion *catstats) {
 
   off_t offset;
@@ -15 +15 @@
   double dec;
   int spd, spd_start, spd_end;
-  int NUSNO, Nusno;
-  Stars *stars;
   short int USNO_RED, USNO_BLUE;
 
@@ -22 +20 @@
   NAMED_PHOTCODE (USNO_RED, "USNO_RED");
   NAMED_PHOTCODE (USNO_BLUE, "USNO_BLUE");
-  if (photcode == USNO_RED) goto good_code;
-  if (photcode == USNO_BLUE) goto good_code;
-  Shutdown ("USNO photcode not specified");
-good_code:
 
   /* identify ra & dec range of interest */
@@ -43 +37 @@
   }
 
-  Nusno = 0;
-  NUSNO = 5000;
-  ALLOCATE (stars, Stars, NUSNO);
+  int Nave = 0;
+  int Nmeas = 0;
+  int NAVE = 1000;
+  int NMEAS = 1000;
+
+  Catalog *catalog = NULL;
+  ALLOCATE (catalog, Catalog, 1);
+  dvo_catalog_init (catalog, TRUE);
+  ALLOCATE (catalog->average, Average, NAVE);
+  ALLOCATE (catalog->measure, Measure, NMEAS);
 
   for (spd = spd_start; spd < spd_end; spd += 75) {
@@ -110 +111 @@
       if (buf[1] > iDEC1) continue;
 
-      InitStar (&stars[Nusno]);
+      dvo_average_init (&catalog->average[Nave]);
+      dvo_measure_init (&catalog->measure[Nmeas+0]);
+      dvo_measure_init (&catalog->measure[Nmeas+1]);
 
-      stars[Nusno].average.R     = buf[0]/360000.0;
-      stars[Nusno].average.D     = buf[1]/360000.0 - 90.0;
-      stars[Nusno].measure.R     = stars[Nusno].average.R;
-      stars[Nusno].measure.D     = stars[Nusno].average.D;
-      stars[Nusno].measure.dM    = NAN;
+      catalog->average[Nave].R     = buf[0]/360000.0;
+      catalog->average[Nave].D     = buf[1]/360000.0 - 90.0;
 
-      /* one pass of addstar does either r or b */
-      if (photcode == USNO_RED) {
-        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].measure.photcode = USNO_BLUE;
-        stars[Nusno].measure.M        = fabs (0.1*((int)(buf[2] - 1000000*((int)(buf[2]/1000000))) / 1000));
-      }
-      Nusno ++;
-      CHECK_REALLOCATE (stars, Stars, NUSNO, Nusno, 5000);
+      catalog->measure[Nmeas+0].R  = catalog->average[Nave].R;
+      catalog->measure[Nmeas+0].D  = catalog->average[Nave].D;
+      catalog->measure[Nmeas+0].dM = NAN;
+      catalog->measure[Nmeas+1].R  = catalog->average[Nave].R;
+      catalog->measure[Nmeas+1].D  = catalog->average[Nave].D;
+      catalog->measure[Nmeas+1].dM = NAN;
+
+      catalog->measure[Nmeas+0].photcode = USNO_RED;
+      catalog->measure[Nmeas+0].M        = fabs (0.1*(buf[2] - 1000*((int)(buf[2]/1000))));
+      catalog->measure[Nmeas+1].photcode = USNO_BLUE;
+      catalog->measure[Nmeas+1].M        = fabs (0.1*((int)(buf[2] - 1000000*((int)(buf[2]/1000000))) / 1000));
+
+      catalog->average[Nave].Nmeasure = 2;
+      catalog->average[Nave].measureOffset = Nmeas;
+
+      Nave ++;
+      Nmeas += 2;
+
+      CHECK_REALLOCATE (catalog->average, Average, NAVE,  Nave,  1000);
+      CHECK_REALLOCATE (catalog->measure, Measure, NMEAS, Nmeas, 1000);
     }
     free (buffer);
     fclose (f);
   }
-  REALLOCATE (stars, Stars, Nusno);
+  catalog->Naverage = Nave;
+  catalog->Nmeasure = Nmeas;
 
-  *nstars = Nusno;
-  if (VERBOSE) fprintf (stderr, "%d stars from USNO 1.0\n", Nusno);
-  return (stars);
+  if (VERBOSE) fprintf (stderr, "%d stars from USNO 1.0\n", Nave);
+  return (catalog);
 }