Changeset 20652 for trunk/Ohana/src/opihi/cmd.data

Timestamp:

Nov 10, 2008, 2:17:14 PM (18 years ago)

Author:

eugene

Message:

ippScripts/scripts/camera_exp.pl

Location:

trunk/Ohana/src/opihi/cmd.data

Files:

• rd.c (modified) (2 diffs)
• rdseg.c (modified) (2 diffs)
• wd.c (modified) (1 diff)

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

@@ -4 +4 @@
 int rd (int argc, char **argv) {
   
-  int i, N, status, plane, Nplane, extend, Nextend, Nskip, JustHead;
+  int i, N, status, plane, Nplane, extend, Nextend, Nskip, JustHead, blank;
   int ccdsel, done, Nword, IsCompressed;
   char region[512], *ccdid, *filename;
@@ -221 +221 @@
   buf[0].bzero  = buf[0].header.bzero;     /* store the original values */
   buf[0].unsign = buf[0].header.unsign;
+
   gprint (GP_LOG, "read %d bytes from %s into buffer %s\n", 
            buf[0].header.size + buf[0].matrix.size, argv[2], argv[1]);
 
+  blank = 0xffff;
+  gfits_scan (&buf[0].header, "BLANK", "%d", 1, &blank);
+
   /** now - convert the matrix values to floats for internal use **/
-  gfits_convert_format (&buf[0].header, &buf[0].matrix, -32, 1.0, 0.0, gfits_get_unsign_mode());
-  
+  gfits_convert_format (&buf[0].header, &buf[0].matrix, -32, 1.0, 0.0, blank, gfits_get_unsign_mode());
+
   return (TRUE);
 }

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

@@ -4 +4 @@
 int rdseg (int argc, char **argv) {
   
-  int x, y, nx, ny, status;
+  int x, y, nx, ny, status, blank;
   char region[512], *filename;
   FILE *f;
@@ -65 +65 @@
            buf[0].header.size + buf[0].matrix.size, argv[2], argv[1]);
 
+  gfits_scan (&buf[0].header, "BLANK", "%d", 1, &blank);
+
   /** now - convert the matrix values to floats for internal use **/
-  gfits_convert_format (&buf[0].header, &buf[0].matrix, -32, 1.0, 0.0, gfits_get_unsign_mode());
+  gfits_convert_format (&buf[0].header, &buf[0].matrix, -32, 1.0, 0.0, blank, gfits_get_unsign_mode());
   
   return (TRUE);

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

@@ -82 +82 @@
 
   if (temp_header.Naxes) {
-    gfits_convert_format (&temp_header, &temp_matrix, outBitpix, outScale, outZero, outUnsign);
+    // the inBlank value probably does not matter: temp_matrix is float, so nan is used
+    gfits_convert_format (&temp_header, &temp_matrix, outBitpix, outScale, outZero, 0xffff, outUnsign);
   } else {
     gfits_modify (&temp_header, "BITPIX", "%d", 1, outBitpix);