Index: src/sas/sascalc/dataloader/readers/cansas_reader_HDF5.py
===================================================================
--- src/sas/sascalc/dataloader/readers/cansas_reader_HDF5.py	(revision 545446375c808e9fc05b60ce0c2e9dc870cd9b62)
+++ src/sas/sascalc/dataloader/readers/cansas_reader_HDF5.py	(revision c94280cac80b38e0a4f88d651999c89b9bbb966d)
@@ -193,15 +193,15 @@
                     continue
                 # Transmission Spectrum
-                elif (key == u'T') \
-                        and (self.parent_class == u'SAStransmission_spectrum'):
+                elif (key == u'T'
+                      and self.parent_class == u'SAStransmission_spectrum'):
                     self.trans_spectrum.transmission = data_set.flatten()
                     continue
-                elif (key == u'Tdev') \
-                        and (self.parent_class == u'SAStransmission_spectrum'):
+                elif (key == u'Tdev'
+                      and self.parent_class == u'SAStransmission_spectrum'):
                     self.trans_spectrum.transmission_deviation = \
                         data_set.flatten()
                     continue
-                elif (key == u'lambda') \
-                        and (self.parent_class == u'SAStransmission_spectrum'):
+                elif (key == u'lambda'
+                      and self.parent_class == u'SAStransmission_spectrum'):
                     self.trans_spectrum.wavelength = data_set.flatten()
                     continue
@@ -234,18 +234,18 @@
                     elif key == u'ID' and self.parent_class == u'SASsample':
                         self.current_datainfo.sample.name = data_point
-                    elif (key == u'thickness') and (self.parent_class ==
-                                                    u'SASsample'):
+                    elif (key == u'thickness'
+                          and self.parent_class == u'SASsample'):
                         self.current_datainfo.sample.thickness = data_point
-                    elif (key == u'temperature') and (self.parent_class ==
-                                                      u'SASsample'):
+                    elif (key == u'temperature'
+                          and self.parent_class == u'SASsample'):
                         self.current_datainfo.sample.temperature = data_point
-                    elif (key == u'transmission') and (self.parent_class ==
-                                                       u'SASsample'):
+                    elif (key == u'transmission'
+                          and self.parent_class == u'SASsample'):
                         self.current_datainfo.sample.transmission = data_point
-                    elif (key == u'x_position') and (self.parent_class ==
-                                                     u'SASsample'):
+                    elif (key == u'x_position'
+                          and self.parent_class == u'SASsample'):
                         self.current_datainfo.sample.position.x = data_point
-                    elif (key == u'y_position') and (self.parent_class ==
-                                                     u'SASsample'):
+                    elif (key == u'y_position'
+                          and self.parent_class == u'SASsample'):
                         self.current_datainfo.sample.position.y = data_point
                     elif key == u'pitch' and self.parent_class == u'SASsample':
@@ -255,11 +255,11 @@
                     elif key == u'roll' and self.parent_class == u'SASsample':
                         self.current_datainfo.sample.orientation.z = data_point
-                    elif (key == u'details') and (self.parent_class ==
-                                                  u'SASsample'):
+                    elif (key == u'details'
+                          and self.parent_class == u'SASsample'):
                         self.current_datainfo.sample.details.append(data_point)
 
                     # Instrumental Information
-                    elif (key == u'name') and (self.parent_class ==
-                                               u'SASinstrument'):
+                    elif (key == u'name'
+                          and self.parent_class == u'SASinstrument'):
                         self.current_datainfo.instrument = data_point
                     elif key == u'name' and self.parent_class == u'SASdetector':
@@ -268,18 +268,18 @@
                         self.detector.distance = float(data_point)
                         self.detector.distance_unit = unit
-                    elif (key == u'slit_length') and (self.parent_class ==
-                                                      u'SASdetector'):
+                    elif (key == u'slit_length'
+                          and self.parent_class == u'SASdetector'):
                         self.detector.slit_length = float(data_point)
                         self.detector.slit_length_unit = unit
-                    elif (key == u'x_position') and (self.parent_class ==
-                                                     u'SASdetector'):
+                    elif (key == u'x_position'
+                          and self.parent_class == u'SASdetector'):
                         self.detector.offset.x = float(data_point)
                         self.detector.offset_unit = unit
-                    elif (key == u'y_position') and (self.parent_class ==
-                                                     u'SASdetector'):
+                    elif (key == u'y_position'
+                          and self.parent_class == u'SASdetector'):
                         self.detector.offset.y = float(data_point)
                         self.detector.offset_unit = unit
-                    elif (key == u'pitch') and (self.parent_class ==
-                                                u'SASdetector'):
+                    elif (key == u'pitch'
+                          and self.parent_class == u'SASdetector'):
                         self.detector.orientation.x = float(data_point)
                         self.detector.orientation_unit = unit
@@ -290,46 +290,46 @@
                         self.detector.orientation.y = float(data_point)
                         self.detector.orientation_unit = unit
-                    elif (key == u'beam_center_x') and (self.parent_class ==
-                                                        u'SASdetector'):
+                    elif (key == u'beam_center_x'
+                          and self.parent_class == u'SASdetector'):
                         self.detector.beam_center.x = float(data_point)
                         self.detector.beam_center_unit = unit
-                    elif (key == u'beam_center_y') and (self.parent_class ==
-                                                        u'SASdetector'):
+                    elif (key == u'beam_center_y'
+                          and self.parent_class == u'SASdetector'):
                         self.detector.beam_center.y = float(data_point)
                         self.detector.beam_center_unit = unit
