Changeset 6995

Timestamp:

Apr 26, 2006, 1:02:29 PM (20 years ago)

Author:

eugene

Message:

updates to getstar for first working version

Location:

trunk/Ohana/src/getstar/src

Files:

• init_catalog.c (modified) (1 diff)
• mkcatalog.c (modified) (1 diff)
• select_by_region.c (modified) (2 diffs)

trunk/Ohana/src/getstar/src/init_catalog.c

@@ -15 +15 @@
   ALLOCATE (catalog[0].missing, Missing, 1);
 
+  // there is no data yet on disk:
+  catalog[0].Nave_disk = 0;
+  catalog[0].Nmeas_disk = 0;
+  catalog[0].Nmiss_disk = 0;
+  catalog[0].Nmeas_off = 0;
 }
+
+/* setup secondary filters to match photcodes:
+ * Nsecfilt is number of filters.  Number of entries in array is
+ * Nsecfilt * Naverage.  At this point, N entries == 0
+ */

trunk/Ohana/src/getstar/src/mkcatalog.c

@@ -119 +119 @@
   fits_modify (&catalog[0].header, "DATE", "%s", 1, line);
   free (line);
-
-  /* dummy allocation so realloc will succeed */
-  ALLOCATE (catalog[0].average, Average, 1);
-  ALLOCATE (catalog[0].measure, Measure, 1);
-  ALLOCATE (catalog[0].missing, Missing, 1);
-  ALLOCATE (catalog[0].secfilt, SecFilt, 1);
-  catalog[0].Naverage = catalog[0].Nmeasure = catalog[0].Nmissing = 0;
-  catalog[0].Nave_disk = catalog[0].Nmeas_disk = catalog[0].Nmiss_disk = 0;
-  catalog[0].Nmeas_off = 0;
-  catalog[0].Nsecfilt = GetPhotcodeNsecfilt ();
-
-  /* setup secondary filters to match photcodes:
-   * Nsecfilt is number of filters.  Number of entries in array is
-   * Nsecfilt * Naverage.  At this point, N entries == 0
-   */
 }

trunk/Ohana/src/getstar/src/select_by_region.c

@@ -13 +13 @@
 
   /* identify selection criteria */
-  if (VERBOSE) fprintf (stderr, "extracting for range %d to %d\n", start, end);
+  if (VERBOSE) fprintf (stderr, "extracting for time range %d to %d\n", start, end);
+  if (VERBOSE) fprintf (stderr, "extracting for region %f,%f to %f,%f\n", 
+                        region[0].Rmin, region[0].Dmin, region[0].Rmax, region[0].Dmax);
 
   /* select the average objects in this region */
@@ -60 +62 @@
     }
   }
+  output[0].Naverage = Nave;
+  output[0].Nmeasure = Nmeas;
+  fprintf (stderr, "output catalog has %d stars (%d measures, %d secfilt)\n",
+           output[0].Naverage, output[0].Nmeasure, output[0].Nsecfilt);
   return (TRUE);
 }