mirror of
				https://github.com/paboyle/Grid.git
				synced 2025-11-03 21:44:33 +00:00 
			
		
		
		
	Merge branch 'feature/hadrons' into feature/qed-fvol
This commit is contained in:
		@@ -45,9 +45,11 @@ class MesonPar: Serializable
 | 
			
		||||
{
 | 
			
		||||
public:
 | 
			
		||||
    GRID_SERIALIZABLE_CLASS_MEMBERS(MesonPar,
 | 
			
		||||
                                    std::string, q1,
 | 
			
		||||
                                    std::string, q2,
 | 
			
		||||
                                    std::string, output);
 | 
			
		||||
                                    std::string,    q1,
 | 
			
		||||
                                    std::string,    q2,
 | 
			
		||||
                                    std::string,    output,
 | 
			
		||||
                                    Gamma::Algebra, gammaSource,
 | 
			
		||||
                                    Gamma::Algebra, gammaSink);
 | 
			
		||||
};
 | 
			
		||||
 | 
			
		||||
template <typename FImpl1, typename FImpl2>
 | 
			
		||||
@@ -59,8 +61,7 @@ public:
 | 
			
		||||
    class Result: Serializable
 | 
			
		||||
    {
 | 
			
		||||
    public:
 | 
			
		||||
        GRID_SERIALIZABLE_CLASS_MEMBERS(Result,
 | 
			
		||||
                                        std::vector<std::vector<std::vector<Complex>>>, corr);
 | 
			
		||||
        GRID_SERIALIZABLE_CLASS_MEMBERS(Result, std::vector<Complex>, corr);
 | 
			
		||||
    };
 | 
			
		||||
public:
 | 
			
		||||
    // constructor
 | 
			
		||||
@@ -114,29 +115,17 @@ void TMeson<FImpl1, FImpl2>::execute(void)
 | 
			
		||||
    PropagatorField1      &q1 = *env().template getObject<PropagatorField1>(par().q1);
 | 
			
		||||
    PropagatorField2      &q2 = *env().template getObject<PropagatorField2>(par().q2);
 | 
			
		||||
    LatticeComplex        c(env().getGrid());
 | 
			
		||||
    SpinMatrix            g[Ns*Ns], g5;
 | 
			
		||||
    Gamma                 gSrc(par().gammaSource), gSnk(par().gammaSink);
 | 
			
		||||
    Gamma                 g5(Gamma::Algebra::Gamma5);
 | 
			
		||||
    std::vector<TComplex> buf;
 | 
			
		||||
    Result                result;
 | 
			
		||||
    
 | 
			
		||||
    g5 = makeGammaProd(Ns*Ns - 1);
 | 
			
		||||
    result.corr.resize(Ns*Ns);
 | 
			
		||||
    for (unsigned int i = 0; i < Ns*Ns; ++i)
 | 
			
		||||
    c = trace(gSnk*q1*adj(gSrc)*g5*adj(q2)*g5);
 | 
			
		||||
    sliceSum(c, buf, Tp);
 | 
			
		||||
    result.corr.resize(buf.size());
 | 
			
		||||
    for (unsigned int t = 0; t < buf.size(); ++t)
 | 
			
		||||
    {
 | 
			
		||||
        g[i] = makeGammaProd(i);
 | 
			
		||||
    }
 | 
			
		||||
    for (unsigned int iSink = 0; iSink < Ns*Ns; ++iSink)
 | 
			
		||||
    {
 | 
			
		||||
        result.corr[iSink].resize(Ns*Ns);
 | 
			
		||||
        for (unsigned int iSrc = 0; iSrc < Ns*Ns; ++iSrc)
 | 
			
		||||
        {
 | 
			
		||||
            c = trace(g[iSink]*q1*g[iSrc]*g5*adj(q2)*g5);
 | 
			
		||||
            sliceSum(c, buf, Tp);
 | 
			
		||||
            result.corr[iSink][iSrc].resize(buf.size());
 | 
			
		||||
            for (unsigned int t = 0; t < buf.size(); ++t)
 | 
			
		||||
            {
 | 
			
		||||
                result.corr[iSink][iSrc][t] = TensorRemove(buf[t]);
 | 
			
		||||
            }
 | 
			
		||||
        }
 | 
			
		||||
        result.corr[t] = TensorRemove(buf[t]);
 | 
			
		||||
    }
 | 
			
		||||
    write(writer, "meson", result);
 | 
			
		||||
}
 | 
			
		||||
 
 | 
			
		||||
@@ -60,11 +60,11 @@ class SeqGammaPar: Serializable
 | 
			
		||||
{
 | 
			
		||||
public:
 | 
			
		||||
    GRID_SERIALIZABLE_CLASS_MEMBERS(SeqGammaPar,
 | 
			
		||||
                                    std::string,  q,
 | 
			
		||||
                                    unsigned int, tA,
 | 
			
		||||
                                    unsigned int, tB,
 | 
			
		||||
                                    unsigned int, gamma,
 | 
			
		||||
                                    std::string,  mom);
 | 
			
		||||
                                    std::string,    q,
 | 
			
		||||
                                    unsigned int,   tA,
 | 
			
		||||
                                    unsigned int,   tB,
 | 
			
		||||
                                    Gamma::Algebra, gamma,
 | 
			
		||||
                                    std::string,    mom);
 | 
			
		||||
};
 | 
			
		||||
 | 
			
		||||
template <typename FImpl>
 | 
			
		||||
@@ -140,11 +140,10 @@ void TSeqGamma<FImpl>::execute(void)
 | 
			
		||||
    PropagatorField &q   = *env().template getObject<PropagatorField>(par().q);
 | 
			
		||||
    Lattice<iScalar<vInteger>> t(env().getGrid());
 | 
			
		||||
    LatticeComplex             ph(env().getGrid()), coor(env().getGrid());
 | 
			
		||||
    SpinMatrix                 g;
 | 
			
		||||
    Gamma                      g(par().gamma);
 | 
			
		||||
    std::vector<Real>          p;
 | 
			
		||||
    Complex                    i(0.0,1.0);
 | 
			
		||||
    
 | 
			
		||||
    g  = makeGammaProd(par().gamma);
 | 
			
		||||
    p  = strToVec<Real>(par().mom);
 | 
			
		||||
    ph = zero;
 | 
			
		||||
    for(unsigned int mu = 0; mu < env().getNd(); mu++)
 | 
			
		||||
@@ -154,7 +153,7 @@ void TSeqGamma<FImpl>::execute(void)
 | 
			
		||||
    }
 | 
			
		||||
    ph = exp(i*ph);
 | 
			
		||||
    LatticeCoordinate(t, Tp);
 | 
			
		||||
    src = where((t >= par().tA) and (t <= par().tB), g*ph*q, 0.*q);
 | 
			
		||||
    src = where((t >= par().tA) and (t <= par().tB), ph*(g*q), 0.*q);
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
END_MODULE_NAMESPACE
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user