diff --git a/oroshi/python/capacitormatrix.py b/oroshi/python/capacitormatrix.py index f7368ee5..5997111a 100644 --- a/oroshi/python/capacitormatrix.py +++ b/oroshi/python/capacitormatrix.py @@ -238,10 +238,10 @@ class CapacitorStack( CapacitorUnit ): for k in range(0, self.capacitorsNumber): unitCapList.append( capacitance[k]/self.capacitorIdOccurence(k) ) - #print self.capacitorsNumber - #print 'capacitance', capacitance - #print 'unitCapList', unitCapList - #print '=============' + print( self.capacitorsNumber ) + print( 'capacitance', capacitance ) + print( 'unitCapList', unitCapList ) + print( '=============' ) return unitCapList @@ -407,7 +407,6 @@ class CapacitorStack( CapacitorUnit ): if self.matchingMode == False : capacitorList[capListIndex].create( self.nets[0][0], self.nets[0][1] ) else : - if self.dummyRing == True: if (matchingSchemeRowIndex == 0 or matchingSchemeRowIndex == self.matrixDim["rows"] + 1 or capListIndex == 0 or capListIndex == self.matrixDim["columns"] + 1) : [ t , b ] = [ self.nets[-1][0] , self.nets[-1][1] ] diff --git a/oroshi/python/capacitorunit.py b/oroshi/python/capacitorunit.py index 50cf370f..8042b4cf 100644 --- a/oroshi/python/capacitorunit.py +++ b/oroshi/python/capacitorunit.py @@ -736,6 +736,7 @@ class CapacitorUnit(): def cutMatrix( self, net, layer, firstCutXCenter, firstCutYCenter, width_cut, height_cut, spacing_cut, cutColumnNumber, cutRowNumber ): + Breakpoint.stop( 200, "CapacitorUnit.cutMatrix() cutRowNumber={}".format(cutRowNumber) ) for i in range( cutRowNumber): matrix = self.cutLine( net, layer, firstCutXCenter, firstCutYCenter + i*(spacing_cut + width_cut), width_cut, height_cut, spacing_cut, cutColumnNumber, 'horizontal' ) diff --git a/oroshi/python/multicapacitor.py b/oroshi/python/multicapacitor.py index 48b0ef06..267f970e 100644 --- a/oroshi/python/multicapacitor.py +++ b/oroshi/python/multicapacitor.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -from ..Hurricane import DataBase, UpdateSession, DbU, Box, Net +from ..Hurricane import Breakpoint, DataBase, UpdateSession, DbU, Box, Net from ..Analog import Device from ..helpers.io import catch from ..helpers import setTraceLevel, trace @@ -134,6 +134,7 @@ def layout ( device, bbMode ): capaSingle.route() else: # Two capa, multiple units. + Breakpoint.setStopLevel( 200 ) capaGenerator = CapacitorStack( device , capaValuesArg # [ 240, 720 ] # capaValuesArg (fF). , typeArg