format codes

N3PDF · Jun 9, 2021 · 6bded37 · 6bded37
1 parent 4880957
commit 6bded37
Show file tree

Hide file tree

Showing 8 changed files with 21 additions and 33 deletions.
diff --git a/include/CombinedRes.h b/include/CombinedRes.h
@@ -28,10  28,10 @@
 #include <vector>
 
 #include "./ComplexDefs.h"
-#include "./SmallptExp.h"
-#include "./ThresExp.h"
 #include "./HighEnergyExp.h"
 #include "./IntMellin.h"
 #include "./SmallptExp.h"
 #include "./ThresExp.h"
 #include "higgs-fo/partonic.h"
 
 class CombinedRes {

diff --git a/include/HighEnergyExp.h b/include/HighEnergyExp.h
@@ -42,18  42,15 @@ class HighEnergyExp {
   /*     std::complex<long double> N, long double xp */
   /* ); */
   std::complex<long double> HighEnergyExpExpr(std::complex<long double> N,
-                                         long double pt);
-
                                               long double pt);
 
   // Matching Coefficients
   long double Hth1gggH(long double xp);
   long double Hth1gqqH(long double xp);
   long double Hth1qqgH(long double xp);
 
-  std::complex<long double> C1gg(std::complex<long double> NN,
-                                            long double xp);
-  std::complex<long double> C2gg(std::complex<long double> NN,
-                                            long double xp);
   std::complex<long double> C1gg(std::complex<long double> NN, long double xp);
   std::complex<long double> C2gg(std::complex<long double> NN, long double xp);
   // LO pt-distribution
   std::complex<long double> LOgggH(std::complex<long double> NN,
                                    long double xp);

diff --git a/include/IntMellin.h b/include/IntMellin.h
@@ -38,7  38,7 @@ class MellinTrans {
 
   double ExtractThresMom(double x, double N, double pt);
   std::complex<long double> xSpaceThres(std::complex<long double> N,
-										long double pt);
                                         long double pt);
 
  private:
   int NF, ORD, CHANNEL;

diff --git a/src/CombinedRes.cpp b/src/CombinedRes.cpp
@@ -67,9  67,8 @@ std::complex<long double> CombinedRes::Matching(std::complex<long double> N,
   }
 }
 
