Changeset 38255 for trunk

Timestamp:

May 11, 2015, 1:19:59 PM (11 years ago)

Author:

eugene

Message:

option to swap raw data bytes on read (for broken files)

Location:

trunk/Ohana/src

Files:

• libfits/Makefile (modified) (1 diff)
• libfits/include/gfitsio.h (modified) (1 diff)
• libfits/matrix/F_swap_raw.c (added)
• opihi/cmd.data/rd.c (modified) (2 diffs)

trunk/Ohana/src/libfits/Makefile

@@ -46 +46 @@
 $(MATR)/F_read_portion.$(ARCH).o                $(MATR)/F_load_M.$(ARCH).o       \
 $(MATR)/F_matrix.$(ARCH).o                      $(MATR)/F_compress_M.$(ARCH).o   \
-$(MATR)/F_uncompress_data.$(ARCH).o
+$(MATR)/F_uncompress_data.$(ARCH).o             $(MATR)/F_swap_raw.$(ARCH).o
 
 TABLE_OBJ = \

trunk/Ohana/src/libfits/include/gfitsio.h

@@ -170 +170 @@
 int     gfits_distribute_data          PROTO((Matrix *matrix, int bitpix, char *data, int Ndata, int *otile, int oblank, int *ztile, int zblank, float zscale, float zzero));
 int     gfits_byteswap_zdata           PROTO((char *zdata, int Nzdata, int bitpix));
+int     gfits_swap_raw                 PROTO((Matrix *matrix));
 int     gfits_extension_is_compressed  PROTO((Header *header));
 off_t   gfits_tile_size                PROTO((Matrix *matrix, int *otile, int *ztile));

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

@@ -13 +13 @@
     remove_argument (N, &argc, argv);
     JustHead = TRUE;
+  }
+
+  int SwapRaw = FALSE;
+  if ((N = get_argument (argc, argv, "-swap-raw"))) {
+    remove_argument (N, &argc, argv);
+    SwapRaw = TRUE;
   }
 
@@ -239 +245 @@
   gfits_scan (&buf[0].header, "BLANK", "%d", 1, &blank);
 
+  if (SwapRaw) {
+    gfits_swap_raw (&buf[0].matrix);
+  }
+
   /** now - convert the matrix values to floats for internal use **/
   gfits_convert_format (&buf[0].header, &buf[0].matrix, -32, 1.0, 0.0, blank, gfits_get_unsign_mode());