Changeset 38404 for branches/eam_branches/ohana.20150429/src/libfits/table/F_set_column.c

Timestamp:

Jun 6, 2015, 7:55:16 AM (11 years ago)

Author:

eugene

Message:

direct copy if bscale,bzero = 1,0

File:

• branches/eam_branches/ohana.20150429/src/libfits/table/F_set_column.c (modified) (6 diffs)

branches/eam_branches/ohana.20150429/src/libfits/table/F_set_column.c

@@ -1 +1 @@
 # include <ohana.h>
 # include <gfitsio.h>
+
+# define SWAP_NONE 
+
+# ifdef BYTE_SWAP 
 # define SWAP_BYTE { \
   char tmp; \
@@ -14 +18 @@
   tmp = Pout[2]; Pout[2] = Pout[5]; Pout[5] = tmp; \
   tmp = Pout[3]; Pout[3] = Pout[4]; Pout[4] = tmp; }
+# else
+# define SWAP_BYTE 
+# define SWAP_WORD 
+# define SWAP_DBLE 
+# endif
 
 /***********************/
@@ -239 +248 @@
   // if (!strcmp (intype, #ITYPE)) {
 
+  int directCopy = (Bzero == 0.0) && (Bscale == 1.0);
+
+# define SET_VALUES(OUTNAME, OUTTYPE, INNAME, INTYPE, SWAP_OP, NBYTES_IN) \
+  if (!strcmp (outtype, OUTNAME) && !strcmp (intype, INNAME)) {         \
+    int NbytesIn = NBYTES_IN;                                           \
+    for (i = 0; i < Nval*Nrow; i++, Pin += NbytesIn, Pout += NbytesOut) { \
+      if (directCopy) {                                                 \
+        *(OUTTYPE *)Pout = *(INTYPE *)Pin;                              \
+      } else {                                                          \
+        *(OUTTYPE *)Pout = (*(INTYPE *)Pin - Bzero) / Bscale;           \
+      }                                                                 \
+      if (!nativeOrder) { SWAP_OP; }}}                                  
+
+  SET_VALUES("char",       char, "char", char, SWAP_NONE, 1);
+  SET_VALUES("byte",       char, "char", char, SWAP_NONE, 1);
+  SET_VALUES("short",     short, "char", char, SWAP_BYTE, 1);
+  SET_VALUES("int",         int, "char", char, SWAP_WORD, 1);
+  SET_VALUES("int64_t", int64_t, "char", char, SWAP_DBLE, 1);
+  SET_VALUES("double",   double, "char", char, SWAP_DBLE, 1);
+  SET_VALUES("float",     float, "char", char, SWAP_WORD, 1);
+
+  SET_VALUES("char",       char, "byte", char, SWAP_NONE, 1);
+  SET_VALUES("byte",       char, "byte", char, SWAP_NONE, 1);
+  SET_VALUES("short",     short, "byte", char, SWAP_BYTE, 1);
+  SET_VALUES("int",         int, "byte", char, SWAP_WORD, 1);
+  SET_VALUES("int64_t", int64_t, "byte", char, SWAP_DBLE, 1);
+  SET_VALUES("float",     float, "byte", char, SWAP_DBLE, 1);
+  SET_VALUES("double",   double, "byte", char, SWAP_WORD, 1);
+
+  SET_VALUES("char",       char, "short", short, SWAP_NONE, 2);
+  SET_VALUES("byte",       char, "short", short, SWAP_NONE, 2);
+  SET_VALUES("short",     short, "short", short, SWAP_BYTE, 2);
+  SET_VALUES("int",         int, "short", short, SWAP_WORD, 2);
+  SET_VALUES("int64_t", int64_t, "short", short, SWAP_DBLE, 2);
+  SET_VALUES("float",     float, "short", short, SWAP_DBLE, 2);
+  SET_VALUES("double",   double, "short", short, SWAP_WORD, 2);
+
+  SET_VALUES("char",       char, "int", int, SWAP_NONE, 4);
+  SET_VALUES("byte",       char, "int", int, SWAP_NONE, 4);
+  SET_VALUES("short",     short, "int", int, SWAP_BYTE, 4);
+  SET_VALUES("int",         int, "int", int, SWAP_WORD, 4);
+  SET_VALUES("int64_t", int64_t, "int", int, SWAP_DBLE, 4);
+  SET_VALUES("float",     float, "int", int, SWAP_DBLE, 4);
+  SET_VALUES("double",   double, "int", int, SWAP_WORD, 4);
+
+  SET_VALUES("char",       char, "int64_t", int64_t, SWAP_NONE, 8);
+  SET_VALUES("byte",       char, "int64_t", int64_t, SWAP_NONE, 8);
+  SET_VALUES("short",     short, "int64_t", int64_t, SWAP_BYTE, 8);
+  SET_VALUES("int",         int, "int64_t", int64_t, SWAP_WORD, 8);
+  SET_VALUES("int64_t", int64_t, "int64_t", int64_t, SWAP_DBLE, 8);
+  SET_VALUES("float",     float, "int64_t", int64_t, SWAP_DBLE, 8);
+  SET_VALUES("double",   double, "int64_t", int64_t, SWAP_WORD, 8);
+
+  SET_VALUES("char",       char, "float", float, SWAP_NONE, 4);
+  SET_VALUES("byte",       char, "float", float, SWAP_NONE, 4);
+  SET_VALUES("short",     short, "float", float, SWAP_BYTE, 4);
+  SET_VALUES("int",         int, "float", float, SWAP_WORD, 4);
+  SET_VALUES("int64_t", int64_t, "float", float, SWAP_DBLE, 4);
+  SET_VALUES("float",     float, "float", float, SWAP_DBLE, 4);
+  SET_VALUES("double",   double, "float", float, SWAP_WORD, 4);
+
+  SET_VALUES("char",       char, "double", double, SWAP_NONE, 8);
+  SET_VALUES("byte",       char, "double", double, SWAP_NONE, 8);
+  SET_VALUES("short",     short, "double", double, SWAP_BYTE, 8);
+  SET_VALUES("int",         int, "double", double, SWAP_WORD, 8);
+  SET_VALUES("int64_t", int64_t, "double", double, SWAP_DBLE, 8);
+  SET_VALUES("float",     float, "double", double, SWAP_DBLE, 8);
+  SET_VALUES("double",   double, "double", double, SWAP_WORD, 8);
+
+# if (0)
   /** input == char **/
   if (!strcmp (outtype, "char") && !strcmp (intype, "char")) {
     int NbytesIn = 1;
     for (i = 0; i < Nval*Nrow; i++, Pin+=NbytesIn, Pout+=NbytesOut) {
-      *(char *)Pout = (*(char *)Pin - Bzero) / Bscale;
+      if (directCopy) { *(char *)Pout = *(char *)Pin; } else {
+        *(char *)Pout = (*(char *)Pin - Bzero) / Bscale;
+      }
     }
   }
@@ -249 +330 @@
     int NbytesIn = 1;
     for (i = 0; i < Nval*Nrow; i++, Pin+=NbytesIn, Pout+=NbytesOut) {
-      *(char *)Pout = (*(char *)Pin - Bzero) / Bscale;
+      if (directCopy) { *(char *)Pout = *(char *)Pin; } else {
+        *(char *)Pout = (*(char *)Pin - Bzero) / Bscale;
+      }
     }
   }
@@ -255 +338 @@
     int NbytesIn = 1;
     for (i = 0; i < Nval*Nrow; i++, Pin += NbytesIn, Pout += NbytesOut) {
-      *(short *)Pout = (*(char *)Pin - Bzero) / Bscale;
+      if (directCopy) { *(short *)Pout = *(char *)Pin; } else {
+        *(short *)Pout = (*(char *)Pin - Bzero) / Bscale;
+      }
 # ifdef BYTE_SWAP
       if (!nativeOrder) { SWAP_BYTE; }
@@ -651 +736 @@
     }
   }
+# endif
 
   /* check array space */