sinq-reflectometry/eos
0
1
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases 1 Wiki Activity

minor format changes

Browse Source
This commit is contained in:
stahn
2024-03-12 15:29:27 +01:00
parent 1598ce64e6
commit bd8a3d7b53
1 changed files with 24 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
libeos/reduction.py
View File

@@ -297,11 +297,15 @@ class AmorReduction:
n_path = os.path.join(dataPath, f'{name}.norm')
if os.path.exists(n_path):
logging.info(f'# normalisation matrix: found and using {n_path}')
self.norm_lz = np.loadtxt(f'{dataPath}/{name}.norm')
with open(n_path, 'r') as fh:
fh.readline()
self.normFileList = fh.readline().split('[')[1].split(']')[0].replace('\'', '').split(', ')
self.normAngle = float(fh.readline().split('= ')[1])
#self.norm_lz = np.loadtxt(f'{dataPath}/{name}.norm')
#with open(n_path, 'r') as fh:
# fh.readline()
# self.normFileList = fh.readline().split('[')[1].split(']')[0].replace('\'', '').split(', ')
# self.normAngle = float(fh.readline().split('= ')[1])
with open(n_path, 'rb') as fh:
self.normFileList = np.load(fh, allow_pickle=True)
self.normAngle = np.load(fh, allow_pickle=True)
self.norm_lz = np.load(fh, allow_pickle=True)
for i, entry in enumerate(self.normFileList):
self.normFileList[i] = entry.split('/')[-1]
self.header.measurement_additional_files = self.normFileList
@@ -326,17 +330,22 @@ class AmorReduction:
Rsm_lz = np.where(qz_lz>0.0217, 1-(qz_lz-0.0217)*(0.0625/0.0217), Rsm_lz)
Rsm_lz = np.where(qz_lz>0.0217*5, np.nan, Rsm_lz)
self.norm_lz = self.norm_lz / Rsm_lz
#if len(lamda_e) > 1e6:
# head = ('normalisation matrix based on the measurements\n'
# f'{fromHDF.file_list}\n'
# f'nu - mu = {self.normAngle}\n'
# f'shape= {np.shape(self.norm_lz)} (lambda, z)\n'
# f'measured at mu = {fromHDF.mu:6.3f} deg\n'
# f'N(l_lambda, z) = theta(z) / sum_i=-1..1 I(l_lambda+i, z)')
# head = head.replace('../', '')
# head = head.replace('./', '')
# head = head.replace('raw/', '')
# np.savetxt(f'{dataPath}/{name}.norm', self.norm_lz, header = head)
if len(lamda_e) > 1e6:
head = ('normalisation matrix based on the measurements\n'
f'{fromHDF.file_list}\n'
f'nu - mu = {self.normAngle}\n'
f'shape= {np.shape(self.norm_lz)} (lambda, z)\n'
f'measured at mu = {fromHDF.mu:6.3f} deg\n'
f'N(l_lambda, z) = theta(z) / sum_i=-1..1 I(l_lambda+i, z)')
head = head.replace('../', '')
head = head.replace('./', '')
head = head.replace('raw/', '')
np.savetxt(f'{dataPath}/{name}.norm', self.norm_lz, header = head)
with open(n_path, 'wb') as fh:
np.save(fh, np.array(fromHDF.file_list), allow_pickle=False)
np.save(fh, np.array(fromHDF.mu), allow_pickle=False)
np.save(fh, self.norm_lz, allow_pickle=False)
self.normFileList = fromHDF.file_list
self.header.reduction.corrections.append('normalisation with \'additional files\'')