rasmus/nafuma
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Add multiplication and drawdown for diffs

Browse source
This commit is contained in:
rasmusthog 2022-10-09 18:41:30 +02:00
parent 76cf0f2275
commit 8b0a5bcff7
1 changed files with 6 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

8
nafuma/xrd/io.py
View file

@ -720,7 +720,7 @@ def read_data(data, options={}, index=0):
diffractogram['I_org'] = diffractogram['I'] diffractogram['I_org'] = diffractogram['I']
diffractogram['2th_org'] = diffractogram['2th'] diffractogram['2th_org'] = diffractogram['2th']
diffractogram = apply_offset(diffractogram, wavelength, index, options) diffractogram = adjust_intensities(diffractogram, wavelength, index, options)
@ -729,7 +729,7 @@ def read_data(data, options={}, index=0):
return diffractogram, wavelength return diffractogram, wavelength
def apply_offset(diffractogram, wavelength, index, options): def adjust_intensities(diffractogram, wavelength, index, options):
if 'current_offset_y' not in options.keys(): if 'current_offset_y' not in options.keys():
options['current_offset_y'] = options['offset_y'] options['current_offset_y'] = options['offset_y']
@ -748,6 +748,10 @@ def apply_offset(diffractogram, wavelength, index, options):
if options['normalise']: if options['normalise']:
diffractogram['I'] = diffractogram['I'] / diffractogram['I'].max() diffractogram['I'] = diffractogram['I'] / diffractogram['I'].max()
diffractogram['I'] = diffractogram['I'] * options['multiply']
if options['drawdown']:
diffractogram['I'] = diffractogram['I'] - diffractogram['I'].mean()
diffractogram['I'] = diffractogram['I'] + index*options['offset_y'] diffractogram['I'] = diffractogram['I'] + index*options['offset_y']