Changeset 33213

Timestamp:

Feb 8, 2012, 6:57:54 AM (14 years ago)

Author:

eugene

Message:

new libdvo API to define skytable filename

Location:

branches/eam_branches/ipp-20111122/Ohana/src/dvomerge/src

Files:

• dvoconvert.c (modified) (1 diff)
• dvomergeContinue.c (modified) (1 diff)
• dvomergeContinue_threaded.c (modified) (1 diff)
• dvomergeCreate.c (modified) (1 diff)
• dvomergeUpdate.c (modified) (1 diff)
• dvomergeUpdate_threaded.c (modified) (1 diff)
• dvoverify.c (modified) (1 diff)

branches/eam_branches/ipp-20111122/Ohana/src/dvomerge/src/dvoconvert.c

@@ -100 +100 @@
 
   // save the output sky table copy
-  sprintf (filename, "%s/SkyTable.fits", output);
-  check_file_access (filename, TRUE, TRUE, VERBOSE);
-  if (!SkyTableSave (outsky, filename)) {
+  char *skyfile = SkyTableFilename (output);
+  check_file_access (skyfile, TRUE, TRUE, VERBOSE);
+  if (!SkyTableSave (outsky, skyfile)) {
     fprintf (stderr, "ERROR: failed to save sky table for %s\n", output);
     exit (1);

branches/eam_branches/ipp-20111122/Ohana/src/dvomerge/src/dvomergeContinue.c

@@ -150 +150 @@
 
   // save the output sky table copy
-  sprintf (filename, "%s/SkyTable.fits", output);
-  check_file_access (filename, TRUE, TRUE, VERBOSE);
-  if (!SkyTableSave (outsky, filename)) {
+  char *skyfile = SkyTableFilename (output);
+  check_file_access (skyfile, TRUE, TRUE, VERBOSE);
+  if (!SkyTableSave (outsky, skyfile)) {
     fprintf (stderr, "ERROR: failed to save sky table for %s\n", output);
     exit (1);

branches/eam_branches/ipp-20111122/Ohana/src/dvomerge/src/dvomergeContinue_threaded.c

@@ -277 +277 @@
 
   // save the output sky table copy
-  sprintf (filename, "%s/SkyTable.fits", output);
-  check_file_access (filename, TRUE, TRUE, VERBOSE);
-  if (!SkyTableSave (outsky, filename)) {
+  char *skyfile = SkyTableFilename  (output);
+  check_file_access (skyfile, TRUE, TRUE, VERBOSE);
+  if (!SkyTableSave (outsky, skyfile)) {
     fprintf (stderr, "ERROR: failed to save sky table for %s\n", output);
     exit (1);

branches/eam_branches/ipp-20111122/Ohana/src/dvomerge/src/dvomergeCreate.c

@@ -183 +183 @@
 
   // save the output sky table copy
-  sprintf (filename, "%s/SkyTable.fits", output);
-  check_file_access (filename, TRUE, TRUE, VERBOSE);
-  if (!SkyTableSave (outsky, filename)) {
+  char *skyfile = SkyTableFilename (output);
+  check_file_access (skyfile, TRUE, TRUE, VERBOSE);
+  if (!SkyTableSave (outsky, skyfile)) {
     fprintf (stderr, "ERROR: failed to save sky table for %s\n", output);
     exit (1);

branches/eam_branches/ipp-20111122/Ohana/src/dvomerge/src/dvomergeUpdate.c

@@ -158 +158 @@
 
   // save the output sky table copy
-  sprintf (filename, "%s/SkyTable.fits", output);
-  check_file_access (filename, TRUE, TRUE, VERBOSE);
-  if (!SkyTableSave (outsky, filename)) {
+  char *skyfile = SkyTableFilename (output);
+  check_file_access (skyfile, TRUE, TRUE, VERBOSE);
+  if (!SkyTableSave (outsky, skyfile)) {
     fprintf (stderr, "ERROR: failed to save sky table for %s\n", output);
     exit (1);

branches/eam_branches/ipp-20111122/Ohana/src/dvomerge/src/dvomergeUpdate_threaded.c

@@ -277 +277 @@
 
   // save the output sky table copy
-  sprintf (filename, "%s/SkyTable.fits", output);
-  check_file_access (filename, TRUE, TRUE, VERBOSE);
-  if (!SkyTableSave (outsky, filename)) {
+  char *skyfile = SkyTableFilename (output);
+  check_file_access (skyfile, TRUE, TRUE, VERBOSE);
+  if (!SkyTableSave (outsky, skyfile)) {
     fprintf (stderr, "ERROR: failed to save sky table for %s\n", output);
     exit (1);

branches/eam_branches/ipp-20111122/Ohana/src/dvomerge/src/dvoverify.c

@@ -84 +84 @@
 
     // check the skytable
-    sprintf (filename, "%s/SkyTable.fits", catdir);
-    if (!VerifyTableFile (filename)) {
+    char *skyfile = SkyTableFilename (catdir);
+    if (!VerifyTableFile (skyfile)) {
       Nbad ++;
     }