Skip to content
Snippets Groups Projects
Commit ddaafea9 authored by Eoin Clerkin's avatar Eoin Clerkin
Browse files

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.
parent dbea68f7
No related branches found
No related tags found
No related merge requests found
Pipeline #16096 passed
...@@ -45,7 +45,7 @@ void setup_sis100_electron() ...@@ -45,7 +45,7 @@ void setup_sis100_electron()
// ----- Geometry Tags -------------------------------------------------- // ----- Geometry Tags --------------------------------------------------
TString magnetGeoTag = "v21a"; TString magnetGeoTag = "v21a";
TString pipeGeoTag = "v16e_1e"; TString pipeGeoTag = "v16e_1e";
TString mvdGeoTag = "v20c_tr"; TString mvdGeoTag = "v20a_tr";
TString stsGeoTag = "v20a"; TString stsGeoTag = "v20a";
TString richGeoTag = "v21a"; TString richGeoTag = "v21a";
TString trdGeoTag = "v20c_1e"; TString trdGeoTag = "v20c_1e";
......
...@@ -8,6 +8,9 @@ ...@@ -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. // 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 // 2020-04-23 - FU - Use exported TOF geometry v16d (same as v16c but
// different file format // different file format
...@@ -39,7 +42,6 @@ void setup_sis100_hadron() ...@@ -39,7 +42,6 @@ void setup_sis100_hadron()
// ----- Geometry Tags -------------------------------------------------- // ----- Geometry Tags --------------------------------------------------
TString magnetGeoTag = "v21a"; TString magnetGeoTag = "v21a";
TString pipeGeoTag = "v16e_1e"; TString pipeGeoTag = "v16e_1e";
TString mvdGeoTag = "v20c_tr";
TString stsGeoTag = "v20a"; TString stsGeoTag = "v20a";
TString trdGeoTag = "v20c_1h"; TString trdGeoTag = "v20c_1h";
TString tofGeoTag = "v20c_1h"; TString tofGeoTag = "v20c_1h";
...@@ -64,7 +66,6 @@ void setup_sis100_hadron() ...@@ -64,7 +66,6 @@ void setup_sis100_hadron()
setup->SetTitle("SIS100 - Hadron Setup"); setup->SetTitle("SIS100 - Hadron Setup");
setup->SetModule(ECbmModuleId::kMagnet, magnetGeoTag); setup->SetModule(ECbmModuleId::kMagnet, magnetGeoTag);
setup->SetModule(ECbmModuleId::kPipe, pipeGeoTag); setup->SetModule(ECbmModuleId::kPipe, pipeGeoTag);
setup->SetModule(ECbmModuleId::kMvd, mvdGeoTag);
setup->SetModule(ECbmModuleId::kSts, stsGeoTag); setup->SetModule(ECbmModuleId::kSts, stsGeoTag);
setup->SetModule(ECbmModuleId::kTrd, trdGeoTag); setup->SetModule(ECbmModuleId::kTrd, trdGeoTag);
setup->SetModule(ECbmModuleId::kTof, tofGeoTag); setup->SetModule(ECbmModuleId::kTof, tofGeoTag);
......
...@@ -8,6 +8,7 @@ ...@@ -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 // 2020-04-23 - FU - Use exported TOF geometry v16d (same as v16c but
// different file format // different file format
// 2017-11-24 - VF - New default v16g for STS (unit-based) // 2017-11-24 - VF - New default v16g for STS (unit-based)
...@@ -38,7 +39,6 @@ void setup_sis100_hadron_APR21() ...@@ -38,7 +39,6 @@ void setup_sis100_hadron_APR21()
// ----- Geometry Tags -------------------------------------------------- // ----- Geometry Tags --------------------------------------------------
TString magnetGeoTag = "v20a"; TString magnetGeoTag = "v20a";
TString pipeGeoTag = "v16b_1e"; TString pipeGeoTag = "v16b_1e";
TString mvdGeoTag = "v20a_tr";
TString stsGeoTag = "v19a"; TString stsGeoTag = "v19a";
TString trdGeoTag = "v20b_1h"; TString trdGeoTag = "v20b_1h";
TString tofGeoTag = "v20b_1h"; TString tofGeoTag = "v20b_1h";
...@@ -63,7 +63,6 @@ void setup_sis100_hadron_APR21() ...@@ -63,7 +63,6 @@ void setup_sis100_hadron_APR21()
setup->SetTitle("SIS100 - Hadron Setup"); setup->SetTitle("SIS100 - Hadron Setup");
setup->SetModule(ECbmModuleId::kMagnet, magnetGeoTag); setup->SetModule(ECbmModuleId::kMagnet, magnetGeoTag);
setup->SetModule(ECbmModuleId::kPipe, pipeGeoTag); setup->SetModule(ECbmModuleId::kPipe, pipeGeoTag);
setup->SetModule(ECbmModuleId::kMvd, mvdGeoTag);
setup->SetModule(ECbmModuleId::kSts, stsGeoTag); setup->SetModule(ECbmModuleId::kSts, stsGeoTag);
setup->SetModule(ECbmModuleId::kTrd, trdGeoTag); setup->SetModule(ECbmModuleId::kTrd, trdGeoTag);
setup->SetModule(ECbmModuleId::kTof, tofGeoTag); setup->SetModule(ECbmModuleId::kTof, tofGeoTag);
......
...@@ -39,7 +39,7 @@ void setup_sis100_hadron_DEC21() ...@@ -39,7 +39,7 @@ void setup_sis100_hadron_DEC21()
// ----- Geometry Tags -------------------------------------------------- // ----- Geometry Tags --------------------------------------------------
TString magnetGeoTag = "v21a"; TString magnetGeoTag = "v21a";
TString pipeGeoTag = "v21d"; 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 stsGeoTag = "v21e";
TString trdGeoTag = "v20c_1h"; TString trdGeoTag = "v20c_1h";
TString tofGeoTag = "v21a_1h"; TString tofGeoTag = "v21a_1h";
...@@ -64,7 +64,6 @@ void setup_sis100_hadron_DEC21() ...@@ -64,7 +64,6 @@ void setup_sis100_hadron_DEC21()
setup->SetTitle("SIS100 - Hadron Setup"); setup->SetTitle("SIS100 - Hadron Setup");
setup->SetModule(ECbmModuleId::kMagnet, magnetGeoTag); setup->SetModule(ECbmModuleId::kMagnet, magnetGeoTag);
setup->SetModule(ECbmModuleId::kPipe, pipeGeoTag); setup->SetModule(ECbmModuleId::kPipe, pipeGeoTag);
setup->SetModule(ECbmModuleId::kMvd, mvdGeoTag);
setup->SetModule(ECbmModuleId::kSts, stsGeoTag); setup->SetModule(ECbmModuleId::kSts, stsGeoTag);
setup->SetModule(ECbmModuleId::kTrd, trdGeoTag); setup->SetModule(ECbmModuleId::kTrd, trdGeoTag);
setup->SetModule(ECbmModuleId::kTof, tofGeoTag); setup->SetModule(ECbmModuleId::kTof, tofGeoTag);
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment