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

Timestamp:

Oct 25, 2010, 12:50:29 PM (16 years ago)

Author:

eugene

Message:

merge changes from eam_branches/ipp-20100823

Location:

trunk/Ohana/src/opihi/cmd.data

Files:

• Makefile (modified) (1 diff)
• center.c (modified) (1 diff)
• init.c (modified) (2 diffs)
• limits.c (modified) (1 diff)
• read_vectors.c (modified) (1 diff)
• reindex.c (copied) (copied from branches/eam_branches/ipp-20100823/Ohana/src/opihi/cmd.data/reindex.c )
• svd.c (modified) (1 diff)

trunk/Ohana/src/opihi/cmd.data/Makefile

@@ -102 +102 @@
 $(SRC)/read_vectors.$(ARCH).o   \
 $(SRC)/rebin.$(ARCH).o          \
-$(SRC)/resize.$(ARCH).o \
+$(SRC)/reindex.$(ARCH).o        \
+$(SRC)/resize.$(ARCH).o         \
 $(SRC)/relocate.$(ARCH).o       \
 $(SRC)/roll.$(ARCH).o           \

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

@@ -16 +16 @@
   if (!GetImage (NULL, &kapa, name)) return (FALSE);
   FREE (name);
+
+  // XXX need an option to center the image based on the current plot limits
 
   if ((argc != 3) && (argc != 4)) {

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

@@ -91 +91 @@
 int rebin            PROTO((int, char **));
 int resize           PROTO((int, char **));
+int reindex          PROTO((int, char **));
 int relocate         PROTO((int, char **));
 int roll             PROTO((int, char **));
@@ -232 +233 @@
   {1, "read",         read_vectors,     "read vectors from datafile"},
   {1, "rebin",        rebin,            "rebin image data by factor of N"},
+  {1, "reindex",      reindex,          "create new vector from old vector based on index vector"},
   {1, "resize",       resize,           "set graphics/image window size"},
   {1, "relocate",     relocate,         "set graphics/image window position"},

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

@@ -24 +24 @@
   if (!GetGraph (&graphmode, &kapa, name)) return (FALSE);
   FREE (name);
+
+  // XXX need an option to set the limits based on the current image bounds
 
   if (argc == 1) {

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

@@ -216 +216 @@
 
     while (1) {
-      if (!gfits_load_header (f, &header)) ESCAPE ("extension not found in file");
+      if (!gfits_load_header (f, &header)) {
+        gprint (GP_ERR, "extension %s not found in file\n", extname);
+        if (CCDKeyword != NULL) free (CCDKeyword); 
+        gfits_free_table  (&table); 
+        gfits_free_header (&header); 
+        return (TRUE);  
+      }
+
       Nbytes = gfits_data_size (&header);
 

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

@@ -82 +82 @@
       }
 
-# if 0     
-      status = svdcmp_bond_raw (Ny, Nx, 1, 1, FLT_EPSILON, 1e-6, a, q, u, v);
+# if 1     
+      status = svdcmp_bond_new (Ny, Nx, 1, 1, FLT_EPSILON, 1e-6, a, q, u, v);
       fprintf (stderr, "status: %d\n", status);
 # else