Skip to content
Snippets Groups Projects

Fix/da qoldformat corr

Merged Andrey Samartsev requested to merge fix/DAQoldformatCorr into master
4 unresolved threads
1 file
+ 10
2
Compare changes
  • Side-by-side
  • Inline
@@ -72,8 +72,16 @@ def get_dssc_ctrl_data(in_folder, slow_data_pattern,
print("No Control Slow Data found!")
return targetGainAll, encodedGainAll, operatingFreqAll
ctrlloc = h5py.File(next(iter(ctrlDataFiles.values())), 'r')[
'/METADATA/dataSources/deviceId'][0]
ctrlloc = None
ctlrh5file = h5py.File(next(iter(ctrlDataFiles.values())), 'r')
if '/METADATA/dataSources/deviceId' in ctlrh5file:
ctrlloc = ctlrh5file['/METADATA/dataSources/deviceId'][0]
elif '/METADATA/deviceId' in ctlrh5file:
ctrlloc = ctlrh5file['/METADATA/deviceId'][0]
else:
print("Control Slow Data not correct!")
return targetGainAll, encodedGainAll, operatingFreqAll
ctrlloc = ctrlloc.decode("utf-8")
ctrlloc = ctrlloc[:ctrlloc.find('/')]
Loading