diff --git a/setup/setup_sis100_electron.C b/setup/setup_sis100_electron.C
index ac3ecd800fff84bee97961697544d07ae0af2687..ff01923e045bd227ce9fb00848099c51cf62f50c 100644
--- a/setup/setup_sis100_electron.C
+++ b/setup/setup_sis100_electron.C
@@ -28,19 +28,19 @@ void setup_sis100_electron()
 {
   // -----  Geometry Tags  --------------------------------------------------
   TString magnetGeoTag    = "v22a";
-  TString pipeGeoTag      = "v21d:v21i";
+  TString pipeGeoTag      = "v21d:v21i"; // corresponds to 11 AGeV/c beam momentum (fully-stripped Au ions)
   TString mvdGeoTag       = "v20d_tr";
   TString stsGeoTag       = "v22d";
   TString richGeoTag      = "v23a";
   TString trdGeoTag       = "v20b_1e";
   TString tofGeoTag       = "v21a_1e";
-  TString fsdGeoTag       = "v23i";
-  TString psdGeoTag       = "v23a";
+  TString fsdGeoTag       = "v23i"; 
+  TString psdGeoTag       = "v23a";  
   TString platGeoTag      = "v22b";
   // ------------------------------------------------------------------------
 
   // -----  Magnetic field  -------------------------------------------------
-  TString fieldTag      = "v22c";
+  TString fieldTag      = "v22c"; 
   Double_t fieldZ       =  0.;            // field centre z position
   Double_t fieldScale   =  1.;            // field scaling factor
   // ------------------------------------------------------------------------
diff --git a/setup/setup_sis100_hadron.C b/setup/setup_sis100_hadron.C
index f5f1a18328370bf4aa821048f69dec1cde3fe5a6..20cee2ee7b2e655084011dc9c99d54dead284df7 100644
--- a/setup/setup_sis100_hadron.C
+++ b/setup/setup_sis100_hadron.C
@@ -21,7 +21,7 @@ void setup_sis100_hadron()
 
   // -----  Geometry Tags  --------------------------------------------------
   TString magnetGeoTag    = "v22a";
-  TString pipeGeoTag      = "v21d:v21i";
+  TString pipeGeoTag      = "v21d:v21i"; //corresponds to 10.96 AGeV/c beam momentum
   // As per discision at SWM 20220217. MVD is to be removed from hadron setup.
   TString stsGeoTag       = "v22d";
   TString trdGeoTag       = "v20c_1h";
diff --git a/setup/setup_sis100_muon_jpsi.C b/setup/setup_sis100_muon_jpsi.C
index 9394eb2068200ac5674aae60ea7e0399b93b3b16..5ed1541d34d15c48405298d86df079d1569119ab 100644
--- a/setup/setup_sis100_muon_jpsi.C
+++ b/setup/setup_sis100_muon_jpsi.C
@@ -43,7 +43,7 @@ void setup_sis100_muon_jpsi()
 
   // -----  Geometry Tags  --------------------------------------------------
   TString magnetGeoTag    = "v22b";
-  TString pipeGeoTag      = "v21d:v21i";
+  TString pipeGeoTag      = "v21d:v21i"; //corresponds to 10.96 AGeV/c beam momentum
   TString stsGeoTag       = "v22d";
   TString muchGeoTag      = "v22a_jpsi";
   TString trdGeoTag       = "v20c_1m";
diff --git a/setup/setup_sis100_muon_lmvm.C b/setup/setup_sis100_muon_lmvm.C
index ae624bac121751d0f47e174003b0a33186664f5c..bbfdbd3211d3bb30f359abcf140a66691d70f86b 100644
--- a/setup/setup_sis100_muon_lmvm.C
+++ b/setup/setup_sis100_muon_lmvm.C
@@ -39,7 +39,7 @@ void setup_sis100_muon_lmvm()
 
   // -----  Geometry Tags  --------------------------------------------------
   TString magnetGeoTag    = "v22b";
-  TString pipeGeoTag      = "v21d:v21i";
+  TString pipeGeoTag      = "v21d:v21i"; // 10.96 AGeV/c beam momentum (Au ion fully stripped)
   TString stsGeoTag       = "v22d";
   TString muchGeoTag      = "v21c_sis100_1m_lmvm";
   TString trdGeoTag       = "v20c_1m";