-std::complex<long double>
-CombinedRes::CombinedResExpr(std::complex<long double> N, long double pt,
-                             int scheme) {
 std::complex<long double> CombinedRes::CombinedResExpr(
     std::complex<long double> N, long double pt, int scheme) {
   std::complex<long double> mres;
 
   // Compute approximation from resummations
@@ -79,7  78,7 @@ CombinedRes::CombinedResExpr(std::complex<long double> N, long double pt,
 
   mres = (1. - Matching(N, pt, scheme)) * SptMellin  
          Matching(N, pt, scheme) * xThresMellin;
-         /* Matching(N, pt, scheme) * ThresMellin; */
   /* Matching(N, pt, scheme) * ThresMellin; */
 
   return mres;
 }
diff --git a/src/HighEnergyExp.cpp b/src/HighEnergyExp.cpp
@@ -74,29  74,28 @@ HighEnergyExp::~HighEnergyExp() {}
 //                               gg-channel NLO pt-distributions //
 //------------------------------------------------------------------------------------------//
 
-
 std::complex<long double> HighEnergyExp::C1gg(std::complex<long double> NN,
-                                           long double xp) {
                                               long double xp) {
   std::complex<long double> result;
-  result = 2*CA/M_PIl / xp / NN;
   result = 2 * CA / M_PIl / xp / NN;
   return result;
 }
 
 std::complex<long double> HighEnergyExp::C2gg(std::complex<long double> NN,
-                                           long double xp) {
                                               long double xp) {
   std::complex<long double> result;
-  result = 2*std::pow(CA,2)/std::pow(M_PIl,2) * (log(xp)/xp) / std::pow(NN,2);
   result = 2 * std::pow(CA, 2) / std::pow(M_PIl, 2) * (log(xp) / xp) /
            std::pow(NN, 2);
   return result;
 }
 
-
 //==========================================================================================//
 //                             Expanded Resummed Expression //
 //------------------------------------------------------------------------------------------//
 
 // TODO: change this into a vector
-std::complex<long double> HighEnergyExp::HighEnergyExpExpr(std::complex<long double> N,
-                                                 long double pt) {
 std::complex<long double> HighEnergyExp::HighEnergyExpExpr(
     std::complex<long double> N, long double pt) {
   // TODO: re-check definition MH2 vs. Qs2
   long double xp = std::pow(pt, 2) / MH2;
   std::complex<long double> zero(0., 0.);
@@ -119,7  118,7 @@ std::complex<long double> HighEnergyExp::HighEnergyExpExpr(std::complex<long dou
     case (1):  // order as^2
     {
       if ((CHANNEL == 0) || (CHANNEL == 5)) {
-        result  = std::pow(aass,2) * C2gg(N, xp);
         result  = std::pow(aass, 2) * C2gg(N, xp);
       }
       if ((CHANNEL == 1) || (CHANNEL == 5)) {
         return zero;

diff --git a/src/IntMellin.cpp b/src/IntMellin.cpp
@@ -30,30  30,25 @@ MellinTrans::MellinTrans(int order, int channel, std::string pdfname,
   MUF2 = static_cast<long double>(std::pow(param.muf, 2));
 }
 
-
 MellinTrans::~MellinTrans() {}
 
-
 struct IntStruct {
   MellinTrans *TransMellin;
   double N;
   double pt;
 };
 
-
 double MellinTrans::ExtractThresMom(double x, double N, double pt) {
   return xThres.ThresXspaceExpr(x, N, pt);
 }
 
-
 double xThresIntegrand(double x, void *p) {
   IntStruct par = *reinterpret_cast<IntStruct *>(p);
   return par.TransMellin->ExtractThresMom(x, par.N, par.pt);
 }
 
-
-std::complex<long double> MellinTrans::xSpaceThres(
-    std::complex<long double> N, long double pt) {
 std::complex<long double> MellinTrans::xSpaceThres(std::complex<long double> N,
                                                    long double pt) {
   int method = 0;
   double reslt, error;
   double nn = static_cast<double>(N.real());

diff --git a/src/Integration.cpp b/src/Integration.cpp
@@ -23,14  23,12 @@ struct IntData {
   void *param;
 };
 
-
 int xIntegrand(int *ndim, double *x, int *ncomp, double *y, void *p) {
   IntData inparam = *reinterpret_cast<IntData *>(p);
   y[0] = inparam.fun(x[0], inparam.param);
   return 0;
 }
 
-
 double ExtrIntegration::IntegrateOverx(int method, double(Func)(double, void *),
                                        void *pp, double *error) {
   int fail;

diff --git a/src/ThresXspace.cpp b/src/ThresXspace.cpp
@@ -116,12  116,12 @@ double ThresXspace::ThresXspaceExpr(double x, double N, double pt) {
         double g1 = -Beta0   6. * NC * theta1  
                     2. * NC * std::log((1. - axp) / 2.) -
                     2. * NC * std::log(axp * xp)   2. * LF;
-                    /*   4. * std::log((1. / axp - 1.) / 2.); */
         /*   4. * std::log((1. / axp - 1.) / 2.); */
         double g0 = -(Beta0 * theta1)   6. * NC * theta2  
                     2. * NC * theta1 * std::log((1. - axp) / 2.) -
                     2. * NC * theta1 * std::log(axp * xp)  
                     2. * (2. * NC * theta1   Beta0) * LF;
-                    /*  *(LF   std::log((1 / axp) - 1.) / 2.); */
         /*  *(LF   std::log((1 / axp) - 1.) / 2.); */
         double SIGMAGG =
             g2 * std::pow(std::log(1. - x), 2)   g1 * std::log(1. - x)   g0;
         result  = aass * LOgggH(x, xp) * SIGMAGG;