Changeset 39360 for trunk

Timestamp:

Feb 18, 2016, 5:36:58 PM (10 years ago)

Author:

eugene

Message:

add support for ntile option in fits output compression

Location:

trunk/Ohana/src/opihi

Files:

• cmd.data/read_vectors.c (modified) (2 diffs)
• cmd.data/write_vectors.c (modified) (2 diffs)
• dvo/avextract.c (modified) (1 diff)
• dvo/avmatch.c (modified) (2 diffs)
• dvo/dvo_host_utils.c (modified) (1 diff)
• dvo/mextract.c (modified) (1 diff)
• dvo/mmatch.c (modified) (2 diffs)
• include/dvomath.h (modified) (1 diff)
• lib.shell/VectorIO.c (modified) (3 diffs)

trunk/Ohana/src/opihi/cmd.data/read_vectors.c

@@ -2 +2 @@
 int dump_raw_table (FTable *table, char *message);
 int dump_cmp_table (FTable *table, char *message);
+void gfits_uncompress_timing ();
 
 FILE *f = (FILE *) NULL;
@@ -594 +595 @@
     }
     if (!gfits_uncompress_table (&table, &rawtable)) ESCAPE ("failed to uncompress table\n");
+    gfits_uncompress_timing ();
+
     dump_raw_table (&rawtable, "rd raw");
 

trunk/Ohana/src/opihi/cmd.data/write_vectors.c

@@ -74 +74 @@
       fprintf (stderr, "NOTE: write_vectors -compress has no effect on non-FITS\n");
     }
+  }
+
+  int Ntile = 0;
+  if ((N = get_argument (argc, argv, "-compress-Ntile"))) {
+    remove_argument (N, &argc, argv);
+    Ntile = atoi(argv[N]);
+    remove_argument (N, &argc, argv);
   }
 
@@ -117 +124 @@
 
   if (FITS) {
-    int status = WriteVectorTableFITS (argv[1], FITS, vec, Nvec, append, compress, format);
+    int status = WriteVectorTableFITS (argv[1], FITS, vec, Nvec, append, compress, format, Ntile);
     free (vec);
     return status;

trunk/Ohana/src/opihi/dvo/avextract.c

@@ -262 +262 @@
   // write vectors to a table (this is used by parallel dvo operations, but can be used elsewhere)
   if (RESULT_FILE && !SKIP_RESULTS) {
-    int status = WriteVectorTableFITS (RESULT_FILE, "RESULT", vec, Nreturn, FALSE, FALSE, NULL);
+    int status = WriteVectorTableFITS (RESULT_FILE, "RESULT", vec, Nreturn, FALSE, FALSE, NULL, 0);
     if (!status) {
       goto escape;

trunk/Ohana/src/opihi/dvo/avmatch.c

@@ -115 +115 @@
 
       CoordsFile = abspath("coords.fits", 1024);
-      int status = WriteVectorTableFITS (CoordsFile, "COORDS", vec, 2, FALSE, FALSE, NULL);
+      int status = WriteVectorTableFITS (CoordsFile, "COORDS", vec, 2, FALSE, FALSE, NULL, 0);
       if (!status) goto escape;
     }
@@ -304 +304 @@
       vec[i][0].Nelements = Nfound;
     }
-    int status = WriteVectorTableFITS (RESULT_FILE, "RESULT", vec, Nfields + 1, FALSE, FALSE, NULL);
+    int status = WriteVectorTableFITS (RESULT_FILE, "RESULT", vec, Nfields + 1, FALSE, FALSE, NULL, 0);
     free (vec[Nfields]->elements.Int);
     free (vec[Nfields]);

trunk/Ohana/src/opihi/dvo/dvo_host_utils.c

@@ -230 +230 @@
   // write vectors to a table (this is used by parallel dvo operations, but can be used elsewhere)
   if (ResultFile) {
-    int status = WriteVectorTableFITS (ResultFile, "RESULT", vec, Nvec, FALSE, FALSE, NULL);
+    int status = WriteVectorTableFITS (ResultFile, "RESULT", vec, Nvec, FALSE, FALSE, NULL, 0);
     if (!status) {
       gprint (GP_ERR, "failed to write result file %s\n", ResultFile);

trunk/Ohana/src/opihi/dvo/mextract.c

@@ -321 +321 @@
   // write vectors to a table (this is used by parallel dvo operations, but can be used elsewhere)
   if (RESULT_FILE && !SKIP_RESULTS) {
-    int status = WriteVectorTableFITS (RESULT_FILE, "RESULT", vec, Nreturn, FALSE, FALSE, NULL);
+    int status = WriteVectorTableFITS (RESULT_FILE, "RESULT", vec, Nreturn, FALSE, FALSE, NULL, 0);
     if (!status) goto escape;
   }

trunk/Ohana/src/opihi/dvo/mmatch.c

@@ -150 +150 @@
       // XXX this is now set for both cases...
       CoordsFile = abspath("coords.fits", 1024);
-      int status = WriteVectorTableFITS (CoordsFile, "COORDS", vec, 2, FALSE, FALSE, NULL);
+      int status = WriteVectorTableFITS (CoordsFile, "COORDS", vec, 2, FALSE, FALSE, NULL, 0);
       if (!status) goto escape;
     }
@@ -350 +350 @@
       vec[Nfields-1] = IDXvec;
     }
-    int status = WriteVectorTableFITS (RESULT_FILE, "RESULT", vec, Nfields, FALSE, FALSE, NULL);
+    int status = WriteVectorTableFITS (RESULT_FILE, "RESULT", vec, Nfields, FALSE, FALSE, NULL, 0);
     if (!status) goto escape;
   }

trunk/Ohana/src/opihi/include/dvomath.h

@@ -168 +168 @@
 
 /* vector IO functions */
-int           WriteVectorTableFITS  PROTO((char *filename, char *extname, Vector **vec, int Nvec, int append, char *compress, char *format));
+int           WriteVectorTableFITS  PROTO((char *filename, char *extname, Vector **vec, int Nvec, int append, char *compress, char *format, int Ntile));
 Vector      **ReadVectorTableFITS   PROTO((char *filename, char *extname, int *Nvec));
 

trunk/Ohana/src/opihi/lib.shell/VectorIO.c

@@ -1 +1 @@
 # include "opihi.h"
+void gfits_compress_timing ();
   
 // write a set of vectors to a FITS FTable structure (vectors names become fits column names)
@@ -103 +104 @@
 
 // write a set of vectors to a FITS file (vectors names become fits column names)
-int WriteVectorTableFITS (char *filename, char *extname, Vector **vec, int Nvec, int append, char *compress, char *format) {
+int WriteVectorTableFITS (char *filename, char *extname, Vector **vec, int Nvec, int append, char *compress, char *format, int Ntile) {
   
   Header rawheader;
@@ -140 +141 @@
 
     dump_raw_table (&rawtable, "wd raw");
-    if (!gfits_compress_table (&rawtable, &cmptable, 0, compress)) goto escape;
+    if (!gfits_compress_table (&rawtable, &cmptable, Ntile, compress)) goto escape;
+    gfits_compress_timing ();
 
     int i, Nfields;