Hi Troels, For this commit message, the meaning is confusing. You should have mentioned that this is for the relaxation dispersion auto-analysis. Otherwise users will be tricked by the release notes into thinking that all results files in all analyses and all parts of relax will have spaces replaced with '_'. More care needs to be taken.
Cheers, Edward On 20 August 2014 23:03, <tlin...@nmr-relax.com> wrote: > Author: tlinnet > Date: Wed Aug 20 23:03:53 2014 > New Revision: 25132 > > URL: http://svn.gna.org/viewcvs/relax?rev=25132&view=rev > Log: > Replaced that folder names for writing out results should be with replaced > with underscores "_". > > Added: > > trunk/test_suite/shared_data/dispersion/bug_21715_clustered_indexerror/non_clustered/No_Rex/ > > trunk/test_suite/shared_data/dispersion/bug_21715_clustered_indexerror/non_clustered/No_Rex/results.bz2 > - copied, changed from r25131, > trunk/test_suite/shared_data/dispersion/bug_21715_clustered_indexerror/non_clustered/No > Rex/results.bz2 > Removed: > > trunk/test_suite/shared_data/dispersion/bug_21715_clustered_indexerror/non_clustered/No > Rex/results.bz2 > Modified: > trunk/auto_analyses/relax_disp.py > > Modified: trunk/auto_analyses/relax_disp.py > URL: > http://svn.gna.org/viewcvs/relax/trunk/auto_analyses/relax_disp.py?rev=25132&r1=25131&r2=25132&view=diff > ============================================================================== > --- trunk/auto_analyses/relax_disp.py (original) > +++ trunk/auto_analyses/relax_disp.py Wed Aug 20 23:03:53 2014 > @@ -388,11 +388,13 @@ > return equivalent > > > - def optimise(self, model=None): > + def optimise(self, model=None, model_path=None): > """Optimise the model, taking model nesting into account. > > - @keyword model: The model to be optimised. > - @type model: str > + @keyword model: The model to be optimised. > + @type model: str > + @keyword model_path: The folder name for the model, where > possible spaces has been replaced with underscore. > + @type model: str > """ > > # Printout. > @@ -409,7 +411,7 @@ > # Use pre-run results as the optimisation starting point. > # Test if file exists. > if self.pre_run_dir: > - path = self.pre_run_dir + sep + model > + path = self.pre_run_dir + sep + model_path > # File path. > file_path = get_file_path('results', path) > > @@ -422,7 +424,7 @@ > res_file_exists = False > > if self.pre_run_dir and res_file_exists: > - self.pre_run_parameters(model=model) > + self.pre_run_parameters(model=model, model_path=model_path) > > # Otherwise use the normal nesting check and grid search if not > nested. > else: > @@ -510,11 +512,13 @@ > self.interpreter.monte_carlo.error_analysis() > > > - def pre_run_parameters(self, model=None): > + def pre_run_parameters(self, model=None, model_path=None): > """Copy parameters from an earlier analysis. > > - @keyword model: The model to be optimised. > - @type model: str > + @keyword model: The model to be optimised. > + @type model: str > + @keyword model_path: The folder name for the model, where > possible spaces has been replaced with underscore. > + @type model: str > """ > > # Printout. > @@ -527,7 +531,7 @@ > self.interpreter.pipe.create(pipe_name=pipe_name, > pipe_type='relax_disp') > > # Load the previous results. > - path = self.pre_run_dir + sep + model > + path = self.pre_run_dir + sep + model_path > self.interpreter.results.read(file='results', dir=path) > > # Force copy of the R2eff values. > @@ -556,7 +560,8 @@ > subtitle(file=sys.stdout, text="The '%s' model" % model, > prespace=3) > > # The results directory path. > - path = self.results_dir+sep+model > + model_path = model.replace(" ", "_") > + path = self.results_dir+sep+model_path > > # The name of the data pipe for the model. > model_pipe = self.name_pipe(model) > @@ -598,7 +603,7 @@ > > # Optimise the model. > else: > - self.optimise(model=model) > + self.optimise(model=model, model_path=model_path) > > # Write out the results. > self.write_results(path=path, model=model) > > Removed: > trunk/test_suite/shared_data/dispersion/bug_21715_clustered_indexerror/non_clustered/No > Rex/results.bz2 > URL: > http://svn.gna.org/viewcvs/relax/trunk/test_suite/shared_data/dispersion/bug_21715_clustered_indexerror/non_clustered/No%20Rex/results.bz2?rev=25131&view=auto > ============================================================================== > Binary file - no diff available. > > Copied: > trunk/test_suite/shared_data/dispersion/bug_21715_clustered_indexerror/non_clustered/No_Rex/results.bz2 > (from r25131, > trunk/test_suite/shared_data/dispersion/bug_21715_clustered_indexerror/non_clustered/No > Rex/results.bz2) > URL: > http://svn.gna.org/viewcvs/relax/trunk/test_suite/shared_data/dispersion/bug_21715_clustered_indexerror/non_clustered/No_Rex/results.bz2?p2=trunk/test_suite/shared_data/dispersion/bug_21715_clustered_indexerror/non_clustered/No_Rex/results.bz2&p1=trunk/test_suite/shared_data/dispersion/bug_21715_clustered_indexerror/non_clustered/No%20Rex/results.bz2&r1=25131&r2=25132&rev=25132&view=diff > ============================================================================== > Binary files - no diff available. > > > _______________________________________________ > relax (http://www.nmr-relax.com) > > This is the relax-commits mailing list > relax-comm...@gna.org > > To unsubscribe from this list, get a password > reminder, or change your subscription options, > visit the list information page at > https://mail.gna.org/listinfo/relax-commits _______________________________________________ relax (http://www.nmr-relax.com) This is the relax-devel mailing list relax-devel@gna.org To unsubscribe from this list, get a password reminder, or change your subscription options, visit the list information page at https://mail.gna.org/listinfo/relax-devel
