Changeset 24750 for trunk/Ohana/src/dvomerge/src/dvomerge.c

Timestamp:

Jul 12, 2009, 10:28:47 AM (17 years ago)

Author:

eugene

Message:

fixed memleaks & photcode defs; dvomerge now working

File:

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

trunk/Ohana/src/dvomerge/src/dvomerge.c

@@ -21 +21 @@
   input2 = argv[3];
   output = argv[5];
+
+  // the first input define the photcode table & db layout
+  sprintf (filename, "%s/Photcodes.dat", input1);
+  if (!LoadPhotcodes (filename, NULL)) {
+    fprintf (stderr, "error loading photcode table %s\n", filename);
+    exit (1);
+  }
+  // save the photcodes in the output catdir
+  sprintf (filename, "%s/Photcodes.dat", output);
+  if (!check_file_access (filename, TRUE, TRUE)) {
+    fprintf (stderr, "error creating output catdir %s\n", output);
+    exit (1);
+  }
+  if (!SavePhotcodesFITS (filename)) {
+    fprintf (stderr, "error saving photcode table %s\n", filename);
+    exit (1);
+  }
 
   // load the sky table for the existing database
@@ -86 +103 @@
         continue;
       }
-      merge_catalogs_old (&outsky[0].regions[i], &outcatalog, &incatalog, 1.0);
+      merge_catalogs_old (&outsky[0].regions[i], &outcatalog, &incatalog, RADIUS);
       dvo_catalog_unlock (&incatalog);
       dvo_catalog_free (&incatalog);
     }
+    SkyListFree (inlist);
+
     outcatalog.catflags = LOAD_AVES | LOAD_MEAS | LOAD_MISS | LOAD_SECF;
     dvo_catalog_save (&outcatalog, VERBOSE);