Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Menu
Open sidebar
atlas
athena
Commits
de1ab2aa
Commit
de1ab2aa
authored
Jun 16, 2021
by
Peter Berta
Browse files
Revert "Merge branch '21.0-TRT_HT_middlebit_option' into '21.0'"
This reverts merge request
!43874
parent
3154eaf0
Pipeline
#2728265
passed with stage
in 0 seconds
Changes
4
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
InnerDetector/InDetExample/InDetRecExample/python/InDetJobProperties.py
View file @
de1ab2aa
...
...
@@ -1263,12 +1263,6 @@ class checkDeadElementsOnTrack(InDetFlagsJobProperty):
allowedTypes
=
[
'bool'
]
StoredValue
=
True
class
maskTRToutOfTimeBits
(
InDetFlagsJobProperty
):
"""Masks out of time bits in TRT raw data similar to supression in data"""
statusOn
=
False
allowedTypes
=
[
'bool'
]
StoredValue
=
False
##-----------------------------------------------------------------------------
## 2nd step
...
...
@@ -2909,8 +2903,7 @@ _list_InDetJobProperties = [Enabled,
doStoreTrackSeeds
,
doStoreTrackCandidates
,
doHIP300
,
checkDeadElementsOnTrack
,
maskTRToutOfTimeBits
checkDeadElementsOnTrack
]
for
j
in
_list_InDetJobProperties
:
jobproperties
.
InDetJobProperties
.
add_JobProperty
(
j
)
...
...
InnerDetector/InDetExample/InDetRecExample/share/ConfiguredInDetPreProcessingTRT.py
View file @
de1ab2aa
...
...
@@ -108,7 +108,6 @@ class ConfiguredInDetPreProcessingTRT:
MaskFirstHTBitArgon
=
False
,
MaskMiddleHTBitArgon
=
False
,
MaskLastHTBitArgon
=
False
,
MaskOutOfTimeBits
=
InDetFlags
.
maskTRToutOfTimeBits
(),
useDriftTimeHTCorrection
=
True
,
useDriftTimeToTCorrection
=
True
)
# reenable ToT
...
...
InnerDetector/InDetRecTools/TRT_DriftCircleTool/TRT_DriftCircleTool/TRT_DriftCircleTool.h
View file @
de1ab2aa
...
...
@@ -106,7 +106,6 @@ public:
bool
m_mask_middle_HT_bit_argon
;
// mask off ht bit in middle 25 ns time bin
bool
m_mask_last_HT_bit
;
// mask off ht bit in last (latest) 25 ns time bin
bool
m_mask_last_HT_bit_argon
;
// mask off ht bit in last (latest) 25 ns time bin
bool
m_mask_out_of_time_bits
;
// removes out of time bits from raw data word
};
...
...
InnerDetector/InDetRecTools/TRT_DriftCircleTool/src/TRT_DriftCircleTool.cxx
View file @
de1ab2aa
...
...
@@ -69,8 +69,7 @@ InDet::TRT_DriftCircleTool::TRT_DriftCircleTool(const std::string& t,
m_mask_middle_HT_bit
(
false
),
m_mask_middle_HT_bit_argon
(
false
),
m_mask_last_HT_bit
(
false
),
m_mask_last_HT_bit_argon
(
false
),
m_mask_out_of_time_bits
(
false
)
m_mask_last_HT_bit_argon
(
false
)
{
declareInterface
<
ITRT_DriftCircleTool
>
(
this
);
declareProperty
(
"TrtDescrManageLocation"
,
m_trt_mgr_location
);
...
...
@@ -100,7 +99,6 @@ InDet::TRT_DriftCircleTool::TRT_DriftCircleTool(const std::string& t,
declareProperty
(
"MaskMiddleHTBitArgon"
,
m_mask_middle_HT_bit_argon
);
declareProperty
(
"MaskLastHTBit"
,
m_mask_last_HT_bit
);
declareProperty
(
"MaskLastHTBitArgon"
,
m_mask_last_HT_bit_argon
);
declareProperty
(
"MaskOutOfTimeBits"
,
m_mask_out_of_time_bits
);
}
///////////////////////////////////////////////////////////////////
...
...
@@ -288,11 +286,7 @@ InDet::TRT_DriftCircleCollection* InDet::TRT_DriftCircleTool::convert(int Mode,c
bool
isOK
=
true
;
double
t0
=
0.
;
double
rawTime
=
m_driftFunctionTool
->
rawTime
(
newtdcvalue
);
unsigned
int
word
=
(
*
r
)
->
getWord
();
if
(
m_mask_out_of_time_bits
)
{
word
=
word
&
0x03FFFEF0
;
// zero first 5 unused bits, first and third HT bits, last 4 LT bits
}
unsigned
int
word
=
(
*
r
)
->
getWord
();
if
(
m_useToTCorrection
&&
!
isArgonStraw
)
{
rawTime
-=
m_driftFunctionTool
->
driftTimeToTCorrection
((
*
r
)
->
timeOverThreshold
(),
id
);
...
...
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