function registry with fixed container order
This commit is contained in:
parent
582019d7cb
commit
1a1066a07e
@ -1,22 +1,25 @@
|
||||
# -*- encoding: utf8 -*-
|
||||
|
||||
from libmath import yafflib
|
||||
|
||||
from PyQt4.QtGui import QColor
|
||||
import numpy as np
|
||||
|
||||
from libmath import yafflib
|
||||
|
||||
from libmath.BDSlib import id_to_color
|
||||
from container_base import BaseObject
|
||||
from gui import ContainerWidgets
|
||||
from container_base import BaseContainer
|
||||
|
||||
import gui.ContainerWidgets
|
||||
|
||||
|
||||
|
||||
|
||||
__author__ = 'markusro'
|
||||
|
||||
|
||||
class Conductivity(BaseObject):
|
||||
class Conductivity(BaseContainer):
|
||||
def __init__( self, plt_imag=None, plt_real=None, limits=None ):
|
||||
super(Conductivity, self).__init__(plt_real=plt_real, plt_imag=plt_imag, limits=limits)
|
||||
self.widget = ContainerWidgets.ConductivityWidget()
|
||||
self.widget = gui.ContainerWidgets.ConductivityWidget()
|
||||
self.color = QColor("blue")
|
||||
self.id_label = "Cond."
|
||||
self.id_string = "cond"
|
||||
@ -31,17 +34,17 @@ class Conductivity(BaseObject):
|
||||
return cplx
|
||||
|
||||
|
||||
class PowerComplex(BaseObject):
|
||||
class PowerComplex(BaseContainer):
|
||||
def __init__( self, plt_real=None, plt_imag=None, limits=None ):
|
||||
super(PowerComplex, self).__init__(plt_real=plt_real, plt_imag=plt_imag, limits=limits)
|
||||
self.widget = ContainerWidgets.PowerLawWidget()
|
||||
self.widget = gui.ContainerWidgets.PowerLawWidget()
|
||||
self.color = QColor("#ff44c4")
|
||||
self.id_label = 'Power Law'
|
||||
self.id_string = "pwr"
|
||||
self.param_number = 2
|
||||
|
||||
def function( self, p, x ):
|
||||
BaseObject.function(self,p,x)
|
||||
BaseContainer.function(self, p, x)
|
||||
om = 2*np.pi*x
|
||||
sgma, n = p
|
||||
power = sgma/(om*1j)**n
|
||||
@ -49,27 +52,27 @@ class PowerComplex(BaseObject):
|
||||
return cplx
|
||||
|
||||
|
||||
class Static(BaseObject):
|
||||
class Static(BaseContainer):
|
||||
def __init__( self, plt_real=None, plt_imag=None, limits=None ):
|
||||
super(Static, self).__init__(plt_real=plt_real, plt_imag=plt_imag, limits=limits)
|
||||
self.widget = ContainerWidgets.StaticWidget()
|
||||
self.widget = gui.ContainerWidgets.StaticWidget()
|
||||
self.color = QColor('#FF0F13')
|
||||
self.id_label = u'ε(∞)'
|
||||
self.id_string = "eps_infty"
|
||||
self.param_number = 1
|
||||
|
||||
def function( self, p, x ):
|
||||
BaseObject.function(self,p,x)
|
||||
BaseContainer.function(self, p, x)
|
||||
eps_inf = p[0]
|
||||
static = np.ones((2, x.size))*eps_inf
|
||||
static[1, :] *= 0 # set imag part zero
|
||||
return static
|
||||
|
||||
|
||||
class Peak(BaseObject):
|
||||
class Peak(BaseContainer):
|
||||
def __init__( self, id_num=None, plt_real=None, plt_imag=None, limits=None ):
|
||||
super(Peak, self).__init__(plt_real=plt_real, plt_imag=plt_imag, limits=limits)
|
||||
self.widget = ContainerWidgets.PeakWidget()
|
||||
self.widget = gui.ContainerWidgets.PeakWidget()
|
||||
self.widget.setId(id_num)
|
||||
self.color = id_to_color(id_num)
|
||||
self.widget.setColor(self.color)
|
||||
@ -79,7 +82,7 @@ class Peak(BaseObject):
|
||||
self.param_number = 4
|
||||
|
||||
def function( self, p, x ):
|
||||
BaseObject.function(self,p,x)
|
||||
BaseContainer.function(self, p, x)
|
||||
eps, t, a, b = p
|
||||
om = 2*np.pi*x
|
||||
hn = eps/(1+(1j*om*t)**a)**b
|
||||
@ -87,10 +90,10 @@ class Peak(BaseObject):
|
||||
return cplx
|
||||
|
||||
|
||||
class YAFF(BaseObject):
|
||||
class YAFF(BaseContainer):
|
||||
def __init__( self, plt_real=None, plt_imag=None, limits=None ):
|
||||
super(YAFF, self).__init__(plt_real=plt_real, plt_imag=plt_imag, limits=limits)
|
||||
self.widget = ContainerWidgets.YaffWidget()
|
||||
self.widget = gui.ContainerWidgets.YaffWidget()
|
||||
self.widget.on_model_changed.connect(self.change_model)
|
||||
self.widget.configuration_changed.connect(self.change_configuration)
|
||||
self.color = QColor(32, 120, 29, int(255*0.82))
|
||||
@ -121,7 +124,7 @@ class YAFF(BaseObject):
|
||||
self.updateData()
|
||||
|
||||
def function( self, p, x ):
|
||||
BaseObject.function(self,p,x)
|
||||
BaseContainer.function(self, p, x)
|
||||
ya = self._libyaff.loss(p, x)
|
||||
cplx = np.array([ya.imag, ya.real])
|
||||
return cplx
|
||||
@ -6,12 +6,12 @@ import pyqtgraph as pg
|
||||
__author__ = 'markusro'
|
||||
|
||||
|
||||
class BaseObject(QObject):
|
||||
class BaseContainer(QObject):
|
||||
changedData = pyqtSignal()
|
||||
removeObj = pyqtSignal(QObject)
|
||||
|
||||
def __init__(self, plt_real=None, plt_imag=None, limits=None):
|
||||
super(BaseObject, self).__init__()
|
||||
super(BaseContainer, self).__init__()
|
||||
|
||||
myPen = pg.mkPen( style=Qt.DotLine,
|
||||
width=2.5)
|
||||
@ -84,7 +84,6 @@ class BaseObject(QObject):
|
||||
@color.setter
|
||||
def color(self, c):
|
||||
self._color = c
|
||||
print c
|
||||
self.data_curve_real.setPen(color=c, style=Qt.DotLine, width=2.5)
|
||||
self.data_curve_imag.setPen(color=c, style=Qt.DotLine, width=2.5)
|
||||
|
||||
|
||||
@ -159,7 +159,32 @@ class FunctionRegister:
|
||||
#print "FR: ",self.registry
|
||||
|
||||
def get_registered_functions( self ):
|
||||
return self.registry
|
||||
# returns functions, peaks sorted by tau
|
||||
|
||||
sorted_functions = list()
|
||||
tau_comp = 0
|
||||
for i_fcn, fcn in enumerate(self.registry):
|
||||
if fcn.id_string == "hn":
|
||||
for i, varname in enumerate(fcn.widget.names):
|
||||
if varname == "tau":
|
||||
if fcn._beta[i] <= tau_comp:
|
||||
sorted_functions.append(fcn)
|
||||
else:
|
||||
sorted_functions.insert(0, fcn)
|
||||
tau_comp = fcn._beta[i]
|
||||
# eps_infty to the front
|
||||
elif fcn.id_string == "eps_infty":
|
||||
sorted_functions.insert(0, fcn)
|
||||
# sort the rest lexigraphically
|
||||
elif fcn.id_string == "pwr":
|
||||
sorted_functions.append(fcn)
|
||||
elif fcn.id_string == "cond":
|
||||
sorted_functions.append(fcn)
|
||||
elif fcn.id_string == "yaff":
|
||||
sorted_functions.append(fcn)
|
||||
else:
|
||||
sorted_functions.append(fcn)
|
||||
return sorted_functions
|
||||
|
||||
|
||||
# ############# deprecated #####################
|
||||
|
||||
37
QDS.py → qds
37
QDS.py → qds
@ -252,49 +252,15 @@ class AppWindow(QMainWindow):
|
||||
pre_header += "# Time: {time}\n# SessionID={id}\n".format(time=time.strftime("%H:%M:%S"), id=self.session_id)
|
||||
pars = []
|
||||
base_filename, file_ext = os.path.splitext(self.filepath)
|
||||
# print "Registered Functions (saveFitResult): ",self.function_registry.get_registered_functions()
|
||||
header = "{n1:13}{n2:13}".format(n1="# 0:T", n2="1:invT")
|
||||
varnum = 2 # T, invT are the first two columns
|
||||
|
||||
# sort peaks by time constant tau
|
||||
sorted_functions = list()
|
||||
tau_comp = 0
|
||||
for i_fcn, fcn in enumerate(self.function_registry.get_registered_functions()):
|
||||
if fcn.id_string == "hn":
|
||||
for i, varname in enumerate(fcn.widget.names):
|
||||
if varname == "tau":
|
||||
if fcn._beta[i] <= tau_comp:
|
||||
sorted_functions.append(fcn)
|
||||
else:
|
||||
sorted_functions.insert(0, fcn)
|
||||
tau_comp = fcn._beta[i]
|
||||
# eps_infty to the front
|
||||
for a in self.function_registry.get_registered_functions():
|
||||
print a.id_string
|
||||
if a.id_string == "eps_infty":
|
||||
sorted_functions.insert(0, a)
|
||||
print a
|
||||
# sort the rest lexigraphically
|
||||
for a in self.function_registry.get_registered_functions():
|
||||
if a.id_string == "pwr":
|
||||
sorted_functions.append(a)
|
||||
print a
|
||||
for a in self.function_registry.get_registered_functions():
|
||||
if a.id_string == "cond":
|
||||
sorted_functions.append(a)
|
||||
print a
|
||||
for a in self.function_registry.get_registered_functions():
|
||||
if a.id_string == "yaff":
|
||||
print a
|
||||
sorted_functions.append(a)
|
||||
|
||||
print sorted_functions
|
||||
|
||||
for i_fcn, fcn in enumerate(sorted_functions):
|
||||
fit_function_name = fcn.id_string
|
||||
for i, name in enumerate(fcn.widget.names): # get variable names
|
||||
header += "{n:13}{n_sd:13}".format(n="%i:%s"%(varnum, name), n_sd="%i:%s_sd"%(varnum+1, name))
|
||||
varnum += 2
|
||||
pre_header += "# %s\n"%fit_function_name
|
||||
# write for each function an extra file
|
||||
fit_filename = "%s_%i.fit"%(base_filename, i_fcn)
|
||||
f_fcn = open(fit_filename, 'w')
|
||||
@ -442,7 +408,6 @@ class AppWindow(QMainWindow):
|
||||
self.function_registry.get_registered_functions()
|
||||
if key.id_string == 'hn']
|
||||
self.peakId = 1
|
||||
print id_list
|
||||
while self.peakId in id_list:
|
||||
self.peakId += 1
|
||||
_peak = Peak(id_num=self.peakId,
|
||||
Loading…
Reference in New Issue
Block a user