Changeset 5322 for trunk/Ohana/src/addstar/src/find_matches.c

Timestamp:

Oct 13, 2005, 2:40:16 PM (21 years ago)

Author:

eugene

Message:

moving options from global to AddstarClientOptions

File:

• trunk/Ohana/src/addstar/src/find_matches.c (modified) (8 diffs)

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

@@ -1 +1 @@
 # include "addstar.h"
 
-void find_matches (GSCRegion *region, Stars *stars, int Nstars, Catalog *catalog, Image *image, Image *overlap, int Noverlap) {
+void find_matches (GSCRegion *region, Stars *stars, int Nstars, Catalog *catalog, Image *image, Image *overlap, int Noverlap, AddstarClientOptions options) {
 
   int i, j, n, N, J;
@@ -85 +85 @@
 
   /* choose a radius for matches */
-  if (DEFAULT_RADIUS == 0) {
-    RADIUS = NSIGMA * 0.02 * image[0].cerror;  /* 0.02 corrects cerror to arcsec from storage units */
+  if (options.radius == 0) {
+    RADIUS = options.Nsigma * 0.02 * image[0].cerror;  /* 0.02 corrects cerror to arcsec from storage units */
   } else {
-    RADIUS = DEFAULT_RADIUS; /* provided by config */
+    RADIUS = options.radius; /* provided by config */
   }
   RADIUS2 = RADIUS*RADIUS;
@@ -162 +162 @@
 
       /* adds the measurement to the calibration if appropriate color terms are found */
-      if (CALIBRATE) {
+      if (options.calibrate) {
         AddToCalibration (&catalog[0].average[n], catalog[0].measure, &catalog[0].measure[Nmeas], next_meas, N);
       }
@@ -190 +190 @@
       Nmeas ++;
 
-      if (!UPDATE) {
+      if (!options.update) {
         /* in UPDATE mode, newly calculated coordinates are not saved */
         update_coords (&catalog[0].average[n], &catalog[0].measure[0], next_meas);
@@ -200 +200 @@
   /* add reference for undetected catalog stars */
   if (!strcmp (&image[0].coords.ctype[4], "-WRP")) RegisterMosaic (MOSAIC);
-  for (j = 0; (j < Nave) && !SKIP_MISSED; j++) {
+  for (j = 0; (j < Nave) && !options.skip_missed; j++) {
     n = N2[j];
     if (catalog[0].found[n] < 0) { 
@@ -224 +224 @@
   /* incorporate unmatched image stars, if this star is in field of this catalog */
   /* these new entries are all written out in UPDATE mode */ 
-  for (i = 0; (i < Nstars) && !ONLY_MATCH; i++) {
+  for (i = 0; (i < Nstars) && !options.only_match; i++) {
     /* make sure there is space for next entry */
     if (Nmeas >= NMEAS) {
@@ -285 +285 @@
 
     /** now add references from all previous non-detection observations of this spot on the sky */
-    for (j = 0; (j < Noverlap) && !SKIP_MISSED; j++) {
+    for (j = 0; (j < Noverlap) && !options.skip_missed; j++) {
       /* make sure there is space for next entry */
       if (Nmiss >= NMISS) {
@@ -316 +316 @@
   REALLOCATE (catalog[0].missing, Missing, Nmiss);
  
-  if (NOSORT) {
+  if (options.nosort) {
     catalog[0].sorted = FALSE;
   } else {