Author: bugman Date: Fri Mar 28 18:41:33 2014 New Revision: 22602 URL: http://svn.gna.org/viewcvs/relax?rev=22602&view=rev Log: Modelfree4 support fix for the changes to the model-free specific analysis package. Modified: trunk/pipe_control/palmer.py Modified: trunk/pipe_control/palmer.py URL: http://svn.gna.org/viewcvs/relax/trunk/pipe_control/palmer.py?rev=22602&r1=22601&r2=22602&view=diff ============================================================================== --- trunk/pipe_control/palmer.py (original) +++ trunk/pipe_control/palmer.py Fri Mar 28 18:41:33 2014 @@ -1,6 +1,6 @@ ############################################################################### # # -# Copyright (C) 2003-2013 Edward d'Auvergne # +# Copyright (C) 2003-2014 Edward d'Auvergne # # # # This file is part of the program relax (http://www.nmr-relax.com). # # # @@ -43,7 +43,7 @@ from pipe_control import diffusion_tensor, pipes from pipe_control.interatomic import return_interatom_list from pipe_control.mol_res_spin import exists_mol_res_spin_data, spin_loop -from specific_analyses.setup import model_free_obj +from specific_analyses.model_free.model import determine_model_type def __deselect_spins(): @@ -664,7 +664,7 @@ raise RelaxFileError('Modelfree4', dir + sep+'mfout') # Determine the parameter set. - model_type = model_free_obj._determine_model_type() + model_type = determine_model_type() # Open the file. mfout_file = open(dir + sep+'mfout', 'r')