Skip to content
Snippets Groups Projects

Update Setups

Merged Update Setups
e.clerkin/cbmroot_geometry:update_setups into master
All threads resolved!
Merged Eoin Clerkin requested to merge e.clerkin/cbmroot_geometry:update_setups into master
All threads resolved!
Compare
and
5 files
+ 17
− 9
Compare changes
  • Side-by-side
  • Inline
Files
5
setup/setup_sis100_cfv.C
+ 7
− 4
@@ -6,6 +6,7 @@
**/
// 2025-02-26 - EC - Bugfix #3510
// 2025-02-18 - EC - Remove PSD
// 2025-01-29 - EC - Add v24 bpipe and v25 fsd
// 2024-11-24 - EC - Introduce CFV MVD after support added
// 2024-11-25 - EC - Reduced CFV TRD 1D
@@ -22,7 +23,7 @@ void setup_sis100_cfv()
TString trdGeoTag = "v23a_1e"; // CFV TRD 1D (reduced acceptance)
TString tofGeoTag = "v24a";
TString fsdGeoTag = "v25i";
TString psdGeoTag = "v23a";
//TString psdGeoTag = "v23a"; https://redmine.cbm.gsi.de/issues/3533
TString platGeoTag = "v22b";
// ------------------------------------------------------------------------
@@ -35,11 +36,12 @@ void setup_sis100_cfv()
// ----- Create setup ---------------------------------------------------
CbmSetup* setup = CbmSetup::Instance();
if ( ! setup->IsEmpty() ) {
std::cout << "-W- setup_sis100_electron: overwriting existing setup"
std::cout << "-W- setup_sis100_cfv: overwriting existing setup"
<< setup->GetTitle() << std::endl;
setup->Clear();
}
setup->SetTitle("SIS100 - Electron Setup");
setup->SetTitle("SIS100 - CFV Setup");
setup->SetName("setup_sis100_cfv");
setup->SetModule(ECbmModuleId::kMagnet, magnetGeoTag);
setup->SetModule(ECbmModuleId::kPipe, pipeGeoTag);
setup->SetModule(ECbmModuleId::kMvd, mvdGeoTag);
@@ -48,9 +50,10 @@ void setup_sis100_cfv()
setup->SetModule(ECbmModuleId::kTrd, trdGeoTag);
setup->SetModule(ECbmModuleId::kTof, tofGeoTag);
setup->SetModule(ECbmModuleId::kFsd, fsdGeoTag);
setup->SetModule(ECbmModuleId::kPsd, psdGeoTag);
// setup->SetModule(ECbmModuleId::kPsd, psdGeoTag);
setup->SetModule(ECbmModuleId::kPlatform, platGeoTag);
setup->SetField(fieldTag, fieldScale, 0., 0., fieldZ);
// ------------------------------------------------------------------------
}