Commit 82c04001 authored by Eoin Clerkin's avatar Eoin Clerkin
Browse files

Target at 12.5cm in setup file.

Small Corrections to setup file. Cleans up.

Moves target into setup file. Gold target at 12.5 cm.
parent 81241522
/** ROOT macro to define the CBM setup sis18_hadron /** ROOT macro to define the CBM setup sis18_hadron
** **
** Contains: MVD + STS + TOF ** Contains: STS + TOF
** **
** @author Volker Friese <v.friese@gsi.de> ** @author Volker Friese <v.friese@gsi.de>
** @author David Emschermann <d.emschermann@gsi.de> ** @author David Emschermann <d.emschermann@gsi.de>
...@@ -8,7 +8,7 @@ ...@@ -8,7 +8,7 @@
** **
**/ **/
// 2022-03-24 - DE - Prepare SIS18 setup: 5 downstream layers of STS + TOF @ 4.6 m // 2022-03-24 - DE - Prepare SIS18 setup: 5 downstream layers of STS + TOF @ 3.2 m
// 2022-02-17 - EC - Places PSD in its parking position // 2022-02-17 - EC - Places PSD in its parking position
// 2021-12-15 - EC - Candidate DEC21 geometries for testing. // 2021-12-15 - EC - Candidate DEC21 geometries for testing.
// 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
...@@ -41,10 +41,9 @@ void setup_sis18_hadron() ...@@ -41,10 +41,9 @@ void setup_sis18_hadron()
// ----- Geometry Tags -------------------------------------------------- // ----- Geometry Tags --------------------------------------------------
TString magnetGeoTag = "v21a"; TString magnetGeoTag = "v21a";
TString pipeGeoTag = "v21d"; TString pipeGeoTag = "v21d";
TString targetGeoTag = "v22a";
TString stsGeoTag = "v21e_sis18"; TString stsGeoTag = "v21e_sis18";
// TString trdGeoTag = "v20c_1h";
TString tofGeoTag = "v21b_1h_sis18"; TString tofGeoTag = "v21b_1h_sis18";
// TString psdGeoTag = "v22c";
TString platGeoTag = "v22a"; TString platGeoTag = "v22a";
// ------------------------------------------------------------------------ // ------------------------------------------------------------------------
...@@ -58,22 +57,20 @@ void setup_sis18_hadron() ...@@ -58,22 +57,20 @@ void setup_sis18_hadron()
// ----- Create setup --------------------------------------------------- // ----- Create setup ---------------------------------------------------
CbmSetup* setup = CbmSetup::Instance(); CbmSetup* setup = CbmSetup::Instance();
if ( ! setup->IsEmpty() ) { if ( ! setup->IsEmpty() ) {
std::cout << "-W- setup_sis100_hadron: overwriting existing setup" std::cout << "-W- setup_sis18_hadron: overwriting existing setup"
<< setup->GetTitle() << std::endl; << setup->GetTitle() << std::endl;
setup->Clear(); setup->Clear();
} }
setup->SetTitle("SIS100 - Hadron Setup"); setup->SetTitle("SIS18 - 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::kTarget, targetGeoTag);
setup->SetModule(ECbmModuleId::kSts, stsGeoTag); setup->SetModule(ECbmModuleId::kSts, stsGeoTag);
// setup->SetModule(ECbmModuleId::kTrd, trdGeoTag);
setup->SetModule(ECbmModuleId::kTof, tofGeoTag); setup->SetModule(ECbmModuleId::kTof, tofGeoTag);
// setup->SetModule(ECbmModuleId::kPsd, psdGeoTag);
setup->SetModule(ECbmModuleId::kPlatform, platGeoTag); setup->SetModule(ECbmModuleId::kPlatform, platGeoTag);
setup->SetField(fieldTag, fieldScale, 0., 0., fieldZ); setup->SetField(fieldTag, fieldScale, 0., 0., fieldZ);
// ------------------------------------------------------------------------ // ------------------------------------------------------------------------
// ----- Screen output ------------------------------------------------ // ----- Screen output ------------------------------------------------
setup->Print(); setup->Print();
// ------------------------------------------------------------------------ // ------------------------------------------------------------------------
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment