diff --git a/main.py b/main.py index bea5a4c..567ea70 100644 --- a/main.py +++ b/main.py @@ -276,7 +276,8 @@ class BeamlineEditor(QtWidgets.QMainWindow, Ui_BeamlineGUI): rows = read_excel_sheet(fileName, "Proto-HL") allElements=self.UIUnresolvedElements.isChecked() - populate_table_comparison(self.UIProtoList,self.plrecs,rows,tolerance=1e-5,report_all=allElements) + + populate_table_comparison(self.UIProtoList,self.plrecs,rows,tolerance=1.5e-4,report_all=allElements) def saveTemplates(self): diff --git a/protoliste.py b/protoliste.py index e4acf69..416f9a9 100644 --- a/protoliste.py +++ b/protoliste.py @@ -334,10 +334,12 @@ class ProtoListe(ApplicationTemplate): channels=ele['PSChannels'] if ele.Baugruppe=='U15': channels=channels+1 - elif ele.Baugruppe == 'SFPlus-U12-AB': + if ele.Baugruppe == 'SFPlus-U12-AB': channels=channels+1 if ele.Baugruppe == 'UE38': channels = channels + 2 + if ele.Baugruppe == 'SFPlus-SUE38': + channels=channels+2 if ele.Baugruppe=='QFU': channels=channels-1 if ele.Baugruppe=='QFUE':