Changes

From XDSwiki
Jump to navigationJump to search
103 bytes added ,  10:01, 25 November 2015
m
no edit summary
Line 310: Line 310:  
description = "/entry/instrument/detector/description"
 
description = "/entry/instrument/detector/description"
 
omega_range_average = "/entry/sample/goniometer/omega_range_average"
 
omega_range_average = "/entry/sample/goniometer/omega_range_average"
countrate_correction_count_cutoff = "/entry/instrument/detector/countrate_correction_count_cutoff"
+
countrate_correction_count_cutoff = "/entry/instrument/detector/detectorSpecific/countrate_correction_count_cutoff"
 
resolution_cutoff = 'max resolution'
 
resolution_cutoff = 'max resolution'
   Line 344: Line 344:  
     lines.append(XDS_detector_lines % {
 
     lines.append(XDS_detector_lines % {
 
         'family': FAMILY,
 
         'family': FAMILY,
         'cutoff': int(float(parameters["/entry/instrument/detector/countrate_correction_count_cutoff"])),
+
         'cutoff': int(float(parameters["/entry/instrument/detector/detectorSpecific/countrate_correction_count_cutoff"])),
 
         'sensor': sensor,
 
         'sensor': sensor,
 
         'pixsize_x': float(parameters["/entry/instrument/detector/x_pixel_size"]) * 1000.0,
 
         'pixsize_x': float(parameters["/entry/instrument/detector/x_pixel_size"]) * 1000.0,
Line 442: Line 442:  
             'python XDS_from_H5.py <name>_master.h5\n')
 
             'python XDS_from_H5.py <name>_master.h5\n')
   −
permitted_versions = ["1.5.0", "1.2.0", "1.2.1", "1.3", "1.3.0", "1.4.0"]
+
permitted_versions = ["1.5.1", "1.5.0", "1.2.0", "1.2.1", "1.3", "1.3.0", "1.4.0"]
 
def version_check(version):
 
def version_check(version):
 
     if (str(version) in permitted_versions):
 
     if (str(version) in permitted_versions):
Line 593: Line 593:  
                 else:
 
                 else:
 
                     print "\nThe HDF5 file was created with version %s of the detector firmware" % (para_version)
 
                     print "\nThe HDF5 file was created with version %s of the detector firmware" % (para_version)
                     print "This script supports versions 1.5 and up."
+
                     print "This script supports versions 1.2 and up."
 +
                    print "\nFile XDS.INP was not created."
 
                     print "Please extract metadata with hdfview or h5dump.\n"
 
                     print "Please extract metadata with hdfview or h5dump.\n"
 
             else:
 
             else:
18

edits

Cookies help us deliver our services. By using our services, you agree to our use of cookies.

Navigation menu