Author: bugman
Date: Tue Feb 23 22:31:03 2010
New Revision: 10877
URL: http://svn.gna.org/viewcvs/relax?rev=10877&view=rev
Log:
User function fixes to match the changes to the user function framework
The exec_info box is now being used.
Modified:
branches/bmrb/prompt/bmrb.py
branches/bmrb/prompt/molecule.py
branches/bmrb/prompt/relax_data.py
branches/bmrb/prompt/spin.py
Modified: branches/bmrb/prompt/bmrb.py
URL:
http://svn.gna.org/viewcvs/relax/branches/bmrb/prompt/bmrb.py?rev=10877&r1=10876&r2=10877&view=diff
==============================================================================
--- branches/bmrb/prompt/bmrb.py (original)
+++ branches/bmrb/prompt/bmrb.py Tue Feb 23 22:31:03 2010
@@ -24,9 +24,6 @@
"""Module containing the BMRB user function class."""
__docformat__ = 'plaintext'
-# Python module imports.
-import sys
-
# relax module imports.
from base_class import User_fn_class
import arg_check
@@ -125,8 +122,8 @@
"""
# Function intro text.
- if self.__relax__.interpreter.intro:
- text = sys.ps3 + "bmrb.citation("
+ if self.exec_info.intro:
+ text = self.exec_info.ps3 + "bmrb.citation("
text = text + "cite_id=" + repr(cite_id)
text = text + ", authors=" + repr(authors)
text = text + ", doi=" + repr(doi)
@@ -169,8 +166,8 @@
"""Display the BMRB data in NMR-STAR format."""
# Function intro text.
- if self.__relax__.interpreter.intro:
- text = sys.ps3 + "bmrb.display("
+ if self.exec_info.intro:
+ text = self.exec_info.ps3 + "bmrb.display("
text = text + "version=" + repr(version) + ")"
print(text)
@@ -196,8 +193,8 @@
"""
# Function intro text.
- if self.__relax__.interpreter.intro:
- text = sys.ps3 + "bmrb.read("
+ if self.exec_info.intro:
+ text = self.exec_info.ps3 + "bmrb.read("
text = text + "file=" + repr(file)
text = text + ", dir=" + repr(dir)
text = text + ", version=" + repr(version) + ")"
@@ -299,8 +296,8 @@
"""
# Function intro text.
- if self.__relax__.interpreter.intro:
- text = sys.ps3 + "bmrb.script("
+ if self.exec_info.intro:
+ text = self.exec_info.ps3 + "bmrb.script("
text = text + "file=" + repr(file)
text = text + ", dir=" + repr(dir)
text = text + ", analysis_type=" + repr(analysis_type)
@@ -374,8 +371,8 @@
"""
# Function intro text.
- if self.__relax__.interpreter.intro:
- text = sys.ps3 + "bmrb.software("
+ if self.exec_info.intro:
+ text = self.exec_info.ps3 + "bmrb.software("
text = text + "name=" + repr(name)
text = text + ", version=" + repr(version)
text = text + ", url=" + repr(url)
@@ -432,8 +429,8 @@
"""
# Function intro text.
- if self.__relax__.interpreter.intro:
- text = sys.ps3 + "bmrb.software_select("
+ if self.exec_info.intro:
+ text = self.exec_info.ps3 + "bmrb.software_select("
text = text + "name=" + repr(name)
text = text + ", version=" + repr(version) + ")"
print(text)
@@ -485,8 +482,8 @@
"""
# Function intro text.
- if self.__relax__.interpreter.intro:
- text = sys.ps3 + "bmrb.thiol_state("
+ if self.exec_info.intro:
+ text = self.exec_info.ps3 + "bmrb.thiol_state("
text = text + "state=" + repr(state) + ")"
print(text)
@@ -522,8 +519,8 @@
"""
# Function intro text.
- if self.__relax__.interpreter.intro:
- text = sys.ps3 + "bmrb.write("
+ if self.exec_info.intro:
+ text = self.exec_info.ps3 + "bmrb.write("
text = text + "file=" + repr(file)
text = text + ", dir=" + repr(dir)
text = text + ", version=" + repr(version)
Modified: branches/bmrb/prompt/molecule.py
URL:
http://svn.gna.org/viewcvs/relax/branches/bmrb/prompt/molecule.py?rev=10877&r1=10876&r2=10877&view=diff
==============================================================================
--- branches/bmrb/prompt/molecule.py (original)
+++ branches/bmrb/prompt/molecule.py Tue Feb 23 22:31:03 2010
@@ -267,8 +267,8 @@
"""
# Function intro text.
- if self.__relax__.interpreter.intro:
- text = sys.ps3 + "molecule.type("
+ if self.exec_info.intro:
+ text = self.exec_info.ps3 + "molecule.type("
text = text + "mol_id=" + repr(mol_id)
text = text + ", type=" + repr(type)
text = text + ", force=" + repr(force) + ")"
Modified: branches/bmrb/prompt/relax_data.py
URL:
http://svn.gna.org/viewcvs/relax/branches/bmrb/prompt/relax_data.py?rev=10877&r1=10876&r2=10877&view=diff
==============================================================================
--- branches/bmrb/prompt/relax_data.py (original)
+++ branches/bmrb/prompt/relax_data.py Tue Feb 23 22:31:03 2010
@@ -218,8 +218,8 @@
"""
# Function intro text.
- if self.__relax__.interpreter.intro:
- text = sys.ps3 + "relax_data.peak_intensity_type("
+ if self.exec_info.intro:
+ text = self.exec_info.ps3 + "relax_data.peak_intensity_type("
text = text + "ri_label=" + repr(ri_label)
text = text + ", frq_label=" + repr(frq_label)
text = text + ", type=" + repr(type) + ")"
@@ -384,8 +384,8 @@
"""
# Function intro text.
- if self.__relax__.interpreter.intro:
- text = sys.ps3 + "relax_data.temp_calibration("
+ if self.exec_info.intro:
+ text = self.exec_info.ps3 + "relax_data.temp_calibration("
text = text + "ri_label=" + repr(ri_label)
text = text + ", frq_label=" + repr(frq_label)
text = text + ", method=" + repr(method) + ")"
@@ -428,8 +428,8 @@
"""
# Function intro text.
- if self.__relax__.interpreter.intro:
- text = sys.ps3 + "relax_data.temp_control("
+ if self.exec_info.intro:
+ text = self.exec_info.ps3 + "relax_data.temp_control("
text = text + "ri_label=" + repr(ri_label)
text = text + ", frq_label=" + repr(frq_label)
text = text + ", method=" + repr(method) + ")"
Modified: branches/bmrb/prompt/spin.py
URL:
http://svn.gna.org/viewcvs/relax/branches/bmrb/prompt/spin.py?rev=10877&r1=10876&r2=10877&view=diff
==============================================================================
--- branches/bmrb/prompt/spin.py (original)
+++ branches/bmrb/prompt/spin.py Tue Feb 23 22:31:03 2010
@@ -287,8 +287,8 @@
"""
# Function intro text.
- if self.__relax__.interpreter.intro:
- text = sys.ps3 + "spin.element("
+ if self.exec_info.intro:
+ text = self.exec_info.ps3 + "spin.element("
text = text + "spin_id=" + repr(spin_id)
text = text + ", element=" + repr(element)
text = text + ", force=" + repr(force) + ")"
r10877 - in /branches/bmrb/prompt: bmrb.py molecule.py relax_data.py spin.py