Changeset 25757 for trunk/Ohana/src/dvomerge

Timestamp:

Oct 2, 2009, 3:15:42 PM (17 years ago)

Author:

eugene

Message:

various dvo and other improvements from gene@dev branch

File:

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

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

@@ -24 +24 @@
   // the first input define the photcode table & db layout
   sprintf (filename, "%s/Photcodes.dat", input1);
-  if (!LoadPhotcodes (filename, NULL)) {
+  if (!LoadPhotcodes (filename, NULL, FALSE)) {
     fprintf (stderr, "error loading photcode table %s\n", filename);
     exit (1);
@@ -30 +30 @@
   // save the photcodes in the output catdir
   sprintf (filename, "%s/Photcodes.dat", output);
-  if (!check_file_access (filename, TRUE, TRUE)) {
+  if (!check_file_access (filename, TRUE, TRUE, TRUE)) {
     fprintf (stderr, "error creating output catdir %s\n", output);
     exit (1);
@@ -40 +40 @@
 
   // load the sky table for the existing database
-  insky1 = SkyTableLoadOptimal (input1, NULL, NULL, SKY_DEPTH_HST, VERBOSE);
+  insky1 = SkyTableLoadOptimal (input1, NULL, NULL, FALSE, SKY_DEPTH_HST, VERBOSE);
   SkyTableSetFilenames (insky1, input1, "cpt");
 
-  insky2 = SkyTableLoadOptimal (input2, NULL, NULL, SKY_DEPTH_HST, VERBOSE);
+  insky2 = SkyTableLoadOptimal (input2, NULL, NULL, FALSE, SKY_DEPTH_HST, VERBOSE);
   SkyTableSetFilenames (insky2, input2, "cpt");
 
   // generate an output table populated at the desired depth
-  outsky = SkyTableLoadOptimal (output, NULL, GSCFILE, SKY_DEPTH, VERBOSE);
+  outsky = SkyTableLoadOptimal (output, NULL, GSCFILE, TRUE, SKY_DEPTH, VERBOSE);
   SkyTableSetFilenames (outsky, output, "cpt");
 
@@ -117 +117 @@
   // save the output sky table copy
   sprintf (filename, "%s/SkyTable.fits", output);
-  check_file_access (filename, TRUE, VERBOSE);
+  check_file_access (filename, TRUE, TRUE, VERBOSE);
   if (!SkyTableSave (outsky, filename)) {
     fprintf (stderr, "ERROR: failed to save sky table for %s\n", output);