1. remove "weight"
2. allow for short wavelength (<912 A)
3. remove ad hoc "X-ray wavelength"