Author: bugman
Date: Mon Dec 8 15:52:19 2014
New Revision: 27015
URL: http://svn.gna.org/viewcvs/relax?rev=27015&view=rev
Log:
Merged revisions 27008-27009,27011,27014 via svnmerge from
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/trunk
........
r27008 | tlinnet | 2014-12-08 00:03:07 +0100 (Mon, 08 Dec 2014) | 1 line
Comment fix in user function select.sn_ratio and deselect.sn_ratio.
........
r27009 | bugman | 2014-12-08 09:27:28 +0100 (Mon, 08 Dec 2014) | 7 lines
Important fix for the spectrum.error_analysis_per_field user function.
This is for the compilation of the user manual. The possessive apostrophe
should not be used in the
text "spectrum ID's". This grammar error triggers an unfortunate bug in
the docstring fetching
script docs/latex/fetch_docstrings.py whereby the script thinks that ' is
the start of a quote.
........
r27011 | bugman | 2014-12-08 11:03:44 +0100 (Mon, 08 Dec 2014) | 7 lines
Added a compressed EPS version of the
128x128/actions/document-preview-archive Oxygen icon.
The EPS bounding box was manually changed to 0 0 18 18 in a text editor.
The scanline translation
parameters were also fixed by changing them all to 18 as well. This allows
the icon to be used in
the relax manual.
........
r27014 | bugman | 2014-12-08 15:50:04 +0100 (Mon, 08 Dec 2014) | 5 lines
Fix for the blacklist objects in data_store.data_classes.Element.to_xml().
The class blacklist variable was not being taken into account.
........
Added:
branches/nmrglue/graphics/oxygen_icons/128x128/actions/document-preview-archive.eps.gz
- copied unchanged from r27014,
trunk/graphics/oxygen_icons/128x128/actions/document-preview-archive.eps.gz
Modified:
branches/nmrglue/ (props changed)
branches/nmrglue/data_store/data_classes.py
branches/nmrglue/user_functions/deselect.py
branches/nmrglue/user_functions/select.py
branches/nmrglue/user_functions/spectrum.py
Propchange: branches/nmrglue/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Mon Dec 8 15:52:19 2014
@@ -1 +1 @@
-/trunk:1-26998
+/trunk:1-27014
Modified: branches/nmrglue/data_store/data_classes.py
URL:
http://svn.gna.org/viewcvs/relax/branches/nmrglue/data_store/data_classes.py?rev=27015&r1=27014&r2=27015&view=diff
==============================================================================
--- branches/nmrglue/data_store/data_classes.py (original)
+++ branches/nmrglue/data_store/data_classes.py Mon Dec 8 15:52:19 2014
@@ -137,7 +137,7 @@
cont_element.setAttribute('desc', self.desc)
# Blacklisted objects.
- blacklist = ['name', 'desc', 'blacklist'] +
list(Element.__dict__.keys()) + list(self.__class__.__dict__.keys()) +
list(object.__dict__.keys())
+ blacklist = self.blacklist + ['name', 'desc', 'blacklist'] +
list(Element.__dict__.keys()) + list(self.__class__.__dict__.keys()) +
list(object.__dict__.keys())
# Store and blacklist the objects which have to_xml() methods.
to_xml_list = []
Modified: branches/nmrglue/user_functions/deselect.py
URL:
http://svn.gna.org/viewcvs/relax/branches/nmrglue/user_functions/deselect.py?rev=27015&r1=27014&r2=27015&view=diff
==============================================================================
--- branches/nmrglue/user_functions/deselect.py (original)
+++ branches/nmrglue/user_functions/deselect.py Mon Dec 8 15:52:19 2014
@@ -286,7 +286,7 @@
# The deselect.sn_ratio user function.
uf = uf_info.add_uf("deselect.sn_ratio")
-uf.title = "Deselect spins with signal to noise ratio higher or lower than
ratio."
+uf.title = "Deselect spins with signal to noise ratio higher or lower than
the given ratio."
uf.title_short = "Spin signal to noise deselection."
uf.display = True
uf.add_keyarg(
@@ -330,8 +330,9 @@
)
# Description.
uf.desc.append(Desc_container())
-uf.desc[-1].add_paragraph("The comparison operation is the method which to
deselect spins accorfing to: operation(sn_ratio, ratio).")
-uf.desc[-1].add_paragraph("The 'all_sn' flag default is False, meaning that
if any of the spins signal to noise levels evaluates to True in the
comparison, the spin is deselected.")
+uf.desc[-1].add_paragraph("The comparison operation is the method which to
deselect spins according to: operation(sn_ratio, ratio).")
+uf.desc[-1].add_paragraph("The possible operations are: '<':strictly less
than, '<=':less than or equal, '>':strictly greater than, '>=':greater than
or equal, '==':equal, '!=':not equal.")
+uf.desc[-1].add_paragraph("The 'all_sn' flag default is False, meaning that
if any of the spin's signal to noise levels evaluates to True in the
comparison, the spin is deselected.")
# Prompt examples.
uf.desc.append(Desc_container("Prompt examples"))
uf.desc[-1].add_paragraph("To deselect all spins with a signal to noise
ratio lower than 10.0:")
Modified: branches/nmrglue/user_functions/select.py
URL:
http://svn.gna.org/viewcvs/relax/branches/nmrglue/user_functions/select.py?rev=27015&r1=27014&r2=27015&view=diff
==============================================================================
--- branches/nmrglue/user_functions/select.py (original)
+++ branches/nmrglue/user_functions/select.py Mon Dec 8 15:52:19 2014
@@ -365,7 +365,7 @@
# The select.sn_ratio user function.
uf = uf_info.add_uf("select.sn_ratio")
-uf.title = "Select spins with signal to noise ratio higher or lower than
ratio."
+uf.title = "Select spins with signal to noise ratio higher or lower than the
given ratio."
uf.title_short = "Spin signal to noise selection."
uf.display = True
uf.add_keyarg(
@@ -409,8 +409,9 @@
)
# Description.
uf.desc.append(Desc_container())
-uf.desc[-1].add_paragraph("The comparison operation is the method which to
select spins accorfing to: operation(sn_ratio, ratio).")
-uf.desc[-1].add_paragraph("The 'all_sn' flag default is True, meaning that
if all of the spins signal to noise levels evaluates to True in the
comparison, the spin is selected.")
+uf.desc[-1].add_paragraph("The comparison operation is the method which to
select spins according to: operation(sn_ratio, ratio).")
+uf.desc[-1].add_paragraph("The possible operations are: '<':strictly less
than, '<=':less than or equal, '>':strictly greater than, '>=':greater than
or equal, '==':equal, '!=':not equal.")
+uf.desc[-1].add_paragraph("The 'all_sn' flag default is True, meaning that
if all of the spin's signal to noise levels evaluates to True in the
comparison, the spin is selected.")
# Prompt examples.
uf.desc.append(Desc_container("Prompt examples"))
uf.desc[-1].add_paragraph("To select all spins with a signal to noise ratio
higher than 10.0:")
Modified: branches/nmrglue/user_functions/spectrum.py
URL:
http://svn.gna.org/viewcvs/relax/branches/nmrglue/user_functions/spectrum.py?rev=27015&r1=27014&r2=27015&view=diff
==============================================================================
--- branches/nmrglue/user_functions/spectrum.py (original)
+++ branches/nmrglue/user_functions/spectrum.py Mon Dec 8 15:52:19 2014
@@ -176,16 +176,16 @@
# The spectrum.error_analysis_per_field user function.
uf = uf_info.add_uf('spectrum.error_analysis_per_field')
-uf.title = "Use spectrum ID's per each field strength for an error analysis
for peak intensities."
+uf.title = "Use spectrum IDs per each field strength for an error analysis
for peak intensities."
uf.title_short = "Per field strength peak intensity error analysis."
# Description.
uf.desc.append(Desc_container())
uf.desc[-1].add_paragraph("Please see the spectrum.error_analysis user
function documentation.")
-uf.desc[-1].add_paragraph("This user function will collect all spectrum ID's
for each field strength separately, and call the spectrum.error_analysis with
these.")
+uf.desc[-1].add_paragraph("This user function will collect all spectrum IDs
for each field strength separately, and call the spectrum.error_analysis with
these.")
uf.desc[-1].add_paragraph("This function is meant as a short-cut for the
spectrum.error_analysis function.")
# Prompt examples.
uf.desc.append(Desc_container("Prompt examples"))
-uf.desc[-1].add_paragraph("To collect all spectrum ID's per field strength,
and perform peak intensity error analysis:")
+uf.desc[-1].add_paragraph("To collect all spectrum IDs per field strength,
and perform peak intensity error analysis:")
uf.desc[-1].add_prompt("relax> spectrum.error_analysis_per_field()")
uf.backend = spectrum.error_analysis_per_field
uf.menu_text = "&error_analysis_per_field"
@@ -602,4 +602,4 @@
uf.gui_icon = "relax.fid"
uf.wizard_size = (600, 400)
uf.wizard_image = WIZARD_IMAGE_PATH + 'spectrum' + sep + 'spectrum_200.png'
-uf.wizard_apply_button = False
+uf.wizard_apply_button = False
r27015 - in /branches/nmrglue: ./ data_store/ graphics/oxygen_icons/128x128/actions/ user_functions/