Refactor check subcommand

src/pineko/cli/check.py

@@ -9,48 +9,54 @@
 from ._base import command
 
 
-@command.command("check")
-@click.argument("pineappl_path", metavar="PINEAPPL", type=click.Path(exists=True))
-@click.argument("eko_path", metavar="EKO", type=click.Path(exists=True))
+@command.group("check")
+def subcommand():
+    """Check grid and operator properties."""
+
+
+@subcommand.command("compatibility")
+@click.argument("grid_path", metavar="PINEAPPL", type=click.Path(exists=True))
+@click.argument("operator_path", metavar="EKO", type=click.Path(exists=True))
 @click.option("--xif", default=1.0, help="factorization scale variation")
-def subcommand(pineappl_path, eko_path, xif):
+def sub_compatibility(grid_path, operator_path, xif):
     """Check PineAPPL grid and EKO compatibility.
 
     In order to be compatible, the grid provided in PINEAPPL and the operator
     provided in EKO, have to expose the same x grid and Q2 grid.
 
     XIF is the factorization scale variation.
+
     """
-    pineappl_grid = pineappl.grid.Grid.read(pineappl_path)
-    operators = eko.output.Output.load_tar(eko_path)
+    pineappl_grid = pineappl.grid.Grid.read(grid_path)
+    operators = eko.output.Output.load_tar(operator_path)
     try:
         check.check_grid_and_eko_compatible(pineappl_grid, operators, xif)
         rich.print("[green]Success:[/] grids are compatible")
     except ValueError as e:
         rich.print("[red]Error:[/]", e)
 
 
-@command.command("check_scalevar")
-@click.argument("pineappl_path", metavar="PINEAPPL", type=click.Path(exists=True))
+@subcommand.command("scvar")
+@click.argument("grid_path", metavar="PINEAPPL", type=click.Path(exists=True))
 @click.argument(
-    "tocheck",
-    metavar="TOCHECK",
-    type=str,
+    "scale",
+    metavar="SCALE",
+    type=click.Choice(["ren", "fact"]),
 )
-def subcommand_sv(pineappl_path, tocheck):
+def subcommand_sv(grid_path, scale):
     """Check if PineAPPL grid contains requested scale variations."""
-    pineappl_grid = pineappl.grid.Grid.read(pineappl_path)
-    if tocheck == "xir":
+    grid = pineappl.grid.Grid.read(grid_path)
+    if scale == "ren":
         try:
-            check.contains_ren(pineappl_grid)
+            check.contains_ren(grid)
             rich.print(
                 "[green]Success:[/] grids contain renormalization scale variations"
             )
         except ValueError as e:
             rich.print("[red]Error:[/]", e)
-    elif tocheck == "xif":
+    elif scale == "fact":
         try:
-            check.contains_fact(pineappl_grid)
+            check.contains_fact(grid)
             rich.print(
                 "[green]Success:[/] grids contain factorization scale variations"
             )