Changeset 4828 for trunk/Ohana/src/markstar/src/wcatalog.c

Timestamp:

Aug 19, 2005, 5:10:19 PM (21 years ago)

Author:

eugene

Message:

modifications to use CATMODE, CATFORMAT

File:

• trunk/Ohana/src/markstar/src/wcatalog.c (modified) (2 diffs)

trunk/Ohana/src/markstar/src/wcatalog.c

@@ -1 +1 @@
 # include "markstar.h"
 
-wcatalog (char *catname, Catalog *catalog) {
+wcatalog (Catalog *catalog) {
   
-  int status;
-  char filename[256];
+  /* set catalog format (elixir, loneos, etc) */
+  if (!strcmp (CATFORMAT, "INTERNAL")) {
+    sprintf (catalog[0].average_format, "DVO_AVERAGE");
+    sprintf (catalog[0].measure_format, "DVO_MEASURE");
+  } else {
+    sprintf (catalog[0].average_format, "DVO_AVERAGE_%s", CATFORMAT);
+    sprintf (catalog[0].measure_format, "DVO_MEASURE_%s", CATFORMAT);
+  }
 
-  fits_modify (&catalog[0].header, "MARKSTAR", "%t", 1, TRUE);
-
-  sprintf (filename, "%s/%s\0", CATDIR, catname);
-  status = save_catalog (filename, catalog, VERBOSE);
+  if (!save_catalog (catalog, VERBOSE)) {
+    fprintf (stderr, "ERROR: failure saving catalog\n");
+    exit (1);
+  }
 
   if (catalog[0].Naverage) {
@@ -27 +33 @@
     catalog[0].Nsecfilt = 0;
   }
-
-  switch (status) {
-  case 0:
-    exit (0);
-  case 1:
-  case 2:
-    return (status);
-  default:
-    fprintf (stderr, "unknown exit status for save_catalog\n");
-    return (FALSE);
-  }
+  fits_free_header (&catalog[0].header);
 }