Changeset 29149

Timestamp:

Sep 12, 2010, 12:39:31 PM (16 years ago)

Author:

eugene

Message:

fix bug in fits keyword reading function for long keywords; re-activate bond svd in opihi

Location:

branches/eam_branches/ipp-20100823/Ohana/src

Files:

• libfits/header/F_H_field.c (modified) (1 diff)
• opihi/cmd.data/svd.c (modified) (1 diff)
• opihi/include/data.h (modified) (1 diff)
• opihi/lib.data/Makefile (modified) (1 diff)

branches/eam_branches/ipp-20100823/Ohana/src/libfits/header/F_H_field.c

@@ -11 +11 @@
 
   if (header[0].buffer == NULL) return NULL;
+
+  // regular keywords cannot be larger than 8 chars (use HIERARCH instead)
+  if (strlen(field) > 8) return NULL; 
 
   /* create a blank-padded keyword with exactly 8 characters */

branches/eam_branches/ipp-20100823/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

branches/eam_branches/ipp-20100823/Ohana/src/opihi/include/data.h

@@ -92 +92 @@
 int svdcmp_bond_raw(int m, int n, int withu, int withv, double eps, double tol, double **a, double *q, double **u, double **v);
 
+/* in svdcmp_bond_new.c */
+int svdcmp_bond_new(int m, int n, int withu, int withv, double eps, double tol, double **a, double *q, double **u, double **v);
+
 /* mrqmin.c */
 opihi_flt mrqcof (opihi_flt *x, opihi_flt *y, opihi_flt *dy, int Npts, 

branches/eam_branches/ipp-20100823/Ohana/src/opihi/lib.data/Makefile

@@ -20 +20 @@
 $(SDIR)/fft.$(ARCH).o                   \
 $(SDIR)/svdcmp.$(ARCH).o                \
+$(SDIR)/svdcmp_bond_new.$(ARCH).o               \
 $(SDIR)/convert.$(ARCH).o               \
 $(SDIR)/bracket.$(ARCH).o               \