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

Added Gb distribution to YAFF menu

Browse Source
This commit is contained in:
Markus Rosenstihl 2014-09-24 16:19:46 +02:00
parent 1fe6057cd6
commit 0a32f6576a
4 changed files with 56 additions and 51 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
YAFFConfig.py
View File

@ -2,7 +2,7 @@
# Form implementation generated from reading ui file 'YAFFConfig.ui' # Form implementation generated from reading ui file 'YAFFConfig.ui'
# #
# Created: Tue Jul 29 08:56:48 2014 # Created: Tue Sep 23 21:38:12 2014
# by: PyQt4 UI code generator 4.11.1 # by: PyQt4 UI code generator 4.11.1
# #
# WARNING! All changes made in this file will be lost! # WARNING! All changes made in this file will be lost!
@ -17,14 +17,12 @@ except AttributeError:
try: try:
_encoding = QtGui.QApplication.UnicodeUTF8 _encoding = QtGui.QApplication.UnicodeUTF8
def _translate(context, text, disambig): def _translate(context, text, disambig):
return QtGui.QApplication.translate(context, text, disambig, _encoding) return QtGui.QApplication.translate(context, text, disambig, _encoding)
except AttributeError: except AttributeError:
def _translate(context, text, disambig): def _translate(context, text, disambig):
return QtGui.QApplication.translate(context, text, disambig) return QtGui.QApplication.translate(context, text, disambig)
class Ui_Dialog(object): class Ui_Dialog(object):
def setupUi(self, Dialog): def setupUi(self, Dialog):
Dialog.setObjectName(_fromUtf8("Dialog")) Dialog.setObjectName(_fromUtf8("Dialog"))
@ -99,19 +97,11 @@ class Ui_Dialog(object):
def retranslateUi(self, Dialog): def retranslateUi(self, Dialog):
Dialog.setWindowTitle(_translate("Dialog", "YAFF Configuration", None)) Dialog.setWindowTitle(_translate("Dialog", "YAFF Configuration", None))
self.groupBox_time.setTitle(_translate("Dialog", "Time values (log10[t])", None)) self.groupBox_time.setTitle(_translate("Dialog", "Time values (log10[t])", None))
self.label.setText(_translate("Dialog", self.label.setText(_translate("Dialog", "<html><head/><body><p>t<span style=\" vertical-align:sub;\">min</span></p></body></html>", None))
"<html><head/><body><p>t<span style=\" vertical-align:sub;\">min</span></p></body></html>", self.label_2.setText(_translate("Dialog", "<html><head/><body><p>t<span style=\" vertical-align:sub;\">max</span></p></body></html>", None))
None))
self.label_2.setText(_translate("Dialog",
"<html><head/><body><p>t<span style=\" vertical-align:sub;\">max</span></p></body></html>",
None))
self.label_3.setText(_translate("Dialog", "N", None)) self.label_3.setText(_translate("Dialog", "N", None))
self.groupBox_tau.setTitle(_translate("Dialog", "τ-Distribution (log10[τ])", None)) self.groupBox_tau.setTitle(_translate("Dialog", "τ-Distribution (log10[τ])", None))
self.label_7.setText(_translate("Dialog", self.label_7.setText(_translate("Dialog", "<html><head/><body><p>t<span style=\" vertical-align:sub;\">min</span></p></body></html>", None))
"<html><head/><body><p>t<span style=\" vertical-align:sub;\">min</span></p></body></html>", self.label_8.setText(_translate("Dialog", "<html><head/><body><p>t<span style=\" vertical-align:sub;\">max</span></p></body></html>", None))
None))
self.label_8.setText(_translate("Dialog",
"<html><head/><body><p>t<span style=\" vertical-align:sub;\">max</span></p></body></html>",
None))
self.label_9.setText(_translate("Dialog", "N", None)) self.label_9.setText(_translate("Dialog", "N", None))

18
YAFFparameters.py
View File

