chizeta/cnorxz
chizeta/cnorxz
0
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

some fixes in pyProjFunction

Browse source
This commit is contained in:
Christian Zimmermann 2017-03-31 17:34:43 +02:00
parent 5a5d8883b4
commit bd8acc6ef2
2 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/ma_functional.cc
View file

@ -61,8 +61,8 @@ namespace MultiArrayTools
i.template getIndex<2>().getMetaPos() * i.template getIndex<2>().getMetaPos() + i.template getIndex<2>().getMetaPos() * i.template getIndex<2>().getMetaPos() +
i.template getIndex<3>().getMetaPos() * i.template getIndex<3>().getMetaPos() ); i.template getIndex<3>().getMetaPos() * i.template getIndex<3>().getMetaPos() );
si.atMeta( i.template getIndex<1>().getMetaPos() * i.template getIndex<0>().getMetaPos()[0] 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<2>().getMetaPos() * i.template getIndex<0>().getMetaPos()[1] +
i.template getIndex<3>().getMetaPos() * i.template getIndex<0>().getMetaPos()[2] ); i.template getIndex<3>().getMetaPos() * i.template getIndex<0>().getMetaPos()[2] );
return out; return out;
} }

4
src/ma_functional.h
View file

@ -67,11 +67,13 @@ namespace MultiArrayTools
{ {
public: public:
typedef SingleIndex<int,RangeType::SPACE> CoordIndex; typedef SingleIndex<int,RangeType::SPACE> CoordIndex;
typedef SingleIndex<std::array<int,3>,RangeType::MOMETUM> MomIndex; typedef SingleIndex<std::array<int,3>,RangeType::MOMENTUM> MomIndex;
typedef MultiIndex<MomIndex,CoordIndex,CoordIndex,CoordIndex> InIndex; typedef MultiIndex<MomIndex,CoordIndex,CoordIndex,CoordIndex> InIndex;
typedef SingleIndex<size_t,RangeType::DISTANCE> DistIndex; typedef SingleIndex<size_t,RangeType::DISTANCE> DistIndex;
typedef SingleIndex<int,RangeType::SPACE> ScalProdIndex; typedef SingleIndex<int,RangeType::SPACE> ScalProdIndex;
typedef MultiIndex<DistIndex,ScalProdIndex> OutIndex; typedef MultiIndex<DistIndex,ScalProdIndex> OutIndex;
typedef MultiRange<SingleRange<size_t,RangeType::DISTANCE>,
SingleRange<int,RangeType::SPACE> > OutRange;
DEFAULT_MEMBERS(pyProjFunction); DEFAULT_MEMBERS(pyProjFunction);