seems to be working.

[phys/u1casc.git] / u1casc-ordinary / obs_diagcorr.hpp

diff --git a/u1casc-ordinary/obs_diagcorr.hpp b/u1casc-ordinary/obs_diagcorr.hpp
index a8d88b53d06ed989c02819344bce9131ec333538..d52a6cdbf57f7b8c42e0b185e1bf3e992b1ed031 100644 (file)
--- a/u1casc-ordinary/obs_diagcorr.hpp
+++ b/u1casc-ordinary/obs_diagcorr.hpp
@@ -103,7 +103,6 @@ void obs_diagcorr::cdiag (gsl_vector *v, gsl_matrix_complex *evec, gsl_matrix_co
   gsl_eigen_hermv_sort(v, evec, GSL_EIGEN_SORT_VAL_ASC);
   
   gsl_eigen_hermv_free(wspace);
   gsl_eigen_hermv_sort(v, evec, GSL_EIGEN_SORT_VAL_ASC);
   
   gsl_eigen_hermv_free(wspace);

-  gsl_matrix_complex_free(evec);

 }
 
 void obs_diagcorr::_finish() {
 }
 
 void obs_diagcorr::_finish() {


@@ -146,7 +145,7 @@ void obs_diagcorr::_finish() {
                                );
       }
     cdiag(jackres, evecres, tmpmatrix);
                                );
       }
     cdiag(jackres, evecres, tmpmatrix);

-
+    

     for (int imeas=0; imeas<O815->comargs.nmeas; imeas++) {
       gsl_matrix_complex_memcpy (tmpmatrix, totalval);
       gsl_matrix_complex_sub (tmpmatrix, measurements[imeas][itsep]);
     for (int imeas=0; imeas<O815->comargs.nmeas; imeas++) {
       gsl_matrix_complex_memcpy (tmpmatrix, totalval);
       gsl_matrix_complex_sub (tmpmatrix, measurements[imeas][itsep]);


@@ -164,7 +163,7 @@ void obs_diagcorr::_finish() {
                                                   discopart
                                                   )
                                  );
                                                   discopart
                                                   )
                                  );

-       }      
+       }

       cdiag(tmpvec, tmpmatrix2, tmpmatrix);
       
       gsl_vector_sub(tmpvec, jackres);
       cdiag(tmpvec, tmpmatrix2, tmpmatrix);
       
       gsl_vector_sub(tmpvec, jackres);