relax SVN archive

migration from CVS

migration from CVS

migration from CVS

migration from CVS

"website at home.gna.org"

Two functions for converting a string bit pattern to a float and a number of IEEE-754 constants.

The fucntions 'bitpatternToFloat()' and 'bitpatternToInt()' have been added to 'float.py'. The
first converts a 64 bit IEEE-754 bit pattern in the form of a string into a 64 bit Python float.
The second converts an arbitrary bit pattern into its integer representation. By looping over each
8 characters of the string (1 byte), 'bitpatternToFloat()' calls 'bitpatternToInt()' to create an
array of integers. Then 'packBytesAsPyFloat()' is called to convert the byte array into the float.
These two functions convert between big and little endian when necessary.

By passing big-endian 64 bit patterns to the 'bitpatternToFloat()' function, the following IEEE-754
constants are defined:
PosZero: 0000000000000000000000000000000000000000000000000000000000000000
NegZero: 1000000000000000000000000000000000000000000000000000000000000000
PosEpsilonDenorm: 0000000000000000000000000000000000000000000000000000000000000001
NegEpsilonDenorm: 1000000000000000000000000000000000000000000000000000000000000001
PosEpsilonNorm: 0000000000010000000000000000000000000000000000000000000000000001
NegEpsilonNorm: 1000000000010000000000000000000000000000000000000000000000000001
PosMax: 0111111111101111111111111111111111111111111111111111111111111111
NegMin: 1111111111101111111111111111111111111111111111111111111111111111
PosInf: 0111111111110000000000000000000000000000000000000000000000000000
NegInf: 1111111111110000000000000000000000000000000000000000000000000000
PosNaN_A: 0111111111110000000000000000000000000000001000000000000000000000
NegNaN_A: 1111111111110000000000000000000000000000001000000000000000000000
PosNaN_B: 0111111111110000000000000000011111111111111111111110000000000000
NegNaN_B: 1111111111110000000000000000011111111111111111111110000000000000
PosNaN_C: 0111111111110101010101010101010101010101010101010101010101010101
NegNaN_C: 1111111111110101010101010101010101010101010101010101010101010101
PosNaN = PosNaN_C
NegNaN = NegNaN_C

Ported r2798 and r2799 from the 1.3 line (fix for bug #7676).

The command used was:
svn merge -r2797:2799 svn+ssh://bugman@.../svn/relax/1.3

These changes fix bug #7676 (https://gna.org/bugs/?7676) reported by Stephen Headey <s dot j dot
headey at massey dot ac dot nz>.

Fix for bug #7676 (https://gna.org/bugs/?7676).

This bug was reported by Stephen Headey <s dot j dot headey at massey dot ac dot nz>. The issue was
originally reported at https://mail.gna.org/public/relax-users/2006-11/msg00003.html (Message-id:
<59ADAF5CA6A8FC4C889BD4097D912BB1072D330D@...>). Together with r2798
(https://mail.gna.org/public/relax-commits/2006-11/msg00096.html) which fixed the issue of not
having 2 header lines, this gives more flexibility in reading XEasy text files.

The function 'self.det_dimensions()' has been added to determine which of w1 or w2 is the proton
dimension. The intensity reading function 'self.intensity_xeasy()' then uses this info to return
the correct proton and heteronucleus names for the given data line.

The intensity reading function now counts the number of header lines in the Sparky or XEasy file.

The function 'self.number_of_header_lines()' has been added. This attempts to execute the intensity
reading functions 'self.intensity_sparky()' or 'self.intensity_xeasy()' and if these fail with
either a RelaxError or an IndexError, then the line is considered a header line. The function will
then return the number of header lines.

Ported r2790 and r2791 from the 1.3 line.

The command used was:
svn merge -r2789:2791 svn+ssh://bugman@.../svn/relax/1.3

These changes enable relax's C modules to be compiled using gcc on Mac OS X.