Changeset 5229

Timestamp:

Oct 6, 2005, 6:11:02 AM (21 years ago)

Author:

eugene

Message:

added CLOSEST match method, added SPLIT table support, made catmode and catformat case-insensitive, added -nosort concept, cleaned find_matches

Location:

trunk/Ohana/src/addstar

Files:

• Makefile (modified) (2 diffs)
• doc/Changes.txt (modified) (2 diffs)
• doc/notes.txt (modified) (1 diff)
• include/addstar.h (modified) (4 diffs)
• src/ConfigInit.c (modified) (1 diff)
• src/addstar.c (modified) (1 diff)
• src/args.c (modified) (2 diffs)
• src/build_links.c (added)
• src/calibrate.c (modified) (3 diffs)
• src/find_matches.c (modified) (18 diffs)
• src/find_matches_closest.c (added)
• src/gcatalog.c (modified) (2 diffs)
• src/image-db.c (modified) (2 diffs)
• src/mkcatalog.c (modified) (5 diffs)
• src/wcatalog.c (modified) (1 diff)

trunk/Ohana/src/addstar/Makefile

@@ -25 +25 @@
 $(SRC)/airmass.$(ARCH).o \
 $(SRC)/args.$(ARCH).o \
+$(SRC)/build_links.$(ARCH).o \
 $(SRC)/calibrate.$(ARCH).o \
 $(SRC)/check_permissions.$(ARCH).o \
@@ -31 +32 @@
 $(SRC)/edge_check.$(ARCH).o \
 $(SRC)/find_matches.$(ARCH).o \
+$(SRC)/find_matches_closest.$(ARCH).o \
 $(SRC)/find_matches_refstars.$(ARCH).o \
 $(SRC)/find_subset.$(ARCH).o \

trunk/Ohana/src/addstar/doc/Changes.txt

@@ -1 +1 @@
 
-2005.02.24 : I am adding the mosaic two-level astrometry information to the Image table.
+2005.10.04
+        - moved measure/missing list manipulation to separate functions
+        - added concept of sorted / unsorted measure catalog
+        - defined build_meas_links and reorder_measure,missing
+        - some cleanup of both find_matches.c and find_matches_closest.c
+
+2005.10.03:
+        - dropping GSCRegion *region entry from find_matches (unused!)
+        - adding function find_matches_closest (alternate matches)
+
+2005.08.19:
+        changed load_photcode to handle CATMODE and CATFORMAT variations
+        - addstar.h: added CATMODE and CATFORMAT globals
+        - ConfigInit: read CATMODE and CATFORMAT from config
+        - gcatalog: set catalog.catmode from CATMODE
+        - mkcatalog: set CATFORMAT and CATMODE for new catalog
+        - wcatalog: set CATFORMAT for new catalog
+        
+        using full photometry conversions in find_matches
+        added SetZeroPoint to gstars to enable phot conversions
+        
+2005.08.15:
+        cleanup of the minor Wall,Werror messages
 
 2005.07.06 : current release is addstar-1.1
@@ -21 +43 @@
         need to know about the mysql backend interface.  
 
-2005.08.15:
-        cleanup of the minor Wall,Werror messages
+2005.02.24 : I am adding the mosaic two-level astrometry information to the Image table.
 
-2005.08.19:
-        changed load_photcode to handle CATMODE and CATFORMAT variations
-        - addstar.h: added CATMODE and CATFORMAT globals
-        - ConfigInit: read CATMODE and CATFORMAT from config
-        - gcatalog: set catalog.catmode from CATMODE
-        - mkcatalog: set CATFORMAT and CATMODE for new catalog
-        - wcatalog: set CATFORMAT for new catalog
-        
-        using full photometry conversions in find_matches
-        added SetZeroPoint to gstars to enable phot conversions
-        

trunk/Ohana/src/addstar/doc/notes.txt

@@ +1 @@
+
+- measure <-> average matches and reordering
+
+  next[i] = i + 1
+  
+
+  
+
 
 2005.03.07 : notes related to new version of addstar

trunk/Ohana/src/addstar/include/addstar.h

@@ -102 +102 @@
 int REPLACE;
 int ONLY_MATCH;
+int CLOSEST;
+int REORDER;
 
 int MODE;
@@ -110 +112 @@
 
 /*** addstar prototypes ***/
