Author: bugman
Date: Tue Oct 7 14:32:47 2014
New Revision: 26184
URL: http://svn.gna.org/viewcvs/relax?rev=26184&view=rev
Log:
Merged revisions 26165-26166 via svnmerge from
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/trunk
........
r26165 | bugman | 2014-10-06 16:35:18 +0200 (Mon, 06 Oct 2014) | 7 lines
Fix for the pipe_control.exp_info.bmrb_write_software() function.
This was broken back at r26071
(http://article.gmane.org/gmane.science.nmr.relax.scm/23822). The
variable name change of software.name to software.software_name was not
applied to the
pipe_control.exp_info module. This caused a few of the Bmrb system tests
to fail.
........
r26166 | bugman | 2014-10-06 16:37:17 +0200 (Mon, 06 Oct 2014) | 5 lines
Added a BMRB NMR-STAR formatted deposition file for the OMP model-free data
for reference.
This is because there are no other NMR-STAR formatted files in the relax
sources.
........
Added:
branches/frame_order_cleanup/test_suite/shared_data/model_free/OMP/bmrb.star
- copied unchanged from r26166,
trunk/test_suite/shared_data/model_free/OMP/bmrb.star
branches/frame_order_cleanup/test_suite/shared_data/model_free/OMP/bmrb_deposition.py
- copied unchanged from r26166,
trunk/test_suite/shared_data/model_free/OMP/bmrb_deposition.py
Modified:
branches/frame_order_cleanup/ (props changed)
branches/frame_order_cleanup/pipe_control/exp_info.py
Propchange: branches/frame_order_cleanup/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Tue Oct 7 14:32:47 2014
@@ -1 +1 @@
-/trunk:1-26139,26142-26164
+/trunk:1-26139,26142-26166
Modified: branches/frame_order_cleanup/pipe_control/exp_info.py
URL:
http://svn.gna.org/viewcvs/relax/branches/frame_order_cleanup/pipe_control/exp_info.py?rev=26184&r1=26183&r2=26184&view=diff
==============================================================================
--- branches/frame_order_cleanup/pipe_control/exp_info.py (original)
+++ branches/frame_order_cleanup/pipe_control/exp_info.py Tue Oct 7
14:32:47 2014
@@ -157,11 +157,11 @@
cite_id_nums.append(cdp.exp_info.get_cite_id_num(cite))
# The program info.
- id = star.software.add(name=software.name,
version=software.version, vendor_name=software.vendor_name,
vendor_eaddress=software.url, task=software.tasks, cite_ids=cite_id_nums)
+ id = star.software.add(name=software.software_name,
version=software.version, vendor_name=software.vendor_name,
vendor_eaddress=software.url, task=software.tasks, cite_ids=cite_id_nums)
# Append the software info.
software_ids.append(id)
- software_labels.append(software.name)
+ software_labels.append(software.software_name)
# relax cannot be the only program used!
else:
r26184 - in /branches/frame_order_cleanup: ./ pipe_control/ test_suite/shared_data/model_free/OMP/