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
Merged
Andrey Samartsev
requested to merge
fix/DAQoldformatCorr
into
master
4 years ago
Overview
17
Commits
9
Pipelines
0
Changes
1
Expand
@ahmedk
@danilevc
0
0
Merge request reports
Viewing commit
12254cc9
Prev
Next
Show latest version
1 file
+
5
−
5
Inline
Compare changes
Side-by-side
Inline
Show whitespace changes
Show one file at a time
12254cc9
pep formatting
· 12254cc9
Andrey Samartsev
authored
4 years ago
cal_tools/cal_tools/dssclib.py
+
5
−
5
Options
@@ -96,15 +96,15 @@ def get_dssc_ctrl_data(in_folder, slow_data_pattern,
for
quadrant
in
slow_data_aggregators
.
keys
():
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
with
h5py
.
File
(
file
)
as
h5file
:
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
"
)
@@ -113,7 +113,7 @@ def get_dssc_ctrl_data(in_folder, slow_data_pattern,
print(f
"
EPC configuration: {epcConfig}
"
)
targGain = _extr_gainparam_conffilename(epcConfig)
tGain[quadrant] = float(
targGain) if targGain is not None else 0.0
targGain) if targGain is not None else 0.0
irampSettings = h5file[iramp_path][0].decode(
"
utf-8
"
)
gainSettingsMap = {}
Loading