Merge pull request #23 from dslosky-usgs/updates

Fix documentation generation
usgs · Nov 6, 2018 · 90a4d87 · 90a4d87
2 parents 3d6f72d + 0d1eb27
commit 90a4d87
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/shakecastaebm/validation/shakecast.py b/shakecastaebm/validation/shakecast.py
@@ -86,15 +86,15 @@ def run():
         [p['acc'] for p in capacity['curve']], 'b', label='Capacity Curve')
 
 
-    intersections = med_intersections + lower_intersections + upper_intersections
+    intersections = [med_intersections, lower_intersections, upper_intersections]
     # intersections
     plt.plot([p['disp'] for p in intersections],
         [p['acc'] for p in intersections], 'yo', label='Intersections')
 
     plt.xlim(0, 20)
     plt.title('Performance Point Calculation\nDemand: {0:.2f} in, \
             Spectral Acceleration: {1:.2f} %g'
-            .format(med_intersections[0]['disp'], med_intersections[0]['acc']))
+            .format(med_intersections['disp'], med_intersections['acc']))
     plt.xlabel('Spectral Displacement (inches)')
     plt.ylabel('Spectral Acceleration (%g)')
     plt.legend()

diff --git a/shakecastaebm/validation/workbook.py b/shakecastaebm/validation/workbook.py
@@ -38,7 +38,7 @@ def run():
         [p['y'] for p in demand_check], '-go', label='Demand Verification')
 
 
-    intersections = med_intersections + lower_intersections + upper_intersections
+    intersections = [med_intersections, lower_intersections, upper_intersections]
     # intersections
     plt.plot([p['disp'] for p in intersections],
         [p['acc'] for p in intersections], 'yo', label='Intersections')