diff --git a/macro/tof/mcbm/Create_TOF_Geometry_v24f_mcbm.C b/macro/tof/mcbm/Create_TOF_Geometry_v24f_mcbm.C
index cc5b4c6f8b2017fd95dbfda550eade0cfa63fe81..47e58fd178052aa9880270eedb7b6bc7a2b7e063 100644
--- a/macro/tof/mcbm/Create_TOF_Geometry_v24f_mcbm.C
+++ b/macro/tof/mcbm/Create_TOF_Geometry_v24f_mcbm.C
@@ -9,7 +9,8 @@
///
// Changelog
-// 2025-02-05 - v24f - NH - origin of file: emscherm@lxbk1135:/lustre/cbm/users/nh/git/cbmroot/macro/mcbm/geometry/tof
+// 2025-03-11 - v24f - NH - PAL, origin of file: /lustre/cbm/users/nh/git/cbmroot/macro/mcbm/geometry/tof
+// 2025-02-05 - v24f - NH - DE, origin of file: /lustre/cbm/users/nh/git/cbmroot/macro/mcbm/geometry/tof
// 2024-04-30 - v24d - ID - Add 2nd downstream wall of TOF modules
// 2024-03-26 - v24b - DE - Shifted in z to position measured in the cave
// 2024-03-26 - v24a - DE - March 2024 setup by NH, script patched by DE in lines 1000 and 1004 to show only 2 STAR modules
@@ -112,16 +113,17 @@ const Int_t NofModuleTypes = 10;
// 0 M4 (TSHU)
// 1 M4 (USTC)
// 2 M6 (USTC)
+// 3 M4
// 5 Diamond
// 6 Buc
// 7 Testbox MRPC4
// 8 Ceramic
// 9 Star2
// Aluminum box for all module types
-const Float_t Module_Size_X[NofModuleTypes] = {180., 180., 180., 180., 180., 5., 40., 100., 10., 100.};
-const Float_t Module_Size_Y[NofModuleTypes] = {49., 49., 74., 28., 18., 5., 15., 49., 10., 49.};
-const Float_t Module_Over_Y[NofModuleTypes] = {11.5, 11.5, 11., 4.5, 4.5, 0., 0., 0., 0., 0.};
-const Float_t Module_Size_Z[NofModuleTypes] = {11., 11., 13., 11., 11., 1., 14.5, 11., 1., 11.2};
+const Float_t Module_Size_X[NofModuleTypes] = {180., 180., 180., 180., 180., 5., 40., 100., 10., 100.};
+const Float_t Module_Size_Y[NofModuleTypes] = { 49., 49., 74., 49., 18., 5., 15., 49., 10., 49.};
+const Float_t Module_Over_Y[NofModuleTypes] = { 11.5, 11.5, 11.5, 11.5, 4.5, 0., 0., 0., 0., 0.};
+const Float_t Module_Size_Z[NofModuleTypes] = { 11., 11., 13., 11., 11., 1., 14.5, 11., 1., 11.2};
const Float_t Module_Thick_Alu_X_left = 0.1;
const Float_t Module_Thick_Alu_X_right = 1.0;
const Float_t Module_Thick_Alu_Y = 0.1;
@@ -132,8 +134,8 @@ const Float_t Wall_Z_Position = 400.;
const Float_t MeanTheta = 0.;
//Type of Counter for module
-const Int_t CounterTypeInModule[NofModuleTypes] = {0, 0, 1, 2, 3, 4, 6, 7, 8, 0};
-const Int_t NCounterInModule[NofModuleTypes] = {5, 5, 5, 5, 5, 1, 2, 1, 8, 2};
+const Int_t CounterTypeInModule[NofModuleTypes] = {0, 0, 1, 0, 3, 4, 6, 7, 8, 0};
+const Int_t NCounterInModule[NofModuleTypes] = {5, 5, 5, 5, 5, 1, 2, 1, 8, 2};
// Placement of the counter inside the module
//const Float_t CounterXStartPosition[NofModuleTypes] = {-60.0, -60.0, -60.0, -60.0, -60.0, 0.0, 0., 0., 0., 0.};
@@ -142,10 +144,11 @@ const Float_t CounterXStartPosition[NofModuleTypes] = {-60.0, -60.0, -60.0, -60
const Float_t CounterXDistance[NofModuleTypes] = { 30., 30.0, 30.0, 30.0, 30.0, 0.0, 0., 0., 0., 0.};
const Float_t CounterYStartPosition[NofModuleTypes] = { 0.0, 0.0, 0.0, 0.0, 0.0, 0., 0., 0., 0., 0.};
const Float_t CounterYDistance[NofModuleTypes] = { 0.0, 0.0, 0.0, 0.0, 0.0, 0., 0., 0., 0., 0.};
-const Float_t CounterZDistance[NofModuleTypes] = { -2.25, 0.0, 0.0, 2.5, 2.5, 0., -3.8, 4., 0.1, 4.3};
+const Float_t CounterZDistance[NofModuleTypes] = { -2.25, 0.0, 0.0, 0.0, 2.5, 0., -3.8, 4., 0.1, 4.3};
const Float_t CounterZStartPosition[NofModuleTypes] = { 3.3, 0.0, 0.0, 0.0, 0.0, 0., 1.9, -2., 0.0,-2.2};
-const Float_t CounterRotationAngle[NofModuleTypes] = { 0., 170, -10.0, 0., 0., 0., 0., 0., 0., 0.};
-const Float_t CounterRotationAngleZ[NofModuleTypes] = { 0., 0., 0.0, 0., 0., 0., 0., 90., 0., 0.};
+const Float_t CounterRotationAngle[NofModuleTypes] = { 0., -10, -10.0, -10., 0., 0., 0., 0., 0., 0.};
+//const Float_t CounterRotationAngle[NofModuleTypes] = { 0., -10, -10.0, 0., 0., 0., 0., 0., 0., 0.};
+const Float_t CounterRotationAngleZ[NofModuleTypes] = { 0., 0., 0.0, 0., 0., 0., 0., 90., 0., 0.};
// clang-format on
// Pole (support structure)
@@ -212,16 +215,16 @@ const Float_t Star2_Types[Star2_NTypes] = {9.,9};
const Float_t Star2_Number[Star2_NTypes] = {1.,1.}; //debugging, V16b
const Float_t Star2_X_Offset[Star2_NTypes] = {-15.,-15.0}; //{62.};
-const Float_t Buc_First_Z_Position = TOF_Z_Front + 34.75;
+const Float_t Buc_First_Z_Position = TOF_Z_Front + 33.;
const Float_t Buc_Delta_Z_Position = 0.;
-const Float_t Buc_First_Y_Position = 33.5; //
+const Float_t Buc_First_Y_Position = 9.0; //
const Float_t Buc_Delta_Y_Position = 0.; //
const Float_t Buc_rotate_Z = 180.;
const Float_t Buc_rotate_Y = 0.;
const Int_t Buc_NTypes = 1;
const Float_t Buc_Types[Buc_NTypes] = {6.};
const Float_t Buc_Number[Buc_NTypes] = {1.}; //debugging, V16b
-const Float_t Buc_X_Offset[Buc_NTypes] = {32.};
+const Float_t Buc_X_Offset[Buc_NTypes] = {46.5};
const Int_t Cer_NTypes = 3;
const Float_t Cer_Z_Position[Cer_NTypes] = {(float) (TOF_Z_Front + 13.2), (float) (TOF_Z_Front + 45.),
@@ -344,7 +347,7 @@ void Create_TOF_Geometry_v24f_mcbm()
// position_side_tof_modules(1); // keep order !!
// position_inner_tof_modules(2);
position_inner_tof_modules(1);
- position_Dia(1);
+ position_Dia(2);
// position_Star2(2);
// position_cer_modules(3);
// position_CERN(1);
@@ -927,7 +930,7 @@ void position_inner_tof_modules(Int_t modNType)
const Double_t ModDx[NModules] = {0., 0., 0., 0., 0., 0., 0., 0., 0.};
const Double_t ModDy[NModules] = {50., 0.,-50.0, 27., -27.0, 0., -25., -50., 37.5};
const Double_t ModDz[NModules] = {0., 0, 0, 20., 20., 92., 72., 60., 72.};
- const Double_t ModAng[NModules] = {0., 0., 0., 0., 0., 0., 0., 0., 0.};
+ const Double_t ModAng[NModules] = {0., 0., 0., 180., 180., 0., 0., 0., 0.};
TGeoRotation* module_rot = NULL;
TGeoCombiTrans* module_combi_trans = NULL;
diff --git a/tof/geofile_tof_v20f_mcbm.root b/tof/geofile_tof_v20f_mcbm.root
deleted file mode 100644
index 34b1ab419cab71eebaea858a5c70d785271b159f..0000000000000000000000000000000000000000
Binary files a/tof/geofile_tof_v20f_mcbm.root and /dev/null differ
diff --git a/tof/tof_v24f_mcbm.geo.info b/tof/tof_v24f_mcbm.geo.info
index ae1f72b183415aa184d0d242a6a014a8c8da1f88..0008292d0141301eedc7f457f2f989e42dacc104 100644
--- a/tof/tof_v24f_mcbm.geo.info
+++ b/tof/tof_v24f_mcbm.geo.info
@@ -2,7 +2,7 @@
## tof_v24f_mcbm information file
#
-# created 20250206
+# created 20250311
# TOF setup
diff --git a/tof/tof_v24f_mcbm.geo.root b/tof/tof_v24f_mcbm.geo.root
index 805d0f90c370ff0745d5f37e2a1616937e241bcd..c8455af89415be9b49e84fdea59beed8b4e79dce 100644
Binary files a/tof/tof_v24f_mcbm.geo.root and b/tof/tof_v24f_mcbm.geo.root differ