1
0
mirror of https://github.com/paboyle/Grid.git synced 2024-11-10 07:55:35 +00:00

ready for pull request

This commit is contained in:
Felix Erben 2019-09-30 16:58:20 +01:00
parent e5d7910fa7
commit 155bcd4ff3
2 changed files with 7 additions and 11 deletions

View File

@ -187,8 +187,8 @@ void BaryonUtils<FImpl>::ContractBaryons(const PropagatorField &q1_src,
Gamma g4(Gamma::Algebra::GammaT); //needed for parity P_\pm = 0.5*(1 \pm \gamma_4)
std::vector<std::vector<int>> epsilon = {{0,1,2},{1,2,0},{2,0,1},{0,2,1},{2,1,0},{1,0,2}};
std::vector<int> epsilon_sgn = {1,1,1,-1,-1,-1};
static const int epsilon[6][3] = {{0,1,2},{1,2,0},{2,0,1},{0,2,1},{2,1,0},{1,0,2}};
static const int epsilon_sgn[6]= {1,1,1,-1,-1,-1};
std::vector<int> wick_contraction = {0,0,0,0,0,0};
for (int ie=0; ie < 6 ; ie++)
@ -214,10 +214,6 @@ void BaryonUtils<FImpl>::ContractBaryons(const PropagatorField &q1_src,
vbaryon_corr[ss] = result;
} );//end loop over lattice sites
}
/*template<class FImpl,class T1,class T2,class T3>
void BaryonUtils<FImpl>::ContractBaryons_Sliced(const T1 &D1,
const T2 &D2,
const T3 &D3,*/
template <class FImpl>
template <class mobj, class robj>
void BaryonUtils<FImpl>::ContractBaryons_Sliced(const mobj &D1,
@ -235,8 +231,8 @@ void BaryonUtils<FImpl>::ContractBaryons_Sliced(const mobj &D1,
Gamma g4(Gamma::Algebra::GammaT); //needed for parity P_\pm = 0.5*(1 \pm \gamma_4)
std::vector<std::vector<int>> epsilon = {{0,1,2},{1,2,0},{2,0,1},{0,2,1},{2,1,0},{1,0,2}};
std::vector<int> epsilon_sgn = {1,1,1,-1,-1,-1};
static const int epsilon[6][3] = {{0,1,2},{1,2,0},{2,0,1},{0,2,1},{2,1,0},{1,0,2}};
static const int epsilon_sgn[6]= {1,1,1,-1,-1,-1};
std::vector<int> wick_contraction = {0,0,0,0,0,0};
for (int ie=0; ie < 6 ; ie++)

View File

@ -134,9 +134,6 @@ void TBaryon<FImpl1, FImpl2, FImpl3>::execute(void)
<< par().q3_src << "') at the source and (Gamma^A,Gamma^B) = ( " << par().GammaA << " , " << par().GammaB
<< " ) and parity " << par().parity << "." << std::endl;
auto &q1_src = envGet(PropagatorField1, par().q1_src);
auto &q2_src = envGet(PropagatorField2, par().q2_src);
auto &q3_src = envGet(PropagatorField3, par().q3_src);
envGetTmp(LatticeComplex, c);
Result result;
int nt = env().getDim(Tp);
@ -168,6 +165,9 @@ void TBaryon<FImpl1, FImpl2, FImpl3>::execute(void)
}
else
{
auto &q1_src = envGet(PropagatorField1, par().q1_src);
auto &q2_src = envGet(PropagatorField2, par().q2_src);
auto &q3_src = envGet(PropagatorField3, par().q3_src);
std::string ns;
ns = vm().getModuleNamespace(env().getObjectModule(par().sink));