Hi again !
Here is a small patch for indentation problems again, but now for tabs...
Cheers
Séb
Selon Sébastien Morin <sebastien.morin.1@xxxxxxxxx>, 10.07.2007:
Hi Ed !
In fact, I thought about this but wasn't sure...
Here is the patch without the modification to the code where it should end
in
'\
', thus without any modification to those files :
maths_fns/mf.py
maths_fns/jw_mf.py
maths_fns/jw_mf_comps.py
maths_fns/chi2.py
minimise/levenberg_marquardt.py
minimise/line_search/test_functions.py
Ciao !
Séb
Selon Edward d'Auvergne <edward.dauvergne@xxxxxxxxx>, 10.07.2007:
Sorry, I didn't realise to warn you that the trailing single space in
the equation lines which terminate in '\' are important. This
character, if not followed by a space, will cause the newline to be
removed from the docstring in the python help system. For example if
you type
relax> from maths_fns import jw_mf
relax> help(jw_mf.calc_S2f_S2s_ts_d2jw_dS2fdS2s)
with the patch applied, you can see the issue - the middle line gets
appended to the top line. A similar issue occurs in the OpenDX input
files that are created by relax. All these special single trailing
whitespaces are important. I'm really sorry for not having realised
earlier, it's been a long time since I worked on that code.
Regards,
Edward
On 7/10/07, Sébastien Morin <sebastien.morin.1@xxxxxxxxx> wrote:
Hi,
Here is a patch for trailing whitespaces in the code for the 1.3 line
(revision
3338).
This should fix all formating issues of this kind for the entire code...
Ciao
Séb :)
Selon Edward d'Auvergne <edward.dauvergne@xxxxxxxxx>, 09.07.2007:
Thanks. Please try to keep different types of changes separate
though. All the changes so far are whitespace related so I can commit
the patch as fixing whitespace formatting in the 1.3 line. If there
are other changes, these should go as separate commits into the relax
repository. That way I can decide if the whitespace commit will be
back ported to the 1.2 line (which isn't really necessary) or if other
changes in individual commits should be back ported (some probably
will while others may not).
Cheers,
Edward
On 7/9/07, Sebastien Morin <sebastien.morin.1@xxxxxxxxx> wrote:
Hi Ed !
I will send a single large patch tomorrow when I have corrected more
code...
Bye
Séb
Edward d'Auvergne wrote:
Hi,
These minor formatting changes do need to made to the repository.
Would you still have all the changes in your checked out copy Séb?
If
you could send a single patch of all the changes, it will be much
easier for me to apply. That would be much appreciated.
Thanks,
Edward
On 7/9/07, Sébastien Morin <sebastien.morin.1@xxxxxxxxx> wrote:
Hi all,
Here are a few patches solving fomating issues in the 1.3 line
(revision 3324).
patch_sample_scripts_palmer ->
sample_scripts/palmer.py
patch_test_suite_runner ->
sample_scripts/relax_curve_diff.py
patch_sample_scripts_relax_curve_diff ->
sample_scripts/remap.py
patch_test_suite_system_tests_jw_mapping ->
test_suite/formatting.py
patch_sample_scripts_remap -> test_suite/runner.py
patch_test_suite_system_tests_main ->
test_suite/system_tests/jw_mapping.py
patch_test_suite_formatting ->
test_suite/system_tests/main.py
patch_test_suite_system_tests_model_free ->
test_suite/system_tests/model_free.py
These are low importance changes but nevertheless the work needs
to
be done.
Cheers.
Séb :)
_______________________________________________
relax (http://nmr-relax.com)
This is the relax-devel mailing list
relax-devel@xxxxxxx
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
--
______________________________________
_______________________________________________
| |
|| Sebastien Morin ||
||| Etudiant au PhD en biochimie |||
|||| Laboratoire de resonance magnetique nucleaire ||||
||||| Dr Stephane Gagne |||||
|||| CREFSIP (Universite Laval, Quebec, CANADA) ||||
||| 1-418-656-2131 #4530 |||
|| ||
|_______________________________________________|
______________________________________
------------------------
Sébastien Morin
Étudiant M.Sc. Biochimie
Laboratoire S. Gagné
3252 Pav. Marchand (Université Laval)
Tél : (418) 656-2131 #4530
Fax : (418) 656-7176
e-mail : sebastien.morin.1@xxxxxxxxx
------------------------
Sébastien Morin
Étudiant M.Sc. Biochimie
Laboratoire S. Gagné
3252 Pav. Marchand (Université Laval)
Tél : (418) 656-2131 #4530
Fax : (418) 656-7176
e-mail : sebastien.morin.1@xxxxxxxxx
------------------------
Sébastien Morin
Étudiant M.Sc. Biochimie
Laboratoire S. Gagné
3252 Pav. Marchand (Université Laval)
Tél : (418) 656-2131 #4530
Fax : (418) 656-7176
e-mail : sebastien.morin.1@xxxxxxxxx
Index: dx/isosurface_3D.py
===================================================================
--- dx/isosurface_3D.py (revision 3338)
+++ dx/isosurface_3D.py (working copy)
@@ -194,22 +194,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 + """
@@ -1332,7 +1332,7 @@
viewAngle,
backgroundColor) [instance: 1, cache: 1];
coloredDefaultCamera =
- UpdateCamera(defaultCamera,
+ UpdateCamera(defaultCamera,
background=backgroundColor) [instance: 1, cache: 1];
nullDefaultCamera =
Inquire(defaultCamera,
@@ -1382,11 +1382,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,
@@ -1408,14 +1408,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(
@@ -1477,7 +1477,7 @@
RECresolution,
ImageResolution,
RECaspect,
- ImageAspect) [instance: 4, cache: 1];
+ ImageAspect) [instance: 4, cache: 1];
NoRECobject, RECNoRerenderObject, RECNoRerHW, RECRerenderObject =
Route(switchRECenable, annoted_object);
Display(
NoRECobject,
@@ -1509,21 +1509,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,
Re: Formating issues in the 1.3 line