Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
athena-weights
Manage
Activity
Members
Labels
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Locked files
Deploy
Releases
Package Registry
Container Registry
Model registry
Operate
Terraform modules
Analyze
Value stream analytics
Contributor analytics
Repository analytics
Code review analytics
Insights
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Petr Baron
athena-weights
Commits
553985c7
Commit
553985c7
authored
7 years ago
by
scott snyder
Browse files
Options
Downloads
Patches
Plain Diff
SCT_ConditionsServices: Comply with ATLAS naming conventions.
Names should not start with underscores.
parent
0b8e5fa3
Loading
Loading
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
InnerDetector/InDetConditions/SCT_ConditionsServices/src/SCT_ByteStreamErrorsSvc.cxx
+13
-13
13 additions, 13 deletions
...ns/SCT_ConditionsServices/src/SCT_ByteStreamErrorsSvc.cxx
with
13 additions
and
13 deletions
InnerDetector/InDetConditions/SCT_ConditionsServices/src/SCT_ByteStreamErrorsSvc.cxx
+
13
−
13
View file @
553985c7
...
...
@@ -350,14 +350,14 @@ SCT_ByteStreamErrorsSvc::isGood(const IdentifierHash & elementIdHash) {
const
Identifier
wafer_id
(
m_sct_id
->
wafer_id
(
elementIdHash
));
const
Identifier
module_id
(
m_sct_id
->
module_id
(
wafer_id
));
unsigned
int
badChips
(
m_config
->
badChips
(
module_id
));
unsigned
int
_
tempMaskedChips
(
tempMaskedChips
(
module_id
));
unsigned
int
tempMaskedChips
2
(
tempMaskedChips
(
module_id
));
const
int
side
(
m_sct_id
->
side
(
wafer_id
));
short
id
(
side
==
0
?
0
:
6
);
bool
allChipsBad
(
true
);
for
(
int
errType
=
SCT_ByteStreamErrors
::
ABCDError_Chip0
;
(
errType
<=
SCT_ByteStreamErrors
::
ABCDError_Chip5
)
and
allChipsBad
;
errType
++
)
{
bool
issueABCDError
=
(
std
::
find
(
m_bsErrors
[
errType
]
->
begin
(),
m_bsErrors
[
errType
]
->
end
(),
elementIdHash
)
!=
m_bsErrors
[
errType
]
->
end
());
bool
isBadChip
=
((
badChips
>>
(
id
))
&
0x1
);
bool
isTempMaskedChip
=
((
_
tempMaskedChips
>>
(
id
))
&
0x1
);
bool
isTempMaskedChip
=
((
tempMaskedChips
2
>>
(
id
))
&
0x1
);
id
++
;
allChipsBad
=
(
issueABCDError
or
isBadChip
or
isTempMaskedChip
);
if
(
not
allChipsBad
)
break
;
...
...
@@ -642,17 +642,17 @@ void SCT_ByteStreamErrorsSvc::setFirstTempMaskedChip(const IdentifierHash& hashI
}
}
unsigned
int
_
tempMaskedChips
(
0
);
unsigned
int
tempMaskedChips
2
(
0
);
if
(
type
==
0
)
{
// both link-0 and link-1 are working
if
(
firstTempMaskedChip_side0
>
0
)
{
for
(
int
iChip
(
firstTempMaskedChip_side0
-
1
);
iChip
<
6
;
iChip
++
)
{
_
tempMaskedChips
|=
(
1
<<
iChip
);
tempMaskedChips
2
|=
(
1
<<
iChip
);
}
}
if
(
firstTempMaskedChip_side1
>
6
)
{
for
(
int
iChip
(
firstTempMaskedChip_side1
-
1
);
iChip
<
12
;
iChip
++
)
{
_
tempMaskedChips
|=
(
1
<<
iChip
);
tempMaskedChips
2
|=
(
1
<<
iChip
);
}
}
}
else
if
(
type
==
1
)
{
...
...
@@ -660,7 +660,7 @@ void SCT_ByteStreamErrorsSvc::setFirstTempMaskedChip(const IdentifierHash& hashI
// first temporarily masked chip information is recorded in only link-0.
if
(
firstTempMaskedChip_side0
>
0
)
{
for
(
int
iChip
(
firstTempMaskedChip_side0
-
1
);
iChip
<
12
;
iChip
++
)
{
_
tempMaskedChips
|=
(
1
<<
iChip
);
tempMaskedChips
2
|=
(
1
<<
iChip
);
}
}
}
else
{
...
...
@@ -671,7 +671,7 @@ void SCT_ByteStreamErrorsSvc::setFirstTempMaskedChip(const IdentifierHash& hashI
for
(
int
iChip
(
firstTempMaskedChip_side0
-
1
);
iChip
<
12
+
6
;
iChip
++
)
{
int
jChip
(
iChip
);
if
(
jChip
>=
12
)
jChip
-=
12
;
_
tempMaskedChips
|=
(
1
<<
jChip
);
tempMaskedChips
2
|=
(
1
<<
jChip
);
}
}
}
...
...
@@ -685,9 +685,9 @@ void SCT_ByteStreamErrorsSvc::setFirstTempMaskedChip(const IdentifierHash& hashI
<<
" phi_module "
<<
m_sct_id
->
phi_module
(
wafId
)
<<
" side "
<<
m_sct_id
->
side
(
wafId
)
<<
" firstTempMaskedChip "
<<
firstTempMaskedChip
<<
"
_
tempMaskedChips"
<<
_
tempMaskedChips
);
<<
" tempMaskedChips
2
"
<<
tempMaskedChips
2
);
(
*
m_tempMaskedChips
)[
moduleId
]
=
_
tempMaskedChips
;
(
*
m_tempMaskedChips
)[
moduleId
]
=
tempMaskedChips
2
;
}
unsigned
int
SCT_ByteStreamErrorsSvc
::
getFirstTempMaskedChip
(
const
IdentifierHash
&
hashId
)
const
{
...
...
@@ -703,7 +703,7 @@ unsigned int SCT_ByteStreamErrorsSvc::tempMaskedChips(const Identifier & moduleI
}
unsigned
int
SCT_ByteStreamErrorsSvc
::
abcdErrorChips
(
const
Identifier
&
moduleId
)
const
{
unsigned
int
_
abcdErrorChips
(
0
);
unsigned
int
abcdErrorChips
2
(
0
);
int
chip
(
0
);
// Side 0
...
...
@@ -715,7 +715,7 @@ unsigned int SCT_ByteStreamErrorsSvc::abcdErrorChips(const Identifier & moduleId
!=
m_bsErrors
[
SCT_ByteStreamErrors
::
ABCDError
]
->
end
())
{
for
(
int
errType
=
SCT_ByteStreamErrors
::
ABCDError_Chip0
;
errType
<=
SCT_ByteStreamErrors
::
ABCDError_Chip5
;
errType
++
)
{
if
(
std
::
find
(
m_bsErrors
[
errType
]
->
begin
(),
m_bsErrors
[
errType
]
->
end
(),
hash_side0
)
!=
m_bsErrors
[
errType
]
->
end
())
{
_
abcdErrorChips
|=
(
1
<<
chip
);
abcdErrorChips
2
|=
(
1
<<
chip
);
}
chip
++
;
}
...
...
@@ -732,11 +732,11 @@ unsigned int SCT_ByteStreamErrorsSvc::abcdErrorChips(const Identifier & moduleId
!=
m_bsErrors
[
SCT_ByteStreamErrors
::
ABCDError
]
->
end
())
{
for
(
int
errType
=
SCT_ByteStreamErrors
::
ABCDError_Chip0
;
errType
<=
SCT_ByteStreamErrors
::
ABCDError_Chip5
;
errType
++
)
{
if
(
std
::
find
(
m_bsErrors
[
errType
]
->
begin
(),
m_bsErrors
[
errType
]
->
end
(),
hash_side1
)
!=
m_bsErrors
[
errType
]
->
end
())
{
_
abcdErrorChips
|=
(
1
<<
chip
);
abcdErrorChips
2
|=
(
1
<<
chip
);
}
chip
++
;
}
}
return
_
abcdErrorChips
;
return
abcdErrorChips
2
;
}
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
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!
Save comment
Cancel
Please
register
or
sign in
to comment