Changeset 5251ec6 in sasview for src/sas/sasgui/perspectives/calculator/sld_panel.py
- Timestamp:
- Oct 11, 2018 12:20:56 PM (5 years ago)
- Branches:
- master, magnetic_scatt, release-4.2.2, ticket-1009, ticket-1249
- Children:
- 98b9f32
- Parents:
- 67ed543
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
src/sas/sasgui/perspectives/calculator/sld_panel.py
r2d220dd r5251ec6 363 363 364 364 """ 365 # TODO: use periodictable.elements object 366 # energy = xray_energy(periodictable.elements[element].K_alpha) 367 # TODO: code is very similar to sld helper 365 368 myformula = formula(str(element)) 366 369 if len(myformula.atoms) != 1: 367 370 return 368 element = myformula.atoms.keys()[0]371 element = list(myformula.atoms.keys())[0] 369 372 energy = xray_energy(element.K_alpha) 370 373 … … 413 416 msg += "Error for wavelength value :expect float" 414 417 elif (self.xray_source == 'Element'): 418 # TODO: use periodictable.elements instead of exec() hacks 419 # if self.xray_source_input not in periodictable.elements: 420 # ... 415 421 try: 416 422 import periodictable … … 447 453 448 454 """ 455 # TODO: use periodictable.elements object 456 # energy = xray_energy(periodictable.elements[element].K_alpha) 449 457 element_formula = formula(str(element)) 450 458 if len(element_formula.atoms) != 1: 451 459 return 452 element = element_formula.atoms.keys()[0]460 element = list(element_formula.atoms.keys())[0] 453 461 energy = xray_energy(element.K_alpha) 462 454 463 atom = molecule_formula.atoms 455 464 return xray_sld_from_atoms(atom, density=density, energy=energy) … … 505 514 #self.wavelength_ctl.SetValue(str(self.wavelength)) 506 515 #self.wavelength_ctl.SetValue(str(self.wavelength)) 507 except :516 except Exception as exc: 508 517 if self.base is not None: 509 msg = "SLD Calculator: %s" % (sys.exc_value)518 msg = "SLD Calculator: %s" % exc 510 519 wx.PostEvent(self.base, StatusEvent(status=msg)) 511 520 if event is not None:
Note: See TracChangeset
for help on using the changeset viewer.