Skip to content

Commit 41c6b74

Browse files
committed
Uses new efficient HillTau system for gathering plot data
1 parent f82804a commit 41c6b74

File tree

1 file changed

+13
-11
lines changed

1 file changed

+13
-11
lines changed

simWrapHillTau.py

Lines changed: 13 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -522,6 +522,7 @@ def makeReadoutPlots( self, readouts ):
522522
for objName in objList:
523523
index = self.model.molInfo[objName].index
524524
self.plotPath[objName] = [ index, numPlots ]
525+
self.model.addPlot( objName )
525526
numPlots += 1
526527
if not i.isPlotOnly:
527528
self.numMainPlots = numPlots
@@ -534,7 +535,7 @@ def old_fillPlots( self ):
534535
self.plots[plotNum] = tempArray[index]
535536
return [ np.array( i ) for i in self.plots], [self.plotDt] * len( self.plots ), self.numMainPlots
536537

537-
def fillPlots(self):
538+
def mediumFillPlots(self):
538539
"""
539540
takes plots from sim and puts the numpy arrays of the plot values from
540541
sim into the return. Also returns main plot dt as a float, and the
@@ -569,16 +570,17 @@ def fillPlots(self):
569570

570571
return output_plots, [self.plotDt] * len(output_plots), self.numMainPlots
571572

572-
573-
574-
575-
576-
577-
578-
579-
580-
581-
573+
def fillPlots(self):
574+
"""
575+
puts the numpy arrays of the plot values from sim into the return.
576+
Also returns main plot dt as a float, and the number of main plots.
577+
"""
578+
if not self.plotPath:
579+
return [], [], self.numMainPlots
580+
outputPlots = []
581+
for idx, name in enumerate( self.plotPath ):
582+
outputPlots.append( np.array(self.model.plotvec[idx] ) )
583+
return outputPlots, [self.plotDt] * len(self.plots), self.numMainPlots
582584

583585

584586
def deliverStim( self, qe ):

0 commit comments

Comments
 (0)