From bd8acc6ef23b8424be725403c04d42391a84e722 Mon Sep 17 00:00:00 2001 From: Christian Zimmermann Date: Fri, 31 Mar 2017 17:34:43 +0200 Subject: [PATCH] some fixes in pyProjFunction --- src/ma_functional.cc | 4 ++-- src/ma_functional.h | 4 +++- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/src/ma_functional.cc b/src/ma_functional.cc index ca35f6d..f8b216b 100644 --- a/src/ma_functional.cc +++ b/src/ma_functional.cc @@ -61,8 +61,8 @@ namespace MultiArrayTools i.template getIndex<2>().getMetaPos() * i.template getIndex<2>().getMetaPos() + i.template getIndex<3>().getMetaPos() * i.template getIndex<3>().getMetaPos() ); - si.atMeta( i.template getIndex<1>().getMetaPos() * i.template getIndex<0>().getMetaPos()[0] - i.template getIndex<2>().getMetaPos() * i.template getIndex<0>().getMetaPos()[1] + si.atMeta( i.template getIndex<1>().getMetaPos() * i.template getIndex<0>().getMetaPos()[0] + + i.template getIndex<2>().getMetaPos() * i.template getIndex<0>().getMetaPos()[1] + i.template getIndex<3>().getMetaPos() * i.template getIndex<0>().getMetaPos()[2] ); return out; } diff --git a/src/ma_functional.h b/src/ma_functional.h index 252ec17..c241938 100644 --- a/src/ma_functional.h +++ b/src/ma_functional.h @@ -67,11 +67,13 @@ namespace MultiArrayTools { public: typedef SingleIndex CoordIndex; - typedef SingleIndex,RangeType::MOMETUM> MomIndex; + typedef SingleIndex,RangeType::MOMENTUM> MomIndex; typedef MultiIndex InIndex; typedef SingleIndex DistIndex; typedef SingleIndex ScalProdIndex; typedef MultiIndex OutIndex; + typedef MultiRange, + SingleRange > OutRange; DEFAULT_MEMBERS(pyProjFunction);