Author: bugman
Date: Mon Mar 18 14:10:36 2013
New Revision: 18853
URL: http://svn.gna.org/viewcvs/relax?rev=18853&view=rev
Log:
Replaced many instances of the tab character '\t' with 4 spaces.
Modified:
trunk/generic_fns/structure/api_base.py
trunk/gui/analyses/elements.py
trunk/maths_fns/c_chi2.c
trunk/maths_fns/exponential.c
trunk/multi/uni_processor.py
trunk/opendx/isosurface_3D.py
trunk/test_suite/system_tests/scripts/curve_fitting/bug_18789_no_grace_errors.py
Modified: trunk/generic_fns/structure/api_base.py
URL:
http://svn.gna.org/viewcvs/relax/trunk/generic_fns/structure/api_base.py?rev=18853&r1=18852&r2=18853&view=diff
==============================================================================
--- trunk/generic_fns/structure/api_base.py (original)
+++ trunk/generic_fns/structure/api_base.py Mon Mar 18 14:10:36 2013
@@ -1324,10 +1324,10 @@
def add_item(self, mol_name=None, mol_cont=None):
"""Append the given MolContainer instance to the MolList.
- @keyword mol_name: The molecule number.
- @type mol_name: int
- @keyword mol_cont: The data structure for the molecule.
- @type mol_cont: MolContainer instance
+ @keyword mol_name: The molecule number.
+ @type mol_name: int
+ @keyword mol_cont: The data structure for the molecule.
+ @type mol_cont: MolContainer instance
@return: The new molecule container.
@rtype: MolContainer instance
"""
Modified: trunk/gui/analyses/elements.py
URL:
http://svn.gna.org/viewcvs/relax/trunk/gui/analyses/elements.py?rev=18853&r1=18852&r2=18853&view=diff
==============================================================================
--- trunk/gui/analyses/elements.py (original)
+++ trunk/gui/analyses/elements.py Mon Mar 18 14:10:36 2013
@@ -53,8 +53,8 @@
@type min: int
@keyword max: The maximum value allowed.
@type max: int
- @keyword tooltip: The tooltip which appears on hovering over
the text or spin control.
- @type tooltip: str
+ @keyword tooltip: The tooltip which appears on hovering over
the text or spin control.
+ @type tooltip: str
@keyword control: The control class to use.
@type control: wx.SpinCtrl derived class
@keyword width_text: The width of the text element.
@@ -155,8 +155,8 @@
@type text: str
@keyword default: The default text of the control.
@type default: str
- @keyword tooltip: The tooltip which appears on hovering over
the text or input field.
- @type tooltip: str
+ @keyword tooltip: The tooltip which appears on hovering over
the text or input field.
+ @type tooltip: str
@keyword button_text: The text to display on the button.
@type button_text: str
@keyword control: The control class to use.
@@ -232,8 +232,8 @@
if tooltip:
self.label.SetToolTipString(tooltip)
self.field.SetToolTipString(tooltip)
- if button:
- self.button.SetToolTipString(tooltip)
+ if button:
+ self.button.SetToolTipString(tooltip)
def Enable(self, enable=True):
Modified: trunk/maths_fns/c_chi2.c
URL:
http://svn.gna.org/viewcvs/relax/trunk/maths_fns/c_chi2.c?rev=18853&r1=18852&r2=18853&view=diff
==============================================================================
--- trunk/maths_fns/c_chi2.c (original)
+++ trunk/maths_fns/c_chi2.c Mon Mar 18 14:10:36 2013
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2003, 2006 Edward d'Auvergne
+ * Copyright (C) 2003-2013 Edward d'Auvergne
*
* This file is part of the program relax (http://www.nmr-relax.com).
*
@@ -24,31 +24,31 @@
double chi2(double *values, double *sd, double *back_calc, int num_times) {
- /* Function to calculate the chi-squared value.
+ /* Function to calculate the chi-squared value.
- The chi-sqared equation
- ~~~~~~~~~~~~~~~~~~~~~~~
- _n_
- \ (yi - yi()) ** 2
- Chi2() = > ----------------
- /__ sigma_i ** 2
- i=1
+ The chi-sqared equation
+ ~~~~~~~~~~~~~~~~~~~~~~~
+ _n_
+ \ (yi - yi()) ** 2
+ Chi2() = > ----------------
+ /__ sigma_i ** 2
+ i=1
- where:
- yi are the values of the measured data set.
- yi() are the values of the back calculated data set.
- sigma_i are the values of the error set.
+ where:
+ yi are the values of the measured data set.
+ yi() are the values of the back calculated data set.
+ sigma_i are the values of the error set.
- The chi-squared value is returned.
- */
+ The chi-squared value is returned.
+ */
- int i;
- double chi2 = 0.0;
+ int i;
+ double chi2 = 0.0;
/* Loop over the time points and sum the chi-squared components */
- for (i = 0; i < num_times; ++i) {
- chi2 = chi2 + square((values[i] - back_calc[i]) / sd[i]);
- }
+ for (i = 0; i < num_times; ++i) {
+ chi2 = chi2 + square((values[i] - back_calc[i]) / sd[i]);
+ }
- return chi2;
+ return chi2;
}
Modified: trunk/maths_fns/exponential.c
URL:
http://svn.gna.org/viewcvs/relax/trunk/maths_fns/exponential.c?rev=18853&r1=18852&r2=18853&view=diff
==============================================================================
--- trunk/maths_fns/exponential.c (original)
+++ trunk/maths_fns/exponential.c Mon Mar 18 14:10:36 2013
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2006 Edward d'Auvergne
+ * Copyright (C) 2006-2013 Edward d'Auvergne
*
* This file is part of the program relax (http://www.nmr-relax.com).
*
@@ -27,8 +27,8 @@
void exponential(double *params, double *relax_times, double *back_calc, int
num_times) {
- /* Function to back calculate the peak intensities.
- */
+ /* Function to back calculate the peak intensities.
+ */
/* Declarations */
double Rx, I0;
Modified: trunk/multi/uni_processor.py
URL:
http://svn.gna.org/viewcvs/relax/trunk/multi/uni_processor.py?rev=18853&r1=18852&r2=18853&view=diff
==============================================================================
--- trunk/multi/uni_processor.py (original)
+++ trunk/multi/uni_processor.py Mon Mar 18 14:10:36 2013
@@ -1,7 +1,7 @@
###############################################################################
#
#
# Copyright (C) 2007 Gary S Thompson (https://gna.org/users/varioustoxins)
#
-# Copyright (C) 2010-2012 Edward d'Auvergne
#
+# Copyright (C) 2010-2013 Edward d'Auvergne
#
#
#
# This file is part of the program relax (http://www.nmr-relax.com).
#
#
#
@@ -157,7 +157,7 @@
if isinstance(result, Exception):
#FIXME: clear command queue
- # and finalise mpi (or restart it if we can!
+ # and finalise mpi (or restart it if we can!
raise result
elif isinstance(result, Result_command):
memo = None
Modified: trunk/opendx/isosurface_3D.py
URL:
http://svn.gna.org/viewcvs/relax/trunk/opendx/isosurface_3D.py?rev=18853&r1=18852&r2=18853&view=diff
==============================================================================
--- trunk/opendx/isosurface_3D.py (original)
+++ trunk/opendx/isosurface_3D.py Mon Mar 18 14:10:36 2013
@@ -1,6 +1,6 @@
###############################################################################
#
#
-# Copyright (C) 2003-2012 Edward d'Auvergne
#
+# Copyright (C) 2003-2013 Edward d'Auvergne
#
#
#
# This file is part of the program relax (http://www.nmr-relax.com).
#
#
#
@@ -206,22 +206,22 @@
# Include the sphere.
if self.num_points == 1:
text = text + """
-// page assignment: Colour Space order=3, windowed=0, showing=0
-// page assignment: ColourScene order=5, windowed=0, showing=0
-// page assignment: Glyph order=2, windowed=0, showing=0
-// page assignment: Grey Space order=4, windowed=0, showing=0
-// page assignment: GreyScene order=6, windowed=0, showing=0
-// page assignment: Image order=7, windowed=0, showing=0
-// page assignment: Isosurfaces order=1, windowed=0, showing=1"""
+// page assignment: Colour Space order=3, windowed=0, showing=0
+// page assignment: ColourScene order=5, windowed=0, showing=0
+// page assignment: Glyph order=2, windowed=0, showing=0
+// page assignment: Grey Space order=4, windowed=0, showing=0
+// page assignment: GreyScene order=6, windowed=0, showing=0
+// page assignment: Image order=7, windowed=0, showing=0
+// page assignment: Isosurfaces order=1, windowed=0, showing=1"""
# No sphere.
else:
text = text + """
-// page assignment: Colour Space order=4, windowed=0, showing=0
-// page assignment: ColourScene order=6, windowed=0, showing=0
-// page assignment: Grey Space order=5, windowed=0, showing=0
-// page assignment: GreyScene order=7, windowed=0, showing=0
-// page assignment: Image order=8, windowed=0, showing=0
-// page assignment: Isosurfaces order=2, windowed=0, showing=1"""
+// page assignment: Colour Space order=4, windowed=0, showing=0
+// page assignment: ColourScene order=6, windowed=0, showing=0
+// page assignment: Grey Space order=5, windowed=0, showing=0
+// page assignment: GreyScene order=7, windowed=0, showing=0
+// page assignment: Image order=8, windowed=0, showing=0
+// page assignment: Isosurfaces order=2, windowed=0, showing=1"""
# Common code.
text = text + """
@@ -1344,7 +1344,7 @@
viewAngle,
backgroundColor) [instance: 1, cache: 1];
coloredDefaultCamera =
- UpdateCamera(defaultCamera,
+ UpdateCamera(defaultCamera,
background=backgroundColor) [instance: 1, cache: 1];
nullDefaultCamera =
Inquire(defaultCamera,
@@ -1394,11 +1394,11 @@
AAyTickLabels,
AAzTickLabels) [instance: 1, cache: 1];
switchAAenable = Compute("$0+1",
- AAenable) [instance: 2, cache: 1];
+ AAenable) [instance: 2, cache: 1];
object = Switch(
- switchAAenable,
- object,
- AAobject) [instance:4, cache: 1];
+ switchAAenable,
+ object,
+ AAobject) [instance:4, cache: 1];
SWapproximation_options =
Switch(
buttonState,
@@ -1420,14 +1420,14 @@
buttonDownDensity,
buttonUpDensity) [instance: 2, cache: 1];
switchRenderMode = Compute(
- "$0+1",
- renderMode) [instance: 3, cache: 1];
+ "$0+1",
+ renderMode) [instance: 3, cache: 1];
approximation_options = Switch(
- switchRenderMode,
+ switchRenderMode,
SWapproximation_options,
- HWapproximation_options) [instance: 7, cache: 1];
+ HWapproximation_options) [instance: 7, cache: 1];
density_options = Switch(
- switchRenderMode,
+ switchRenderMode,
SWdensity_options,
HWdensity_options) [instance: 8, cache: 1];
renderModeString = Switch(
@@ -1489,7 +1489,7 @@
RECresolution,
ImageResolution,
RECaspect,
- ImageAspect) [instance: 4, cache: 1];
+ ImageAspect) [instance: 4, cache: 1];
NoRECobject, RECNoRerenderObject, RECNoRerHW, RECRerenderObject =
Route(switchRECenable, annoted_object);
Display(
NoRECobject,
@@ -1521,21 +1521,21 @@
RECfile,
RECformat) [instance: 1, cache: 1];
RECupdateCamera =
- UpdateCamera(
- camera,
- resolution=RECresolution,
- aspect=RECaspect) [instance: 2, cache: 1];
+ UpdateCamera(
+ camera,
+ resolution=RECresolution,
+ aspect=RECaspect) [instance: 2, cache: 1];
Display(
RECRerenderObject,
camera,
where,
throttle) [instance: 1, cache: 1];
RECRerenderObject =
- ScaleScreen(
- RECRerenderObject,
- NULL,
- RECresolution,
- camera) [instance: 1, cache: 1];
+ ScaleScreen(
+ RECRerenderObject,
+ NULL,
+ RECresolution,
+ camera) [instance: 1, cache: 1];
image =
Render(
RECRerenderObject,
Modified:
trunk/test_suite/system_tests/scripts/curve_fitting/bug_18789_no_grace_errors.py
URL:
http://svn.gna.org/viewcvs/relax/trunk/test_suite/system_tests/scripts/curve_fitting/bug_18789_no_grace_errors.py?rev=18853&r1=18852&r2=18853&view=diff
==============================================================================
---
trunk/test_suite/system_tests/scripts/curve_fitting/bug_18789_no_grace_errors.py
(original)
+++
trunk/test_suite/system_tests/scripts/curve_fitting/bug_18789_no_grace_errors.py
Mon Mar 18 14:10:36 2013
@@ -77,7 +77,7 @@
spectrum.baseplane_rmsd(error=18200/1e6, spectrum_id='040', spin_id=None)
spectrum.baseplane_rmsd(error=21100/1e6, spectrum_id='420', spin_id=None)
-# Peak intensity error analysis.
+# Peak intensity error analysis.
spectrum.error_analysis()
# Deselect unresolved spins.
r18853 - in /trunk: generic_fns/structure/ gui/analyses/ maths_fns/ multi/ opendx/ test_suite/system_tests/scripts/curve_fit...