From 5147301655ce141bd2881b84236b8c357cad667c Mon Sep 17 00:00:00 2001
From: David Emschermann <d.emschermann@gsi.de>
Date: Tue, 26 Mar 2024 14:53:42 +0100
Subject: [PATCH] Fix mcbm_transport.C parameters

---
 macro/mcbm/mcbm_transport.C | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/macro/mcbm/mcbm_transport.C b/macro/mcbm/mcbm_transport.C
index edeab61070..43dd7b776d 100644
--- a/macro/mcbm/mcbm_transport.C
+++ b/macro/mcbm/mcbm_transport.C
@@ -30,7 +30,10 @@ void mcbm_transport(Int_t nEvents = 10,
                     //                  const char* setupName = "mcbm_beam_2022_02",
                     //                  const char* setupName = "mcbm_beam_2022_01",
                     const char* setupName = "mcbm_beam_2024_03_22_gold",
+<<<<<<< HEAD
                     //                  const char* setupName = "mcbm_beam_2023_00_much_out_sts_downstream",
+=======
+>>>>>>> 7db1a6be4 (Fix mcbm_transport.C parameters)
                     //                  const char* setupName = "mcbm_beam_2022_06_16_gold",
                     //                  const char* setupName = "mcbm_beam_2022_05_23_nickel",
                     //                  const char* setupName = "mcbm_beam_2022_03_28_uranium",
-- 
GitLab