diff options
| author | Thomas White <taw@physics.org> | 2023-06-20 11:02:58 +0200 |
|---|---|---|
| committer | Thomas White <taw@physics.org> | 2023-07-28 13:22:05 +0200 |
| commit | 36d71427be23ef836440d81db8e9dde828947863 (patch) | |
| tree | df2c3be6112be69b72c8e27afb18e3ae5d1a1e82 /libcrystfel/src | |
| parent | 6b1ded5ca7ce3313add69211423bb3c8d5633e0f (diff) | |
Initial conversion of Millepede code to fs/ss gradients
Diffstat (limited to 'libcrystfel/src')
| -rw-r--r-- | libcrystfel/src/crystfel-mille.c | 23 |
1 files changed, 10 insertions, 13 deletions
diff --git a/libcrystfel/src/crystfel-mille.c b/libcrystfel/src/crystfel-mille.c index fc819371..a16ade52 100644 --- a/libcrystfel/src/crystfel-mille.c +++ b/libcrystfel/src/crystfel-mille.c @@ -99,16 +99,13 @@ void write_mille(Mille *mille, int n, UnitCell *cell, yl = h*asy + k*bsy + l*csy; zl = h*asz + k*bsz + l*csz; - twod_mapping(rps[i].peak->fs, rps[i].peak->ss, &xpk, &ypk, - rps[i].panel, dx, dy); - - /* x terms: local */ + /* fs terms: local */ for ( j=0; j<9; j++ ) { - local_gradients[j] = x_gradient(rv[j], rps[i].refl, - cell, rps[i].panel); + local_gradients[j] = fs_gradient(rv[j], rps[i].refl, + cell, rps[i].panel); } - /* x terms: global */ + /* fs terms: global */ j = 0; group = rps[i].panel->group; while ( group != NULL ) { @@ -131,16 +128,16 @@ void write_mille(Mille *mille, int n, UnitCell *cell, mille_add_measurement(mille, 9, local_gradients, j, global_gradients, labels, - x_dev(&rps[i], image->detgeom, dx, dy), + fs_dev(&rps[i], image->detgeom), 0.65*rps[i].panel->pixel_pitch); - /* y terms: local */ + /* ss terms: local */ for ( j=0; j<9; j++ ) { - local_gradients[j] = y_gradient(rv[j], rps[i].refl, - cell, rps[i].panel); + local_gradients[j] = ss_gradient(rv[j], rps[i].refl, + cell, rps[i].panel); } - /* y terms: global */ + /* ss terms: global */ j = 0; group = rps[i].panel->group; while ( group != NULL ) { @@ -163,7 +160,7 @@ void write_mille(Mille *mille, int n, UnitCell *cell, mille_add_measurement(mille, 9, local_gradients, j, global_gradients, labels, - x_dev(&rps[i], image->detgeom, dx, dy), + ss_dev(&rps[i], image->detgeom), 0.65*rps[i].panel->pixel_pitch); } } |