-                    elif (key == u'x_pixel_size') and (self.parent_class ==
-                                                       u'SASdetector'):
+                    elif (key == u'x_pixel_size'
+                          and self.parent_class == u'SASdetector'):
                         self.detector.pixel_size.x = float(data_point)
                         self.detector.pixel_size_unit = unit
-                    elif (key == u'y_pixel_size') and (self.parent_class ==
-                                                       u'SASdetector'):
+                    elif (key == u'y_pixel_size'
+                          and self.parent_class == u'SASdetector'):
                         self.detector.pixel_size.y = float(data_point)
                         self.detector.pixel_size_unit = unit
-                    elif (key == u'distance') and (self.parent_class ==
-                                                   u'SAScollimation'):
+                    elif (key == u'distance'
+                          and self.parent_class == u'SAScollimation'):
                         self.collimation.length = data_point
                         self.collimation.length_unit = unit
-                    elif (key == u'name') and (self.parent_class ==
-                                               u'SAScollimation'):
+                    elif (key == u'name'
+                          and self.parent_class == u'SAScollimation'):
                         self.collimation.name = data_point
-                    elif (key == u'shape') and (self.parent_class ==
-                                                u'SASaperture'):
+                    elif (key == u'shape'
+                          and self.parent_class == u'SASaperture'):
                         self.aperture.shape = data_point
-                    elif (key == u'x_gap') and (self.parent_class ==
-                                                u'SASaperture'):
+                    elif (key == u'x_gap'
+                          and self.parent_class == u'SASaperture'):
                         self.aperture.size.x = data_point
-                    elif (key == u'y_gap') and (self.parent_class ==
-                                                u'SASaperture'):
+                    elif (key == u'y_gap'
+                          and self.parent_class == u'SASaperture'):
                         self.aperture.size.y = data_point
 
                     # Process Information
-                    elif (key == u'Title') and (self.parent_class ==
-                                                u'SASprocess'): # CanSAS 2.0
+                    elif (key == u'Title'
+                          and self.parent_class == u'SASprocess'): # CanSAS 2.0
                         self.process.name = data_point
-                    elif (key == u'name') and (self.parent_class ==
-                                               u'SASprocess'): # NXcanSAS
+                    elif (key == u'name'
+                          and self.parent_class == u'SASprocess'): # NXcanSAS
                         self.process.name = data_point
-                    elif (key == u'description') and (self.parent_class ==
-                                                      u'SASprocess'):
+                    elif (key == u'description'
+                          and self.parent_class == u'SASprocess'):
                         self.process.description = data_point
                     elif key == u'date' and self.parent_class == u'SASprocess':
@@ -341,42 +341,42 @@
 
                     # Source
-                    elif (key == u'wavelength') and (self.parent_class ==
-                                                     u'SASdata'):
+                    elif (key == u'wavelength'
+                          and self.parent_class == u'SASdata'):
                         self.current_datainfo.source.wavelength = data_point
                         self.current_datainfo.source.wavelength_unit = unit
-                    elif (key == u'incident_wavelength') and \
-                        (self.parent_class == 'SASsource'):
+                    elif (key == u'incident_wavelength'
+                          and self.parent_class == 'SASsource'):
                         self.current_datainfo.source.wavelength = data_point
                         self.current_datainfo.source.wavelength_unit = unit
-                    elif (key == u'wavelength_max') and (self.parent_class ==
-                                                         u'SASsource'):
+                    elif (key == u'wavelength_max'
+                          and self.parent_class == u'SASsource'):
                         self.current_datainfo.source.wavelength_max = data_point
                         self.current_datainfo.source.wavelength_max_unit = unit
-                    elif (key == u'wavelength_min') and (self.parent_class ==
-                                                         u'SASsource'):
+                    elif (key == u'wavelength_min'
+                          and self.parent_class == u'SASsource'):
                         self.current_datainfo.source.wavelength_min = data_point
                         self.current_datainfo.source.wavelength_min_unit = unit
-                    elif key == u'incident_wavelength_spread' and \
-                            (self.parent_class == u'SASsource'):
+                    elif (key == u'incident_wavelength_spread'
+                          and self.parent_class == u'SASsource'):
                         self.current_datainfo.source.wavelength_spread = \
                             data_point
                         self.current_datainfo.source.wavelength_spread_unit = \
                             unit
-                    elif (key == u'beam_size_x') and (self.parent_class ==
-                                                      u'SASsource'):
+                    elif (key == u'beam_size_x'
+                          and self.parent_class == u'SASsource'):
                         self.current_datainfo.source.beam_size.x = data_point
                         self.current_datainfo.source.beam_size_unit = unit
-                    elif (key == u'beam_size_y') and (self.parent_class ==
-                                                      u'SASsource'):
+                    elif (key == u'beam_size_y'
+                          and self.parent_class == u'SASsource'):
                         self.current_datainfo.source.beam_size.y = data_point
                         self.current_datainfo.source.beam_size_unit = unit
-                    elif (key == u'beam_shape') and (self.parent_class ==
-                                                     u'SASsource'):
+                    elif (key == u'beam_shape'
+                          and self.parent_class == u'SASsource'):
                         self.current_datainfo.source.beam_shape = data_point
-                    elif (key == u'radiation') and (self.parent_class ==
-                                                    u'SASsource'):
+                    elif (key == u'radiation'
+                          and self.parent_class == u'SASsource'):
                         self.current_datainfo.source.radiation = data_point
-                    elif (key == u'transmission') and (self.parent_class ==
-                                                       u'SASdata'):
+                    elif (key == u'transmission'
+                          and self.parent_class == u'SASdata'):
                         self.current_datainfo.sample.transmission = data_point
 
