markusro/qdsfit
1
0
Fork 0
Code Issues Pull Requests Releases Activity

function registry with fixed container order

Browse Source
This commit is contained in:
Markus Rosenstihl
2014-09-25 17:14:50 +02:00
parent 582019d7cb
commit 1a1066a07e
4 changed files with 61 additions and 69 deletions
Download Patch File Download Diff File Expand all files Collapse all files

61
data/Container.py
View File

@@ -1,75 +1,78 @@
# -*- 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"
self.param_number = 3
def function(self, p, x ):
def function( self, p, x ):
om = 2*np.pi*x
sgma, isgma, n = p
cond = sgma/(om**n) + isgma/(1j*om**n) # Jonscher (Universal Dielectric Response: e",e' prop sigma/omega**n
cond = sgma/(om**n)+isgma/(1j*om**n) # Jonscher (Universal Dielectric Response: e",e' prop sigma/omega**n
cplx = np.array([cond.real, -cond.imag])
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
sgma, n = p
power = sgma/(om*1j)**n
cplx = np.array([power.real, -power.imag])
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
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,18 +82,18 @@ class Peak(BaseObject):
self.param_number = 4
def function( self, p, x ):
BaseObject.function(self,p,x)
eps,t,a,b = p
BaseContainer.function(self, p, x)
eps, t, a, b = p
om = 2*np.pi*x
hn = eps/(1+(1j*om*t)**a)**b
cplx = np.array([hn.real, -hn.imag])
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))
@@ -101,19 +104,19 @@ class YAFF(BaseObject):
self._selector_mask = self.widget.selector_mask
@property
def param_number(self):
def param_number( self ):
return self._param_number
@param_number.setter
def param_number(self, num=None):
def param_number( self, num=None ):
self._param_number = self._libyaff.params
def change_configuration(self, t_list, tau_list):
def change_configuration( self, t_list, tau_list ):
self._libyaff.dist_tau = tau_list
self._libyaff.time_points = t_list
self.updateData()
def change_model(self):
def change_model( self ):
self._libyaff = yafflib.Yaff(self.widget.getYaffType())
self._selector_mask = self.widget.selector_mask
self.id_label = self._libyaff.label
@@ -121,7 +124,7 @@ class YAFF(BaseObject):
self.updateData()
def function( self, p, x ):
BaseObject.function(self,p,x)
ya = self._libyaff.loss( p, x)
BaseContainer.function(self, p, x)
ya = self._libyaff.loss(p, x)
cplx = np.array([ya.imag, ya.real])
return cplx

5
data/container_base.py
View File

@@ -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)