From 66a61bad32a054d0a7c52b4fe3237b3a04406967 Mon Sep 17 00:00:00 2001 From: graeme-winter Date: Wed, 27 Jun 2018 05:42:18 +0100 Subject: [PATCH] Putative support for E-32-0105 instrument with vertical axis at Max IV: overrides default based on serial number key --- dxtbx/format/FormatHDFEigerNearlyNexus.py | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/dxtbx/format/FormatHDFEigerNearlyNexus.py b/dxtbx/format/FormatHDFEigerNearlyNexus.py index eddaaaccb3..3a628fe746 100644 --- a/dxtbx/format/FormatHDFEigerNearlyNexus.py +++ b/dxtbx/format/FormatHDFEigerNearlyNexus.py @@ -235,13 +235,20 @@ def create_scalar(handle, path, dtype, value): # print " - making up starting angle to be 0" # print " - using /entry/sample/goniometer/omega_range_average as oscillation range" # Get the number of images + + try: + key = handle['/entry/instrument/detector/detector_number'].value + default_axis = {'E-32-0105':(0,1,0)}[key] + except KeyError as e: + default_axis = (1,0,0) + num_images = 0 for name in sorted(handle['/entry/data'].iterkeys()): num_images += len(handle_orig['/entry/data/%s' % name]) dataset = group.create_dataset('omega', (num_images,), dtype="float32") dataset.attrs['units'] = 'degree' dataset.attrs['transformation_type'] = 'rotation' - dataset.attrs['vector'] = (1, 0, 0) + dataset.attrs['vector'] = default_axis dataset.attrs['offset'] = 0 dataset.attrs['depends_on'] = '.' omega_range_average = handle['/entry/sample/goniometer/omega_range_average'][()]