summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobin H. Johnson <robbat2@gentoo.org>2015-08-08 13:49:04 -0700
committerRobin H. Johnson <robbat2@gentoo.org>2015-08-08 17:38:18 -0700
commit56bd759df1d0c750a065b8c845e93d5dfa6b549d (patch)
tree3f91093cdb475e565ae857f1c5a7fd339e2d781e /sci-chemistry/nmrglue/files
downloadgentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.tar.gz
gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.tar.bz2
gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.zip
proj/gentoo: Initial commit
This commit represents a new era for Gentoo: Storing the gentoo-x86 tree in Git, as converted from CVS. This commit is the start of the NEW history. Any historical data is intended to be grafted onto this point. Creation process: 1. Take final CVS checkout snapshot 2. Remove ALL ChangeLog* files 3. Transform all Manifests to thin 4. Remove empty Manifests 5. Convert all stale $Header$/$Id$ CVS keywords to non-expanded Git $Id$ 5.1. Do not touch files with -kb/-ko keyword flags. Signed-off-by: Robin H. Johnson <robbat2@gentoo.org> X-Thanks: Alec Warner <antarus@gentoo.org> - did the GSoC 2006 migration tests X-Thanks: Robin H. Johnson <robbat2@gentoo.org> - infra guy, herding this project X-Thanks: Nguyen Thai Ngoc Duy <pclouds@gentoo.org> - Former Gentoo developer, wrote Git features for the migration X-Thanks: Brian Harring <ferringb@gentoo.org> - wrote much python to improve cvs2svn X-Thanks: Rich Freeman <rich0@gentoo.org> - validation scripts X-Thanks: Patrick Lauer <patrick@gentoo.org> - Gentoo dev, running new 2014 work in migration X-Thanks: Michał Górny <mgorny@gentoo.org> - scripts, QA, nagging X-Thanks: All of other Gentoo developers - many ideas and lots of paint on the bikeshed
Diffstat (limited to 'sci-chemistry/nmrglue/files')
-rw-r--r--sci-chemistry/nmrglue/files/nmrglue-0.5-nohyper.patch33
1 files changed, 33 insertions, 0 deletions
diff --git a/sci-chemistry/nmrglue/files/nmrglue-0.5-nohyper.patch b/sci-chemistry/nmrglue/files/nmrglue-0.5-nohyper.patch
new file mode 100644
index 000000000000..103f5b154d0b
--- /dev/null
+++ b/sci-chemistry/nmrglue/files/nmrglue-0.5-nohyper.patch
@@ -0,0 +1,33 @@
+From ba1eee9e71623110511545c058afe2a92e139aa5 Mon Sep 17 00:00:00 2001
+From: Jonathan Helmus <jjhelmus@gmail.com>
+Date: Tue, 3 Mar 2015 19:47:05 -0600
+Subject: [PATCH] pipe_proc.py tp function correctly sets FDSIZE.
+
+Fixes issue #27
+---
+ nmrglue/process/pipe_proc.py | 7 +++++--
+ 1 file changed, 5 insertions(+), 2 deletions(-)
+
+diff --git a/nmrglue/process/pipe_proc.py b/nmrglue/process/pipe_proc.py
+index 79b6303..8c1271c 100644
+--- a/nmrglue/process/pipe_proc.py
++++ b/nmrglue/process/pipe_proc.py
+@@ -1527,13 +1527,16 @@ def tp(dic, data, hyper=False, nohyper=False, auto=False, nohdr=False):
+ data = np.array(p.tp_hyper(data), dtype="complex64")
+ else:
+ data = p.tp(data)
+- if dic[fn2 + "QUADFLAG"] != 1 and nohyper is not True:
++ if dic[fn2 + "QUADFLAG"] != 1 and nohyper is False:
+ # unpack complex as needed
+ data = np.array(p.c2ri(data), dtype="complex64")
+
+ # update the dimentionality and order
+ dic["FDSLICECOUNT"] = data.shape[0]
+- if data.dtype == 'float32':
++ if (data.dtype == 'float32') and (nohyper is True):
++ # when nohyper is True and the new last dimension was complex
++ # prior to transposing then FDSIZE is set as if the dimension was
++ # converted to complex data, that is half the actual size.
+ dic["FDSIZE"] = data.shape[1] / 2
+ else:
+ dic["FDSIZE"] = data.shape[1]