Last changes for v 1.3.0 of hoppet

alexanderkarlberg · Feb 12, 2024 · a6443b3 · a6443b3
1 parent b88fe95
commit a6443b3
Show file tree

Hide file tree

Showing 7 changed files with 18 additions and 17 deletions.
diff --git a/proVBFH-inclusive/src/parameters.f90 b/proVBFH-inclusive/src/parameters.f90
@@ -21,7 +21,7 @@ module parameters
  real(dp), public :: v_H, lambda_HHH
  real(dp), public :: sqrts, S, pi, Q0_cut_sq
  real(dp), public :: hmasswindow, toyas
- integer, public :: order_min, order_max, scale_choice, iseed
+ integer, public :: order_min, order_max, scale_choice, scale_choice_hoppet, iseed
  integer, public :: nflav, ipdf, itmx1, itmx2, ncall1, ncall2
  logical, public :: higgs_use_BW, higgsfixwdth, toypdf
  character * 4, public :: seedstr
@@ -119,6 +119,7 @@ subroutine set_parameters ()
  nloop = 3 
  minQval = min(xmuF*Qmin, Qmin)
  maxQval = max(xmuF*sqrts, sqrts)
+ scale_choice_hoppet = min(scale_choice,2)
  if (.not.CheckAllArgsUsed(0)) call exit()
  end subroutine set_parameters
 

diff --git a/proVBFH-inclusive/src/provbfh_incl.f90 b/proVBFH-inclusive/src/provbfh_incl.f90
@@ -97,10 +97,10 @@ program provbfh_incl
  ! initialise the grid and dglap holder
  call hoppetStartExtended(ymax,dy,minQval,maxQval,dlnlnQ,nloop,&
  & order,factscheme_MSbar)
- call StartStrFct(order_max, nflav, xmur, xmuf, scale_choice,&
- & mh, .true., mw, mz)
+ call StartStrFct(order_max, nflav, scale_choice_hoppet, mh,&
+ & .true., mw, mz)
  call read_PDF(toy_Q0, test_Q0, mur_PDF)
- call InitStrFct(order_max, separate_orders = .true.)
+ call InitStrFct(order_max, separate_orders = .true., xR = xmur, xF = xmuf)
  ! !! === DEBUGGING ONLY
  ! ! write the structure functions to file, for debugging purposes
  ! call debugging(100.0_dp, 1,1)

diff --git a/proVBFH-inclusive/src/provbfhh_incl.f90 b/proVBFH-inclusive/src/provbfhh_incl.f90
@@ -100,10 +100,10 @@ program provbfh_incl
  xmuf = scales_muf(iscales)
  call hoppetStartExtended(ymax,dy,minQval,maxQval,dlnlnQ,nloop,&
  & order,factscheme_MSbar)
- call StartStrFct(order_max, nflav, xmur, xmuf, scale_choice,&
- & mh, .true., mw, mz)
+ call StartStrFct(order_max, nflav, scale_choice, mh, .true., &
+ & mw, mz)
  call read_PDF(toy_Q0, test_Q0, mur_PDF)
- call InitStrFct(order_max, separate_orders = .true.)
+ call InitStrFct(order_max, separate_orders = .true., xR = xmur, xF = xmuf)
 
  ! !! === DEBUGGING ONLY
  ! ! write the structure functions to file, for debugging purposes

diff --git a/proVBFH/src/inclusive/incl_parameters.f90 b/proVBFH/src/inclusive/incl_parameters.f90
@@ -16,7 +16,7 @@ module incl_parameters
  real(dp), public :: sin_thw, mw, mz, w_width, z_width
  real(dp), public :: sqrts, S, pi, Q0_cut_sq
  real(dp), public :: hmasswindow, toyas
- integer, public :: order_min, order_max, scale_choice, iwhichseed
+ integer, public :: order_min, order_max, scale_choice, scale_choice_hoppet, iwhichseed
  integer, public :: nflav, ipdf, itmx1, itmx2, ncall1, ncall2
  logical, public :: do_analysis_call, manyseeds,non_fact,oneloop_on,twoloop_on
  logical, public :: higgs_use_BW, higgsfixwdth, complexpole, toypdf
@@ -184,7 +184,7 @@ subroutine set_parameters ()
  nloop = 3 
  minQval = min(xmuF*Qmin, Qmin)
  maxQval = max(xmuF*sqrts, sqrts)
-
+ scale_choice_hoppet = min(scale_choice,2)
  param_initialised = .true.
  end subroutine set_parameters
 

diff --git a/proVBFH/src/inclusive/incl_vbfh.f90 b/proVBFH/src/inclusive/incl_vbfh.f90
@@ -43,10 +43,10 @@ subroutine inclusive_init()
  ! initialise hoppet
  call hoppetStartExtended(ymax,dy,minQval,maxQval,dlnlnQ,nloop,&
  & order,factscheme_MSbar)
- call StartStrFct(order_max, nflav, xmur, xmuf, scale_choice, mh,&
- & .true., mw, mz)
+ call StartStrFct(order_max, nflav, scale_choice_hoppet, mh, .true., mw,&
+ & mz)
  call read_PDF()
- call InitStrFct(order_max, separate_orders = .true.)
+ call InitStrFct(order_max, separate_orders = .true., xR = xmur, xF = xmuf)
 
  ! !! === DEBUGGING ONLY
  ! ! write the structure functions to file, for debugging purposes

diff --git a/proVBFHH/src/inclusive/incl_parameters.f90 b/proVBFHH/src/inclusive/incl_parameters.f90
@@ -17,7 +17,7 @@ module incl_parameters
  real(dp), public :: v_H, lambda_HHH, lambdafact
  real(dp), public :: sqrts, S, pi, Q0_cut_sq
  real(dp), public :: hmasswindow, toyas
- integer, public :: order_min, order_max, scale_choice, iwhichseed
+ integer, public :: order_min, order_max, scale_choice, scale_choice_hoppet, iwhichseed
  integer, public :: nflav, ipdf, itmx1, itmx2, ncall1, ncall2
  logical, public :: do_analysis_call, manyseeds, non_fact
  logical, public :: higgs_use_BW, higgsfixwdth, complexpole, toypdf
@@ -233,7 +233,7 @@ subroutine set_parameters ()
  nloop = 3 
  minQval = min(xmuF*Qmin, Qmin)
  maxQval = max(xmuF*sqrts, sqrts)
-
+ scale_choice_hoppet = min(scale_choice,2)
  param_initialised = .true.
  end subroutine set_parameters
 

diff --git a/proVBFHH/src/inclusive/incl_vbfhh.f90 b/proVBFHH/src/inclusive/incl_vbfhh.f90
@@ -43,10 +43,10 @@ subroutine inclusive_init()
  ! initialise hoppet
  call hoppetStartExtended(ymax,dy,minQval,maxQval,dlnlnQ,nloop,&
  & order,factscheme_MSbar)
- call StartStrFct(order_max, nflav, xmur, xmuf, scale_choice, mh,&
- & .true., mw, mz)
+ call StartStrFct(order_max, nflav, scale_choice_hoppet, mh, .true., mw,&
+ & mz)
  call read_PDF()
- call InitStrFct(order_max, separate_orders = .true.)
+ call InitStrFct(order_max, separate_orders = .true., xR = xmur, xF = xmuf)
 
  ! !! === DEBUGGING ONLY
  ! ! write the structure functions to file, for debugging purposes