-void       AddToCalibration       PROTO((Average *average, Measure *measure, Measure *new, int Nstar));
+void       AddToCalibration       PROTO((Average *average, Measure *measure, Measure *new, int *next, int Nstar));
 void       ConfigInit             PROTO((int *argc, char **argv));
 void       FindCalibration        PROTO((Image *image));
@@ -132 +134 @@
 int        edge_check             PROTO((double *x1, double *y1, double *x2, double *y2));
 void       find_matches           PROTO((GSCRegion *region, Stars *stars, int Nstars, Catalog *catalog, Image *image, Image *overlap, int Noverlap));
+void       find_matches_closest   PROTO((GSCRegion *region, Stars *stars, int Nstars, Catalog *catalog, Image *image, Image *overlap, int Noverlap));
 void       find_matches_refstars  PROTO((GSCRegion *region, Stars **stars, int Nstars, Catalog *catalog));
 Stars    **find_subset            PROTO((GSCRegion *region, Stars *stars, int Nstars, int *NSTARS));
@@ -182 +185 @@
 void       fsort2                 PROTO((float *X, float *Y, int N));
 
+int *init_measure_links (Average *average, int Naverage, Measure *measure, int Nmeasure);
+int *init_missing_links (Average *average, int Naverage, Missing *missing, int Nmissing);
+int add_meas_link (Average *average, int *next, int Nmeasure);
+int add_miss_link (Average *average, int *next, int Nmissing);
+int *build_measure_links (Average *average, int Naverage, Measure *measure, int Nmeasure);
+Measure *reorder_measure (Average *average, int Naverage, Measure *measure, int Nmeasure, int *next);
+Missing *reorder_missing (Average *average, int Naverage, Missing *missing, int Nmissing, int *next_miss);
+
 /** 
   there is an inconsistency to be resolved: fixed structures (like Image)

trunk/Ohana/src/addstar/src/ConfigInit.c

@@ -62 +62 @@
   }
 
+  /* default mode, format, if not specified */
   if (*CATMODE == 0) strcpy (CATMODE, "RAW");
   if (*CATFORMAT == 0) strcpy (CATFORMAT, "ELIXIR");

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

@@ -61 +61 @@
     case M_IMAGE:
       Nsubset = Nstars;
-      find_matches (&regions[i], stars, Nstars, &catalog, &image, overlap, Noverlap);
+      if (CLOSEST) {
+        find_matches_closest (&regions[i], stars, Nstars, &catalog, &image, overlap, Noverlap);
+      } else {
+        find_matches (&regions[i], stars, Nstars, &catalog, &image, overlap, Noverlap);
+      }
       break;
     case M_REFCAT:

trunk/Ohana/src/addstar/src/args.c

@@ -22 +22 @@
   fprintf (stderr, "  -missed                     : skipped 'missed' entries\n");
   fprintf (stderr, "  -replace                    : replace time/photcode measurements (no duplication)\n");
+  fprintf (stderr, "  -closest                    : use closest-star algorith\n");
   fprintf (stderr, "  -image                      : only insert image data\n");
   fprintf (stderr, "  -cal                        : perform zero-point calibration\n");
@@ -144 +145 @@
     remove_argument (N, &argc, argv);
   }
+  /* use 'closest star' matching, rather than traditional method */
+  CLOSEST = FALSE;
+  if ((N = get_argument (argc, argv, "-closest"))) {
+    CLOSEST = TRUE;
+    remove_argument (N, &argc, argv);
+  }
+  /* only add new rows (-update) or re-write complete measure table */
+  REORDER = TRUE;
+  if ((N = get_argument (argc, argv, "-update"))) {
+    REORDER = FALSE;
+    remove_argument (N, &argc, argv);
+  }
   /* only add image potion to image table */
   ONLY_IMAGES = FALSE;

trunk/Ohana/src/addstar/src/calibrate.c

@@ -41 +41 @@
 }
 
