diff --git a/cal_tools/cal_tools/dssclib.py b/cal_tools/cal_tools/dssclib.py index 83271eb9afbcbc4c216e6b572c2fbb388e6f059d..18a339e77265fea20d0d300732634e8f887d9e00 100644 --- a/cal_tools/cal_tools/dssclib.py +++ b/cal_tools/cal_tools/dssclib.py @@ -13,7 +13,7 @@ def get_pulseid_checksum(fname, h5path, h5path_idx): with h5py.File(fname, "r") as infile: count = np.squeeze(infile[f"{h5path_idx}/count"]) first = np.squeeze(infile[f"{h5path_idx}/first"]) - last_index = int(first[count != 0][-1]+count[count != 0][-1]) + last_index = int(first[count != 0][-1] + count[count != 0][-1]) first_index = int(first[count != 0][0]) pulseids = infile[f"{h5path}/pulseId"][first_index: int(first[count != 0][1])] @@ -25,7 +25,7 @@ def get_pulseid_checksum(fname, h5path, h5path_idx): def _extr_gainparam_conffilename(fileName: str) -> Tuple[int]: """extracts target gain from config filename, if provided.""" - vals = re.search(".*_TG(?P<TG>\d+.?\d+)", fileName) + vals = re.search(".*_TG(?P<TG>\\d+.?\\d+)", fileName) if vals: return vals.group('TG') @@ -54,7 +54,7 @@ def get_dssc_ctrl_data(in_folder, slow_data_pattern, encodedGainAll = {} operatingFreqAll = {} for i in range(16): - qm = 'Q{}M{}'.format(i//4+1, i % 4+1) + qm = 'Q{}M{}'.format(i // 4 + 1, i % 4 + 1) targetGainAll[qm] = None encodedGainAll[qm] = None operatingFreqAll[qm] = None @@ -66,7 +66,7 @@ def get_dssc_ctrl_data(in_folder, slow_data_pattern, f = os.path.join(in_folder, quad_sd_pattern) if os.path.exists(f): - ctrlDataFiles[quadrant+1] = f + ctrlDataFiles[quadrant + 1] = f if len(ctrlDataFiles) == 0: print("No Control Slow Data found!") @@ -97,7 +97,7 @@ def get_dssc_ctrl_data(in_folder, slow_data_pattern, if len(file): with h5py.File(file) as h5file: if not daq_format: - tGain[quadrant] = 0.0 # 0.0 is default value for TG + tGain[quadrant] = 0.0 # 0.0 is default value for TG else: epcConfig = h5file[f'/RUN/{ctrlloc}/FPGA/PPT_Q{quadrant}/epcRegisterFilePath/value'][0]\ .decode("utf-8") @@ -106,7 +106,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 gainSettingsMap = {} for coarseParam in ['fcfEnCap', 'csaFbCap', 'csaResistor']: