zebra/pyzebra
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix imports and indentation

Browse Source
This commit is contained in:
usov_i 2020-10-26 16:33:30 +01:00
parent dba2dc6149
commit 42c6e6b921
2 changed files with 85 additions and 82 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
pyzebra/__init__.py
View File

@ -5,6 +5,7 @@ from pyzebra.comm_export import export_comm
from pyzebra.fit2 import fitccl from pyzebra.fit2 import fitccl
from pyzebra.h5 import * from pyzebra.h5 import *
from pyzebra.load_1D import load_1D, parse_1D from pyzebra.load_1D import load_1D, parse_1D
from pyzebra.param_study_moduls import add_dict, auto, merge, scan_dict
from pyzebra.xtal import * from pyzebra.xtal import *
__version__ = "0.1.1" __version__ = "0.1.1"

18
pyzebra/param_study_moduls.py
View File

@ -1,12 +1,14 @@
from load_1D import load_1D
import pandas as pd
from mpl_toolkits.mplot3d import Axes3D # dont delete, otherwise waterfall wont work
import matplotlib.pyplot as plt
import matplotlib as mpl
import numpy as np
import pickle import pickle
import matplotlib as mpl
import matplotlib.pyplot as plt
import numpy as np
import pandas as pd
import scipy.io as sio import scipy.io as sio
import uncertainties as u import uncertainties as u
from mpl_toolkits.mplot3d import Axes3D # dont delete, otherwise waterfall wont work
from .load_1D import load_1D
def create_tuples(x, y, y_err): def create_tuples(x, y, y_err):
@ -211,7 +213,7 @@ def save_table(data, filetype, name, path=None):
if filetype == "json": if filetype == "json":
data.to_json((path + name + ".json")) data.to_json((path + name + ".json"))
def normalize(dict, key, monitor): def normalize(dict, key, monitor):
"""Normalizes the measurement to monitor, checks if sigma exists, otherwise creates it """Normalizes the measurement to monitor, checks if sigma exists, otherwise creates it
:arg dict : dictionary to from which to tkae the scan :arg dict : dictionary to from which to tkae the scan
:arg key : which scan to normalize from dict1 :arg key : which scan to normalize from dict1
@ -227,7 +229,7 @@ def save_table(data, filetype, name, path=None):
return scaled_counts, scaled_sigma return scaled_counts, scaled_sigma
def merge(dict1, dict2, scand_dict_result, keep=True, monitor=100000): def merge(dict1, dict2, scand_dict_result, keep=True, monitor=100000):
"""merges the two tuples and sorts them, if om value is same, Counts value is average """merges the two tuples and sorts them, if om value is same, Counts value is average
averaging is propagated into sigma if dict1 == dict2, key[1] is deleted after merging averaging is propagated into sigma if dict1 == dict2, key[1] is deleted after merging
:arg dict1 : dictionary to which measurement will be merged :arg dict1 : dictionary to which measurement will be merged