r16784 - in /branches/uf_redesign/gui/analyses: auto_noe.py auto_rx_base.py -- June 08, 2012 - 17:29

Author: bugman
Date: Fri Jun  8 17:29:04 2012
New Revision: 16784

URL: http://svn.gna.org/viewcvs/relax?rev=16784&view=rev
Log:
The GUI now sends the pipe bundle name into the relax_fit and noe 
auto-analyses.


Modified:
    branches/uf_redesign/gui/analyses/auto_noe.py
    branches/uf_redesign/gui/analyses/auto_rx_base.py

Modified: branches/uf_redesign/gui/analyses/auto_noe.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/uf_redesign/gui/analyses/auto_noe.py?rev=16784&r1=16783&r2=16784&view=diff
==============================================================================
--- branches/uf_redesign/gui/analyses/auto_noe.py (original)
+++ branches/uf_redesign/gui/analyses/auto_noe.py Fri Jun  8 17:29:04 2012
@@ -155,8 +155,9 @@
         data = Container()
         missing = []
 
-        # The pipe name.
+        # The pipe name and bundle.
         data.pipe_name = self.data.pipe_name
+        data.pipe_bundle = self.data.pipe_bundle
 
         # The frequency.
         frq = gui_to_str(self.field_nmr_frq.GetValue())
@@ -522,7 +523,7 @@
         """Execute the calculation."""
 
         # Execute.
-        NOE_calc(pipe_name=self.data.pipe_name, 
file_root=self.data.file_root, results_dir=self.data.save_dir, 
save_state=False)
+        NOE_calc(pipe_name=self.data.pipe_name, 
pipe_bundle=self.data.pipe_bundle, file_root=self.data.file_root, 
results_dir=self.data.save_dir, save_state=False)
 
         # Alias the relax data store data.
         data = ds.relax_gui.analyses[self.data_index]

Modified: branches/uf_redesign/gui/analyses/auto_rx_base.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/uf_redesign/gui/analyses/auto_rx_base.py?rev=16784&r1=16783&r2=16784&view=diff
==============================================================================
--- branches/uf_redesign/gui/analyses/auto_rx_base.py (original)
+++ branches/uf_redesign/gui/analyses/auto_rx_base.py Fri Jun  8 17:29:04 2012
@@ -160,8 +160,9 @@
         data = Container()
         missing = []
 
-        # The pipe name.
+        # The pipe name and bundle.
         data.pipe_name = self.data.pipe_name
+        data.pipe_bundle = self.data.pipe_bundle
 
         # The frequency.
         frq = gui_to_str(self.field_nmr_frq.GetValue())
@@ -550,7 +551,7 @@
         """Execute the calculation."""
 
         # Execute.
-        Relax_fit(pipe_name=self.data.pipe_name, 
file_root=self.data.file_root, results_dir=self.data.save_dir, 
grid_inc=self.data.inc, mc_sim_num=self.data.mc_sim_num, view_plots=False)
+        Relax_fit(pipe_name=self.data.pipe_name, 
pipe_bundle=self.data.pipe_bundle, file_root=self.data.file_root, 
results_dir=self.data.save_dir, grid_inc=self.data.inc, 
mc_sim_num=self.data.mc_sim_num, view_plots=False)
 
         # Alias the relax data store data.
         data = ds.relax_gui.analyses[self.data_index]