Remove and rename a few variable in the plot script

Author: cschwan

pineappl_cli/src/plot.py

@@ -275,12 +275,11 @@ def main():
     plt.rc('ytick.major', width=0.5)
     plt.rc('ytick.minor', visible=True, width=0.5)
 
-    xaxis = '{xaxis}'
-    xunit = '{xunit}'
     xlabel = r'{xlabel}'
     ylabel = r'{ylabel}'
+    xlog = {xlog}
     ylog = {ylog}
-    description = r'{description}'
+    title = r'{title}'
 
     data_slices = data()
 
@@ -290,10 +289,10 @@ def main():
 
         figure, axes = plt.subplots(len(panels), 1, sharex=True, squeeze=False)
 
-        if len(kwargs['x']) != 2 and xunit != '':
+        if len(kwargs['x']) > 2 and xlog:
             axes[0, 0].set_xscale('log')
 
-        axes[ 0, 0].set_title(description)
+        axes[ 0, 0].set_title(title)
         axes[-1, 0].set_xlabel(xlabel)
 
         for plot, axis in zip(panels, axes[:, 0]):

pineappl_cli/src/plot.rs

@@ -463,8 +463,9 @@ impl Subcommand for Opts {
                     format!(" [\\si{{{}}}]", yunit)
                 }
             );
+            let xlog = if xunit == "" { "False" } else { "True" };
             let ylog = if xlabel == "" { "True" } else { "False" };
-            let description = key_values
+            let title = key_values
                 .get("description")
                 .map(String::as_str)
                 .unwrap_or("");
@@ -476,12 +477,11 @@ impl Subcommand for Opts {
                 inte = if bins == 1 { "" } else { "#" },
                 nint = if bins == 1 { "#" } else { "" },
                 pdfs = if pdfs == 1 || bins == 1 { "#" } else { "" },
-                xaxis = xaxis,
-                xunit = xunit,
                 xlabel = xlabel,
                 ylabel = ylabel,
+                xlog = xlog,
                 ylog = ylog,
-                description = description,
+                title = title,
                 output = output.to_str().unwrap(),
                 data = data_string,
                 metadata = format_metadata(&vector),

pineappl_cli/tests/plot.rs

@@ -295,12 +295,11 @@ def main():
     plt.rc('ytick.major', width=0.5)
     plt.rc('ytick.minor', visible=True, width=0.5)
 
-    xaxis = 'x1'
-    xunit = ''
     xlabel = r'$\eta_{\bar{\ell}}$'
     ylabel = r'$\frac{\mathrm{d}\sigma}{\mathrm{d}\eta_{\bar{\ell}}}$ [\si{pb}]'
+    xlog = False
     ylog = False
-    description = r'LHCb differential W-boson production cross section at 7 TeV'
+    title = r'LHCb differential W-boson production cross section at 7 TeV'
 
     data_slices = data()
 
@@ -310,10 +309,10 @@ def main():
 
         figure, axes = plt.subplots(len(panels), 1, sharex=True, squeeze=False)
 
-        if len(kwargs['x']) != 2 and xunit != '':
+        if len(kwargs['x']) > 2 and xlog:
             axes[0, 0].set_xscale('log')
 
-        axes[ 0, 0].set_title(description)
+        axes[ 0, 0].set_title(title)
         axes[-1, 0].set_xlabel(xlabel)
 
         for plot, axis in zip(panels, axes[:, 0]):