Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
Eoin Clerkin
cbmroot_geometry
Commits
7f6a2088
Commit
7f6a2088
authored
Nov 25, 2020
by
Norbert Herrmann
Browse files
more Logging
parent
9481c20f
Changes
3
Hide whitespace changes
Inline
Side-by-side
MQ/hitbuilder/CbmDeviceHitBuilderTof.cxx
View file @
7f6a2088
...
...
@@ -4363,12 +4363,12 @@ Bool_t CbmDeviceHitBuilderTof::FillHistos() {
Int_t
iS0
=
pDig0
->
GetSide
();
Int_t
iS1
=
pDig1
->
GetSide
();
if
(
iCh0
!=
iCh1
||
iS0
==
iS1
)
{
LOG
(
error
)
<<
Form
(
" MT2 for Tofhit %d in iDetIndx %d, Ch %d from "
"
%3.0f strips: "
,
iHitInd
,
iDetIndx
,
iCh
,
dNstrips
)
LOG
(
error
)
<<
Form
(
" MT2 for Tofhit %d in iDetIndx %d, Ch %d from
%3.0f strips: "
,
iHitInd
,
iDetIndx
,
iCh
,
dNstrips
)
<<
Form
(
" Dig0: Ind %d, Ch %d, Side %d, T: %6.1f "
,
iDigInd0
,
iCh0
,
...
...
fles/mcbm2018/unpacker/CbmMcbm2018UnpackerAlgoTof.cxx
View file @
7f6a2088
...
...
@@ -251,7 +251,8 @@ Bool_t CbmMcbm2018UnpackerAlgoTof::InitParameters() {
case
1
:
// STAR eTOF modules
if
(
fviRpcSide
[
iGbtx
]
<
2
)
{
// mTof modules
LOG
(
info
)
<<
"Start eTOF module side "
<<
fviRpcSide
[
iGbtx
]
<<
" at "
<<
iCh
;
LOG
(
info
)
<<
"Start eTOF module side "
<<
fviRpcSide
[
iGbtx
]
<<
" at "
<<
iCh
;
const
Int_t
RpcMap
[
3
]
=
{
0
,
1
,
2
};
for
(
Int_t
iRpc
=
0
;
iRpc
<
fviNrOfRpc
[
iGbtx
];
iRpc
++
)
{
Int_t
iStrMax
=
32
;
...
...
@@ -371,8 +372,8 @@ Bool_t CbmMcbm2018UnpackerAlgoTof::InitParameters() {
LOG
(
info
)
<<
" Map end ceramics box at GBTX - iCh = "
<<
iCh
;
break
;
case
4
:
// intended fallthrough
[[
fallthrough
]];
case
4
:
// intended fallthrough
[[
fallthrough
]];
case
9
:
// Star2 boxes
{
LOG
(
info
)
<<
" Map Star2 box at GBTX - iCh = "
<<
iCh
;
...
...
@@ -455,23 +456,18 @@ Bool_t CbmMcbm2018UnpackerAlgoTof::InitParameters() {
case
0
:
iRpcMap
=
0
;
break
;
case
1
:
iRpcMap
=
1
;
break
;
}
if
(
iFeet
%
2
==
1
)
if
(
iFeet
%
2
==
1
)
iModuleIdMap
=
1
;
else
iModuleIdMap
=
0
;
switch
(
iFeet
)
{
case
0
:
case
3
:
iSideMap
=
0
;
break
;
case
1
:
case
2
:
iSideMap
=
1
;
break
;
}
}
break
;
switch
(
iFeet
)
{
case
0
:
case
3
:
iSideMap
=
0
;
break
;
case
1
:
case
2
:
iSideMap
=
1
;
break
;
}
}
break
;
}
if
(
iSideMap
>
-
1
)
fviRpcChUId
[
iCh
]
=
CbmTofAddress
::
GetUniqueAddress
(
...
...
macro/mcbm/geometry/tof/Create_TOF_Geometry_v20d_cosmicHD.C
View file @
7f6a2088
...
...
@@ -210,15 +210,15 @@ const Float_t Star2_Delta_Z_Position[3] = {0., 22.3, 37.8};
const
Float_t
Star2_First_Y_Position
=
0
.;
//
const
Float_t
Star2_Delta_Y_Position
=
0
.;
//
const
Float_t
Star2_rotate_Z
=
0
.;
const
Int_t
Star2_NTypes
=
2
;
const
Float_t
Star2_Types
[
Star2_NTypes
]
=
{
9
.,
4
.};
const
Float_t
Star2_Number
[
Star2_NTypes
]
=
{
1
.,
2
.};
//debugging, V16b
const
Float_t
Star2_X_Offset
[
Star2_NTypes
]
=
{
0
.,
0
.};
//{62.};
const
Int_t
Star2_NTypes
=
2
;
const
Float_t
Star2_Types
[
Star2_NTypes
]
=
{
9
.,
4
.};
const
Float_t
Star2_Number
[
Star2_NTypes
]
=
{
1
.,
2
.};
//debugging, V16b
const
Float_t
Star2_X_Offset
[
Star2_NTypes
]
=
{
0
.,
0
.};
//{62.};
const
Float_t
Buc_First_Z_Position
=
TOF_Z_Front
+
46
.
3
;
const
Float_t
Buc_Delta_Z_Position
=
0
.;
const
Float_t
Buc_First_Y_Position
=
7
.
9
;
// 7.5
const
Float_t
Buc_Delta_Y_Position
=
-
15
.;
//
const
Float_t
Buc_First_Y_Position
=
7
.
9
;
// 7.5
const
Float_t
Buc_Delta_Y_Position
=
-
15
.;
//
const
Float_t
Buc_rotate_Z
=
180
.;
const
Float_t
Buc_rotate_X
=
180
.;
const
Int_t
Buc_NTypes
=
2
;
...
...
@@ -246,12 +246,12 @@ const Float_t CERN_Number[CERN_NTypes] = {
1
.};
// evtl. double for split signals
const
Float_t
Star_First_Z_Position
=
TOF_Z_Front
-
12
.;
const
Float_t
Star_Delta_Z_Position
=
0
;
//20.;
const
Float_t
Star_Delta_Z_Position
=
0
;
//20.;
const
Float_t
Star_First_Y_Position
=
0
.;
//
const
Float_t
Star_Delta_Y_Position
=
0
.;
//
const
Float_t
Star_rotate_Y
=
0
;
//-6.8;
const
Float_t
Star_rotate_Z
=
0
.;
const
Int_t
Star_NTypes
=
1
;
const
Int_t
Star_NTypes
=
1
;
const
Float_t
Star_Types
[
Star2_NTypes
]
=
{
1
.};
const
Float_t
Star_Number
[
Star2_NTypes
]
=
{
1
.};
const
Float_t
Star_X_Offset
[
Star2_NTypes
]
=
{
-
5
.};
...
...
@@ -774,8 +774,8 @@ TGeoVolume* create_new_tof_module(Int_t modType) {
TGeoRotation
*
counter_rot
=
new
TGeoRotation
();
counter_rot
->
RotateY
(
rotangle
);
if
(
modType
==
6
)
counter_rot
->
RotateX
(
180
);
if
(
modType
==
6
)
counter_rot
->
RotateX
(
180
);
TGeoCombiTrans
*
counter_combi_trans
=
new
TGeoCombiTrans
(
*
counter_trans
,
*
counter_rot
);
gas_box_vol
->
AddNode
(
gCounter
[
cType
],
j
,
counter_combi_trans
);
...
...
@@ -1098,7 +1098,7 @@ void position_Star2(Int_t modNType) {
for
(
Int_t
j
=
0
;
j
<
modNType
;
j
++
)
{
Int_t
modType
=
Star2_Types
[
j
];
Float_t
xPos
=
Star2_X_Offset
[
j
];
modNum
=
0
;
modNum
=
0
;
for
(
Int_t
i
=
0
;
i
<
Star2_Number
[
j
];
i
++
)
{
ii
++
;
module_trans
=
new
TGeoTranslation
(
""
,
xPos
,
yPos
,
zPos
);
...
...
@@ -1117,8 +1117,7 @@ void position_Buc(Int_t modNType) {
TGeoRotation
*
module_rot
=
new
TGeoRotation
(
"Buc2018"
,
Buc_rotate_Z
,
Buc_rotate_X
,
0
.);
TGeoRotation
*
module_rot0
=
new
TGeoRotation
(
"Buc2018"
,
Buc_rotate_Z
,
0
,
0
.);
TGeoRotation
*
module_rot0
=
new
TGeoRotation
(
"Buc2018"
,
Buc_rotate_Z
,
0
,
0
.);
//TGeoRotation* module_rot = new TGeoRotation();
// module_rot->RotateZ(Buc_rotate_Z);
// module_rot->RotateX(Buc_rotate_X);
...
...
@@ -1134,12 +1133,12 @@ void position_Buc(Int_t modNType) {
Float_t
xPos
=
Buc_X_Offset
[
j
];
for
(
Int_t
i
=
0
;
i
<
Buc_Number
[
j
];
i
++
)
{
ii
++
;
module_trans
=
new
TGeoTranslation
(
""
,
xPos
,
yPos
,
zPos
);
if
(
j
==
0
)
module_trans
=
new
TGeoTranslation
(
""
,
xPos
,
yPos
,
zPos
);
if
(
j
==
0
)
module_combi_trans
=
new
TGeoCombiTrans
(
*
module_trans
,
*
module_rot
);
else
else
module_combi_trans
=
new
TGeoCombiTrans
(
*
module_trans
,
*
module_rot
);
gGeoMan
->
GetVolume
(
geoVersionStand
)
->
AddNode
(
gModules
[
modType
],
modNum
,
module_combi_trans
);
modNum
++
;
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment