diff --git a/macro/trd/geometry/trd.v20/CbmTrdPads_v20a.h b/macro/trd/geometry/trd.v20/CbmTrdPads_v20a.h
index e597b113f2cf91831f86ccbafa64cd1fd90053db..b5c220dcc1586cdede71a617f9c445b5ba11b9fb 100644
--- a/macro/trd/geometry/trd.v20/CbmTrdPads_v20a.h
+++ b/macro/trd/geometry/trd.v20/CbmTrdPads_v20a.h
@@ -10,73 +10,73 @@
Int_t fst1_sect_count = 3;
// array of pad geometries in the TRD (trd1mod[1-8])
-// 8 modules // 3 sectors // 4 values
-Float_t fst1_pad_type[8][3][4] =
-
-// module type 1
-// number of pads: 80 x 32 = 2560
-// pad size sector 1: 0.68 cm x 1.75 cm = 1.18 cm2
-// pad size sector 0: 0.68 cm x 1.50 cm = 1.01 cm2
- { { { 54.0, 6.00, 54.0/ 80, 1.50 },
- { 54.0, 42.00, 54.0/ 80, 1.75 },
- { 54.0, 6.00, 54.0/ 80, 1.50 } },
+// 8 modules // 3 sectors // 4 values
+Float_t fst1_pad_type[8][3][4] =
-// module type 2
-// number of pads: 80 x 16 = 1280
-// pad size sector 1: 0.68 cm x 3.50 cm = 2.36 cm2
-// pad size sector 0: 0.68 cm x 3.25 cm = 2.19 cm2
- { { 54.0, 13.00, 54.0/ 80, 3.25 },
- { 54.0, 28.00, 54.0/ 80, 3.50 },
- { 54.0, 13.00, 54.0/ 80, 3.25 } },
+ // module type 1
+ // number of pads: 80 x 32 = 2560
+ // pad size sector 1: 0.68 cm x 1.75 cm = 1.18 cm2
+ // pad size sector 0: 0.68 cm x 1.50 cm = 1.01 cm2
+ {{{54.0, 6.00, 54.0 / 80, 1.50},
+ {54.0, 42.00, 54.0 / 80, 1.75},
+ {54.0, 6.00, 54.0 / 80, 1.50}},
-// module type 3
-// number of pads: 80 x 8 = 640
-// pad size sector 1: 0.68 cm x 6.75 cm = 4.56 cm2
-// pad size sector 0: 0.68 cm x 6.75 cm = 4.56 cm2
- { { 54.0, 13.50, 54.0/ 80, 6.75 },
- { 54.0, 27.00, 54.0/ 80, 6.75 },
- { 54.0, 13.50, 54.0/ 80, 6.75 } },
+ // module type 2
+ // number of pads: 80 x 16 = 1280
+ // pad size sector 1: 0.68 cm x 3.50 cm = 2.36 cm2
+ // pad size sector 0: 0.68 cm x 3.25 cm = 2.19 cm2
+ {{54.0, 13.00, 54.0 / 80, 3.25},
+ {54.0, 28.00, 54.0 / 80, 3.50},
+ {54.0, 13.00, 54.0 / 80, 3.25}},
-// module type 4
-// number of pads: 80 x 8 = 640
-// pad size sector 1: 0.68 cm x 6.75 cm = 4.56 cm2
-// pad size sector 0: 0.68 cm x 6.75 cm = 4.56 cm2
- { { 54.0, 13.50, 54.0/ 80, 6.75 },
- { 54.0, 27.00, 54.0/ 80, 6.75 },
- { 54.0, 13.50, 54.0/ 80, 6.75 } },
+ // module type 3
+ // number of pads: 80 x 8 = 640
+ // pad size sector 1: 0.68 cm x 6.75 cm = 4.56 cm2
+ // pad size sector 0: 0.68 cm x 6.75 cm = 4.56 cm2
+ {{54.0, 13.50, 54.0 / 80, 6.75},
+ {54.0, 27.00, 54.0 / 80, 6.75},
+ {54.0, 13.50, 54.0 / 80, 6.75}},
-//---
+ // module type 4
+ // number of pads: 80 x 8 = 640
+ // pad size sector 1: 0.68 cm x 6.75 cm = 4.56 cm2
+ // pad size sector 0: 0.68 cm x 6.75 cm = 4.56 cm2
+ {{54.0, 13.50, 54.0 / 80, 6.75},
+ {54.0, 27.00, 54.0 / 80, 6.75},
+ {54.0, 13.50, 54.0 / 80, 6.75}},
-// module type 5
-// number of pads: 144 x 24 = 3456
-// pad size sector 1: 0.67 cm x 4.00 cm = 2.67 cm2
-// pad size sector 0: 0.67 cm x 4.00 cm = 2.67 cm2
- { { 96.0, 32.00, 96.0/144, 4.00 },
- { 96.0, 32.00, 96.0/144, 4.00 },
- { 96.0, 32.00, 96.0/144, 4.00 } },
+ //---
-// module type 6
-// number of pads: 144 x 16 = 2304
-// pad size sector 1: 0.67 cm x 6.00 cm = 4.00 cm2
-// pad size sector 0: 0.67 cm x 6.00 cm = 4.00 cm2
- { { 96.0, 36.00, 96.0/144, 6.00 },
- { 96.0, 24.00, 96.0/144, 6.00 },
- { 96.0, 36.00, 96.0/144, 6.00 } },
+ // module type 5
+ // number of pads: 144 x 24 = 3456
+ // pad size sector 1: 0.67 cm x 4.00 cm = 2.67 cm2
+ // pad size sector 0: 0.67 cm x 4.00 cm = 2.67 cm2
+ {{96.0, 32.00, 96.0 / 144, 4.00},
+ {96.0, 32.00, 96.0 / 144, 4.00},
+ {96.0, 32.00, 96.0 / 144, 4.00}},
-// module type 7
-// number of pads: 144 x 8 = 1152
-// pad size sector 1: 0.67 cm x 12.00 cm = 8.00 cm2
-// pad size sector 0: 0.67 cm x 12.00 cm = 8.00 cm2
- { { 96.0, 24.00, 96.0/144, 12.00 },
- { 96.0, 48.00, 96.0/144, 12.00 },
- { 96.0, 24.00, 96.0/144, 12.00 } },
+ // module type 6
+ // number of pads: 144 x 16 = 2304
+ // pad size sector 1: 0.67 cm x 6.00 cm = 4.00 cm2
+ // pad size sector 0: 0.67 cm x 6.00 cm = 4.00 cm2
+ {{96.0, 36.00, 96.0 / 144, 6.00},
+ {96.0, 24.00, 96.0 / 144, 6.00},
+ {96.0, 36.00, 96.0 / 144, 6.00}},
-// module type 8
-// number of pads: 144 x 4 = 576
-// pad size sector 1: 0.67 cm x 24.00 cm = 16.00 cm2
-// pad size sector 0: 0.67 cm x 24.00 cm = 16.00 cm2
- { { 96.0, 24.00, 96.0/144, 24.00 },
- { 96.0, 48.00, 96.0/144, 24.00 },
- { 96.0, 24.00, 96.0/144, 24.00 } } };
+ // module type 7
+ // number of pads: 144 x 8 = 1152
+ // pad size sector 1: 0.67 cm x 12.00 cm = 8.00 cm2
+ // pad size sector 0: 0.67 cm x 12.00 cm = 8.00 cm2
+ {{96.0, 24.00, 96.0 / 144, 12.00},
+ {96.0, 48.00, 96.0 / 144, 12.00},
+ {96.0, 24.00, 96.0 / 144, 12.00}},
+
+ // module type 8
+ // number of pads: 144 x 4 = 576
+ // pad size sector 1: 0.67 cm x 24.00 cm = 16.00 cm2
+ // pad size sector 0: 0.67 cm x 24.00 cm = 16.00 cm2
+ {{96.0, 24.00, 96.0 / 144, 24.00},
+ {96.0, 48.00, 96.0 / 144, 24.00},
+ {96.0, 24.00, 96.0 / 144, 24.00}}};
#endif
diff --git a/macro/trd/geometry/trd.v20/CbmTrdPads_v20b.h b/macro/trd/geometry/trd.v20/CbmTrdPads_v20b.h
index 1d503df1d27defd615910d18bf4eb99e82cec803..0399f2ba163d502266af80c6781f4fd39ce3b524 100644
--- a/macro/trd/geometry/trd.v20/CbmTrdPads_v20b.h
+++ b/macro/trd/geometry/trd.v20/CbmTrdPads_v20b.h
@@ -10,73 +10,73 @@
Int_t fst1_sect_count = 3;
// array of pad geometries in the TRD (trd1mod[1-8])
-// 8 modules // 3 sectors // 4 values
-Float_t fst1_pad_type[8][3][4] =
-
-// module type 1
-// number of pads: 80 x 32 = 2560
-// pad size sector 1: 0.68 cm x 1.75 cm = 1.18 cm2
-// pad size sector 0: 0.68 cm x 1.50 cm = 1.01 cm2
- { { { 54.0, 6.00, 54.0/ 80, 1.50 },
- { 54.0, 42.00, 54.0/ 80, 1.75 },
- { 54.0, 6.00, 54.0/ 80, 1.50 } },
+// 8 modules // 3 sectors // 4 values
+Float_t fst1_pad_type[8][3][4] =
-// module type 2
-// number of pads: 80 x 16 = 1280
-// pad size sector 1: 0.68 cm x 3.50 cm = 2.36 cm2
-// pad size sector 0: 0.68 cm x 3.25 cm = 2.19 cm2
- { { 54.0, 13.00, 54.0/ 80, 3.25 },
- { 54.0, 28.00, 54.0/ 80, 3.50 },
- { 54.0, 13.00, 54.0/ 80, 3.25 } },
+ // module type 1
+ // number of pads: 80 x 32 = 2560
+ // pad size sector 1: 0.68 cm x 1.75 cm = 1.18 cm2
+ // pad size sector 0: 0.68 cm x 1.50 cm = 1.01 cm2
+ {{{54.0, 6.00, 54.0 / 80, 1.50},
+ {54.0, 42.00, 54.0 / 80, 1.75},
+ {54.0, 6.00, 54.0 / 80, 1.50}},
-// module type 3
-// number of pads: 80 x 8 = 640
-// pad size sector 1: 0.68 cm x 6.75 cm = 4.56 cm2
-// pad size sector 0: 0.68 cm x 6.75 cm = 4.56 cm2
- { { 54.0, 13.50, 54.0/ 80, 6.75 },
- { 54.0, 27.00, 54.0/ 80, 6.75 },
- { 54.0, 13.50, 54.0/ 80, 6.75 } },
+ // module type 2
+ // number of pads: 80 x 16 = 1280
+ // pad size sector 1: 0.68 cm x 3.50 cm = 2.36 cm2
+ // pad size sector 0: 0.68 cm x 3.25 cm = 2.19 cm2
+ {{54.0, 13.00, 54.0 / 80, 3.25},
+ {54.0, 28.00, 54.0 / 80, 3.50},
+ {54.0, 13.00, 54.0 / 80, 3.25}},
-// module type 4
-// number of pads: 80 x 8 = 640
-// pad size sector 1: 0.68 cm x 6.75 cm = 4.56 cm2
-// pad size sector 0: 0.68 cm x 6.75 cm = 4.56 cm2
- { { 54.0, 13.50, 54.0/ 80, 6.75 },
- { 54.0, 27.00, 54.0/ 80, 6.75 },
- { 54.0, 13.50, 54.0/ 80, 6.75 } },
+ // module type 3
+ // number of pads: 80 x 8 = 640
+ // pad size sector 1: 0.68 cm x 6.75 cm = 4.56 cm2
+ // pad size sector 0: 0.68 cm x 6.75 cm = 4.56 cm2
+ {{54.0, 13.50, 54.0 / 80, 6.75},
+ {54.0, 27.00, 54.0 / 80, 6.75},
+ {54.0, 13.50, 54.0 / 80, 6.75}},
-//---
+ // module type 4
+ // number of pads: 80 x 8 = 640
+ // pad size sector 1: 0.68 cm x 6.75 cm = 4.56 cm2
+ // pad size sector 0: 0.68 cm x 6.75 cm = 4.56 cm2
+ {{54.0, 13.50, 54.0 / 80, 6.75},
+ {54.0, 27.00, 54.0 / 80, 6.75},
+ {54.0, 13.50, 54.0 / 80, 6.75}},
-// module type 5
-// number of pads: 144 x 24 = 3456
-// pad size sector 1: 0.67 cm x 4.00 cm = 2.67 cm2
-// pad size sector 0: 0.67 cm x 4.00 cm = 2.67 cm2
- { { 96.0, 32.00, 96.0/144, 4.00 },
- { 96.0, 32.00, 96.0/144, 4.00 },
- { 96.0, 32.00, 96.0/144, 4.00 } },
+ //---
-// module type 6
-// number of pads: 144 x 16 = 2304
-// pad size sector 1: 0.67 cm x 6.00 cm = 4.00 cm2
-// pad size sector 0: 0.67 cm x 6.00 cm = 4.00 cm2
- { { 96.0, 36.00, 96.0/144, 6.00 },
- { 96.0, 24.00, 96.0/144, 6.00 },
- { 96.0, 36.00, 96.0/144, 6.00 } },
+ // module type 5
+ // number of pads: 144 x 24 = 3456
+ // pad size sector 1: 0.67 cm x 4.00 cm = 2.67 cm2
+ // pad size sector 0: 0.67 cm x 4.00 cm = 2.67 cm2
+ {{96.0, 32.00, 96.0 / 144, 4.00},
+ {96.0, 32.00, 96.0 / 144, 4.00},
+ {96.0, 32.00, 96.0 / 144, 4.00}},
-// module type 7
-// number of pads: 144 x 8 = 1152
-// pad size sector 1: 0.67 cm x 12.00 cm = 8.00 cm2
-// pad size sector 0: 0.67 cm x 12.00 cm = 8.00 cm2
- { { 96.0, 24.00, 96.0/144, 12.00 },
- { 96.0, 48.00, 96.0/144, 12.00 },
- { 96.0, 24.00, 96.0/144, 12.00 } },
+ // module type 6
+ // number of pads: 144 x 16 = 2304
+ // pad size sector 1: 0.67 cm x 6.00 cm = 4.00 cm2
+ // pad size sector 0: 0.67 cm x 6.00 cm = 4.00 cm2
+ {{96.0, 36.00, 96.0 / 144, 6.00},
+ {96.0, 24.00, 96.0 / 144, 6.00},
+ {96.0, 36.00, 96.0 / 144, 6.00}},
-// module type 8
-// number of pads: 144 x 4 = 576
-// pad size sector 1: 0.67 cm x 24.00 cm = 16.00 cm2
-// pad size sector 0: 0.67 cm x 24.00 cm = 16.00 cm2
- { { 96.0, 24.00, 96.0/144, 24.00 },
- { 96.0, 48.00, 96.0/144, 24.00 },
- { 96.0, 24.00, 96.0/144, 24.00 } } };
+ // module type 7
+ // number of pads: 144 x 8 = 1152
+ // pad size sector 1: 0.67 cm x 12.00 cm = 8.00 cm2
+ // pad size sector 0: 0.67 cm x 12.00 cm = 8.00 cm2
+ {{96.0, 24.00, 96.0 / 144, 12.00},
+ {96.0, 48.00, 96.0 / 144, 12.00},
+ {96.0, 24.00, 96.0 / 144, 12.00}},
+
+ // module type 8
+ // number of pads: 144 x 4 = 576
+ // pad size sector 1: 0.67 cm x 24.00 cm = 16.00 cm2
+ // pad size sector 0: 0.67 cm x 24.00 cm = 16.00 cm2
+ {{96.0, 24.00, 96.0 / 144, 24.00},
+ {96.0, 48.00, 96.0 / 144, 24.00},
+ {96.0, 24.00, 96.0 / 144, 24.00}}};
#endif