From 46ea0572568419a5c118ab56d1747358d652fd9a Mon Sep 17 00:00:00 2001
From: Eoin Clerkin <e.clerkin@gsi.de>
Date: Fri, 4 Mar 2022 16:22:21 +0100
Subject: [PATCH] Bugfix in tof placement
It is discovered in issue2446 that the tof is placed incorrectely
in some setups. This fixes the issue. Defines local tof origin
as front surface of the frame, most upstream point.
Updates the geometry hash
---
external/InstallGeometry.cmake | 2 +-
macro/tof/geometry/Create_TOF_Geometry_v20c.C | 9 +++++----
macro/tof/geometry/Create_TOF_Geometry_v21a.C | 14 ++++++++------
3 files changed, 14 insertions(+), 11 deletions(-)
diff --git a/external/InstallGeometry.cmake b/external/InstallGeometry.cmake
index 3996960d99..63e5c6175c 100644
--- a/external/InstallGeometry.cmake
+++ b/external/InstallGeometry.cmake
@@ -1,4 +1,4 @@
-set(GEOMETRY_VERSION 34f302c071bda80da0bb8d562937b66a31bc27cd)
+set(GEOMETRY_VERSION 25ff39965c78da394bb0ca3eb2a22cd36f8d5ad1)
set(GEOMETRY_SRC_URL "https://git.cbm.gsi.de/CbmSoft/cbmroot_geometry.git")
diff --git a/macro/tof/geometry/Create_TOF_Geometry_v20c.C b/macro/tof/geometry/Create_TOF_Geometry_v20c.C
index bd5a0dc074..997adb9349 100644
--- a/macro/tof/geometry/Create_TOF_Geometry_v20c.C
+++ b/macro/tof/geometry/Create_TOF_Geometry_v20c.C
@@ -9,6 +9,7 @@
// Changelog
//
+// 2021-03-04 - EC - Bugfix of positioning of front face
// 2021-12-15 - EC - Placement for centre of the magnet as global coordinate system
// 2020-04-19 - FU - The change are the same ones introduced with 723791eafb1810b6e1e067e067907420668056de
// in the file Create_TOF_Geometry_v20a.C to fix a problem with the geometry.
@@ -78,7 +79,7 @@ const TString FileNameInfo = geoVersion + ".geo.info";
const Double_t TOF_Z_Corr = ("tof_v20c_1e" == geoVersion ? 760 : // SIS 100 electron
("tof_v20c_1h" == geoVersion ? 760 : // SIS 100 hadron
- ("tof_v20c_1m" == geoVersion ? 839 : // SIS 100 muon
+ ("tof_v20c_1m" == geoVersion ? 819 : // SIS 100 muon
("tof_v16e_1h" == geoVersion ? 546.485 : // SIS 100 hadron
("tof_v16e_1e" == geoVersion ? 696.485 : // SIS 100 electron
("tof_v16e_1m" == geoVersion ? 776.485 : // SIS 100 muon
@@ -89,9 +90,9 @@ const Double_t TOF_Z_Corr = ("tof_v20c_1e" == geoVersion ? 760 :
// TOF_Z_Front corresponds to front cover of outer super module towers
-const Double_t TOF_Z_Front = ("tof_v20c_1m" == geoVersion ? (762 - TOF_Z_Corr) : // SIS 100 muon
- ("tof_v20c_1e" == geoVersion ? (703 - TOF_Z_Corr) : // SIS 100 electron
- ("tof_v20c_1h" == geoVersion ? (703 - TOF_Z_Corr) : // SIS 100 hadron
+const Double_t TOF_Z_Front = ("tof_v20c_1m" == geoVersion ? (722 - TOF_Z_Corr) : // SIS 100 muon
+ ("tof_v20c_1e" == geoVersion ? (663 - TOF_Z_Corr) : // SIS 100 electron
+ ("tof_v20c_1h" == geoVersion ? (663 - TOF_Z_Corr) : // SIS 100 hadron
("tof_v16e_1h" == geoVersion ? (450 - TOF_Z_Corr) : // SIS 100 hadron
("tof_v16e_1e" == geoVersion ? (600 - TOF_Z_Corr) : // SIS 100 electron
("tof_v16e_1m" == geoVersion ? (680 - TOF_Z_Corr) : // SIS 100 muon
diff --git a/macro/tof/geometry/Create_TOF_Geometry_v21a.C b/macro/tof/geometry/Create_TOF_Geometry_v21a.C
index a0b43bcf47..164f55f3ec 100644
--- a/macro/tof/geometry/Create_TOF_Geometry_v21a.C
+++ b/macro/tof/geometry/Create_TOF_Geometry_v21a.C
@@ -62,9 +62,11 @@ const TString FileNameSim = geoVersion + ".geo.root";
const TString FileNameGeo = geoVersion + "_geo.root";
const TString FileNameInfo = geoVersion + ".geo.info";
-const Double_t TOF_Z_Corr = ("tof_v21a_1e" == geoVersion ? 800 : // SIS 100 electron
- ("tof_v21a_1h" == geoVersion ? 800 : // SIS 100 hadron
- ("tof_v21a_1m" == geoVersion ? 859 : // SIS 100 muon
+// Seting the TOF_Z_Corr and the TOF_Z_Front to be equal sets the origin of the tof to be the most upstream point
+
+const Double_t TOF_Z_Corr = ("tof_v21a_1e" == geoVersion ? 705 : // SIS 100 electron
+ ("tof_v21a_1h" == geoVersion ? 705 : // SIS 100 hadron
+ ("tof_v21a_1m" == geoVersion ? 740 : // SIS 100 muon
("tof_v16e_1h" == geoVersion ? 546.485 : // SIS 100 hadron
("tof_v16e_1e" == geoVersion ? 696.485 : // SIS 100 electron
("tof_v16e_1m" == geoVersion ? 776.485 : // SIS 100 muon
@@ -75,9 +77,9 @@ const Double_t TOF_Z_Corr = ("tof_v21a_1e" == geoVersion ? 800 :
// TOF_Z_Front corresponds to front cover of outer super module towers
-const Double_t TOF_Z_Front = ("tof_v21a_1m" == geoVersion ? (762 - TOF_Z_Corr) : // SIS 100 muon
- ("tof_v21a_1e" == geoVersion ? (703 - TOF_Z_Corr) : // SIS 100 electron
- ("tof_v21a_1h" == geoVersion ? (703 - TOF_Z_Corr) : // SIS 100 hadron
+const Double_t TOF_Z_Front = ("tof_v21a_1m" == geoVersion ? (740 - TOF_Z_Corr) : // SIS 100 muon
+ ("tof_v21a_1e" == geoVersion ? (705 - TOF_Z_Corr) : // SIS 100 electron
+ ("tof_v21a_1h" == geoVersion ? (705 - TOF_Z_Corr) : // SIS 100 hadron
("tof_v16e_1h" == geoVersion ? (450 - TOF_Z_Corr) : // SIS 100 hadron
("tof_v16e_1e" == geoVersion ? (600 - TOF_Z_Corr) : // SIS 100 electron
("tof_v16e_1m" == geoVersion ? (680 - TOF_Z_Corr) : // SIS 100 muon
--
GitLab