From 3de85d56e18ec0853f32ffc2a0093cbe10225e04 Mon Sep 17 00:00:00 2001
From: Eoin Clerkin <e.clerkin@gsi.de>
Date: Thu, 2 Mar 2023 10:09:48 +0100
Subject: [PATCH] Introduces STS3+5 geometry as defaults

Adds new STS defaults. Removes downstream section of beampipe from jpsi setup
due to overlaps with bellows assembly.
---
 setup/setup_sis100_electron_MAR23.C  | 2 +-
 setup/setup_sis100_hadron_MAR23.C    | 2 +-
 setup/setup_sis100_muon_jpsi_MAR23.C | 4 ++--
 setup/setup_sis100_muon_lmvm_MAR23.C | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/setup/setup_sis100_electron_MAR23.C b/setup/setup_sis100_electron_MAR23.C
index 2152094f..2f28d568 100644
--- a/setup/setup_sis100_electron_MAR23.C
+++ b/setup/setup_sis100_electron_MAR23.C
@@ -23,7 +23,7 @@ void setup_sis100_electron_MAR23()
   TString magnetGeoTag    = "v22a";
   TString pipeGeoTag      = "v21d:v21i";
   TString mvdGeoTag       = "v20d_tr";
-  TString stsGeoTag       = "v21g";
+  TString stsGeoTag       = "v22c";
   TString richGeoTag      = "v22a";
   TString trdGeoTag       = "v20b_1e";
   TString tofGeoTag       = "v21a_1e";
diff --git a/setup/setup_sis100_hadron_MAR23.C b/setup/setup_sis100_hadron_MAR23.C
index 8c09fb82..0ebf0af8 100644
--- a/setup/setup_sis100_hadron_MAR23.C
+++ b/setup/setup_sis100_hadron_MAR23.C
@@ -22,7 +22,7 @@ void setup_sis100_hadron_MAR23()
   TString magnetGeoTag    = "v22a";
   TString pipeGeoTag      = "v21d:v21i";
   // As per discision at SWM 20220217. MVD is to be removed from hadron setup.
-  TString stsGeoTag       = "v21g";
+  TString stsGeoTag       = "v22c";
   TString trdGeoTag       = "v20c_1h";
   TString tofGeoTag       = "v21a_1h";
 //  TString psdGeoTag       = "v22c"; Paused or Removed Detector System
diff --git a/setup/setup_sis100_muon_jpsi_MAR23.C b/setup/setup_sis100_muon_jpsi_MAR23.C
index 46f7ff5c..4809a6a4 100644
--- a/setup/setup_sis100_muon_jpsi_MAR23.C
+++ b/setup/setup_sis100_muon_jpsi_MAR23.C
@@ -41,8 +41,8 @@ void setup_sis100_muon_jpsi_MAR23()
 
   // -----  Geometry Tags  --------------------------------------------------
   TString magnetGeoTag    = "v22b";
-  TString pipeGeoTag      = "v21d:v21i";
-  TString stsGeoTag       = "v21g";
+  TString pipeGeoTag      = "v21d";
+  TString stsGeoTag       = "v22c";
   TString muchGeoTag      = "v21c_sis100_1m_jpsi";
   TString trdGeoTag       = "v20c_1m";
   TString tofGeoTag       = "v21a_1m";
diff --git a/setup/setup_sis100_muon_lmvm_MAR23.C b/setup/setup_sis100_muon_lmvm_MAR23.C
index d170563c..c8ba3a92 100644
--- a/setup/setup_sis100_muon_lmvm_MAR23.C
+++ b/setup/setup_sis100_muon_lmvm_MAR23.C
@@ -38,7 +38,7 @@ void setup_sis100_muon_lmvm_MAR23()
   // -----  Geometry Tags  --------------------------------------------------
   TString magnetGeoTag    = "v22b";
   TString pipeGeoTag      = "v21d:v21i";
-  TString stsGeoTag       = "v21g";
+  TString stsGeoTag       = "v22c";
   TString muchGeoTag      = "v21c_sis100_1m_lmvm";
   TString trdGeoTag       = "v20c_1m";
   TString tofGeoTag       = "v21a_1m";
-- 
GitLab