diff --git a/tools/t7.py b/tools/t7.py index ea220a5..9cdd47a 100644 --- a/tools/t7.py +++ b/tools/t7.py @@ -186,6 +186,12 @@ class AutoLayout: self.return_log.append(f'芯片{chipname}有碱基不平衡:\n{desc}') print(f'芯片{chipname}有碱基不平衡:\n{desc}') + def dec_lib_data_scatter(self, data): + """ + + """ + pass + @staticmethod def level(row): @@ -194,8 +200,8 @@ class AutoLayout: if 'nextera' in row['classification'].lower(): return 1000 - # if '华大' in row['classification']: - # return 1100 + if '华大' in row['classification'] and 'NN' in row['i5']: + return 1100 if '超加急' in str(row['priority']): return 1500 @@ -453,7 +459,7 @@ class AutoLayout: # 有nextera, 华大文库 必须满足大于50G 到了芯片结算 # chipname = f'chip{self.loc_chip_num}' nextera_size = self.chip_speciallib_nextera_size[chipname] - # huada_size = self.chip_speciallib_huada_size[chipname] + huada_size = self.chip_speciallib_huada_size[chipname] flag = True if 0 < nextera_size < 50: # 有nextera文库,但是不满足50G 去除 @@ -470,21 +476,21 @@ class AutoLayout: self.chip_speciallib_nextera_size[chipname] = 0 self.chip_size[chipname] -= nextera_size flag = False - # if 0 < huada_size < 50: - # # 有华大文库,但是不满足50G 去除 - # huada_barcode = set() - # no_huada_data = list() - # for libdata in self.index_assignments[chipname]: - # if '华大' not in libdata['classification']: - # no_huada_data.append(libdata) - # else: - # self.no_assign_data.append(libdata) - # huada_barcode.update(libdata['barcode']) - # self.index_assignments[chipname] = no_huada_data - # self.chip_barcode_recode[chipname] -= huada_barcode - # self.chip_speciallib_huada_size[chipname] = 0 - # self.chip_size[chipname] -= huada_size - # flag = False + if 0 < huada_size < 50: + # 有华大文库,但是不满足50G 去除 + huada_barcode = set() + no_huada_data = list() + for libdata in self.index_assignments[chipname]: + if '华大' not in libdata['classification']: + no_huada_data.append(libdata) + else: + self.no_assign_data.append(libdata) + huada_barcode.update(libdata['barcode']) + self.index_assignments[chipname] = no_huada_data + self.chip_barcode_recode[chipname] -= huada_barcode + self.chip_speciallib_huada_size[chipname] = 0 + self.chip_size[chipname] -= huada_size + flag = False if flag: self.loc_chip_num += 1