place if-statement and 1-line-expression into same line

Author: lubynets

PWGHF/D2H/Macros/compute_fraction_cutvar.py

@@ -202,16 +202,14 @@ def main(config):
         )
 
     pt_bin_to_process_name_suffix = ""
-    if pt_bin_to_process != -1:
-        pt_bin_to_process_name_suffix = "_bin_" + str(pt_bin_to_process)
+    if pt_bin_to_process != -1: pt_bin_to_process_name_suffix = "_bin_" + str(pt_bin_to_process)
 
     output_name_template = cfg['output']['file'].replace(".root", "") + pt_bin_to_process_name_suffix + ".root"
     output = ROOT.TFile(os.path.join(cfg["output"]["directory"], output_name_template), "recreate")
     n_sets = len(hist_rawy)
     pt_axis_title = hist_rawy[0].GetXaxis().GetTitle()
     for ipt in range(hist_rawy[0].GetNbinsX()):
-        if pt_bin_to_process !=-1 and ipt+1 != pt_bin_to_process:
-            continue
+        if pt_bin_to_process !=-1 and ipt+1 != pt_bin_to_process: continue
         all_vectors_monotonous = MinimisationStatus.Success
         pt_min = hist_rawy[0].GetXaxis().GetBinLowEdge(ipt + 1)
         pt_max = hist_rawy[0].GetXaxis().GetBinUpEdge(ipt + 1)
@@ -282,8 +280,7 @@ def main(config):
             if is_save_to_root_file[ObjectToSave.RawYield]:
                 for _, hist in histos_rawy.items():
                     hist.Write()
-            if (is_save_canvas_as_macro[PlotType.Rawy]):
-                canv_rawy.SaveAs(f"canv_rawy_{ipt+1}.C")
+            if is_save_canvas_as_macro[PlotType.Rawy]: canv_rawy.SaveAs(f"canv_rawy_{ipt+1}.C")
 
             hist_bin_title_unc = hist_bin_title if is_draw_title[PlotType.Unc] else ""
             canv_unc, histos_unc, leg_unc = minimiser.plot_uncertainties(f"_pt_{pt_min}_to_{pt_max}", hist_bin_title_unc)
@@ -292,8 +289,7 @@ def main(config):
             if is_save_to_root_file[ObjectToSave.Uncertainty]:
                 for _, hist in histos_unc.items():
                     hist.Write()
-            if (is_save_canvas_as_macro[PlotType.Unc]):
-                canv_unc.SaveAs(f"canv_unc_{ipt+1}.C")
+            if is_save_canvas_as_macro[PlotType.Unc]: canv_unc.SaveAs(f"canv_unc_{ipt+1}.C")
 
             hist_bin_title_eff = hist_bin_title if is_draw_title[PlotType.Eff] else ""
             canv_eff, histos_eff, leg_e = minimiser.plot_efficiencies(f"_pt_{pt_min}_to_{pt_max}", hist_bin_title_eff)
@@ -302,8 +298,7 @@ def main(config):
             if is_save_to_root_file[ObjectToSave.Efficiency]:
                 for _, hist in histos_eff.items():
                     hist.Write()
-            if (is_save_canvas_as_macro[PlotType.Eff]):
-                canv_eff.SaveAs(f"canv_eff_{ipt+1}.C")
+            if is_save_canvas_as_macro[PlotType.Eff]: canv_eff.SaveAs(f"canv_eff_{ipt+1}.C")
 
             hist_bin_title_frac = hist_bin_title if is_draw_title[PlotType.Frac] else ""
             canv_frac, histos_frac, leg_f = minimiser.plot_fractions(f"_pt_{pt_min}_to_{pt_max}", hist_bin_title_frac)
@@ -312,16 +307,14 @@ def main(config):
             if is_save_to_root_file[ObjectToSave.Fraction]:
                 for _, hist in histos_frac.items():
                     hist.Write()
-            if (is_save_canvas_as_macro[PlotType.Frac]):
-                canv_frac.SaveAs(f"canv_frac_{ipt+1}.C")
+            if is_save_canvas_as_macro[PlotType.Frac]: canv_frac.SaveAs(f"canv_frac_{ipt+1}.C")
 
             hist_bin_title_cov = hist_bin_title if is_draw_title[PlotType.Cov] else ""
             canv_cov, histo_cov = minimiser.plot_cov_matrix(True, f"_pt_{pt_min}_to_{pt_max}", hist_bin_title_cov)
             output.cd()
             if is_save_to_root_file[ObjectToSave.Canvas]: canv_cov.Write()
             if is_save_to_root_file[ObjectToSave.CorrelationMatrix]: histo_cov.Write()
-            if (is_save_canvas_as_macro[PlotType.Cov]):
-                canv_cov.SaveAs(f"canv_cov_{ipt+1}.C")
+            if is_save_canvas_as_macro[PlotType.Cov]: canv_cov.SaveAs(f"canv_cov_{ipt+1}.C")
         else:
             print(f"Minimization for pT {pt_min}, {pt_max} not successful")
             hist_minimisation_status.SetBinContent(ipt + 1, MinimisationStatus.Fail)