Changeset 38404 for branches/eam_branches/ohana.20150429/src/libfits/table/F_get_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_get_column.c (modified) (5 diffs)

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

@@ -76 +76 @@
   }
 
-  /* convert data in-situ with correct type, byte swap and Bzero/Bscale */
+  // NOTE: we have already copied the data to 'array', so the blocks below
+  // only need to swap if this is a direct copy
   Pin  = array;
   Pout = array;
+  int directCopy = (Bzero == 0.0) && (Bscale == 1.0);
+
+  /* convert data in-situ with correct type, byte swap and Bzero/Bscale */
   if (!strcmp (type, "char")) {
     for (i = 0; i < Nval*Ny; i++, Pin+=Nbytes, Pout+=Nbytes) {
-      *(char *)Pout = *(char *)Pin*Bscale + Bzero;
+      if (!directCopy) { *(char *)Pout = *(char *)Pin*Bscale + Bzero; }
     }
   }
   if (!strcmp (type, "byte")) {
     for (i = 0; i < Nval*Ny; i++, Pin+=Nbytes, Pout+=Nbytes) {
-      *(char *)Pout = *(char *)Pin*Bscale + Bzero;
+      if (!directCopy) { *(char *)Pout = *(char *)Pin*Bscale + Bzero; }
     }
   }
@@ -94 +98 @@
       if (!nativeOrder) { SWAP_BYTE; }
 # endif
-      *(short *)Pout = *(short *)Pin*Bscale + Bzero;
+      if (!directCopy) { *(short *)Pout = *(short *)Pin*Bscale + Bzero; }
     }  
   }
@@ -102 +106 @@
       if (!nativeOrder) { SWAP_WORD; }
 # endif
-      *(int *)Pout = *(int *)Pin*Bscale + Bzero;
+      if (!directCopy) { *(int *)Pout = *(int *)Pin*Bscale + Bzero; }
     }
   }
   if (!strcmp (type, "int64_t")) {
-    if ((Bzero == 0.0) && (Bscale == 1.0)) {
-      for (i = 0; i < Nval*Ny; i++, Pin+=Nbytes, Pout+=Nbytes) {
-# ifdef BYTE_SWAP
-        if (!nativeOrder) { SWAP_DBLE; }
-# endif
-        *(int64_t *)Pout = *(int64_t *)Pin;
-      }
-    } else {
-      for (i = 0; i < Nval*Ny; i++, Pin+=Nbytes, Pout+=Nbytes) {
-# ifdef BYTE_SWAP
-        if (!nativeOrder) { SWAP_DBLE; }
-# endif
-        *(int64_t *)Pout = *(int64_t *)Pin*Bscale + Bzero;
-      }
+    for (i = 0; i < Nval*Ny; i++, Pin+=Nbytes, Pout+=Nbytes) {
+# ifdef BYTE_SWAP
+      if (!nativeOrder) { SWAP_DBLE; }
+# endif
+      if (!directCopy) { *(int64_t *)Pout = *(int64_t *)Pin*Bscale + Bzero; }
     }
   }
@@ -127 +122 @@
       if (!nativeOrder) { SWAP_WORD; }
 # endif
-      *(float *)Pout = *(float *)Pin*Bscale + Bzero;
+      if (!directCopy) { *(float *)Pout = *(float *)Pin*Bscale + Bzero; }
     }
   }
@@ -135 +130 @@
       if (!nativeOrder) { SWAP_DBLE; }
 # endif
-      *(double *)Pout = *(double *)Pin*Bscale + Bzero;
+      if (!directCopy) { *(double *)Pout = *(double *)Pin*Bscale + Bzero; }
     }
   }