From 96e8ab1f6220f97b8e83f1cc516ea0c47c52ef8f Mon Sep 17 00:00:00 2001
From: David <mayerich@uh.edu>
Date: Tue, 18 Oct 2016 16:16:38 -0500
Subject: [PATCH] fixed stim::cylinder template error

---
 stim/visualization/cylinder.h | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/stim/visualization/cylinder.h b/stim/visualization/cylinder.h
index 0c1442c..19c3bd1 100644
--- a/stim/visualization/cylinder.h
+++ b/stim/visualization/cylinder.h
@@ -4,6 +4,9 @@
 #include <stim/math/circle.h>
 #include <stim/biomodels/centerline.h>
 
+/*
+	
+*/
 
 namespace stim
 {
@@ -12,13 +15,13 @@ class cylinder
  : public centerline<T>
 {
 	private:
-		stim::circle<T> s;			//an arbitrary circle
-		std::vector<stim::circle<T> > e;	//an array of circles that store the centerline
+		stim::circle<T> s;							//an arbitrary circle
+		std::vector<stim::circle<T> > e;			//an array of circles that store the centerline
 
 		std::vector<stim::vec3<T> > norms;
 		std::vector<stim::vec<T> > Us;
-		std::vector<stim::vec<T> > mags;
-		std::vector< T > L;			//length of the cylinder at each position.
+		std::vector<stim::vec<T> > mags;			//stores a list of magnitudes for each point in the centerline (assuming mags[0] is the radius)
+		std::vector< T > L;							//length of the cylinder at each position (pre-integration)
 
 
 		using stim::centerline<T>::c;
@@ -234,7 +237,7 @@ class cylinder
 		cylinder(std::vector< stim::vec3<T> > inP)
 			: centerline<T>(inP)
 		{
-			std::vector< T > inM;						//create an array of arbitrary magnitudes
+			std::vector< stim::vec<T> > inM;						//create an array of arbitrary magnitudes
 
 			stim::vec<T> zero;
 			zero.push_back(0);
--
libgit2 0.21.4