Commit 2bd82106 authored by Cédric Mezrag's avatar Cédric Mezrag
Browse files

dummit commit

parent 11de7135
...@@ -190,7 +190,8 @@ std::function<std::map<int, double>(double const&, double const&)> GPDEvolutionA ...@@ -190,7 +190,8 @@ std::function<std::map<int, double>(double const&, double const&)> GPDEvolutionA
PartonDistribution pd = pGPDModule->compute(kin, this->getGPDType()); PartonDistribution pd = pGPDModule->compute(kin, this->getGPDType());
// Put them in a map // Put them in a map
std::map<int, double> physd{{0, 0.5 * pd.getGluonDistribution().getGluonDistribution()}}; //std::map<int, double> physd{{0, 0.5 * pd.getGluonDistribution().getGluonDistribution()}};
std::map<int, double> physd{{0, pd.getGluonDistribution().getGluonDistribution()}};
for (QuarkFlavor::Type const t : pd.listTypeOfQuarkFlavor()) { for (QuarkFlavor::Type const t : pd.listTypeOfQuarkFlavor()) {
// Swap up and down according to the PDG convention // Swap up and down according to the PDG convention
......
...@@ -766,11 +766,13 @@ PARTONS::PartonDistribution pionDiehlGRSModel1::computeH() ...@@ -766,11 +766,13 @@ PARTONS::PartonDistribution pionDiehlGRSModel1::computeH()
if (m_x >= m_xi) { if (m_x >= m_xi) {
// Integration // Integration
Hg = integrate(m_pIntegralxLargeHg, Beta1, Beta2, emptyParameters); //Hg = integrate(m_pIntegralxLargeHg, Beta1, Beta2, emptyParameters);
Hg = gluonxPdfAnsatz(m_x); // Check Forward limit
} }
if (fabs(m_x) < m_xi) { if (fabs(m_x) < m_xi) {
std::cout << "issue, model evaluated in the wrong region"<< std::endl;
Hg = integrate(m_pIntegralxSmall1Hg, 0., Beta2, emptyParameters); Hg = integrate(m_pIntegralxSmall1Hg, 0., Beta2, emptyParameters);
Hg += integrate(m_pIntegralxSmall2Hg, 0., Beta2Mx, emptyParameters); Hg += integrate(m_pIntegralxSmall2Hg, 0., Beta2Mx, emptyParameters);
//Dterm part //Dterm part
...@@ -780,6 +782,7 @@ PARTONS::PartonDistribution pionDiehlGRSModel1::computeH() ...@@ -780,6 +782,7 @@ PARTONS::PartonDistribution pionDiehlGRSModel1::computeH()
} }
if (m_x <= -m_xi) { if (m_x <= -m_xi) {
std::cout << "issue, model evaluated in the wrong region"<< std::endl;
// Integration // Integration
Hg = integrate(m_pIntegralxLargeHgMx, Beta1Mx, Beta2Mx, Hg = integrate(m_pIntegralxLargeHgMx, Beta1Mx, Beta2Mx,
emptyParameters); emptyParameters);
...@@ -795,10 +798,12 @@ PARTONS::PartonDistribution pionDiehlGRSModel1::computeH() ...@@ -795,10 +798,12 @@ PARTONS::PartonDistribution pionDiehlGRSModel1::computeH()
double Hs = 0; double Hs = 0;
if (m_x >= m_xi) { if (m_x >= m_xi) {
Hs = integrate(m_pIntegralxLargeHsSea, Beta1, Beta2, emptyParameters); //Hs = integrate(m_pIntegralxLargeHsSea, Beta1, Beta2, emptyParameters);
Hs = seaPdfAnsatz(m_x); //check forward limit
} }
if (fabs(m_x) < m_xi) { if (fabs(m_x) < m_xi) {
std::cout << "issue, model evaluated in the wrong region"<< std::endl;
Hs = integrate(m_pIntegralxSmallHsSea, Eps, Beta2Min, emptyParameters); Hs = integrate(m_pIntegralxSmallHsSea, Eps, Beta2Min, emptyParameters);
Hs += integrate(m_pIntegralxSmall1HsSea, Beta2Min, Beta2, Hs += integrate(m_pIntegralxSmall1HsSea, Beta2Min, Beta2,
emptyParameters); emptyParameters);
...@@ -812,6 +817,7 @@ PARTONS::PartonDistribution pionDiehlGRSModel1::computeH() ...@@ -812,6 +817,7 @@ PARTONS::PartonDistribution pionDiehlGRSModel1::computeH()
if (m_x <= -m_xi) { if (m_x <= -m_xi) {
Hs = -integrate(m_pIntegralxLargeHsSeaMx, Beta1Mx, Beta2Mx, Hs = -integrate(m_pIntegralxLargeHsSeaMx, Beta1Mx, Beta2Mx,
emptyParameters); emptyParameters);
std::cout << "issue, model evaluated in the wrong region"<< std::endl;
} }
if(std::isnan(Hs)){ std::cout << "Nan detected in s-quark gpd computation for xi = " << m_xi << " and x = " << m_x << std::endl ;} if(std::isnan(Hs)){ std::cout << "Nan detected in s-quark gpd computation for xi = " << m_xi << " and x = " << m_x << std::endl ;}
...@@ -831,13 +837,16 @@ PARTONS::PartonDistribution pionDiehlGRSModel1::computeH() ...@@ -831,13 +837,16 @@ PARTONS::PartonDistribution pionDiehlGRSModel1::computeH()
if (m_x >= m_xi) { if (m_x >= m_xi) {
// Integration, u quark // Integration, u quark
HuVal = integrate(m_pIntegralHuVal, Beta1, Beta2, emptyParameters); //HuVal = integrate(m_pIntegralHuVal, Beta1, Beta2, emptyParameters);
HuVal = 0.5 * valencePdfAnsatz(m_x); // Check Forward limit
// Integration, d quark // Integration, d quark
HdValMx = integrate(m_pIntegralHdValMx, Beta1, Beta2, emptyParameters); //HdValMx = integrate(m_pIntegralHdValMx, Beta1, Beta2, emptyParameters);
HdValMx = 0.5 * valencePdfAnsatz(m_x);
} }
if (fabs(m_x) < m_xi) { if (fabs(m_x) < m_xi) {
std::cout << "issue, model evaluated in the wrong region"<< std::endl;
// Integration, u quark // Integration, u quark
HuVal = integrate(m_pIntegralHuVal, Eps, Beta2, emptyParameters); HuVal = integrate(m_pIntegralHuVal, Eps, Beta2, emptyParameters);
//D-term //D-term
...@@ -858,7 +867,7 @@ PARTONS::PartonDistribution pionDiehlGRSModel1::computeH() ...@@ -858,7 +867,7 @@ PARTONS::PartonDistribution pionDiehlGRSModel1::computeH()
if (m_Mx >= m_xi) { if (m_Mx >= m_xi) {
std::cout << "issue, model evaluated in the wrong region"<< std::endl;
// Integration, u quark // Integration, u quark
HuValMx = MathIntegratorModule::integrate(m_pIntegralHuValMx, Beta1Mx, Beta2Mx, HuValMx = MathIntegratorModule::integrate(m_pIntegralHuValMx, Beta1Mx, Beta2Mx,
emptyParameters); emptyParameters);
...@@ -869,7 +878,7 @@ PARTONS::PartonDistribution pionDiehlGRSModel1::computeH() ...@@ -869,7 +878,7 @@ PARTONS::PartonDistribution pionDiehlGRSModel1::computeH()
} }
if (fabs(m_Mx) < m_xi) { if (fabs(m_Mx) < m_xi) {
std::cout << "issue, model evaluated in the wrong region"<< std::endl;
// Integration, u quark // Integration, u quark
HuValMx = MathIntegratorModule::integrate(m_pIntegralHuValMx, Eps, Beta2Mx, emptyParameters); HuValMx = MathIntegratorModule::integrate(m_pIntegralHuValMx, Eps, Beta2Mx, emptyParameters);
HuValMx -= -0.5 * ( integrate(m_pIntegralDuVal, Eps, ((1+m_x/m_xi)/2), emptyParameters) HuValMx -= -0.5 * ( integrate(m_pIntegralDuVal, Eps, ((1+m_x/m_xi)/2), emptyParameters)
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment