finalize rebase

Author: scarlehoff

n3fit/src/evolven3fit/cli.py

@@ -2,7 +2,7 @@
 
 
 def cli_evolven3fit(
-    configuration_folder, q_fin, q_points, op_card_info, theory_card_info, force, load, dump,
+    configuration_folder, q_fin, q_points, op_card_info, theory_card_info, force, load, dump
 ):
     """Evolves the fitted PDFs.
 
@@ -23,12 +23,5 @@ def cli_evolven3fit(
     """
     utils.check_is_a_fit(configuration_folder)
     return evolve.evolve_fit(
-        configuration_folder,
-        q_fin,
-        q_points,
-        op_card_info,
-        theory_card_info,
-        force,
-        load,
-        dump,
+        configuration_folder, q_fin, q_points, op_card_info, theory_card_info, force, load, dump
     )

n3fit/src/evolven3fit/eko_utils.py

@@ -174,30 +174,27 @@ def build_opcard(op_card_dict, theory, x_grid, mu0, mugrid):
     if op_card_dict is None:
         op_card_dict = {}
 
-	# Taken from cards.py https://github.com/NNPDF/eko/blob/master/src/ekobox/cards.py
-	# 7735fdb
+    # Taken from cards.py https://github.com/NNPDF/eko/blob/master/src/ekobox/cards.py
+    # 7735fdb
     op_card = dict(
-    	init=(1.65, 4),
-    	mugrid=[(100.0, 5)],
-    	xgrid=np.geomspace(1e-7, 1.0, 50).tolist(),
-    	configs=dict(
+        init=(1.65, 4),
+        mugrid=[(100.0, 5)],
+        xgrid=np.geomspace(1e-7, 1.0, 50).tolist(),
+        configs=dict(
             # These three values might be set by op_card_dict
-    		ev_op_iterations=10,
-    		n_integration_cores=1,
-    		polarized=False,
+            ev_op_iterations=10,
+            n_integration_cores=1,
+            polarized=False,
             #
-    		ev_op_max_order=[10, 0],
-    		interpolation_polynomial_degree=4,
-    		interpolation_is_log=True,
-    		scvar_method=None,
-    		inversion_method=None,
-    		evolution_method="iterate-exact",
-    		time_like=False,
-    	),
-    	debug=dict(
-    		skip_singlet=False,
-    		skip_non_singlet=False,
-    	),
+            ev_op_max_order=[10, 0],
+            interpolation_polynomial_degree=4,
+            interpolation_is_log=True,
+            scvar_method=None,
+            inversion_method=None,
+            evolution_method="iterate-exact",
+            time_like=False,
+        ),
+        debug=dict(skip_singlet=False, skip_non_singlet=False),
     )
 
     op_card["init"] = (mu0, theory["nf0"])

n3fit/src/evolven3fit/evolve.py

@@ -11,7 +11,6 @@
 from eko import basis_rotation, runner
 from eko.interpolation import XGrid
 from eko.io import manipulate
-from eko import basis_rotation, runner
 from validphys.utils import yaml_safe
 
 from . import eko_utils, utils

n3fit/src/evolven3fit/q2grids.py

@@ -1,12 +1,13 @@
 """
-    Definition of default Q2 grids
+Definition of default Q2 grids
 
-    This file includes:
+This file includes:
 
-        ``Q2GRID_DEFAULT``: default NNPDF Q2 grid for evolution (55 points, starts at Q=1GeV)
-        ``Q2GRID_NNPDF40``: q2 grid used in the fits for the NNPDF4.0 release (49 points, starts at Q=1.65 GeV)
-        ``Q2GRID_Nf03``: q2 grid used in the perturvative charm fits for the NNPDF4.0 release (48 points, starts at Q=1GeV)
+    ``Q2GRID_DEFAULT``: default NNPDF Q2 grid for evolution (55 points, starts at Q=1GeV)
+    ``Q2GRID_NNPDF40``: q2 grid used in the fits for the NNPDF4.0 release (49 points, starts at Q=1.65 GeV)
+    ``Q2GRID_Nf03``: q2 grid used in the perturvative charm fits for the NNPDF4.0 release (48 points, starts at Q=1GeV)
 """
+
 import numpy as np
 
 Q2GRID_NNPDF40 = (