Changeset d398285 in sasview for src/sas/sascalc/dataloader
- Timestamp:
- Jul 13, 2016 8:52:08 AM (8 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:
- 0f1e140
- Parents:
- dd5bf63
- Location:
- src/sas/sascalc/dataloader/readers
- Files:
-
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
TabularUnified src/sas/sascalc/dataloader/readers/cansas_constants.py ¶
rb699768 rd398285 106 106 "unit" : "x_unit", 107 107 "attributes" : {"unit" : 108 {"variable" : "{0}. _xunit = \"{1}\"",108 {"variable" : "{0}.xaxis(\"Q\", \'{1}\')", 109 109 "storeas" : "content" 110 110 } … … 114 114 "unit" : "y_unit", 115 115 "attributes" : {"unit" : 116 {"variable" : "{0}. _yunit = \"{1}\"",116 {"variable" : "{0}.yaxis(\"Intensity\", \'{1}\')", 117 117 "storeas" : "content" 118 118 } -
TabularUnified src/sas/sascalc/dataloader/readers/cansas_reader.py ¶
raf09f48 rd398285 12 12 #copyright 2008,2009 University of Tennessee 13 13 ############################################################################# 14 14 ##TODO: Replace 1/A with 1/\AA for Angstorm 15 ##TODO: Put in x-axis and y-axis information 15 16 import logging 16 17 import numpy … … 456 457 attrib_variable = cansas_attrib.get("variable") 457 458 if key == 'unit' and unit != '': 459 if unit == "1/A": 460 unit = "A^{-1}" 461 elif unit == "1/cm": 462 unit = "cm^{-1}" 458 463 attrib_value = unit 459 464 else: -
TabularUnified src/sas/sascalc/dataloader/readers/cansas_reader_HDF5.py ¶
rad52d31 rd398285 109 109 attr_keys = value.attrs.keys() 110 110 attr_values = value.attrs.values() 111 class_name = value.attrs.get(u'NX_class') 111 if value.attrs.get(u'canSAS_class') is not None: 112 class_name = value.attrs.get(u'canSAS_class') 113 else: 114 class_name = value.attrs.get(u'NX_class') 112 115 if class_name is not None: 113 116 class_prog = re.compile(class_name) … … 131 134 for data_point in data_set: 132 135 ## Top Level Meta Data 136 unit = self._get_unit(value) 133 137 if key == u'definition': 134 138 self.current_dataset.meta_data['reader'] = data_point … … 142 146 ## I and Q Data 143 147 elif key == u'I': 144 i_unit = value.attrs.get(u'unit')145 148 if type(self.current_dataset) is Data2D: 146 149 self.current_dataset.data = np.append(self.current_dataset.data, data_point) 147 self.current_dataset.zaxis("Intensity (%s)" % (i_unit), i_unit)150 self.current_dataset.zaxis("Intensity", unit) 148 151 else: 149 152 self.current_dataset.y = np.append(self.current_dataset.y, data_point) 150 self.current_dataset.yaxis("Intensity (%s)" % (i_unit), i_unit)153 self.current_dataset.yaxis("Intensity", unit) 151 154 elif key == u'Idev': 152 155 if type(self.current_dataset) is Data2D: … … 155 158 self.current_dataset.dy = np.append(self.current_dataset.dy, data_point) 156 159 elif key == u'Q': 157 q_unit = value.attrs.get(u'unit') 158 self.current_dataset.xaxis("Q (%s)" % (q_unit), q_unit) 160 self.current_dataset.xaxis("Q", unit) 159 161 if type(self.current_dataset) is Data2D: 160 162 self.current_dataset.q = np.append(self.current_dataset.q, data_point) … … 162 164 self.current_dataset.x = np.append(self.current_dataset.x, data_point) 163 165 elif key == u'Qy': 164 q_unit = value.attrs.get(u'unit') 165 self.current_dataset.yaxis("Q (%s)" % (q_unit), q_unit) 166 self.current_dataset.yaxis("Q_y", unit) 166 167 self.current_dataset.qy_data = np.append(self.current_dataset.qy_data, data_point) 167 168 elif key == u'Qydev': 168 169 self.current_dataset.dqy_data = np.append(self.current_dataset.dqy_data, data_point) 169 170 elif key == u'Qx': 170 q_unit = value.attrs.get(u'unit') 171 self.current_dataset.xaxis("Q (%s)" % (q_unit), q_unit) 171 self.current_dataset.xaxis("Q_x", unit) 172 172 self.current_dataset.qx_data = np.append(self.current_dataset.qx_data, data_point) 173 173 elif key == u'Qxdev': … … 191 191 elif key == u'SDD' and parent == u'SASdetector': 192 192 self.detector.distance = data_point 193 self.detector.distance_unit = value.attrs.get(u'unit')193 self.detector.distance_unit = unit 194 194 elif key == u'SSD' and parent == u'SAScollimation': 195 195 self.collimation.length = data_point 196 self.collimation.length_unit = value.attrs.get(u'unit')196 self.collimation.length_unit = unit 197 197 elif key == u'name' and parent == u'SAScollimation': 198 198 self.collimation.name = data_point … … 221 221 elif key == u'wavelength' and parent == u'SASdata': 222 222 self.source.wavelength = data_point 223 self.source.wavelength.unit = value.attrs.get(u'unit')223 self.source.wavelength.unit = unit 224 224 elif key == u'radiation' and parent == u'SASsource': 225 225 self.source.radiation = data_point … … 426 426 name = self._create_unique_key(dictionary, name, numb) 427 427 return name 428 429 def _get_unit(self, value): 430 """ 431 Find the unit for a particular value within the h5py dictionary 432 433 :param value: attribute dictionary for a particular value set 434 :return: 435 """ 436 unit = value.attrs.get(u'units') 437 if unit == None: 438 unit = value.attrs.get(u'unit') 439 440 ## Convert the unit formats 441 if unit == "1/A": 442 unit = "A^{-1}" 443 elif unit == "1/cm": 444 unit = "cm^{-1}" 445 446 return unit
Note: See TracChangeset
for help on using the changeset viewer.