portelli/Grid
1
0
Fork 0
mirror of https://github.com/paboyle/Grid.git synced 2024-09-20 09:15:38 +01:00
Code Releases Activity

some cleanup in Baryon2pt

Browse Source
This commit is contained in:
Felix Erben 2019-02-20 12:56:13 +00:00
parent 5bb9de9242
commit f70c5b004a
4 changed files with 34 additions and 64 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

62
Hadrons/Modules/MDistil/BContraction.hpp
View File

@ -18,18 +18,17 @@ BEGIN_HADRONS_NAMESPACE
******************************************************************************/ ******************************************************************************/
BEGIN_MODULE_NAMESPACE(MDistil) BEGIN_MODULE_NAMESPACE(MDistil)
// general baryon tensor set based on Eigen tensors and Grid-allocated memory // general baryon tensor set based on Eigen tensors and Grid-allocated memory
// Dimensions: // Dimensions:
// 0 - ext - external field (momentum, EM field, ...) // 0 - ext - external field (momentum, EM field, ...)
// 1 - str - spin-color structure // 1 - str - dirac structure
// 2 - t - timeslice // 2 - t - timeslice
// 3 - i - left distillation mode index // 3 - s - free spin index
// 4 - j - middle distillation mode index // 4 - i - left distillation mode index
// 5 - k - left distillation mode index // 5 - j - middle distillation mode index
// 6 - k - left distillation mode index
// template <typename T> // template <typename T>
// using BaryonTensorSet = Eigen::TensorMap<Eigen::Tensor<T, 6, Eigen::RowMajor>>; // using BaryonTensorSet = Eigen::TensorMap<Eigen::Tensor<T, 7, Eigen::RowMajor>>;
class BContractionPar: Serializable class BContractionPar: Serializable
@ -74,7 +73,7 @@ protected:
/*class BFieldIO: Serializable{ /*class BFieldIO: Serializable{
public: public:
using BaryonTensorSet = Eigen::Tensor<Complex, 6>; using BaryonTensorSet = Eigen::Tensor<Complex, 7>;
GRID_SERIALIZABLE_CLASS_MEMBERS(BFieldIO, GRID_SERIALIZABLE_CLASS_MEMBERS(BFieldIO,
BaryonTensorSet, BField BaryonTensorSet, BField
); );
@ -183,9 +182,9 @@ void TBContraction<FImpl>::execute(void)
Gamma::Algebra::GammaYGamma5, // i gamma_4 C gamma_5 = i gamma_2 gamma_5 Gamma::Algebra::GammaYGamma5, // i gamma_4 C gamma_5 = i gamma_2 gamma_5
}; };
std::vector<Complex> factor23{{0.,-1.},{0.,1.},{0.,1.}}; std::vector<Complex> factor23{{0.,-1.},{0.,1.},{0.,1.}};
using BaryonTensorSet = Eigen::Tensor<Complex, 6>; using BaryonTensorSet = Eigen::Tensor<Complex, 7>;
int Ngamma=3; int Ngamma=3;
BaryonTensorSet BField3(Nmom,4*Ngamma,Nt,N_1,N_2,N_3); BaryonTensorSet BField3(Nmom,Ngamma,Nt,4,N_1,N_2,N_3);
Eigen::Tensor<Complex, 3> corr(Nmom,4,Nt); Eigen::Tensor<Complex, 3> corr(Nmom,4,Nt);
@ -216,7 +215,7 @@ void TBContraction<FImpl>::execute(void)
tmp111 = 0.5*(double)parity*(tmp111 + tmp222); // P_\pm * ... tmp111 = 0.5*(double)parity*(tmp111 + tmp222); // P_\pm * ...
diquark2 = factor23[0]*innerProduct(tmp22s,tmp333); diquark2 = factor23[0]*innerProduct(tmp22s,tmp333);
for (int is=0 ; is < 4 ; is++){ for (int is=0 ; is < 4 ; is++){
BField3(imom,is+4*ig,t,i1,i2,i3)+=(double)epsilon_sgn[ie]*tmp111()(is)()*diquark2; BField3(imom,ig,t,is,i1,i2,i3)+=(double)epsilon_sgn[ie]*tmp111()(is)()*diquark2;
} }
} }
} }
@ -228,7 +227,7 @@ void TBContraction<FImpl>::execute(void)
} }
for (int is=0 ; is < 4 ; is++){ for (int is=0 ; is < 4 ; is++){
for (int t=0 ; t < Nt ; t++){ for (int t=0 ; t < Nt ; t++){
std::cout << "BaryonField(is=" << is << ",t=" << t << ") = " << BField3(0,is,t,0,0,0) << std::endl; std::cout << "BaryonField(is=" << is << ",t=" << t << ") = " << BField3(0,0,t,is,0,0,0) << std::endl;
} }
} }
@ -240,45 +239,6 @@ void TBContraction<FImpl>::execute(void)
Hdf5Writer writer(filename); Hdf5Writer writer(filename);
write(writer,"BaryonField",BField_save.BField); write(writer,"BaryonField",BField_save.BField);
/* int Npairs = 0;
char left[] = "uud";
char right[] = "uud";
std::vector<int> pairs(6);
for (int ie=0, i=0 ; ie < 6 ; ie++){
if (left[0] == right[epsilon[ie][0]] && left[1] == right[epsilon[ie][1]] && left[2] == right[epsilon[ie][2]]){
pairs[i] = ie;
i++;
Npairs++;
}
}
pairs.resize(Npairs);
std::cout << Npairs << " pairs: " << pairs << std::endl;
for (int imom=0 ; imom < Nmom ; imom++){
for (int is=0 ; is < 4 ; is++){
for (int t=0 ; t < Nt ; t++){
corr(imom,is,t) = 0.;
}
}
}
for (int ipair=0 ; ipair < Npairs ; ipair++){
Eigen::array<Eigen::IndexPair<int>, 3> product_dims = { Eigen::IndexPair<int>(0,epsilon[pairs[ipair]][0]),Eigen::IndexPair<int>(1,epsilon[pairs[ipair]][1]) ,Eigen::IndexPair<int>(2,epsilon[pairs[ipair]][2]) };
for (int imom=0 ; imom < Nmom ; imom++){
Eigen::Tensor<Complex,5> B5 = BField3.chip(imom,0);
for (int is=0 ; is < 4 ; is++){
Eigen::Tensor<Complex,4> B4 = B5.chip(is,0);
for (int t=0 ; t < Nt ; t++){
Eigen::Tensor<Complex,3> B3 = B4.chip(t,0);
Eigen::Tensor<Complex,0> C2 = B3.contract(B3,product_dims);
corr(imom,is,t) += (double)epsilon_sgn[pairs[ipair]]*C2(0);
}
}
}
}
for (int is=0 ; is < 4 ; is++){
for (int t=0 ; t < Nt ; t++){
std::cout << "C2(is=" << is << ",t=" << t << ") = " << corr(0,is,t) << std::endl;
}
}*/
} }
END_MODULE_NAMESPACE END_MODULE_NAMESPACE

