Changeset ca10d8e in sasview for DataLoader/readers
- Timestamp:
- Feb 11, 2009 2:12:47 PM (16 years ago)
- Branches:
- master, ESS_GUI, ESS_GUI_Docs, ESS_GUI_batch_fitting, ESS_GUI_bumps_abstraction, ESS_GUI_iss1116, ESS_GUI_iss879, ESS_GUI_iss959, ESS_GUI_opencl, ESS_GUI_ordering, ESS_GUI_sync_sascalc, costrafo411, magnetic_scatt, release-4.1.1, release-4.1.2, release-4.2.2, release_4.0.1, ticket-1009, ticket-1094-headless, ticket-1242-2d-resolution, ticket-1243, ticket-1249, ticket885, unittest-saveload
- Children:
- acb37d9
- Parents:
- 1309e919
- Location:
- DataLoader/readers
- Files:
-
- 6 edited
-
IgorReader.py (modified) (4 diffs)
-
abs_reader.py (modified) (1 diff)
-
ascii_reader.py (modified) (1 diff)
-
cansas_reader.py (modified) (1 diff)
-
danse_reader.py (modified) (4 diffs)
-
hfir1d_reader.py (modified) (1 diff)
Legend:
- Unmodified
- Added
- Removed
-
DataLoader/readers/IgorReader.py
rb568ec1b rca10d8e 79 79 data_conv_i = None 80 80 81 if has_converter == True and output.Q_unit != ' A^{-1}':82 data_conv_q = Converter(' A^{-1}')81 if has_converter == True and output.Q_unit != '1/A': 82 data_conv_q = Converter('1/A') 83 83 # Test it 84 84 data_conv_q(1.0, output.Q_unit) 85 85 86 if has_converter == True and output.I_unit != ' cm^{-1}':87 data_conv_i = Converter(' cm^{-1}')86 if has_converter == True and output.I_unit != '1/cm': 87 data_conv_i = Converter('1/cm') 88 88 # Test it 89 89 data_conv_i(1.0, output.I_unit) … … 191 191 qx = 4.0*math.pi/wavelength * math.sin(theta/2.0) 192 192 193 if has_converter == True and output.Q_unit != ' A^{-1}':193 if has_converter == True and output.Q_unit != '1/A': 194 194 qx = data_conv_q(qx, units=output.Q_unit) 195 195 … … 202 202 qy = 4.0*math.pi/wavelength * math.sin(theta/2.0) 203 203 204 if has_converter == True and output.Q_unit != ' A^{-1}':204 if has_converter == True and output.Q_unit != '1/A': 205 205 qy = data_conv_q(qy, units=output.Q_unit) 206 206 … … 258 258 ymin =ymin-ystep/2.0 259 259 ymax =ymax+ystep/2.0 260 if has_converter == True and output.Q_unit != ' A^{-1}':260 if has_converter == True and output.Q_unit != '1/A': 261 261 xmin = data_conv_q(xmin, units=output.Q_unit) 262 262 xmax = data_conv_q(xmax, units=output.Q_unit) -
DataLoader/readers/abs_reader.py
rd06ba5e rca10d8e 62 62 data_conv_i = None 63 63 64 if has_converter == True and output.x_unit != ' A^{-1}':65 data_conv_q = Converter(' A^{-1}')64 if has_converter == True and output.x_unit != '1/A': 65 data_conv_q = Converter('1/A') 66 66 # Test it 67 67 data_conv_q(1.0, output.x_unit) 68 68 69 if has_converter == True and output.y_unit != ' cm^{-1}':70 data_conv_i = Converter(' cm^{-1}')69 if has_converter == True and output.y_unit != '1/cm': 70 data_conv_i = Converter('1/cm') 71 71 # Test it 72 72 data_conv_i(1.0, output.y_unit) -
DataLoader/readers/ascii_reader.py
rb92c1ad0 rca10d8e 58 58 data_conv_i = None 59 59 60 if has_converter == True and output.x_unit != ' A^{-1}':61 data_conv_q = Converter(' A^{-1}')60 if has_converter == True and output.x_unit != '1/A': 61 data_conv_q = Converter('1/A') 62 62 # Test it 63 63 data_conv_q(1.0, output.x_unit) 64 64 65 if has_converter == True and output.y_unit != ' cm^{-1}':66 data_conv_i = Converter(' cm^{-1}')65 if has_converter == True and output.y_unit != '1/cm': 66 data_conv_i = Converter('1/cm') 67 67 # Test it 68 68 data_conv_i(1.0, output.y_unit) -
DataLoader/readers/cansas_reader.py
r2bc8d4a rca10d8e 569 569 data_conv_i = None 570 570 571 if has_converter == True and data_info.x_unit != ' A^{-1}':572 data_conv_q = Converter(' A^{-1}')571 if has_converter == True and data_info.x_unit != '1/A': 572 data_conv_q = Converter('1/A') 573 573 # Test it 574 574 data_conv_q(1.0, output.Q_unit) 575 575 576 if has_converter == True and data_info.y_unit != ' cm^{-1}':577 data_conv_i = Converter(' cm^{-1}')576 if has_converter == True and data_info.y_unit != '1/cm': 577 data_conv_i = Converter('1/cm') 578 578 # Test it 579 579 data_conv_i(1.0, output.I_unit) -
DataLoader/readers/danse_reader.py
reeaabb1 rca10d8e 87 87 data_conv_i = None 88 88 89 if has_converter == True and output.Q_unit != ' A^{-1}':90 data_conv_q = Converter(' A^{-1}')89 if has_converter == True and output.Q_unit != '1/A': 90 data_conv_q = Converter('1/A') 91 91 # Test it 92 92 data_conv_q(1.0, output.Q_unit) 93 93 94 if has_converter == True and output.I_unit != ' cm^{-1}':95 data_conv_i = Converter(' cm^{-1}')94 if has_converter == True and output.I_unit != '1/cm': 95 data_conv_i = Converter('1/cm') 96 96 # Test it 97 97 data_conv_i(1.0, output.I_unit) … … 161 161 qx = 4.0*math.pi/wavelength * math.sin(theta/2.0) 162 162 163 if has_converter == True and output.Q_unit != ' A^{-1}':163 if has_converter == True and output.Q_unit != '1/A': 164 164 qx = data_conv_q(qx, units=output.Q_unit) 165 165 166 166 x_vals.append(qx) 167 if xmin==None or qx< =xmin:167 if xmin==None or qx<xmin: 168 168 xmin = qx 169 if xmax==None or qx> =xmax:169 if xmax==None or qx>xmax: 170 170 xmax = qx 171 171 … … 176 176 qy = 4.0*math.pi/wavelength * math.sin(theta/2.0) 177 177 178 if has_converter == True and output.Q_unit != ' A^{-1}':178 if has_converter == True and output.Q_unit != '1/A': 179 179 qy = data_conv_q(qy, units=output.Q_unit) 180 180 … … 242 242 ymax =ymax+stepq/2.0 243 243 244 if has_converter == True and output.Q_unit != ' A^{-1}':244 if has_converter == True and output.Q_unit != '1/A': 245 245 xmin = data_conv_q(xmin, units=output.Q_unit) 246 246 xmax = data_conv_q(xmax, units=output.Q_unit) -
DataLoader/readers/hfir1d_reader.py
rc5f0337 rca10d8e 58 58 data_conv_i = None 59 59 60 if has_converter == True and output.x_unit != ' A^{-1}':61 data_conv_q = Converter(' A^{-1}')60 if has_converter == True and output.x_unit != '1/A': 61 data_conv_q = Converter('1/A') 62 62 # Test it 63 63 data_conv_q(1.0, output.x_unit) 64 64 65 if has_converter == True and output.y_unit != ' cm^{-1}':66 data_conv_i = Converter(' cm^{-1}')65 if has_converter == True and output.y_unit != '1/cm': 66 data_conv_i = Converter('1/cm') 67 67 # Test it 68 68 data_conv_i(1.0, output.y_unit)
Note: See TracChangeset
for help on using the changeset viewer.
