aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas White <taw@physics.org>2020-08-07 18:19:41 +0200
committerThomas White <taw@physics.org>2020-08-10 10:39:46 +0200
commitd48aeb2b1eaad5724957f4c504c4cfc9186c064f (patch)
tree796102272dede1a859164f7b21afe4361da2a152
parent93adeb93e307a53816a71ff717cafeff6a3695b8 (diff)
pinkIndexer: Remove detector update
Overall detector offsets can now be done via the geometry file, and this is labelled as a hack. It doesn't actually do very much anyway, because the "updated" detector is thrown away for the next pattern. The updated detector is used only for subsequent indexing attempts on the same pattern.
-rw-r--r--libcrystfel/src/indexers/pinkindexer.c14
1 files changed, 0 insertions, 14 deletions
diff --git a/libcrystfel/src/indexers/pinkindexer.c b/libcrystfel/src/indexers/pinkindexer.c
index 67bd48f5..6bf9bde7 100644
--- a/libcrystfel/src/indexers/pinkindexer.c
+++ b/libcrystfel/src/indexers/pinkindexer.c
@@ -89,7 +89,6 @@ struct pinkIndexer_private_data {
static void reduceReciprocalCell(UnitCell* cell, LatticeTransform_t* appliedReductionTransform);
static void restoreReciprocalCell(UnitCell *cell, LatticeTransform_t* appliedReductionTransform);
static void makeRightHanded(UnitCell* cell);
-static void update_detector(struct detector *det, double xoffs, double yoffs);
int run_pinkIndexer(struct image *image, void *ipriv)
{
@@ -173,7 +172,6 @@ int run_pinkIndexer(struct image *image, void *ipriv)
}
crystal_set_cell(cr, uc);
crystal_set_det_shift(cr, center_shift[indexed][0], center_shift[indexed][1]);
- update_detector(image->det, center_shift[indexed][0], center_shift[indexed][1]);
image_add_crystal(image, cr);
indexed++;
@@ -364,18 +362,6 @@ static void makeRightHanded(UnitCell *cell)
}
}
-//hack for electron crystallography while crystal_set_det_shift is not working approprietly
-static void update_detector(struct detector *det, double xoffs, double yoffs)
-{
- int i;
-
- for (i = 0; i < det->n_panels; i++) {
- struct panel *p = &det->panels[i];
- p->cnx += xoffs * p->res;
- p->cny += yoffs * p->res;
- }
-}
-
void pinkIndexer_cleanup(void *pp)
{
struct pinkIndexer_private_data* pinkIndexer_private_data = (struct pinkIndexer_private_data*) pp;