From 0b70d3435e646fbf071121b3daac4c5cb6dffe2b Mon Sep 17 00:00:00 2001
From: Eoin Clerkin <e.clerkin@gsi.de>
Date: Thu, 17 Feb 2022 12:34:38 +0100
Subject: [PATCH] Setup changes as decided at SWM20220217
The MVD for sis100_electron is changed to v20a.
The MVD is removed from sis100_hadron_DEC21 setup.
At FU request, it is also removed from sis100_hadron and
sis100_hadron_APR21 setups.
---
setup/setup_sis100_electron.C | 2 +-
setup/setup_sis100_hadron.C | 5 +++--
setup/setup_sis100_hadron_APR21.C | 3 +--
setup/setup_sis100_hadron_DEC21.C | 3 +--
4 files changed, 6 insertions(+), 7 deletions(-)
diff --git a/setup/setup_sis100_electron.C b/setup/setup_sis100_electron.C
index 12651c3a..18cb3f0e 100644
--- a/setup/setup_sis100_electron.C
+++ b/setup/setup_sis100_electron.C
@@ -45,7 +45,7 @@ void setup_sis100_electron()
// ----- Geometry Tags --------------------------------------------------
TString magnetGeoTag = "v21a";
TString pipeGeoTag = "v16e_1e";
- TString mvdGeoTag = "v20c_tr";
+ TString mvdGeoTag = "v20a_tr";
TString stsGeoTag = "v20a";
TString richGeoTag = "v21a";
TString trdGeoTag = "v20c_1e";
diff --git a/setup/setup_sis100_hadron.C b/setup/setup_sis100_hadron.C
index ac6c5003..f3943f42 100644
--- a/setup/setup_sis100_hadron.C
+++ b/setup/setup_sis100_hadron.C
@@ -8,6 +8,9 @@
**
**/
+
+
+// 2022-02-18 - EC - decided in SWM 20220217 that the mvd should be removed from hadron setup.
// 2021-12-15 - EC - V&V all APR21 geometries are shifted by 40cm.
// 2020-04-23 - FU - Use exported TOF geometry v16d (same as v16c but
// different file format
@@ -39,7 +42,6 @@ void setup_sis100_hadron()
// ----- Geometry Tags --------------------------------------------------
TString magnetGeoTag = "v21a";
TString pipeGeoTag = "v16e_1e";
- TString mvdGeoTag = "v20c_tr";
TString stsGeoTag = "v20a";
TString trdGeoTag = "v20c_1h";
TString tofGeoTag = "v20c_1h";
@@ -64,7 +66,6 @@ void setup_sis100_hadron()
setup->SetTitle("SIS100 - Hadron Setup");
setup->SetModule(ECbmModuleId::kMagnet, magnetGeoTag);
setup->SetModule(ECbmModuleId::kPipe, pipeGeoTag);
- setup->SetModule(ECbmModuleId::kMvd, mvdGeoTag);
setup->SetModule(ECbmModuleId::kSts, stsGeoTag);
setup->SetModule(ECbmModuleId::kTrd, trdGeoTag);
setup->SetModule(ECbmModuleId::kTof, tofGeoTag);
diff --git a/setup/setup_sis100_hadron_APR21.C b/setup/setup_sis100_hadron_APR21.C
index e734737a..dc5d46c8 100644
--- a/setup/setup_sis100_hadron_APR21.C
+++ b/setup/setup_sis100_hadron_APR21.C
@@ -8,6 +8,7 @@
**
**/
+// 2022-02-18 - EC - Decided in SWM 20220217 that mvd should be removed.
// 2020-04-23 - FU - Use exported TOF geometry v16d (same as v16c but
// different file format
// 2017-11-24 - VF - New default v16g for STS (unit-based)
@@ -38,7 +39,6 @@ void setup_sis100_hadron_APR21()
// ----- Geometry Tags --------------------------------------------------
TString magnetGeoTag = "v20a";
TString pipeGeoTag = "v16b_1e";
- TString mvdGeoTag = "v20a_tr";
TString stsGeoTag = "v19a";
TString trdGeoTag = "v20b_1h";
TString tofGeoTag = "v20b_1h";
@@ -63,7 +63,6 @@ void setup_sis100_hadron_APR21()
setup->SetTitle("SIS100 - Hadron Setup");
setup->SetModule(ECbmModuleId::kMagnet, magnetGeoTag);
setup->SetModule(ECbmModuleId::kPipe, pipeGeoTag);
- setup->SetModule(ECbmModuleId::kMvd, mvdGeoTag);
setup->SetModule(ECbmModuleId::kSts, stsGeoTag);
setup->SetModule(ECbmModuleId::kTrd, trdGeoTag);
setup->SetModule(ECbmModuleId::kTof, tofGeoTag);
diff --git a/setup/setup_sis100_hadron_DEC21.C b/setup/setup_sis100_hadron_DEC21.C
index d658eeb8..5f56275c 100644
--- a/setup/setup_sis100_hadron_DEC21.C
+++ b/setup/setup_sis100_hadron_DEC21.C
@@ -39,7 +39,7 @@ void setup_sis100_hadron_DEC21()
// ----- Geometry Tags --------------------------------------------------
TString magnetGeoTag = "v21a";
TString pipeGeoTag = "v21d";
- TString mvdGeoTag = "v20d_tr";
+ // As per discision at SWM 20220217. MVD is to be removed from hadron setup.
TString stsGeoTag = "v21e";
TString trdGeoTag = "v20c_1h";
TString tofGeoTag = "v21a_1h";
@@ -64,7 +64,6 @@ void setup_sis100_hadron_DEC21()
setup->SetTitle("SIS100 - Hadron Setup");
setup->SetModule(ECbmModuleId::kMagnet, magnetGeoTag);
setup->SetModule(ECbmModuleId::kPipe, pipeGeoTag);
- setup->SetModule(ECbmModuleId::kMvd, mvdGeoTag);
setup->SetModule(ECbmModuleId::kSts, stsGeoTag);
setup->SetModule(ECbmModuleId::kTrd, trdGeoTag);
setup->SetModule(ECbmModuleId::kTof, tofGeoTag);
--
GitLab