Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
P
pycalibration
Manage
Activity
Members
Labels
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Deploy
Model registry
Analyze
Contributor analytics
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
calibration
pycalibration
Merge requests
!432
Fix/da qoldformat corr
Code
Review changes
Check out branch
Download
Patches
Plain diff
Merged
Fix/da qoldformat corr
fix/DAQoldformatCorr
into
master
Overview
17
Commits
9
Pipelines
0
Changes
1
4 unresolved threads
Hide all comments
Merged
Andrey Samartsev
requested to merge
fix/DAQoldformatCorr
into
master
4 years ago
Overview
17
Commits
9
Pipelines
0
Changes
1
4 unresolved threads
Hide all comments
Expand
@ahmedk
@danilevc
0
0
Merge request reports
Compare
version 4
version 6
5e7b7ce3
4 years ago
version 5
e7828b55
4 years ago
version 4
12254cc9
4 years ago
version 3
2176dfac
4 years ago
version 2
faee68c2
4 years ago
version 1
94178854
4 years ago
master (base)
and
version 5
latest version
5e7b7ce3
9 commits,
4 years ago
version 6
5e7b7ce3
9 commits,
4 years ago
version 5
e7828b55
8 commits,
4 years ago
version 4
12254cc9
7 commits,
4 years ago
version 3
2176dfac
6 commits,
4 years ago
version 2
faee68c2
4 commits,
4 years ago
version 1
94178854
3 commits,
4 years ago
Show latest version
1 file
+
3
−
3
Inline
Compare changes
Side-by-side
Inline
Show whitespace changes
Show one file at a time
cal_tools/cal_tools/dssclib.py
+
3
−
3
Options
@@ -93,18 +93,18 @@ def get_dssc_ctrl_data(in_folder, slow_data_pattern,
tGain
=
{}
encodedGain
=
{}
operatingFreqs
=
{}
for
quadrant
in
slow_data_aggregators
.
keys
(
):
for
quadrant
in
range
(
1
,
5
):
if
quadrant
in
ctrlDataFiles
.
keys
():
file
=
ctrlDataFiles
[
quadrant
]
with
h5py
.
File
(
file
)
as
h5file
:
iramp_path
=
f
'
/ RUN /
{
ctrlloc
}
/
FPGA
/
PPT_Q
{
quadrant
}
/
gain
/
irampFineTrm
/
value
iramp_path
=
f
"
/RUN/
{
ctrlloc
}
/
FPGA
/
PPT_Q
{
quadrant
}
/
gain
/
irampFineTrm
/
value
"
if
not
daq_format
:
tGain
[
quadrant
]
=
0.0
# 0.0 is default value for TG
if
iramp_path
in
h5file
:
irampSettings
=
h5file
[
iramp_path
][
0
]
else
:
irampSettings =
"
Various
irampSettings
=
"
Various
"
else
:
epcConfig
=
h5file
[
f
'
/RUN/
{
ctrlloc
}
/FPGA/PPT_Q
{
quadrant
}
/epcRegisterFilePath/value
'
][
0
]
\
.
decode
(
"
utf-8
"
)
@@ -116,7+116,7 @@
targGain
)
if
targGain
is
not
None
else
0.0
irampSettings
=
h5file
[
iramp_path
][
0
].
decode
(
"
utf-8
"
)
gainSettingsMap
=
{}
for
coarseParam
in
[
'
fcfEnCap
'
,
'
csaFbCap
'
,
'
csaResistor
'
]:
gainSettingsMap
[
coarseParam
]
=
int
(
h5file
[
f
'
/RUN/
{
ctrlloc
}
/FPGA/PPT_Q
{
quadrant
}
/gain/
{
coarseParam
}
/value
'
][
0
])
Loading