From a7ea933b23bf3ecadbbe0373eb90f52ed721a0d1 Mon Sep 17 00:00:00 2001
From: David Emschermann <d.emschermann@gsi.de>
Date: Tue, 26 Mar 2024 15:01:46 +0100
Subject: [PATCH] Fix mcbm_transport.C parameters finally

---
 macro/mcbm/mcbm_transport.C | 59 +++++++++++++++++++------------------
 1 file changed, 31 insertions(+), 28 deletions(-)

diff --git a/macro/mcbm/mcbm_transport.C b/macro/mcbm/mcbm_transport.C
index 3176de3426..b9b4e64e8d 100644
--- a/macro/mcbm/mcbm_transport.C
+++ b/macro/mcbm/mcbm_transport.C
@@ -44,7 +44,8 @@ void mcbm_transport(Int_t nEvents = 10,
                     //                  const char* setupName = "mcbm_beam_2019_11",
                     //                  const char* setupName = "mcbm_beam_2019_03",
                     //                  const char* setupName = "sis18_mcbm_25deg_long",
-                    const char* output = "data/test", const char* inputFile = "", Bool_t overwrite = kTRUE)
+                    const char* output = "data/test", const char* inputFile = "", 
+                    Bool_t overwrite = kTRUE, int randomSeed = 0)
 {
   // --- Define the beam angle ----------------------------------------------
   Double_t beamRotY = 25.;
@@ -118,32 +119,33 @@ void mcbm_transport(Int_t nEvents = 10,
 
   // DE  run.AddInput(new FairParticleGenerator(2212, 1, 0., 0., 1.));  // single proton along beam axis
 
-// geometrical acceptance
-
-// Double_t stszoff = 0.;  // nominal
- Double_t stszoff = 5.;  // Iron Carbon 2022
- // Double_t stszoff = 7.;  // July 2021 and Carbon 2022
-
-// mSTS station 0
-  SetTrack(&run, beamRotY,-13, -5.9, +5.8, 28.5 + stszoff);
-  SetTrack(&run, beamRotY,-13, -5.9,  0.0, 28.5 + stszoff);
-  SetTrack(&run, beamRotY,-13, -5.9, -5.8, 28.5 + stszoff);
-//
-  SetTrack(&run, beamRotY, 11, -2.9, +8.8, 41.5 + stszoff);
-  SetTrack(&run, beamRotY, 11, -2.9,  0.0, 41.5 + stszoff);
-  SetTrack(&run, beamRotY, 11, -2.9, -8.8, 41.5 + stszoff);
-//
-  SetTrack(&run, beamRotY, 11,  0.0, +5.8, 28.5 + stszoff);
-  SetTrack(&run, beamRotY, 11,  0.0,  0.0, 28.5 + stszoff);
-  SetTrack(&run, beamRotY, 11,  0.0, -5.8, 28.5 + stszoff);
-//
-  SetTrack(&run, beamRotY, 11, +2.9, +8.8, 41.5 + stszoff);
-  SetTrack(&run, beamRotY, 11, +2.9,  0.0, 41.5 + stszoff);
-  SetTrack(&run, beamRotY, 11, +2.9, -8.8, 41.5 + stszoff);
-//
-  SetTrack(&run, beamRotY,-11, +5.9, +5.8, 28.5 + stszoff);
-  SetTrack(&run, beamRotY,-11, +5.9,  0.0, 28.5 + stszoff);
-  SetTrack(&run, beamRotY,-11, +5.9, -5.8, 28.5 + stszoff);
+  // ACC // geometrical acceptance
+  //
+  // ACC  Double_t stszoff = 0.;  // nominal
+  // IRO  Double_t stszoff = 5.;  // Iron Carbon 2022
+  // CAR  Double_t stszoff = 7.;  // July 2021 and Carbon 2022
+  // nominal
+  //
+  // ACC // mSTS station 0
+  // ACC   SetTrack(&run, beamRotY,-13, -5.9, +5.8, 28.5 + stszoff);
+  // ACC   SetTrack(&run, beamRotY,-13, -5.9,  0.0, 28.5 + stszoff);
+  // ACC   SetTrack(&run, beamRotY,-13, -5.9, -5.8, 28.5 + stszoff);
+  // ACC //
+  // ACC   SetTrack(&run, beamRotY, 11, -2.9, +8.8, 41.5 + stszoff);
+  // ACC   SetTrack(&run, beamRotY, 11, -2.9,  0.0, 41.5 + stszoff);
+  // ACC   SetTrack(&run, beamRotY, 11, -2.9, -8.8, 41.5 + stszoff);
+  // ACC //
+  // ACC   SetTrack(&run, beamRotY, 11,  0.0, +5.8, 28.5 + stszoff);
+  // ACC   SetTrack(&run, beamRotY, 11,  0.0,  0.0, 28.5 + stszoff);
+  // ACC   SetTrack(&run, beamRotY, 11,  0.0, -5.8, 28.5 + stszoff);
+  // ACC //
+  // ACC   SetTrack(&run, beamRotY, 11, +2.9, +8.8, 41.5 + stszoff);
+  // ACC   SetTrack(&run, beamRotY, 11, +2.9,  0.0, 41.5 + stszoff);
+  // ACC   SetTrack(&run, beamRotY, 11, +2.9, -8.8, 41.5 + stszoff);
+  // ACC //
+  // ACC   SetTrack(&run, beamRotY,-11, +5.9, +5.8, 28.5 + stszoff);
+  // ACC   SetTrack(&run, beamRotY,-11, +5.9,  0.0, 28.5 + stszoff);
+  // ACC   SetTrack(&run, beamRotY,-11, +5.9, -5.8, 28.5 + stszoff);
   //
   // TOFDS  SetTrack(&run, beamRotY,-13, 71, +5.8, 235);
   // TOFDS  SetTrack(&run, beamRotY,-13, 71,  0.0, 235);
@@ -196,7 +198,7 @@ void mcbm_transport(Int_t nEvents = 10,
   // clang-format on
 
   // comment the following line to remove target interaction
-  //  run.AddInput(inFile);
+  run.AddInput(inFile);
   run.SetOutFileName(outFile, overwrite);
   run.SetParFileName(parFile);
   run.SetGeoFileName(geoFile);
@@ -208,6 +210,7 @@ void mcbm_transport(Int_t nEvents = 10,
   run.SetBeamAngle(beamRotY * TMath::DegToRad(), 0.);
   if (nEvents <= 10)  // store only for small number of events
     run.StoreTrajectories();
+  run.SetRandomSeed(randomSeed);
   run.Run(nEvents);
   // ------------------------------------------------------------------------
 
-- 
GitLab