From 883515d3a87ec1ca305f0bedb5dbc6aa06d9ea43 Mon Sep 17 00:00:00 2001 From: Luca Rottoli Date: Thu, 14 Feb 2019 16:09:52 +0100 Subject: [PATCH 1/2] new implementation of scale variations --- src/DIS/SetScaleVariationProcedure.f | 4 +++- src/DIS/initParametersDIS.f | 9 ++++++--- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/src/DIS/SetScaleVariationProcedure.f b/src/DIS/SetScaleVariationProcedure.f index a72b1b45..ad58ce03 100644 --- a/src/DIS/SetScaleVariationProcedure.f +++ b/src/DIS/SetScaleVariationProcedure.f @@ -3,9 +3,11 @@ * SetScaleVariationProcedure.f: * * This subroutine sets the the procedure to be used to vary -* factorisation and remormalisation scale: +* factorisation and renormalisation scale: * - 0: consistent scale variation in DIS and evolution * - 1: variation only in the DIS structure functions +* - 2: renormalisation scale variation in structure functions, +* factorisation scale variation in the evolution * ************************************************************************ subroutine SetScaleVariationProcedure(svproc) diff --git a/src/DIS/initParametersDIS.f b/src/DIS/initParametersDIS.f index b2bd2733..95661e10 100644 --- a/src/DIS/initParametersDIS.f +++ b/src/DIS/initParametersDIS.f @@ -191,14 +191,16 @@ subroutine initParametersDIS call exit(-10) endif * - if(ScVarProc.lt.0.or.ScVarProc.gt.1)then + if(ScVarProc.lt.0.or.ScVarProc.gt.2)then write(6,*) achar(27)//"[31mERROR:" write(6,*) "Scale variation procedure unknown:" write(6,*) "ScVarProc = ",ScVarProc write(6,*) " " write(6,*) "The options are:" - write(6,*) "- 0" - write(6,*) "- 1" + write(6,*) "-0 consistent scale variation in DIS and evolution" + write(6,*) "-1 variation only in the DIS structure functions" + write(6,*) "-2 renormalisation scale variation in structure + functions, factorisation scale variation in the evolution" write(6,*) achar(27)//"[0m" call exit(-10) endif @@ -208,6 +210,7 @@ subroutine initParametersDIS if(krenQ.ne.1d0.or.kfacQ.ne.1d0)then call SetRenFacRatio(dsqrt(krenQ/kfacQ)) if(ScVarProc.eq.1) call SetRenFacRatio(1d0) + if(ScVarProc.eq.2) kfacQ = 1d0 endif * * Ensure that for the time-like evolution only proper settings are used From ef678cf9871474e26797160753a3b61018f58223 Mon Sep 17 00:00:00 2001 From: Luca Rottoli Date: Thu, 14 Feb 2019 16:09:52 +0100 Subject: [PATCH 2/2] new implementation of scale variations --- src/DIS/SetScaleVariationProcedure.f | 4 +++- src/DIS/initParametersDIS.f | 9 ++++++--- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/src/DIS/SetScaleVariationProcedure.f b/src/DIS/SetScaleVariationProcedure.f index a72b1b45..ad58ce03 100644 --- a/src/DIS/SetScaleVariationProcedure.f +++ b/src/DIS/SetScaleVariationProcedure.f @@ -3,9 +3,11 @@ * SetScaleVariationProcedure.f: * * This subroutine sets the the procedure to be used to vary -* factorisation and remormalisation scale: +* factorisation and renormalisation scale: * - 0: consistent scale variation in DIS and evolution * - 1: variation only in the DIS structure functions +* - 2: renormalisation scale variation in structure functions, +* factorisation scale variation in the evolution * ************************************************************************ subroutine SetScaleVariationProcedure(svproc) diff --git a/src/DIS/initParametersDIS.f b/src/DIS/initParametersDIS.f index b2bd2733..b6a1c8a5 100644 --- a/src/DIS/initParametersDIS.f +++ b/src/DIS/initParametersDIS.f @@ -191,14 +191,16 @@ subroutine initParametersDIS call exit(-10) endif * - if(ScVarProc.lt.0.or.ScVarProc.gt.1)then + if(ScVarProc.lt.0.or.ScVarProc.gt.2)then write(6,*) achar(27)//"[31mERROR:" write(6,*) "Scale variation procedure unknown:" write(6,*) "ScVarProc = ",ScVarProc write(6,*) " " write(6,*) "The options are:" - write(6,*) "- 0" - write(6,*) "- 1" + write(6,*) "-0 consistent scale variation in DIS and evolution" + write(6,*) "-1 variation only in the DIS structure functions" + write(6,*) "-2 ren. scale variation in structure functions," + write(6,*) "factorisation scale variation in evolution" write(6,*) achar(27)//"[0m" call exit(-10) endif @@ -208,6 +210,7 @@ subroutine initParametersDIS if(krenQ.ne.1d0.or.kfacQ.ne.1d0)then call SetRenFacRatio(dsqrt(krenQ/kfacQ)) if(ScVarProc.eq.1) call SetRenFacRatio(1d0) + if(ScVarProc.eq.2) kfacQ = 1d0 endif * * Ensure that for the time-like evolution only proper settings are used