From c761020915396fcf98bb3963582216653b12d03d Mon Sep 17 00:00:00 2001
From: David Emschermann <d.emschermann@gsi.de>
Date: Tue, 15 Mar 2022 19:47:19 +0100
Subject: [PATCH] update default setup names, number of events and set time
based mode as default
- update default setup name to mcbm_beam_2022_03_09_carbon, number of events and set time based mode as default
- Change default setup in mcbm_transport.C to mcbm_beam_2022_03_22_iron, refs #2470
- Change default setup in mcbm_transport.C to mcbm_beam_2022_03_20_iron, refs #2470
- Change default setup in mcbm_transport.C to mcbm_beam_2022_03_22_iron, refs #2470
- Change default setup in mcbm_transport.C to mcbm_beam_2022_03_27_iron, refs #2470
---
macro/mcbm/mcbm_digi.C | 2 +-
macro/mcbm/mcbm_reco.C | 2 +-
macro/mcbm/mcbm_reco_event.C | 3 ++-
macro/mcbm/mcbm_transport.C | 43 ++++++++++++++++++++++--------------
4 files changed, 30 insertions(+), 20 deletions(-)
diff --git a/macro/mcbm/mcbm_digi.C b/macro/mcbm/mcbm_digi.C
index e0c5730a13..3cc93000e9 100644
--- a/macro/mcbm/mcbm_digi.C
+++ b/macro/mcbm/mcbm_digi.C
@@ -36,7 +36,7 @@ void mcbm_digi(Int_t nEvents = 10, // Number of events to p
TString dataSet = "data/test", // Data set for file names
Double_t eventRate = 1.e7, // Interaction rate [1/s]
Double_t timeSliceLength = 1.e4, // Length of time-slice [ns]
- Bool_t eventMode = kTRUE // Event-by-event mode
+ Bool_t eventMode = kFALSE // Event-by-event mode
)
{
diff --git a/macro/mcbm/mcbm_reco.C b/macro/mcbm/mcbm_reco.C
index 70c64ee793..179d93b7cc 100644
--- a/macro/mcbm/mcbm_reco.C
+++ b/macro/mcbm/mcbm_reco.C
@@ -18,7 +18,7 @@
void mcbm_reco(Int_t nEvents = 10, TString dataset = "data/test", TString sEvBuildRaw = "Real",
- const char* setupName = "mcbm_beam_2022_05")
+ const char* setupName = "mcbm_beam_2022_03_09_carbon")
{
// ========================================================================
// Adjust this part according to your requirements
diff --git a/macro/mcbm/mcbm_reco_event.C b/macro/mcbm/mcbm_reco_event.C
index 5ff0c1deb4..b0d10234cf 100644
--- a/macro/mcbm/mcbm_reco_event.C
+++ b/macro/mcbm/mcbm_reco_event.C
@@ -17,7 +17,8 @@
// --------------------------------------------------------------------------
-void mcbm_reco_event(Int_t nEvents = 100, TString dataset = "data/test", const char* setupName = "mcbm_beam_2022_03")
+void mcbm_reco_event(Int_t nEvents = 10, TString dataset = "data/test",
+ const char* setupName = "mcbm_beam_2022_03_09_carbon")
{
// ========================================================================
// Adjust this part according to your requirements
diff --git a/macro/mcbm/mcbm_transport.C b/macro/mcbm/mcbm_transport.C
index 072a547e6b..905e6bd17c 100644
--- a/macro/mcbm/mcbm_transport.C
+++ b/macro/mcbm/mcbm_transport.C
@@ -2,6 +2,8 @@
SPDX-License-Identifier: GPL-3.0-only
Authors: Volker Friese [committer], David Emschermann */
+// clang-format off
+
// --------------------------------------------------------------------------
//
// Macro for standard transport simulation in mCBM using UrQMD input and GEANT3
@@ -18,7 +20,7 @@
void SetTrack(CbmTransport*, Double_t, Int_t, Double_t, Double_t, Double_t);
-void mcbm_transport(Int_t nEvents = 2,
+void mcbm_transport(Int_t nEvents = 10,
// const char* setupName = "mcbm_beam_2022_06",
// const char* setupName = "mcbm_beam_2022_05",
// const char* setupName = "mcbm_beam_2022_04",
@@ -26,9 +28,11 @@ void mcbm_transport(Int_t nEvents = 2,
// const char* setupName = "mcbm_beam_2022_02",
// const char* setupName = "mcbm_beam_2022_01",
// const char* setupName = "mcbm_beam_2022_03_28_uranium",
+ const char* setupName = "mcbm_beam_2022_03_27_iron",
// const char* setupName = "mcbm_beam_2022_03_22_iron",
+ // const char* setupName = "mcbm_beam_2022_03_20_iron",
// const char* setupName = "mcbm_beam_2022_03_09_carbon",
- const char* setupName = "mcbm_beam_2021_07_surveyed",
+ // const char* setupName = "mcbm_beam_2021_07_surveyed",
// const char* setupName = "mcbm_beam_2021_04",
// const char* setupName = "mcbm_beam_2021_03",
// const char* setupName = "mcbm_beam_2020_03",
@@ -111,26 +115,31 @@ void mcbm_transport(Int_t nEvents = 2,
// 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);
- // ACC SetTrack(&run, beamRotY,-13, -5.9, 0.0, 28.5);
- // ACC SetTrack(&run, beamRotY,-13, -5.9, -5.8, 28.5);
+ // 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);
- // ACC SetTrack(&run, beamRotY, 11, -2.9, 0.0, 41.5);
- // ACC SetTrack(&run, beamRotY, 11, -2.9, -8.8, 41.5);
+ // 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);
- // ACC SetTrack(&run, beamRotY, 11, 0.0, 0.0, 28.5);
- // ACC SetTrack(&run, beamRotY, 11, 0.0, -5.8, 28.5);
+ // 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);
- // ACC SetTrack(&run, beamRotY, 11, +2.9, 0.0, 41.5);
- // ACC SetTrack(&run, beamRotY, 11, +2.9, -8.8, 41.5);
+ // 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);
- // ACC SetTrack(&run, beamRotY,-11, +5.9, 0.0, 28.5);
- // ACC SetTrack(&run, beamRotY,-11, +5.9, -5.8, 28.5);
+ // 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);
//
// WIN // x : cos(25.*acos(-1.)/180.) * -4.25 : x = -3.852 cm
// WIN // z : sin(25.*acos(-1.)/180.) * -4.25 + 15.2 + 0.3 : z = 13.704 cm
--
GitLab