From 13cea1421cdb5c1b84fa03ab29bafaef4428bebc Mon Sep 17 00:00:00 2001 From: reiche Date: Tue, 27 Feb 2024 14:16:18 +0100 Subject: [PATCH] Added several fixes and features --- Python_Code/AssemblyList.py | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/Python_Code/AssemblyList.py b/Python_Code/AssemblyList.py index 482932e..6ac02f2 100644 --- a/Python_Code/AssemblyList.py +++ b/Python_Code/AssemblyList.py @@ -6,12 +6,14 @@ import numpy as np class AssemblyList: def __init__(self): self.assembly={} + self.assemblylist = {} self.components = ComponentList.ComponentList() self.check={} def readFiles(self,filedir,folder,phase): self.components.readFiles(folder,phase) self.assembly.clear() + self.assemblylist.clear() for subdir, dirs, files in os.walk(filedir): for file in files: filepath = subdir + os.sep + file @@ -39,7 +41,11 @@ class AssemblyList: soff = tab['S Offset'][i] part3d = tab['3D-Part'][i] type = tab['Type'][i] - self.assembly[parent].append({'Name':name,'soff':soff,'3DPart':part3d,'Type':type}) + if name in self.assemblylist.keys(): + print('*** Error: Duplicated generation of assembly element:',name,'for parent',parent) + else: + self.assemblylist[name] = 1 + self.assembly[parent].append({'Name':name,'soff':soff,'3DPart':part3d,'Type':type}) def generateLayout(self,proto): @@ -56,7 +62,7 @@ class AssemblyList: pele['Type']='' pele['Category']='' if len(pele['Suffix']) < 2: - name = '%s-ZERO' % pele['Prefix'] + name = '%s-CELL' % pele['Prefix'] if len(DLsave)> 0: esec=copy.deepcopy(DLsave[0]) sname=esec['Name'][0:7] @@ -155,10 +161,11 @@ class AssemblyList: def generateEntry(self,name,data,parent,soff): - if 'ZERO' in name: name=name[0:7] sec = self.components.find_section(name) + if sec is None: + return data['3DX_Section']=sec['3DX-Section UG'].to_string(index=False,na_rep='').strip() if 'RKLY' in name: data['3DX_Section'] = sec['3DX-Section OG'].to_string(index=False, na_rep='').strip()