Author: bugman
Date: Wed Aug 20 19:33:47 2014
New Revision: 25118
URL: http://svn.gna.org/viewcvs/relax?rev=25118&view=rev
Log:
Fixes for indentation accidentally committed at r25108.
This can be seen at http://thread.gmane.org/gmane.science.nmr.relax.scm/22858.
A Vim command was accidentally typed which removed one level of indentation.
Modified:
trunk/user_functions/relax_disp.py
Modified: trunk/user_functions/relax_disp.py
URL:
http://svn.gna.org/viewcvs/relax/trunk/user_functions/relax_disp.py?rev=25118&r1=25117&r2=25118&view=diff
==============================================================================
--- trunk/user_functions/relax_disp.py (original)
+++ trunk/user_functions/relax_disp.py Wed Aug 20 19:33:47 2014
@@ -63,22 +63,22 @@
uf.title = "Perform a relaxation dispersion optimisation using Flemming
Hansen's CATIA."
uf.title_short = "CATIA execution."
uf.add_keyarg(
-name = "dir",
-py_type = "str",
-arg_type = "dir sel",
-desc_short = "directory name",
-desc = "The directory containing all of the CATIA input files.",
-can_be_none = True
-)
-uf.add_keyarg(
-name = "binary",
-default = "catia",
-py_type = "str",
-arg_type = "file sel",
-desc_short = "CATIA executable file",
-desc = "The name of the executable CATIA program file.",
-wiz_filesel_style = FD_OPEN,
-wiz_filesel_preview = False
+ name = "dir",
+ py_type = "str",
+ arg_type = "dir sel",
+ desc_short = "directory name",
+ desc = "The directory containing all of the CATIA input files.",
+ can_be_none = True
+)
+uf.add_keyarg(
+ name = "binary",
+ default = "catia",
+ py_type = "str",
+ arg_type = "file sel",
+ desc_short = "CATIA executable file",
+ desc = "The name of the executable CATIA program file.",
+ wiz_filesel_style = FD_OPEN,
+ wiz_filesel_preview = False
)
# Description.
uf.desc.append(Desc_container())
@@ -98,20 +98,20 @@
uf.title = "Create the input files for Flemming Hansen's CATIA program."
uf.title_short = "CATIA input file creation."
uf.add_keyarg(
-name = "dir",
-default = "catia",
-py_type = "str",
-arg_type = "dir sel",
-desc_short = "directory name",
-desc = "The directory to place the CATIA input files, output directory,
etc.",
-can_be_none = True
-)
-uf.add_keyarg(
-name = "force",
-default = False,
-py_type = "bool",
-desc_short = "force flag",
-desc = "A flag which if set to True will cause the files to be overwritten
if they already exist."
+ name = "dir",
+ default = "catia",
+ py_type = "str",
+ arg_type = "dir sel",
+ desc_short = "directory name",
+ desc = "The directory to place the CATIA input files, output directory,
etc.",
+ can_be_none = True
+)
+uf.add_keyarg(
+ name = "force",
+ default = False,
+ py_type = "bool",
+ desc_short = "force flag",
+ desc = "A flag which if set to True will cause the files to be
overwritten if they already exist."
)
# Description.
uf.desc.append(Desc_container())
@@ -129,21 +129,21 @@
uf.title = "Define clusters of spins for joint optimisation."
uf.title_short = "Spin clustering."
uf.add_keyarg(
-name = "cluster_id",
-py_type = "str",
-desc_short = "cluster ID",
-desc = "The cluster identification string.",
-wiz_element_type = 'combo',
-wiz_combo_iter = relax_disp_uf.cluster_ids
-)
-uf.add_keyarg(
-name = "spin_id",
-py_type = "str",
-desc_short = "spin ID string",
-desc = "The spin identifier string for the spin or group of spins to add to
the cluster.",
-wiz_element_type = 'combo',
-wiz_combo_iter = get_spin_ids,
-can_be_none = True
+ name = "cluster_id",
+ py_type = "str",
+ desc_short = "cluster ID",
+ desc = "The cluster identification string.",
+ wiz_element_type = 'combo',
+ wiz_combo_iter = relax_disp_uf.cluster_ids
+)
+uf.add_keyarg(
+ name = "spin_id",
+ py_type = "str",
+ desc_short = "spin ID string",
+ desc = "The spin identifier string for the spin or group of spins to add
to the cluster.",
+ wiz_element_type = 'combo',
+ wiz_combo_iter = get_spin_ids,
+ can_be_none = True
)
# Description.
uf.desc.append(Desc_container())
@@ -168,27 +168,27 @@
uf.title = "Set the CPMG pulse sequence information associated with a given
spectrum."
uf.title_short = "CPMG experiment setup."
uf.add_keyarg(
-name = "spectrum_id",
-py_type = "str",
-desc_short = "spectrum ID string",
-desc = "The spectrum ID string to associate the CPMG pulse sequence
information to.",
-wiz_element_type = 'combo',
-wiz_combo_iter = spectrum.get_ids,
-wiz_read_only = True
-)
-uf.add_keyarg(
-name = "cpmg_frq",
-py_type = "num",
-desc_short = "CPMG frequency (Hz)",
-desc = "The frequency, in Hz, of the CPMG pulse train.",
-can_be_none = True
-)
-uf.add_keyarg(
-name = "ncyc_even",
-default = True,
-py_type = "bool",
-desc_short = "even ncyc flag",
-desc = "A flag which if True means that the number of CPMG blocks must be
even. This is pulse sequence dependant."
+ name = "spectrum_id",
+ py_type = "str",
+ desc_short = "spectrum ID string",
+ desc = "The spectrum ID string to associate the CPMG pulse sequence
information to.",
+ wiz_element_type = 'combo',
+ wiz_combo_iter = spectrum.get_ids,
+ wiz_read_only = True
+)
+uf.add_keyarg(
+ name = "cpmg_frq",
+ py_type = "num",
+ desc_short = "CPMG frequency (Hz)",
+ desc = "The frequency, in Hz, of the CPMG pulse train.",
+ can_be_none = True
+)
+uf.add_keyarg(
+ name = "ncyc_even",
+ default = True,
+ py_type = "bool",
+ desc_short = "even ncyc flag",
+ desc = "A flag which if True means that the number of CPMG blocks must
be even. This is pulse sequence dependant."
)
# Description.
uf.desc.append(Desc_container())
@@ -212,29 +212,29 @@
uf.title = "Optimisation of the CPMG data using Art Palmer's CPMGFit
program."
uf.title_short = "CPMGFit execution."
uf.add_keyarg(
-name = "dir",
-py_type = "str",
-arg_type = "dir sel",
-desc_short = "directory name",
-desc = "The directory containing all of the CPMGFit input files. If not
given, this defaults to the model name in lower case.",
-can_be_none = True
-)
-uf.add_keyarg(
-name = "force",
-default = False,
-py_type = "bool",
-desc_short = "force flag",
-desc = "A flag which if set to True will cause the results files to be
overwritten if they already exist."
-)
-uf.add_keyarg(
-name = "binary",
-default = "cpmgfit",
-py_type = "str",
-arg_type = "file sel",
-desc_short = "CPMGFit executable file",
-desc = "The name of the executable CPMGFit program file.",
-wiz_filesel_style = FD_OPEN,
-wiz_filesel_preview = False
+ name = "dir",
+ py_type = "str",
+ arg_type = "dir sel",
+ desc_short = "directory name",
+ desc = "The directory containing all of the CPMGFit input files. If not
given, this defaults to the model name in lower case.",
+ can_be_none = True
+)
+uf.add_keyarg(
+ name = "force",
+ default = False,
+ py_type = "bool",
+ desc_short = "force flag",
+ desc = "A flag which if set to True will cause the results files to be
overwritten if they already exist."
+)
+uf.add_keyarg(
+ name = "binary",
+ default = "cpmgfit",
+ py_type = "str",
+ arg_type = "file sel",
+ desc_short = "CPMGFit executable file",
+ desc = "The name of the executable CPMGFit program file.",
+ wiz_filesel_style = FD_OPEN,
+ wiz_filesel_preview = False
)
# Description.
uf.desc.append(Desc_container())
@@ -254,36 +254,36 @@
uf.title = "Create the input files for Art Palmer's CPMGFit program."
uf.title_short = "CPMGFit input file creation."
uf.add_keyarg(
-name = "dir",
-py_type = "str",
-arg_type = "dir sel",
-desc_short = "directory name",
-desc = "The directory to place the files. If not given, this defaults to
the model name in lower case.",
-can_be_none = True
-)
-uf.add_keyarg(
-name = "force",
-default = False,
-py_type = "bool",
-desc_short = "force flag",
-desc = "A flag which if set to True will cause the files to be overwritten
if they already exist."
-)
-uf.add_keyarg(
-name = "binary",
-default = "cpmgfit",
-py_type = "str",
-arg_type = "file sel",
-desc_short = "CPMGFit executable file",
-desc = "The name of the executable CPMGFit program file.",
-wiz_filesel_style = FD_OPEN,
-wiz_filesel_preview = False
-)
-uf.add_keyarg(
-name = "spin_id",
-py_type = "str",
-desc_short = "spin ID string",
-desc = "The spin identification string.",
-can_be_none = True
+ name = "dir",
+ py_type = "str",
+ arg_type = "dir sel",
+ desc_short = "directory name",
+ desc = "The directory to place the files. If not given, this defaults
to the model name in lower case.",
+ can_be_none = True
+)
+uf.add_keyarg(
+ name = "force",
+ default = False,
+ py_type = "bool",
+ desc_short = "force flag",
+ desc = "A flag which if set to True will cause the files to be
overwritten if they already exist."
+)
+uf.add_keyarg(
+ name = "binary",
+ default = "cpmgfit",
+ py_type = "str",
+ arg_type = "file sel",
+ desc_short = "CPMGFit executable file",
+ desc = "The name of the executable CPMGFit program file.",
+ wiz_filesel_style = FD_OPEN,
+ wiz_filesel_preview = False
+)
+uf.add_keyarg(
+ name = "spin_id",
+ py_type = "str",
+ desc_short = "spin ID string",
+ desc = "The spin identification string.",
+ can_be_none = True
)
# Description.
uf.desc.append(Desc_container())
@@ -304,40 +304,40 @@
uf.title = "Select the relaxation dispersion experiment type."
uf.title_short = "Relaxation dispersion experiment type selection."
uf.add_keyarg(
-name = "spectrum_id",
-py_type = "str",
-desc_short = "spectrum ID string",
-desc = "The spectrum ID string to associate the spin-lock field strength
to.",
-wiz_element_type = 'combo',
-wiz_combo_iter = spectrum.get_ids,
-wiz_read_only = True
-)
-uf.add_keyarg(
-name = "exp_type",
-default = EXP_TYPE_CPMG_SQ,
-py_type = "str",
-desc_short = "experiment type",
-desc = "The type of relaxation dispersion experiment performed.",
-wiz_element_type = "combo",
-wiz_combo_choices = [
- "Single quantum (SQ) CPMG-type data",
- "Zero quantum (ZQ) CPMG-type data",
- "Double quantum (DQ) CPMG-type data",
- "Multiple quantum (MQ) CPMG-type data",
- "1H single quantum (SQ) CPMG-type data",
- "1H multiple quantum (SQ) CPMG-type data",
- "%s-type data" % r1rho
-],
-wiz_combo_data = [
- EXP_TYPE_CPMG_SQ,
- EXP_TYPE_CPMG_ZQ,
- EXP_TYPE_CPMG_DQ,
- EXP_TYPE_CPMG_MQ,
- EXP_TYPE_CPMG_PROTON_SQ,
- EXP_TYPE_CPMG_PROTON_MQ,
- EXP_TYPE_R1RHO
-],
-wiz_read_only = True
+ name = "spectrum_id",
+ py_type = "str",
+ desc_short = "spectrum ID string",
+ desc = "The spectrum ID string to associate the spin-lock field strength
to.",
+ wiz_element_type = 'combo',
+ wiz_combo_iter = spectrum.get_ids,
+ wiz_read_only = True
+)
+uf.add_keyarg(
+ name = "exp_type",
+ default = EXP_TYPE_CPMG_SQ,
+ py_type = "str",
+ desc_short = "experiment type",
+ desc = "The type of relaxation dispersion experiment performed.",
+ wiz_element_type = "combo",
+ wiz_combo_choices = [
+ "Single quantum (SQ) CPMG-type data",
+ "Zero quantum (ZQ) CPMG-type data",
+ "Double quantum (DQ) CPMG-type data",
+ "Multiple quantum (MQ) CPMG-type data",
+ "1H single quantum (SQ) CPMG-type data",
+ "1H multiple quantum (SQ) CPMG-type data",
+ "%s-type data" % r1rho
+ ],
+ wiz_combo_data = [
+ EXP_TYPE_CPMG_SQ,
+ EXP_TYPE_CPMG_ZQ,
+ EXP_TYPE_CPMG_DQ,
+ EXP_TYPE_CPMG_MQ,
+ EXP_TYPE_CPMG_PROTON_SQ,
+ EXP_TYPE_CPMG_PROTON_MQ,
+ EXP_TYPE_R1RHO
+ ],
+ wiz_read_only = True
)
# Description.
uf.desc.append(Desc_container())
@@ -368,12 +368,12 @@
uf.title = "Deselect all spins with insignificant dispersion."
uf.title_short = "Insignificant spin deselection."
uf.add_keyarg(
-name = "level",
-py_type = "float",
-default = 2.0,
-desc_short = "insignificance level",
-desc = "The R2eff/R1rho value in rad/s by which to judge insignificance. If
the maximum difference between two points on all dispersion curves for a spin
is less than this value, that spin will be deselected.",
-can_be_none = False
+ name = "level",
+ py_type = "float",
+ default = 2.0,
+ desc_short = "insignificance level",
+ desc = "The R2eff/R1rho value in rad/s by which to judge insignificance.
If the maximum difference between two points on all dispersion curves for a
spin is less than this value, that spin will be deselected.",
+ can_be_none = False
)
# Description.
uf.desc.append(Desc_container())
r25118 - /trunk/user_functions/relax_disp.py