-/* this does not use the linked list to navigate the measure structure
-   this is OK for old measures, but will break for entries which have
-   already added a new measure to the list.  */
-void AddToCalibration (Average *average, Measure *measure, Measure *new, int Nstar) {
+/* use the linked list to navigate the measures; safe for unsorted measures */
+void AddToCalibration (Average *average, Measure *measure, Measure *new, int *next, int Nstar) {
 
-  int i, found0, found1, found2;
+  int i, m, found0, found1, found2;
   float CalM0, CalM1, CalM2, dCalM;
   short CalC0, CalC1, CalC2;
@@ -57 +55 @@
   CalC2 = thiscode[0].c2;
 
+  m = average[0].offset;
   for (i = 0; i < average[0].Nm; i++) {
-    if (measure[0].source == CalC0) { 
+    if (measure[m].source == CalC0) { 
       found0 = TRUE; 
-      CalM0  = measure[i].M_PS; 
-      dCalM  = measure[i].dM_PS; 
+      CalM0  = measure[m].M_PS; 
+      dCalM  = measure[m].dM_PS; 
     }
-    if (measure[i].source == CalC1) { 
+    if (measure[m].source == CalC1) { 
       found1 = TRUE; 
-      CalM1  = measure[i].M_PS; 
+      CalM1  = measure[m].M_PS; 
     }
-    if (measure[i].source == CalC2) { 
+    if (measure[m].source == CalC2) { 
       found2 = TRUE; 
-      CalM2  = measure[i].M_PS; 
+      CalM2  = measure[m].M_PS; 
     }
     if (found0 && found1 && found2) {
@@ -75 +74 @@
       return;
     }
-    /* n = next[n]; - if we use this, we need to pass in measure[0] above */
+    m = next[m];
   }
   return;

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

@@ -3 +3 @@
 void find_matches (GSCRegion *region, Stars *stars, int Nstars, Catalog *catalog, Image *image, Image *overlap, int Noverlap) {
 
-  int i, j, k, n, m, N, J;
+  int i, j, n, N, J;
   double X, Y, RADIUS, RADIUS2, secz;
   float *X1, *Y1, *X2, *Y2;
   float dX, dY, dR;
-  int *N1, *N2,  *next, *next_miss, last, last_miss;
+  int *N1, *N2,  *next_meas, *next_miss;
   int Nave, NAVE, Nmeas, NMEAS, Nmiss, NMISS, Nmatch;
-  Measure *tmpmeasure;
-  Missing *tmpmissing;
   Coords tcoords;
   int Nsecfilt, Nsec;
   float Mcat, *Mval, MTIME;
+  double dtime;
+  struct timeval start, stop;
+
+  gettimeofday (&start, NULL);
 
   /* photcode data - must by of type DEP, (PRI, SEC) - probably should restrict to DEP */
@@ -28 +30 @@
 
   /** allocate local arrays (catalog) **/
-  Nave = catalog[0].Naverage;
-  NAVE = Nave + 1000;
+  NAVE = Nave = catalog[0].Naverage;
   ALLOCATE (X2, float, NAVE);
   ALLOCATE (Y2, float, NAVE);
   ALLOCATE (N2, int,   NAVE);
   ALLOCATE (catalog[0].found, int, NAVE);
-  REALLOCATE (catalog[0].average, Average, NAVE);
-  REALLOCATE (catalog[0].secfilt, SecFilt, NAVE*catalog[0].Nsecfilt);
   /* for secfilt j and star i, secfilt[i*Nsecfilt+j] */
 
+  /* internal counters */
   Nmatch = 0;
-  Nmeas = catalog[0].Nmeasure;
-  NMEAS = Nmeas + 1000;
-  ALLOCATE (next, int, NMEAS);
-  REALLOCATE (catalog[0].measure, Measure, NMEAS);
-  
-  Nmiss = catalog[0].Nmissing;
-  NMISS = Nmiss + 1000;
-  ALLOCATE (next_miss, int, NMISS);
-  REALLOCATE (catalog[0].missing, Missing, NMISS);
+  NMEAS = Nmeas = catalog[0].Nmeasure;
+  NMISS = Nmiss = catalog[0].Nmissing;
   
   /* project onto rectilinear grid with 1 arcsec pixels */
@@ -67 +60 @@
   }
 
+  /* build spatial index (RA sort) */
   for (i = 0; i < Nstars; i++) {
     fRD_to_XY (&X1[i], &Y1[i], stars[i].R, stars[i].D, &tcoords);
@@ -73 +67 @@
   if (Nstars > 1) sort_lists (X1, Y1, N1, Nstars);
   
+  /* build spatial index (RA sort) */
   for (i = 0; i < Nave; i++) {
     fRD_to_XY (&X2[i], &Y2[i], catalog[0].average[i].R_PS, catalog[0].average[i].D_PS, &tcoords);
@@ -80 +75 @@
   if (Nave > 1) sort_lists (X2, Y2, N2, Nave);
 
-  /* set up pointers for linked list of measurements */
-  for (i = 0; i < Nmeas - 1; i++) {
-    next[i] = i+1;
-  }
-  next[i] = -1;
-  last = i;
-
-  for (i = 0; i < Nmiss - 1; i++) {
-    next_miss[i] = i+1;
-  }
-  next_miss[i] = -1;
-  last_miss = i;
+  /* set up pointers for linked list of measure, missing */
+  if (catalog[0].ordered) {
+    next_meas = init_measure_links (catalog[0].average, Nave, catalog[0].measure, Nmeas);
+  } else {
+    next_meas = build_measure_links (catalog[0].average, Nave, catalog[0].measure, Nmeas);
+  }    
+  next_miss = init_missing_links (catalog[0].average, Nave, catalog[0].missing, Nmiss);
+  /* missing MUST be written ordered, or not at all */
 
   /* choose a radius for matches */
@@ -102 +93 @@
 
   /* correct instrumental mags for exposure time */
-  if (image[0].exptime > 0) {
-    MTIME = 2.500*log10(image[0].exptime);
-  } else {
-    MTIME = 0;
-  }
+  MTIME = (image[0].exptime > 0) ? 2.500*log10(image[0].exptime) : 0.0;
 
   /** find matched stars **/
   for (i = j = 0; (i < Nstars) && (j < Nave); ) {
     
+    /* negative dX: j is too large */
     dX = X1[i] - X2[j];
     if (dX <= -2*RADIUS) {
@@ -116 +104 @@
       continue;
     }
+    /* positive dX, i is too large */
     if (dX >= 2*RADIUS) {
       j++;
@@ -121 +110 @@
     }
 
-    /* negative dX: j is too large, positive dX, i is too large */
+    /* within match range; look for matches */
     for (J = j; (dX > -2*RADIUS) && (J < Nave); J++) {
       dX = X1[i] - X2[J];
@@ -128 +117 @@
       if (dR > RADIUS2) continue;
 
+      /* make sure there is space for next entry */
+      if (Nmeas >= NMEAS) {
+        NMEAS = Nmeas + 1000;
+        REALLOCATE (next_meas, int, NMEAS);
+        REALLOCATE (catalog[0].measure, Measure, NMEAS);
+      }
+
       Nmatch ++;
       n = N2[J];
       N = N1[i];
-      m = catalog[0].average[n].offset;  
-
-      /** insert star in measurement list */
-      /* find last measurement of this star */
-      for (k = 0; k < catalog[0].average[n].Nm - 1; k++) m = next[m];
-      /* set up references */
-      next[Nmeas] = next[m];
-      next[m] = Nmeas;
-      /* last just was moved */
-      if (next[Nmeas] == -1) last = Nmeas;
-        
+
+      /* add to end of measurement list */
+      add_meas_link (&catalog[0].average[n], next_meas, Nmeas);
+
       /* calculate accurate per-star airmass */
       secz = airmass (image[0].secz_PS, stars[N].R, stars[N].D, SiderealTime, Latitude);
@@ -171 +160 @@
       if (*Mval == NO_MAG) *Mval = Mcat;
 
-      /** this is a little tricky: the new measures are not in the measure sequence
-          this call can run into the next star if we have had two measures found at this location. **/
+      /* adds the measurement to the calibration if appropriate color terms are found */
       if (CALIBRATE) {
-        AddToCalibration (&catalog[0].average[n], &catalog[0].measure[m], &catalog[0].measure[Nmeas], N);
+        AddToCalibration (&catalog[0].average[n], catalog[0].measure, &catalog[0].measure[Nmeas], next_meas, N);
       }
 
@@ -196 +184 @@
         catalog[0].found[n] = Nmeas;
       }
-
       catalog[0].average[n].Nm ++;
       Nmeas ++;
-      if (Nmeas == NMEAS) {
-        NMEAS = Nmeas + 1000;
-        REALLOCATE (next, int, NMEAS);
-        REALLOCATE (catalog[0].measure, Measure, NMEAS);
-      }
-
-      update_coords (&catalog[0].average[n], &catalog[0].measure[0], next);
+
+      update_coords (&catalog[0].average[n], &catalog[0].measure[0], next_meas);
     }
     i++;
@@ -215 +197 @@
     n = N2[j];
     if (catalog[0].found[n] < 0) { 
+      /* make sure there is space for next entry */
+      if (Nmiss >= NMISS) {
+        NMISS = Nmiss + 1000;
+        REALLOCATE (next_miss, int, NMISS);
+        REALLOCATE (catalog[0].missing, Missing, NMISS);
+      }
+
       /* should the catalog star be on this image? project into image coords */
       if (!in_image (catalog[0].average[n].R_PS, catalog[0].average[n].D_PS, image)) continue;
-      /* find last missing meas */
-      if (catalog[0].average[n].Nn < 1) { /* no previous missing obs */
-        catalog[0].average[n].missing = Nmiss;
-        next_miss[last_miss] = Nmiss;
-        next_miss[Nmiss] = -1;
-        last_miss = Nmiss;
-      } else {
-        m = catalog[0].average[n].missing;
-        for (k = 0; k < catalog[0].average[n].Nn - 1; k++)
-          m = next_miss[m];
-        next_miss[Nmiss] = next_miss[m];
-        next_miss[m] = Nmiss;
-        if (next_miss[Nmiss] == -1) { /* last just was moved */
-          last_miss = Nmiss;
-        }
-      }
+      add_miss_link (&catalog[0].average[n], next_miss, Nmiss);
+
       /* calculate time of exposure for this coordinate in the image */
       RD_to_XY (&X, &Y, catalog[0].average[n].R_PS, catalog[0].average[n].D_PS, &image[0].coords);        
@@ -238 +213 @@
       catalog[0].average[n].Nn ++;
       Nmiss ++;
-      if (Nmiss == NMISS) {
-        NMISS = Nmiss + 1000;
-        REALLOCATE (next_miss, int, NMISS);
-        REALLOCATE (catalog[0].missing, Missing, NMISS);
-      }
     }
   }
@@ -248 +218 @@
   /* incorporate unmatched image stars, if this star is in field of this catalog */
   for (i = 0; (i < Nstars) && !ONLY_MATCH; i++) {
+    /* make sure there is space for next entry */
+    if (Nmeas >= NMEAS) {
+      NMEAS = Nmeas + 1000;
+      REALLOCATE (next_meas, int, NMEAS);
+      REALLOCATE (catalog[0].measure, Measure, NMEAS);
+    }
+    if (Nave >= NAVE) {
+      NAVE = Nave + 1000;
+      REALLOCATE (catalog[0].average, Average, NAVE);
+      REALLOCATE (catalog[0].secfilt, SecFilt, NAVE*catalog[0].Nsecfilt);
+    }
+
     N = N1[i];
     if (stars[N].found >= 0) continue;
@@ -297 +279 @@
     /** now add references from all previous non-detection observations of this spot on the sky */
     for (j = 0; (j < Noverlap) && !SKIP_MISSED; j++) {
+      /* make sure there is space for next entry */
+      if (Nmiss >= NMISS) {
+        NMISS = Nmiss + 1000;
+        REALLOCATE (next_miss, int, NMISS);
+        REALLOCATE (catalog[0].missing, Missing, NMISS);
+      }
       if (!FindMosaicForImage (overlap, Noverlap, j)) continue;
       if (!in_image (catalog[0].average[Nave].R_PS, catalog[0].average[Nave].D_PS, &overlap[j])) continue;
-      if (catalog[0].average[Nave].Nn < 1) {
-        catalog[0].average[Nave].missing = Nmiss;
-      }
-      next_miss[last_miss] = Nmiss;
-      next_miss[Nmiss] = -1;
-      last_miss = Nmiss;
+      add_miss_link (&catalog[0].average[Nave], next_miss, Nmiss);
+
       /* get time of exposure of this portion of the image */
       RD_to_XY (&X, &Y, catalog[0].average[Nave].R_PS, catalog[0].average[Nave].D_PS, &overlap[j].coords);        
@@ -310 +294 @@
       catalog[0].average[Nave].Nn ++;
       Nmiss ++;
-      if (Nmiss == NMISS) {
-        NMISS = Nmiss + 1000;
-        REALLOCATE (next_miss, int, NMISS);
-        REALLOCATE (catalog[0].missing, Missing, NMISS);
-      }
     }
 
     stars[N].found = Nmeas;
-    next[last] = Nmeas;
-    next[Nmeas] = -1;
-    last = Nmeas;
+    next_meas[Nmeas] = -1;
     Nmeas ++;
-    if (Nmeas == NMEAS) {
-      NMEAS = Nmeas + 1000;
-      REALLOCATE (next, int, NMEAS);
-      REALLOCATE (catalog[0].measure, Measure, NMEAS);
-    }
     Nave ++;
-    if (Nave == NAVE) {
-      NAVE = Nave + 1000;
-      REALLOCATE (catalog[0].average, Average, NAVE);
-      REALLOCATE (catalog[0].secfilt, SecFilt, NAVE*catalog[0].Nsecfilt);
-    }
   }
       
@@ -338 +305 @@
   REALLOCATE (catalog[0].average, Average, Nave);
   REALLOCATE (catalog[0].measure, Measure, Nmeas);
+  REALLOCATE (catalog[0].missing, Missing, Nmiss);
  
-  /* fix order of Measure (memory intensive, but fast) */
-  N = 0; 
-  ALLOCATE (tmpmeasure, Measure, Nmeas);
-  for (i = 0; i < Nave; i++) {
-    n = catalog[0].average[i].offset;
-    catalog[0].average[i].offset = N;
-    for (k = 0; k < catalog[0].average[i].Nm; k++, N++) {
-      tmpmeasure[N] = catalog[0].measure[n]; 
-      tmpmeasure[N].averef = i;
-      n = next[n];
-    }
-  }
-  free (catalog[0].measure);
-  catalog[0].measure = tmpmeasure;
-    
-  /* fix order of Missing (memory intensive, but fast) */
-  N = 0; 
-  ALLOCATE (tmpmissing, Missing, Nmiss);
-  for (i = 0; i < Nave; i++) {
-    if (catalog[0].average[i].Nn > 0) {
-      n = catalog[0].average[i].missing;
-      catalog[0].average[i].missing = N;
-      for (k = 0; k < catalog[0].average[i].Nn; k++, N++) {
-        tmpmissing[N] = catalog[0].missing[n]; 
-        n = next_miss[n];
-      }
-    }
-  }
-  free (catalog[0].missing);
-  catalog[0].missing = tmpmissing;
+  /* XXX EAM - temporary examination of next_meas
+  for (i = 0; i < 5; i++) {
+    m = catalog[0].average[i].offset;
+    for (j = 0; j < catalog[0].average[i].Nm; j++) {
+      fprintf (stderr, "this: %d (%f), next: %d\n", m, catalog[0].measure[m].M_PS, next_meas[m]);
+      m = next_meas[m];
+    }
+  } */
+
+  if (REORDER) {
+    catalog[0].measure = reorder_measure (catalog[0].average, Nave, catalog[0].measure, Nmeas, next_meas);
+    catalog[0].ordered = TRUE;
+  } else {
+    catalog[0].ordered = FALSE;
+  }
+  catalog[0].missing = reorder_missing (catalog[0].average, Nave, catalog[0].missing, Nmiss, next_miss);
+  /* missing is REQUIRED to be sorted */
 
   /* note stars which have been found in this catalog */
@@ -384 +339 @@
   catalog[0].Nmissing = Nmiss;
   if (VERBOSE) fprintf (stderr, "Nstars, Nave, Nmeas, Nmiss: %d %d %d %d, (%d matches)\n", Nstars, Nave, Nmeas, Nmiss, Nmatch);
+
+  gettimeofday (&stop, NULL);
+  dtime = DTIME (stop, start);
+  fprintf (stderr, "  match time %8.3f sec for %5d stars, %6d average\n", dtime, Nstars, Nave);
+
+  return;
 }
 

trunk/Ohana/src/addstar/src/gcatalog.c

@@ -3 +3 @@
 int gcatalog (Catalog *catalog) {
   
-  int Nsecfilt;
+  int Nsecfilt, status;
   char mode;
 
@@ -14 +14 @@
     exit (1);
   }
+
+  /* should this be moved into save_catalog?? */
+  status = fits_scan (&catalog[0].header, "ORDERED", "%t", 1, &catalog[0].ordered);
+  if (!status) catalog[0].ordered = TRUE;
+  /* XXX EAM - is this a good choice?  should the default be 'FALSE'? */
 
   /* check Nsecfile value, update if needed */

trunk/Ohana/src/addstar/src/image-db.c

@@ -40 +40 @@
 
   /* set the recommended mode */
-  if (!strcmp (CATMODE, "RAW")) {
+  db[0].mode = DVO_MODE_UNDEF;
+  if (!strcasecmp (CATMODE, "RAW")) {
     /* make header a fake image */
     db[0].header.bitpix   = 16;
@@ -49 +50 @@
     db[0].mode = DVO_MODE_RAW;
   }
-
-  if (!strcmp (CATMODE, "MEF") || !strcmp (CATMODE, "SPLIT")) {
+  if (!strcasecmp (CATMODE, "MEF") || !strcasecmp (CATMODE, "SPLIT")) {
     db[0].header.extend   = TRUE;
     fits_create_header (&db[0].header);
     db[0].mode = DVO_MODE_MEF;
   }
+  if (db[0].mode == DVO_MODE_UNDEF) {
+    fprintf (stderr, "invalid output catalog mode\n");
+    exit (1);
+  }
 
   /* set the recommended format */
   db[0].format = DVO_FORMAT_UNDEF;
-  if (!strcmp (CATFORMAT, "INTERNAL"))  db[0].format = DVO_FORMAT_INTERNAL;
-  if (!strcmp (CATFORMAT, "LONEOS"))    db[0].format = DVO_FORMAT_LONEOS;
-  if (!strcmp (CATFORMAT, "ELIXIR"))    db[0].format = DVO_FORMAT_ELIXIR;
-  if (!strcmp (CATFORMAT, "PANSTARRS")) db[0].format = DVO_FORMAT_PANSTARRS;
+  if (!strcasecmp (CATFORMAT, "INTERNAL"))  db[0].format = DVO_FORMAT_INTERNAL;
+  if (!strcasecmp (CATFORMAT, "LONEOS"))    db[0].format = DVO_FORMAT_LONEOS;
+  if (!strcasecmp (CATFORMAT, "ELIXIR"))    db[0].format = DVO_FORMAT_ELIXIR;
+  if (!strcasecmp (CATFORMAT, "PANSTARRS")) db[0].format = DVO_FORMAT_PANSTARRS;
   if (db[0].format == DVO_FORMAT_UNDEF) {
     fprintf (stderr, "invalid output catalog format\n");

trunk/Ohana/src/addstar/src/mkcatalog.c

@@ -3 +3 @@
 void mkcatalog (GSCRegion *region, Catalog *catalog) {
   
-  char *line;
+  int length, status;
+  char *path, *root, *file, *line;
   time_t now;
 
@@ -10 +11 @@
   /* set the recommended CATFORMAT */
   catalog[0].catformat = DVO_FORMAT_UNDEF;
-  if (!strcmp (CATFORMAT, "INTERNAL"))  catalog[0].catformat = DVO_FORMAT_INTERNAL;
-  if (!strcmp (CATFORMAT, "LONEOS"))    catalog[0].catformat = DVO_FORMAT_LONEOS;
-  if (!strcmp (CATFORMAT, "ELIXIR"))    catalog[0].catformat = DVO_FORMAT_ELIXIR;
-  if (!strcmp (CATFORMAT, "PANSTARRS")) catalog[0].catformat = DVO_FORMAT_PANSTARRS;
+  if (!strcasecmp (CATFORMAT, "INTERNAL"))  catalog[0].catformat = DVO_FORMAT_INTERNAL;
+  if (!strcasecmp (CATFORMAT, "LONEOS"))    catalog[0].catformat = DVO_FORMAT_LONEOS;
+  if (!strcasecmp (CATFORMAT, "ELIXIR"))    catalog[0].catformat = DVO_FORMAT_ELIXIR;
+  if (!strcasecmp (CATFORMAT, "PANSTARRS")) catalog[0].catformat = DVO_FORMAT_PANSTARRS;
   if (catalog[0].catformat == DVO_FORMAT_UNDEF) {
     fprintf (stderr, "invalid output catalog format\n");
@@ -20 +21 @@
 
   /* set the recommended CATMODE */
-  catalog[0].catmode = DVO_MODE_RAW;
-  if (!strcmp (CATMODE, "RAW"))  catalog[0].catmode = DVO_MODE_RAW;
-  if (!strcmp (CATMODE, "MEF"))  catalog[0].catmode = DVO_MODE_MEF;
+  catalog[0].catmode = DVO_MODE_UNDEF;
+  if (!strcasecmp (CATMODE, "RAW"))  catalog[0].catmode = DVO_MODE_RAW;
+  if (!strcasecmp (CATMODE, "MEF"))  catalog[0].catmode = DVO_MODE_MEF;
+  if (!strcasecmp (CATMODE, "SPLIT"))  catalog[0].catmode = DVO_MODE_SPLIT;
+  if (catalog[0].catmode == DVO_MODE_UNDEF) {
+    fprintf (stderr, "invalid output catalog mode\n");
+    exit (1);
+  }
 
   fits_init_header (&catalog[0].header);
@@ -36 +42 @@
   fits_create_header (&catalog[0].header);
   
+  if (catalog[0].catmode == DVO_MODE_SPLIT) {
+    path = pathname (catalog[0].filename);
+    root = filerootname (catalog[0].filename);
+    length = strlen(path) + strlen(root) + 6;
+
+    /* define measure catalog file */
+    ALLOCATE (catalog[0].measure_catalog, Catalog, 1);
+    fits_init_header (&catalog[0].measure_catalog[0].header);
+    fits_create_header (&catalog[0].measure_catalog[0].header);
+    ALLOCATE (catalog[0].measure_catalog[0].filename, char, length);
+    sprintf (catalog[0].measure_catalog[0].filename, "%s/%s.cpm", path, root);
+    status = lock_catalog (catalog[0].measure_catalog, catalog[0].lockmode);
+    if (status != 2) {
+      fprintf (stderr, "error with file lock\n");
+      exit (2);
+    }
+    file = filebasename (catalog[0].measure_catalog[0].filename);
+    fits_modify (&catalog[0].header, "MEASURE", "%s", 1, file);
+    free (file);
+
+    /* define missing catalog file */
+    ALLOCATE (catalog[0].missing_catalog, Catalog, 1);
+    fits_init_header (&catalog[0].missing_catalog[0].header);
+    fits_create_header (&catalog[0].missing_catalog[0].header);
+    ALLOCATE (catalog[0].missing_catalog[0].filename, char, length);
+    sprintf (catalog[0].missing_catalog[0].filename, "%s/%s.cpn", path, root);
+    if (lock_catalog (catalog[0].missing_catalog, catalog[0].lockmode) != 2) {
+      fprintf (stderr, "error with file lock\n");
+      exit (2);
+    }
+    file = filebasename (catalog[0].missing_catalog[0].filename);
+    fits_modify (&catalog[0].header, "MISSING", "%s", 1, file);
+    free (file);
+
+    /* define secfilt catalog file */
+    ALLOCATE (catalog[0].secfilt_catalog, Catalog, 1);
+    fits_init_header (&catalog[0].secfilt_catalog[0].header);
+    fits_create_header (&catalog[0].secfilt_catalog[0].header);
+    ALLOCATE (catalog[0].secfilt_catalog[0].filename, char, length);
+    sprintf (catalog[0].secfilt_catalog[0].filename, "%s/%s.cps", path, root);
+    if (lock_catalog (catalog[0].secfilt_catalog, catalog[0].lockmode) != 2) {
+      fprintf (stderr, "error with file lock\n");
+      exit (2);
+    }
+    file = filebasename (catalog[0].secfilt_catalog[0].filename);
+    fits_modify (&catalog[0].header, "SECFILT", "%s", 1, file);
+    free (file);
+    free (path);
+    free (root);
+  }    
+
   /* write RA,DEC range in header */
   fits_modify (&catalog[0].header, "RA0",  "%lf", 1, region[0].RA[0]);
@@ -48 +105 @@
   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].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
+   * Nsecfilt is number of filters.  Number of entries in array is
+   * Nsecfilt * Naverage.  At this point, N entries == 0
    */
-  ALLOCATE (catalog[0].secfilt, SecFilt, 1);
-  catalog[0].Nsecfilt = GetPhotcodeNsecfilt ();
 }

trunk/Ohana/src/addstar/src/wcatalog.c

@@ -5 +5 @@
   /* output CATMODE and CATFORMAT are set by mkcatalog 
      or by mode and format of existing data */
+
+  /* should this be moved into save_catalog?? */
+  fits_modify (&catalog[0].header, "ORDERED",  "%t", 1, catalog[0].ordered);
 
   if (!save_catalog (catalog, VERBOSE)) {