From 60994d01d288de6443d81a7b656d686d933c3b31 Mon Sep 17 00:00:00 2001
From: Alexandru Bercuci <abercuci@niham.nipne.ro>
Date: Mon, 29 Jan 2024 10:32:26 +0000
Subject: [PATCH] trd v23 info correct
Correct and make clear information in the info
files of previous generated v23 trd binaries.
---
macro/trd/fair/trd.v23/Create_TRD_Geometry_v23a.C | 12 +++++++-----
trd/trd_v23a_1e.geo.info | 2 --
trd/trd_v23a_1h.geo.info | 8 +++-----
trd/trd_v23a_1m.geo.info | 8 +++-----
4 files changed, 13 insertions(+), 17 deletions(-)
diff --git a/macro/trd/fair/trd.v23/Create_TRD_Geometry_v23a.C b/macro/trd/fair/trd.v23/Create_TRD_Geometry_v23a.C
index c6f258a2..3a1d9ddf 100644
--- a/macro/trd/fair/trd.v23/Create_TRD_Geometry_v23a.C
+++ b/macro/trd/fair/trd.v23/Create_TRD_Geometry_v23a.C
@@ -896,9 +896,11 @@ void dump_info_file()
fprintf(ifile, "# position\n");
// Show position of TRD
- fprintf(ifile, "%4f cm z-front position of TRD in hadron setup\n", zfront[0]);
- fprintf(ifile, "%4f cm z-front position of TRD in electron setup\n", zfront[1]);
- fprintf(ifile, "%4f cm z-front position of TRD in muon setup\n", zfront[2]);
+ TString sname = "NotASetup";
+ if (setupVer[setupid].CompareTo("_1h") == 0) sname = "hadron";
+ else if (setupVer[setupid].CompareTo("_1e") == 0) sname = "electron";
+ else if (setupVer[setupid].CompareTo("_1m") == 0) sname = "muon";
+ fprintf(ifile, "%4f cm z-front position of TRD in %s setup\n", zfront[setupid], sname.Data());
fprintf(ifile, "\n");
// fprintf(ifile, "# envelope\n");
@@ -975,7 +977,7 @@ void dump_info_file()
fprintf(ifile, "\n");
// angles
- fprintf(ifile, "# angles of acceptance for inner + outer modules\n");
+ fprintf(ifile, "# angles of acceptance for inner + outer modules (assuming the target is at z=0)\n");
for (Int_t iLayer = 0; iLayer < MaxLayers; iLayer++)
if (ShowLayer[iLayer]) {
@@ -1013,7 +1015,7 @@ void dump_info_file()
fprintf(ifile, "\n");
// aperture
- fprintf(ifile, "# inner aperture\n");
+ fprintf(ifile, "# inner aperture (assuming the target is at z=0)\n");
for (Int_t iLayer = 0; iLayer < MaxLayers; iLayer++)
if (ShowLayer[iLayer]) {
diff --git a/trd/trd_v23a_1e.geo.info b/trd/trd_v23a_1e.geo.info
index 6029c6f4..ea9d27bf 100644
--- a/trd/trd_v23a_1e.geo.info
+++ b/trd/trd_v23a_1e.geo.info
@@ -5,9 +5,7 @@
# created 20230621
# position
-410.000000 cm z-front position of TRD in hadron setup
410.000000 cm z-front position of TRD in electron setup
-490.000000 cm z-front position of TRD in muon setup
# detector thickness
284.000000 cm end of TRD (z)
diff --git a/trd/trd_v23a_1h.geo.info b/trd/trd_v23a_1h.geo.info
index e9137f78..49e27e88 100644
--- a/trd/trd_v23a_1h.geo.info
+++ b/trd/trd_v23a_1h.geo.info
@@ -5,9 +5,7 @@
# created 20230621
# position
-410.000000 cm z-front position of TRD in hadron setup
-410.000000 cm z-front position of TRD in electron setup
-490.000000 cm z-front position of TRD in muon setup
+410.000000 cm z-front position of TRD in hadron setup
# detector thickness
284.000000 cm end of TRD (z)
@@ -39,13 +37,13 @@
-247.500000 cm to 247.500000 cm y-dimension of layer 3
-247.500000 cm to 247.500000 cm y-dimension of layer 4
-# angles of acceptance for inner + outer modules assuming the target is at z=0
+# angles of acceptance for inner + outer modules (assuming the target is at z=0)
vi: 30.11 deg, vo: 29.23 deg, h: 35.20 deg - vertical/horizontal - layer 1
vi: 26.56 deg, vo: 25.75 deg, h: 31.30 deg - vertical/horizontal - layer 2
vi: 23.70 deg, vo: 22.96 deg, h: 28.10 deg - vertical/horizontal - layer 3
vi: 21.38 deg, vo: 20.69 deg, h: 25.46 deg - vertical/horizontal - layer 4
-# inner aperture assuming the target is at z=0 (normally should be -44cm)
+# inner aperture (assuming the target is at z=0)
v: 3.69 deg, h: 7.34 deg - vertical/horizontal - layer 1
v: 3.18 deg, h: 6.34 deg - vertical/horizontal - layer 2
v: 2.79 deg, h: 5.57 deg - vertical/horizontal - layer 3
diff --git a/trd/trd_v23a_1m.geo.info b/trd/trd_v23a_1m.geo.info
index 6726c561..b0ea0220 100644
--- a/trd/trd_v23a_1m.geo.info
+++ b/trd/trd_v23a_1m.geo.info
@@ -5,9 +5,7 @@
# created 20230621
# position
-410.000000 cm z-front position of TRD in hadron setup
-410.000000 cm z-front position of TRD in electron setup
-490.000000 cm z-front position of TRD in muon setup
+490.000000 cm z-front position of TRD in muon setup
# detector thickness
284.000000 cm end of TRD (z)
@@ -39,13 +37,13 @@
-247.500000 cm to 247.500000 cm y-dimension of layer 3
-247.500000 cm to 247.500000 cm y-dimension of layer 4
-# angles of acceptance for inner + outer modules assuming the target is at z=0
+# angles of acceptance for inner + outer modules (assuming the target is at z=0)
vi: 26.16 deg, vo: 25.36 deg, h: 30.86 deg - vertical/horizontal - layer 1
vi: 23.38 deg, vo: 22.65 deg, h: 27.74 deg - vertical/horizontal - layer 2
vi: 21.11 deg, vo: 20.44 deg, h: 25.16 deg - vertical/horizontal - layer 3
vi: 19.23 deg, vo: 18.60 deg, h: 22.99 deg - vertical/horizontal - layer 4
-# inner aperture assuming the target is at z=0 (currently should be -44 cm)
+# inner aperture (assuming the target is at z=0)
v: 3.12 deg, h: 6.23 deg - vertical/horizontal - layer 1
v: 2.75 deg, h: 5.49 deg - vertical/horizontal - layer 2
v: 2.46 deg, h: 4.90 deg - vertical/horizontal - layer 3
--
GitLab