Skip to content

Commit

Permalink
Fix wrong merge
Browse files Browse the repository at this point in the history
  • Loading branch information
felixhekhorn committed Sep 16, 2024
1 parent b1beb83 commit 7d5dac7
Showing 1 changed file with 7 additions and 8 deletions.
15 changes: 7 additions & 8 deletions src/eko/evolution_operator/operator_matrix_element.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
"""The |OME| for the non-trivial matching conditions in the |VFNS| evolution."""
"""The |OME| for the non-trivial matching conditions in the |VFNS|
evolution."""

import copy
import enum
Expand All @@ -16,6 +17,7 @@
from .. import scale_variations as sv
from ..io.types import InversionMethod
from ..matchings import Segment
from ..scale_variations.exponentiated import gamma_variation
from . import Operator, QuadKerBase

logger = logging.getLogger(__name__)
Expand All @@ -41,7 +43,6 @@ def matching_method(s: InversionMethod) -> MatchingMethods:
-------
i :
int representation
"""
if s is not None:
return MatchingMethods["BACKWARD_" + s.value.upper()]
Expand All @@ -50,7 +51,8 @@ def matching_method(s: InversionMethod) -> MatchingMethods:

@nb.njit(cache=True)
def build_ome(A, matching_order, a_s, backward_method):
r"""Construct the matching expansion in :math:`a_s` with the appropriate method.
r"""Construct the matching expansion in :math:`a_s` with the appropriate
method.
Parameters
----------
Expand All @@ -67,7 +69,6 @@ def build_ome(A, matching_order, a_s, backward_method):
-------
ome : numpy.ndarray
matching operator matrix
"""
# to get the inverse one can use this FORM snippet
# Symbol a;
Expand Down Expand Up @@ -157,7 +158,6 @@ def quad_ker(
-------
ker : float
evaluated integration kernel
"""
ker_base = QuadKerBase(u, is_log, logx, mode0)
integrand = ker_base.integrand(areas)
Expand Down Expand Up @@ -189,7 +189,7 @@ def quad_ker(

# correct for scale variations
if sv_mode == sv.Modes.exponentiated:
A = sv.exponentiated.gamma_variation(A, order, nf, Lsv)
A = gamma_variation(A, order, nf, Lsv)

# build the expansion in alpha_s depending on the strategy
ker = build_ome(A, order, a_s, backward_method)
Expand All @@ -202,8 +202,7 @@ def quad_ker(


class OperatorMatrixElement(Operator):
r"""
Internal representation of a single |OME|.
r"""Internal representation of a single |OME|.
The actual matrices are computed upon calling :meth:`compute`.
Expand Down

0 comments on commit 7d5dac7

Please sign in to comment.