--- trunk/SHAPES/SphereHarm.cpp	2004/06/23 20:28:39	1288
+++ trunk/SHAPES/SphereHarm.cpp	2004/06/24 15:47:52	1298
@@ -1,7 +1,4 @@
 #include "SphereHarm.hpp"
-#include "cospmls.h"
-#include "makeweights.h"
-#include "FST_semi_memo.h"
 
 SphereHarm::SphereHarm( int bandWidth ){
   bw = bandWidth;
@@ -112,11 +109,14 @@ void SphereHarm::printShapesFileStart(char name[200], 
                 weights );
 }
 
-void SphereHarm::printShapesFileStart(char name[200], string particle,
+void SphereHarm::printShapesFileStart(char name[200], char particle[80],
                                       double mass, double momInert[3][3]){
   ofstream shapes(name);
+  shapes << "begin ShapeInfo\n";
+  shapes << "#name\t\tmass\tI_xx\tI_yy\tI_zz\n";
   shapes << particle << "\t" << mass << "\t" << momInert[0][0] << "\t" 
-         << momInert[1][1] << "\t" << momInert[2][2] << "\n\n";
+         << momInert[1][1] << "\t" << momInert[2][2] << "\n";
+  shapes << "end ShapeInfo\n";
 }
 
 void SphereHarm::printToShapesFile(char name[200], int index){
@@ -188,20 +188,20 @@ void SphereHarm::printToShapesFile(char name[200], int
       }
         
       if (fabs(cm) > 0.01 * biggest) 
-        shapes << l << "\t" << m << "\tcos\t" << cm << "\n";
+        shapes << l << "\t" << m << "\tcos\t\t" << cm << "\n";
       if (fabs(sm) > 0.01 * biggest) 
-        shapes << l << "\t" << m << "\tsin\t" << sm << "\n";
+        shapes << l << "\t" << m << "\tsin\t\t" << sm << "\n";
     }
   }
   switch(index){
     case 0:{
-      shapes << "\nend ContactFunctions\n";
+      shapes << "end ContactFunctions\n";
     }; break;
     case 1:{
-      shapes << "\nend RangeFunctions\n";
+      shapes << "end RangeFunctions\n";
     }; break;
     case 2:{
-      shapes << "\nend StrengthFunctions\n";
+      shapes << "end StrengthFunctions\n";
     }; break;
   }
 }