32
Hadrons/Modules/MDistil/Baryon2pt.hpp
View File

@ -24,6 +24,8 @@ public:
GRID_SERIALIZABLE_CLASS_MEMBERS(Baryon2ptPar, GRID_SERIALIZABLE_CLASS_MEMBERS(Baryon2ptPar,
std::string, inputL, std::string, inputL,
std::string, inputR, std::string, inputR,
std::string, quarksL,
std::string, quarksR,
std::string, output std::string, output
); );
}; };
@ -95,6 +97,8 @@ void TBaryon2pt<FImpl>::execute(void)
const std::string &inputL{par().inputL}; const std::string &inputL{par().inputL};
const std::string &inputR{par().inputR}; const std::string &inputR{par().inputR};
const std::string &inputL{par().quarksL};
const std::string &inputR{par().quarksR};
const std::string &output{par().output}; const std::string &output{par().output};
int Nmom=1; int Nmom=1;
@ -108,10 +112,10 @@ void TBaryon2pt<FImpl>::execute(void)
int N_2=20; int N_2=20;
int N_3=20; int N_3=20;
// using BaryonTensorSet = Eigen::Tensor<Complex, 6>; // using BaryonTensorSet = Eigen::Tensor<Complex, 7>;
BFieldIO BFieldL; BFieldIO BFieldL;
BFieldL.BField.resize(Nmom,4*Ngamma,Nt,N_1,N_2,N_3); BFieldL.BField.resize(Nmom,Ngamma,Nt,4,N_1,N_2,N_3);
std::string filenameL ="./" + inputL + ".h5"; std::string filenameL ="./" + inputL + ".h5";
std::cout << "Reading from file " << filenameL << std::endl; std::cout << "Reading from file " << filenameL << std::endl;
@ -119,7 +123,7 @@ void TBaryon2pt<FImpl>::execute(void)
read(readerL,"BaryonField",BFieldL.BField); read(readerL,"BaryonField",BFieldL.BField);
BFieldIO BFieldR; BFieldIO BFieldR;
BFieldR.BField.resize(Nmom,4*Ngamma,Nt,N_1,N_2,N_3); BFieldR.BField.resize(Nmom,Ngamma,Nt,4,N_1,N_2,N_3);
std::string filenameR ="./" + inputR + ".h5"; std::string filenameR ="./" + inputR + ".h5";
std::cout << "Reading from file " << filenameR << std::endl; std::cout << "Reading from file " << filenameR << std::endl;
@ -153,16 +157,20 @@ void TBaryon2pt<FImpl>::execute(void)
Eigen::array<Eigen::IndexPair<int>, 3> product_dims = { Eigen::IndexPair<int>(0,epsilon[pairs[ipair]][0]),Eigen::IndexPair<int>(1,epsilon[pairs[ipair]][1]) ,Eigen::IndexPair<int>(2,epsilon[pairs[ipair]][2]) }; Eigen::array<Eigen::IndexPair<int>, 3> product_dims = { Eigen::IndexPair<int>(0,epsilon[pairs[ipair]][0]),Eigen::IndexPair<int>(1,epsilon[pairs[ipair]][1]) ,Eigen::IndexPair<int>(2,epsilon[pairs[ipair]][2]) };
for (int imom=0 ; imom < Nmom ; imom++){ for (int imom=0 ; imom < Nmom ; imom++){
std::cout << imom << std::endl; std::cout << imom << std::endl;
Eigen::Tensor<Complex,5> B5L = BFieldL.BField.chip(imom,0); Eigen::Tensor<Complex,6> B6L = BFieldL.BField.chip(imom,0);
Eigen::Tensor<Complex,5> B5R = BFieldR.BField.chip(imom,0); Eigen::Tensor<Complex,6> B6R = BFieldR.BField.chip(imom,0);
for (int is=0 ; is < 4 ; is++){ for (int ig=0 ; ig < Ngamma ; ig++){
Eigen::Tensor<Complex,4> B4L = B5L.chip(is,0); Eigen::Tensor<Complex,5> B5L = B6L.chip(ig,0);
Eigen::Tensor<Complex,4> B4R = B5R.chip(is,0); Eigen::Tensor<Complex,5> B5R = B6R.chip(ig,0);
for (int t=0 ; t < Nt ; t++){ for (int t=0 ; t < Nt ; t++){
Eigen::Tensor<Complex,3> B3L = B4L.chip(t,0); Eigen::Tensor<Complex,4> B4L = B5L.chip(t,0);
Eigen::Tensor<Complex,3> B3R = B4R.chip(tsrc,0); Eigen::Tensor<Complex,4> B4R = B5R.chip(tsrc,0);
Eigen::Tensor<Complex,0> C2 = B3L.contract(B3R,product_dims); for (int is=0 ; is < 4 ; is++){
corr(imom,t) += (double)epsilon_sgn[pairs[ipair]]*C2(0); Eigen::Tensor<Complex,4> B3L = B4L.chip(is,0);
Eigen::Tensor<Complex,4> B3R = B4R.chip(is,0);
Eigen::Tensor<Complex,0> C2 = B3L.contract(B3R,product_dims);
corr(imom,t) += (double)epsilon_sgn[pairs[ipair]]*C2(0);
}
} }
} }
} }

