Changeset 38440 for branches/eam_branches/ohana.20150429/src/opihi/cmd.data/rd.c

Timestamp:

Jun 12, 2015, 5:22:34 PM (11 years ago)

Author:

eugene

Message:

merge updates from trunk

Location:

branches/eam_branches/ohana.20150429

Files:

• . (modified) (1 prop)
• src/opihi/cmd.data (modified) (1 prop)
• src/opihi/cmd.data/rd.c (modified) (3 diffs)

branches/eam_branches/ohana.20150429/src/opihi/cmd.data/rd.c

@@ -19 +19 @@
     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;
   }
 
@@ -176 +182 @@
   if (plane >= 0) {
     // we are requesting a specific plane (-1 : all data)
-    int tooFar = Nz ? (plane >= Nz) : (plane > Nz);
+    int tooFar = (Nz > 0) ? (plane >= Nz) : (plane > 0);
     if (tooFar) {
       gprint (GP_ERR, "-plane is too large: %d total planes\n", Nz);
@@ -249 +255 @@
   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());