Changeset 38440

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/dvopsps/src/insert_detections_dvopsps_catalog.c (modified) (1 diff)
• src/libfits/Makefile (modified) (1 diff)
• src/libfits/include/gfitsio.h (modified) (1 diff)
• src/libfits/matrix/F_swap_raw.c (copied) (copied from trunk/Ohana/src/libfits/matrix/F_swap_raw.c )
• src/opihi/cmd.data (modified) (1 prop)
• src/opihi/cmd.data/Makefile (modified) (1 diff)
• src/opihi/cmd.data/init.c (modified) (2 diffs)
• src/opihi/cmd.data/mslice.c (copied) (copied from trunk/Ohana/src/opihi/cmd.data/mslice.c )
• src/opihi/cmd.data/rd.c (modified) (3 diffs)

branches/eam_branches/ohana.20150429/src/dvopsps/src/insert_detections_dvopsps_catalog.c

@@ -215 +215 @@
       fprintf (stderr, "%s\n", mysql_error(mysql));
       fprintf (stderr, "Nbuffer: %d\n", buffer->Nbuffer);
-      if (DEBUG) fprintf (stderr, "%s\n", buffer->buffer);
+      if (DEBUG) {
+        FILE *f = fopen ("dvopsps.dump.sql", "w");
+        fprintf (f, "%s\n", buffer->buffer);
+        fclose (f);
+      }
       status = FALSE;
     }

branches/eam_branches/ohana.20150429/src/libfits/Makefile

@@ -63 +63 @@
 $(MATR)/F_matrix.$(ARCH).o                      $(MATR)/F_compress_utils.$(ARCH).o \
 $(MATR)/F_compress_M.$(ARCH).o                  $(MATR)/F_compress_data.$(ARCH).o  \
-$(MATR)/F_uncompress_M.$(ARCH).o                $(MATR)/F_uncompress_data.$(ARCH).o
+$(MATR)/F_uncompress_M.$(ARCH).o                $(MATR)/F_uncompress_data.$(ARCH).o \
+$(MATR)/F_swap_raw.$(ARCH).o
 
 TABLE_OBJ = \

branches/eam_branches/ohana.20150429/src/libfits/include/gfitsio.h

@@ -197 +197 @@
 int     gfits_compress_image           PROTO((Header *header, Matrix *matrix, FTable *ftable, int *Ztile, char *zcmptype));
 int     gfits_collect_data             PROTO((Matrix *matrix, char *raw, int Nraw, int raw_pixsize, int *otile, int oblank, int *ztile, int zblank, float zscale, float zzero));
+
 int     gfits_copy_keywords_compress   PROTO((Header *srchead, Header *tgthead));
+int     gfits_swap_raw                 PROTO((Matrix *matrix));
 
 off_t   gfits_tile_size                PROTO((Matrix *matrix, int *otile, int *ztile));

branches/eam_branches/ohana.20150429/src/opihi/cmd.data/Makefile

@@ -91 +91 @@
 $(SRC)/mget.$(ARCH).o           \
 $(SRC)/mget3d.$(ARCH).o         \
+$(SRC)/mslice.$(ARCH).o         \
 $(SRC)/minterpolate.$(ARCH).o   \
 $(SRC)/medimage.$(ARCH).o       \

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

@@ -82 +82 @@
 int mget             PROTO((int, char **));
 int mget3d           PROTO((int, char **));
+int mslice           PROTO((int, char **));
 int minterp          PROTO((int, char **));
 int medimage_command PROTO((int, char **));
@@ -248 +249 @@
   {1, "mget",         mget,             "extract a vector from an image"},
   {1, "mget3d",       mget3d,           "extract a vector from a 3D image"},
+  {1, "mslice",       mslice,           "extract an image plane from a 3D image"},
   {1, "imget",        mget,             "extract a vector from an image"},
   {1, "minterp",      minterp,          "interpolate image pixels"},

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());