From 6c40c685421c9d88cd08f2923299f5339df0436b Mon Sep 17 00:00:00 2001
From: Alexandru Bercuci <abercuci@niham.nipne.ro>
Date: Wed, 17 Nov 2021 10:14:49 +0200
Subject: [PATCH] update trd geometry v22a_mcbm for issue #2332
---
external/InstallGeometry.cmake | 2 +-
external/InstallParameter.cmake | 2 +-
.../geometry/trd/Create_TRD_Geometry_v22a.C | 21 +++++++++----------
macro/trd/README.md | 6 +++---
4 files changed, 15 insertions(+), 16 deletions(-)
diff --git a/external/InstallGeometry.cmake b/external/InstallGeometry.cmake
index 625022f1d7..dd9709550c 100644
--- a/external/InstallGeometry.cmake
+++ b/external/InstallGeometry.cmake
@@ -1,4 +1,4 @@
-set(GEOMETRY_VERSION b61d2f1c9bf607bb4fc72489dab65e16ef64a0e4)
+set(GEOMETRY_VERSION 6464ba5bd2b1981969762615208706d11a55b2f8)
set(GEOMETRY_SRC_URL "https://git.cbm.gsi.de/CbmSoft/cbmroot_geometry.git")
diff --git a/external/InstallParameter.cmake b/external/InstallParameter.cmake
index 69f145cca4..76e15dffd5 100644
--- a/external/InstallParameter.cmake
+++ b/external/InstallParameter.cmake
@@ -1,4 +1,4 @@
-set(PARAMETER_VERSION 744d63b5eb609de9d590c301c5437edc73cbfea1)
+set(PARAMETER_VERSION 7efe5425ec9fd50976801d71f60f4167d4dbfb91)
set(PARAMETER_SRC_URL "https://git.cbm.gsi.de/CbmSoft/cbmroot_parameter.git")
diff --git a/macro/mcbm/geometry/trd/Create_TRD_Geometry_v22a.C b/macro/mcbm/geometry/trd/Create_TRD_Geometry_v22a.C
index 89494e5574..5fed432b7c 100644
--- a/macro/mcbm/geometry/trd/Create_TRD_Geometry_v22a.C
+++ b/macro/mcbm/geometry/trd/Create_TRD_Geometry_v22a.C
@@ -2804,25 +2804,24 @@ TGeoVolume* create_trd2d_module_type(Int_t moduleType)
// now go on with FEB placement
TGeoVolumeAssembly* vol_feb = new TGeoVolumeAssembly("FEB"); // the mother volume of all FEBs
if (moduleType == 9) { // define ROB placement fot large 2D chamber
- Int_t cFeb(1);
+ Int_t cFeb(-1);
for (Int_t iFeb(0); cFeb < 2; cFeb++) {
- vol_feb->AddNode(vol_faspro_fy, cFeb + 1,
- new TGeoTranslation("", (cFeb - 0.5) * (FASPRO_length + FASPRO_dx) - FASPRO_length / 3, 0.,
+ vol_feb->AddNode(vol_faspro_fy, cFeb+1,
+ new TGeoTranslation("", (cFeb - 0.5) * (FASPRO_length + FASPRO_dx), 0.,
-0.5 * (FASPRO_thickness + FASPRO_zspace) + 0.05));
- for (Int_t rFeb(1); rFeb < 5; rFeb++) {
+ for (Int_t rFeb(0); rFeb < 5; rFeb++) {
// the upper side ...
- // vol_feb->AddNode(faspro, iFeb++,
- // new TGeoTranslation("",
- // cFeb*(FASPRO_length+FASPRO_dx),
- // (rFeb+0.5)*(FASPRO_width+FASPRO_dy), 0));
+ vol_feb->AddNode(faspro, iFeb++,
+ new TGeoTranslation("", cFeb*(FASPRO_length+FASPRO_dx),
+ (rFeb+0.5)*(FASPRO_width+FASPRO_dy), 0));
// the bottom side ...
vol_feb->AddNode(faspro, iFeb++,
- new TGeoTranslation("", cFeb * (FASPRO_length + FASPRO_dx) - FASPRO_length / 3.,
- -(rFeb + 0.5) * (FASPRO_width + FASPRO_dy) + FASPRO_width / 2, 0));
+ new TGeoTranslation("", cFeb * (FASPRO_length + FASPRO_dx),
+ -(rFeb + 0.5) * (FASPRO_width + FASPRO_dy), 0));
}
}
vol_feb->AddNode(vol_faspro_fy, cFeb + 1,
- new TGeoTranslation("", (cFeb - 0.5) * (FASPRO_length + FASPRO_dx) - FASPRO_length / 3., 0.,
+ new TGeoTranslation("", (cFeb - 0.5) * (FASPRO_length + FASPRO_dx), 0.,
-0.5 * (FASPRO_thickness + FASPRO_zspace)));
}
else { // define ROB placement fot small 2D hybrid chamber
diff --git a/macro/trd/README.md b/macro/trd/README.md
index e6db54cddd..efd758c895 100644
--- a/macro/trd/README.md
+++ b/macro/trd/README.md
@@ -11,14 +11,14 @@ The following ordered steps should be performed in order to produce the paramete
- trd_[tag].geo.root;
- trd_[tag]_geo.root;
- CbmTrdPads_[tag].h;
-2. Copy the first two files **geometry/trd**. In the case when the geometry of the pad-plane is not of a default type as implemented in **core/detectors/trd/CbmTrdPads.h** replace also this file with the one newly generated CbmTrdPads_[tag].h.
-3. Compile the code by running **make install** on your build directory
+2. In the case when the geometry of the pad-plane is not of a default type as implemented in **core/detectors/trd/CbmTrdPads.h** replace also this file with the one newly generated CbmTrdPads_[tag].h. Compile the code by running **make install** on your build directory.
+3. Copy the first two files from the list above to **$VMCWORKDIR/geometry/trd**.
4. Execute **macro/trd/create_digipar_root.sh tag**. The following **four** files will be created:
- trd_[tag].asic.par
- trd_[tag].digi.par
- trd_[tag].gain.par
- trd_[tag].gas.par
-5. Move these files to the **parameters/trd** directory and execute item *3* again.
+5. Move these files to the **$VMCWORKDIR/parameters/trd** directory.
## Run simulation
In the **macro/trd** directory execute the following scripts:
--
GitLab