2
Hadrons/Modules/MDistil/Distil.hpp
View File

@ -202,7 +202,7 @@ public:
class BFieldIO: Serializable{ class BFieldIO: Serializable{
public: public:
using BaryonTensorSet = Eigen::Tensor<Complex, 6>; using BaryonTensorSet = Eigen::Tensor<Complex, 7>;
GRID_SERIALIZABLE_CLASS_MEMBERS(BFieldIO, GRID_SERIALIZABLE_CLASS_MEMBERS(BFieldIO,
BaryonTensorSet, BField BaryonTensorSet, BField
); );

2
tests/hadrons/Test_hadrons_distil.cc
View File

@ -292,6 +292,8 @@ void test_Baryon2pt(Application &application)
MDistil::Baryon2pt::Par Baryon2ptPar; MDistil::Baryon2pt::Par Baryon2ptPar;
Baryon2ptPar.inputL="BaryonFieldPhi"; Baryon2ptPar.inputL="BaryonFieldPhi";
Baryon2ptPar.inputR="BaryonFieldRho"; Baryon2ptPar.inputR="BaryonFieldRho";
Baryon2ptPar.quarksL="uud";
Baryon2ptPar.quarksR="uud";
Baryon2ptPar.output="C2_baryon"; Baryon2ptPar.output="C2_baryon";
application.createModule<MDistil::Baryon2pt>("C2_b",Baryon2ptPar); application.createModule<MDistil::Baryon2pt>("C2_b",Baryon2ptPar);
} }