diff --git a/mcbm/setup_mcbm_beam_2022_03_20_iron.geo.root b/mcbm/setup_mcbm_beam_2022_03_20_iron.geo.root
new file mode 100644
index 0000000000000000000000000000000000000000..0cd6917700b7a605c59b7d66832c13ad2a416ab7
Binary files /dev/null and b/mcbm/setup_mcbm_beam_2022_03_20_iron.geo.root differ
diff --git a/setup/setup_mcbm_beam_2022_03_20_iron.C b/setup/setup_mcbm_beam_2022_03_20_iron.C
new file mode 100644
index 0000000000000000000000000000000000000000..6df51d7dfbbcef34a86af6ab8f8383c9a7d74945
--- /dev/null
+++ b/setup/setup_mcbm_beam_2022_03_20_iron.C
@@ -0,0 +1,111 @@
+/** ROOT macro to define the CBM setup sis18_mcbm
+ **
+ ** @author Volker Friese <v.friese@gsi.de>
+ ** @author David Emschermann <d.emschermann@gsi.de>
+ ** @date 5 February 2016
+ **
+ **/
+
+// clang-format off
+
+// 2022-03-20 - DE - prepare setup for mCBM March 2022-03-20 iron run
+// 2022-03-09 - DE - prepare setup for mCBM March 2022-03-09 carbon run
+// 2022-02-04 - DE - surveyed position of STS v22c (7 cm downstream of nominal)
+// 2021-09-28 - DE - surveyed position of TRD v21b, TOF v21d and RICH v21a
+// 2020-08-17 - DE - add TRD v21a, add TOF v21c, disable MUCH v20a
+// 2020-05-26 - DE - use RICH v20d which moved according to TOF v20b
+// 2020-05-25 - DE - use TRD v20b with 2 modules and support frame for 2021
+// 2020-05-22 - DE - use platform v20a with measured size of support table
+// 2020-05-12 - DE - make mRICH v20b (without window) the new default
+// 2020-03-11 - DE - prepare setup for mCBM Spring 2021 beamtime
+// 2020-03-11 - DE - prepare setup for mCBM May 2020 beamtime
+// 2020-03-11 - DE - prepare setup for mCBM March 2020 beamtime
+// 2019-12-20 - FU - use the new pipe/targetbox geometry which consists of
+// root files which are both passed to to CbmSetup
+// 2019-11-28 - DE - move mTOF v19b +12 cm in x direction for the Nov 2019 run
+// 2019-11-15 - DE - use mSTS v19b with single module in the top left of station
+// 0 2019-08-15 - DE - use mCBM targetbox as pipe v19b 2019-08-12 - DE - use
+// mSTS v19a 2019-08-08 - FU - use mMUCH v19a 2019-08-02 - DE - use pipe v19a
+// with flange position at z=610 mm 2019-07-31 - DE - add TOF v18m=v19a geometry
+// - provided by the TOF group 2019-07-31 - DE - add RICH v19a geometry -
+// provided by the RICH group 2019-03-15 - DE - this is supposed to be the start
+// version of mCBM in March 2019 2018-08-24 - DE - this is supposed to be the
+// start version of mCBM in 2018 2018-06-27 - DE - set flipped mTOF v18j
+// geometry as new default 2018-05-24 - DE - place 20deg_long setup back at 25
+// degrees, see issue #1078 2018-02-27 - DE - use mTRD v18o to fix redmine issue
+// #1046 with tracking 2017-12-11 - DE - enable mBUCH v18m 2017-12-04 - DE - add
+// mPSD to mCBM setup 2017-11-22 - DE - use TRD v17n with 22 cm spacing from CAD
+// 2017-11-17 - DE - set aerogel mRICH v18d as default
+// 2017-11-10 - DE - switch to mMUCH v18e with Mv2 dimensions
+// 2017-11-03 - DE - add long setup, (acceptance matching +-12 degrees from
+// mSTS) 2017-11-02 - DE - add common support table v18c 2017-11-02 - DE -
+// include mBUCH with mTRD v18j 2017-10-23 - DE - use mMUCH with vertically
+// aligned left rim 2017-10-18 - DE - use mTOF v18h with vertical orientation
+// 2017-10-16 - DE - use 20 degree beampipe
+// 2017-06-03 - DE - add RICH v18a_mcbm
+// 2017-05-02 - DE - switch back to 5x5 RPC TOF
+// 2017-05-02 - DE - skip MVD in the initial setup
+// 2016-02-05 - VF - Replaces former sis18_mcbm_setup.C,
+// now using the CbmSetup class.
+// 2015-06-18 - DE - mCBM @ SIS18 setup
+
+void setup_mcbm_beam_2022_03_20_iron() {
+
+ // ----- Geometry Tags --------------------------------------------------
+ TString platGeoTag = "v20a_mcbm"; // 2020 // support table
+
+ TString pipeGeoTag = "v19f_mcbm"; // pipe after target box
+
+ // TString mvdGeoTag = "v18b_mcbm";
+
+ // done
+ TString stsGeoTag = "v22d_mcbm";
+
+ // done
+ TString muchGeoTag = "v22g_mcbm"; // 2 GEM layers and 1 RPC
+
+ // done
+ TString trdGeoTag = "v22d_mcbm"; // TRD-2D + 2x TRD-1D modules
+
+ // keep v21d for now
+ TString tofGeoTag = "v21d_mcbm"; // TOF quad + double stacks
+ // TOF will be updated to v21e once new RPC positions are confirmed
+ // TString tofGeoTag = "v21e_mcbm"; // TOF quad + double stacks
+
+ // done
+ TString richGeoTag = "v21b_mcbm"; // geometry shifted wrt v21a
+
+ // unchanged
+ TString psdGeoTag = "v20a_mcbm"; // at 25 degree, below the beampipe
+ // ------------------------------------------------------------------------
+
+ // ----- Magnetic field -------------------------------------------------
+ TString fieldTag = "v18a";
+ Double_t fieldZ = 40.; // field centre z position
+ Double_t fieldScale = 0.; // field scaling factor
+ // ------------------------------------------------------------------------
+
+ // ----- Create setup ---------------------------------------------------
+ CbmSetup *setup = CbmSetup::Instance();
+ if (!setup->IsEmpty()) {
+ std::cout << "-W- setup_sis18_mcbm: overwriting existing setup"
+ << setup->GetTitle() << std::endl;
+ setup->Clear();
+ }
+ setup->SetTitle("SIS18 - mCBM Setup");
+ setup->SetModule(ECbmModuleId::kPlatform, platGeoTag);
+ setup->SetModule(ECbmModuleId::kPipe, pipeGeoTag);
+ // setup->SetModule(ECbmModuleId::kMvd, mvdGeoTag); // skip mvd
+ setup->SetModule(ECbmModuleId::kSts, stsGeoTag);
+ setup->SetModule(ECbmModuleId::kMuch, muchGeoTag);
+ setup->SetModule(ECbmModuleId::kTrd, trdGeoTag);
+ setup->SetModule(ECbmModuleId::kTof, tofGeoTag);
+ setup->SetModule(ECbmModuleId::kRich, richGeoTag);
+ setup->SetModule(ECbmModuleId::kPsd, psdGeoTag);
+ setup->SetField(fieldTag, fieldScale, 0., 0., fieldZ);
+ // ------------------------------------------------------------------------
+
+ // ----- Screen output ------------------------------------------------
+ setup->Print();
+ // ------------------------------------------------------------------------
+}
diff --git a/setup/setup_mcbm_beam_2022_03_22_iron.C b/setup/setup_mcbm_beam_2022_03_22_iron.C
index 9a5d901f5ee43e9299ba86c513bca2dd2ec01fc6..5679cda3597b188d0546a4b40a302d6637c91dcd 100644
--- a/setup/setup_mcbm_beam_2022_03_22_iron.C
+++ b/setup/setup_mcbm_beam_2022_03_22_iron.C
@@ -8,6 +8,7 @@
// clang-format off
+// 2022-03-20 - DE - prepare setup for mCBM March 2022-03-20 iron run
// 2022-03-09 - DE - prepare setup for mCBM March 2022-03-09 carbon run
// 2022-02-04 - DE - surveyed position of STS v22c (7 cm downstream of nominal)
// 2021-09-28 - DE - surveyed position of TRD v21b, TOF v21d and RICH v21a
@@ -58,10 +59,10 @@ void setup_mcbm_beam_2022_03_22_iron() {
// TString mvdGeoTag = "v18b_mcbm";
// done
- TString stsGeoTag = "v22a_mcbm";
+ TString stsGeoTag = "v22d_mcbm";
// done
- TString muchGeoTag = "v22f_mcbm"; // 2 GEM layers and 1 RPC
+ TString muchGeoTag = "v22g_mcbm"; // 2 GEM layers and 1 RPC
// done
TString trdGeoTag = "v22d_mcbm"; // TRD-2D + 2x TRD-1D modules
@@ -96,7 +97,7 @@ void setup_mcbm_beam_2022_03_22_iron() {
setup->SetModule(ECbmModuleId::kPipe, pipeGeoTag);
// setup->SetModule(ECbmModuleId::kMvd, mvdGeoTag); // skip mvd
setup->SetModule(ECbmModuleId::kSts, stsGeoTag);
- // setup->SetModule(ECbmModuleId::kMuch, muchGeoTag);
+ setup->SetModule(ECbmModuleId::kMuch, muchGeoTag);
setup->SetModule(ECbmModuleId::kTrd, trdGeoTag);
setup->SetModule(ECbmModuleId::kTof, tofGeoTag);
setup->SetModule(ECbmModuleId::kRich, richGeoTag);