diff options
author | Thomas White <taw@physics.org> | 2017-09-15 15:46:37 +0200 |
---|---|---|
committer | Thomas White <taw@physics.org> | 2017-09-15 15:46:37 +0200 |
commit | 5ca956f67456831501cf413259790eec6d6c6c1f (patch) | |
tree | 7ae69fb902f78af2828d4bbd4609a934c0a09dc7 /libcrystfel/src/predict-refine.c | |
parent | f6de9f595620b5d4a1ecf3d8d6d4cde9b3c179e0 (diff) | |
parent | ca0d7a9e1982b55ae3891d8dbe7f05a79ed3e7f1 (diff) |
Merge branch 'tom/index'
Diffstat (limited to 'libcrystfel/src/predict-refine.c')
-rw-r--r-- | libcrystfel/src/predict-refine.c | 17 |
1 files changed, 17 insertions, 0 deletions
diff --git a/libcrystfel/src/predict-refine.c b/libcrystfel/src/predict-refine.c index 61ce3629..e702cf33 100644 --- a/libcrystfel/src/predict-refine.c +++ b/libcrystfel/src/predict-refine.c @@ -138,10 +138,12 @@ static void UNUSED write_pairs(const char *filename, struct reflpeak *rps, double write_fs, write_ss; double fs, ss; struct panel *p; + signed int h, k, l; fs = rps[i].peak->fs; ss = rps[i].peak->ss; p = rps[i].panel; + get_indices(rps[i].refl, &h, &k, &l); write_fs = fs + p->orig_min_fs; write_ss = ss + p->orig_min_ss; @@ -152,6 +154,9 @@ static void UNUSED write_pairs(const char *filename, struct reflpeak *rps, x_dev(&rps[i], det), y_dev(&rps[i], det)); + //fprintf(fh, "%4i %4i %4i 0.0 - 0.0 1 %7.2f %7.2f %s\n", + // h, k, l, write_fs, write_ss, p->name); + } fclose(fh); @@ -483,6 +488,18 @@ static int iterate(struct reflpeak *rps, int n, UnitCell *cell, } + int k; + for ( k=0; k<num_params; k++ ) { + double M_curr; + M_curr = gsl_matrix_get(M, k, k); + if ( (rv[k] == GPARAM_DETX) || (rv[k] == GPARAM_DETY) ) { + M_curr += 10.0; + } else { + M_curr += 1e-18; + } + gsl_matrix_set(M, k, k, M_curr); + } + //show_matrix_eqn(M, v); shifts = solve_svd(v, M, NULL, 0); if ( shifts == NULL ) { |