@ -2,7 +2,7 @@
# Form implementation generated from reading ui file 'YAFFparameters.ui' # Form implementation generated from reading ui file 'YAFFparameters.ui'
# #
# Created: Tue Jul 29 08:56:48 2014 # Created: Tue Sep 23 21:38:12 2014
# by: PyQt4 UI code generator 4.11.1 # by: PyQt4 UI code generator 4.11.1
# #
# WARNING! All changes made in this file will be lost! # WARNING! All changes made in this file will be lost!
@ -17,14 +17,12 @@ except AttributeError:
try: try:
_encoding = QtGui.QApplication.UnicodeUTF8 _encoding = QtGui.QApplication.UnicodeUTF8
def _translate(context, text, disambig): def _translate(context, text, disambig):
return QtGui.QApplication.translate(context, text, disambig, _encoding) return QtGui.QApplication.translate(context, text, disambig, _encoding)
except AttributeError: except AttributeError:
def _translate(context, text, disambig): def _translate(context, text, disambig):
return QtGui.QApplication.translate(context, text, disambig) return QtGui.QApplication.translate(context, text, disambig)
class Ui_Form(object): class Ui_Form(object):
def setupUi(self, Form): def setupUi(self, Form):
Form.setObjectName(_fromUtf8("Form")) Form.setObjectName(_fromUtf8("Form"))
@ -257,6 +255,7 @@ class Ui_Form(object):
self.comboBox.addItem(_fromUtf8("")) self.comboBox.addItem(_fromUtf8(""))
self.comboBox.addItem(_fromUtf8("")) self.comboBox.addItem(_fromUtf8(""))
self.comboBox.addItem(_fromUtf8("")) self.comboBox.addItem(_fromUtf8(""))
self.comboBox.addItem(_fromUtf8(""))
self.gridLayout.addWidget(self.comboBox, 0, 1, 1, 1) self.gridLayout.addWidget(self.comboBox, 0, 1, 1, 1)
self.removeButton = QtGui.QPushButton(Form) self.removeButton = QtGui.QPushButton(Form)
self.removeButton.setObjectName(_fromUtf8("removeButton")) self.removeButton.setObjectName(_fromUtf8("removeButton"))
@ -283,24 +282,21 @@ class Ui_Form(object):
self.label_huh.setText(_translate("Form", "TextLabel", None)) self.label_huh.setText(_translate("Form", "TextLabel", None))
self.label_2.setText(_translate("Form", "TextLabel", None)) self.label_2.setText(_translate("Form", "TextLabel", None))
self.label_102.setText(_translate("Form", "g", None)) self.label_102.setText(_translate("Form", "g", None))
self.label_222.setText( self.label_222.setText(_translate("Form", "<html><head/><body><p>τ<span style=\" vertical-align:sub;\">α</span></p></body></html>", None))
_translate("Form", "<html><head/><body><p>τ<span style=\" vertical-align:sub;\">α</span></p></body></html>",
None))
self.label_322.setText(_translate("Form", "α", None)) self.label_322.setText(_translate("Form", "α", None))
self.label_8.setText(_translate("Form", "TextLabel", None)) self.label_8.setText(_translate("Form", "TextLabel", None))
self.label_1.setText(_translate("Form", "TextLabel", None)) self.label_1.setText(_translate("Form", "TextLabel", None))
self.label_3.setText(_translate("Form", "TextLabel", None)) self.label_3.setText(_translate("Form", "TextLabel", None))
self.label_82.setText(_translate("Form", "b", None)) self.label_82.setText(_translate("Form", "b", None))
self.label_622.setText( self.label_622.setText(_translate("Form", "<html><head/><body><p>τ<span style=\" vertical-align:sub;\">β</span></p></body></html>", None))
_translate("Form", "<html><head/><body><p>τ<span style=\" vertical-align:sub;\">β</span></p></body></html>",
None))
self.label_7.setText(_translate("Form", "TextLabel", None)) self.label_7.setText(_translate("Form", "TextLabel", None))
self.label_72.setText(_translate("Form", "a", None)) self.label_72.setText(_translate("Form", "a", None))
self.label_23.setText(_translate("Form", "Fix", None)) self.label_23.setText(_translate("Form", "Fix", None))
self.comboBox.setItemText(0, _translate("Form", "GG", None)) self.comboBox.setItemText(0, _translate("Form", "GG", None))
self.comboBox.setItemText(1, _translate("Form", "GGe", None)) self.comboBox.setItemText(1, _translate("Form", "GGe", None))
self.comboBox.setItemText(2, _translate("Form", "GG + b", None)) self.comboBox.setItemText(2, _translate("Form", "Gb", None))
self.comboBox.setItemText(3, _translate("Form", "GGe + b", None)) self.comboBox.setItemText(3, _translate("Form", "GG + b", None))
self.comboBox.setItemText(4, _translate("Form", "GGe + b", None))
self.removeButton.setText(_translate("Form", "Remove", None)) self.removeButton.setText(_translate("Form", "Remove", None))
self.configButton.setText(_translate("Form", "Configure", None)) self.configButton.setText(_translate("Form", "Configure", None))

5
YAFFparameters.ui
View File

@ -441,6 +441,11 @@
<string>GGe</string> <string>GGe</string>
</property> </property>
</item> </item>
<item>
<property name="text">
<string>Gb</string>
</property>
</item>
<item> <item>
<property name="text"> <property name="text">
<string>GG + b</string> <string>GG + b</string>

14
libyaff.py
View File

@ -45,6 +45,7 @@ class Yaff(QObject):
yaff = [ yaff = [
(self.yaff_gg, "GG"), (self.yaff_gg, "GG"),
(self.yaff_gge, "GGe"), (self.yaff_gge, "GGe"),
(self.yaff_gb, "Gb"),
(self.yaff, "GG + GGb"), (self.yaff, "GG + GGb"),
(self.yaff_extended, "GGe + GGb"), (self.yaff_extended, "GGe + GGb"),
] ]
@ -205,6 +206,19 @@ class Yaff(QObject):
self.step_signal.emit(list(p)) self.step_signal.emit(list(p))
return epp return epp
def yaff_gb(self, p,x, cb=None):
"""
GG
"""
delta_eps, tau1, a1, b1, lambd, tau2, a2, b2, s, g = p
#ts = logspace(-10,5,512*2)
dist_ggb = self.ggb(p=[tau2, a2, b2], tau=self.dist_tau)
self.dist_y = dist_ggb
phi_alpha = self.dist_to_relax(self.time_points, self.dist_tau, self.dist_y).real
epp = delta_eps*2*pi*x*filon(2*pi*x, self.time_points, phi_alpha )
self.step_signal.emit(list(p))
return epp
def yaff_gg(self, p,x, cb=None): def yaff_gg(self, p,x, cb=None):
""" """
GG GG