--- trunk/OOPSE/libBASS/MakeStamps.cpp	2004/01/26 18:52:42	981
+++ trunk/OOPSE/libBASS/MakeStamps.cpp	2004/01/27 20:34:11	993
@@ -223,23 +223,6 @@ int MakeStamps::rigidBodyPosition( event* the_event ){
   return 1;
 }
 
-int MakeStamps::rigidBodyPosition( event* the_event ){
-  
-  current_rigidbody->setPosition( the_event->evt.pos.x,
-                                  the_event->evt.pos.y,
-                                  the_event->evt.pos.z );
-  return 1;
-}
-
-
-int MakeStamps::rigidBodyOrientation( event* the_event ){
-  
-  current_rigidbody->setOrientation( the_event->evt.ornt.x,
-                                     the_event->evt.ornt.y,
-                                     the_event->evt.ornt.z );
-  return 1;
-}
-
 int MakeStamps::rigidBodyAssign( event* the_event ){
 
   switch( the_event->evt.asmt.asmt_type ){
@@ -285,23 +268,12 @@ int MakeStamps::newAtomInMolecule( event* the_event ){
   return 1;
 }
 
-int MakeStamps::newAtomInMolecule( event* the_event ){
+int MakeStamps::newAtom( event* the_event ){
   
   current_atom = new AtomStamp;
   
   the_event->err_msg = current_mol->addAtom( current_atom,
 					     the_event->evt.blk_index );
-  
-  if( the_event->err_msg != NULL ) return 0;
-  return 1;
-}
-
-int MakeStamps::newAtomInRigidBody( event* the_event ){
-  
-  current_atom = new AtomStamp;
-  
-  the_event->err_msg = current_rigidbody->addAtom( current_atom,
-                                                   the_event->evt.blk_index );
   
   if( the_event->err_msg != NULL ) return 0;
   return 1;
@@ -411,10 +383,10 @@ int MakeStamps::bondMember( event* the_event ){
   return 0;
 }
 
-int MakeStamps::bondMember( event* the_event ){
+int MakeStamps::bondMembers( event* the_event ){
 
-  current_bond->members( the_event->evt.mbr.a,
-			 the_event->evt.mbr.b );
+  current_bond->members( the_event->evt.mbrs.a,
+			 the_event->evt.mbrs.b );
   return 1;
 }
 
@@ -474,11 +446,11 @@ int MakeStamps::bendMember( event* the_event ){
   return 0;
 }
 
-int MakeStamps::bendMember( event* the_event ){
+int MakeStamps::bendMembers( event* the_event ){
 
-  current_bend->members( the_event->evt.mbr.a,
-			 the_event->evt.mbr.b,
-			 the_event->evt.mbr.c );
+  current_bend->members( the_event->evt.mbrs.a,
+			 the_event->evt.mbrs.b,
+			 the_event->evt.mbrs.c );
   return 1;
 }
 
@@ -538,12 +510,12 @@ int MakeStamps::torsionMember( event* the_event ){
   return 0;
 }
 
-int MakeStamps::torsionMember( event* the_event ){
+int MakeStamps::torsionMembers( event* the_event ){
 
-  current_torsion->members( the_event->evt.mbr.a,
-			    the_event->evt.mbr.b,
-			    the_event->evt.mbr.c,
-			    the_event->evt.mbr.d );
+  current_torsion->members( the_event->evt.mbrs.a,
+			    the_event->evt.mbrs.b,
+			    the_event->evt.mbrs.c,
+			    the_event->evt.mbrs.d );
   return 1;
 }
 
@@ -560,3 +532,53 @@ int MakeStamps::torsionEnd( event* the_event ){
   
   return 1;
 }
+
+int MakeStamps::newMember( event* the_event ){
+  
+  current_member = new MemberStamp;
+  
+  the_event->err_msg = current_rigidbody->addMember( current_member,
+                                                     the_event->evt.blk_index );
+  if( the_event->err_msg != NULL ) return 0;
+  
+  return 1;
+}
+
+int MakeStamps::memberAssign( event* the_event ){
+  
+  switch( the_event->evt.asmt.asmt_type ){
+    
+  case STRING:
+    current_member->assignString( the_event->evt.asmt.lhs,
+                                  the_event->evt.asmt.rhs.sval );
+    return 1;
+    break;
+    
+  case DOUBLE:
+    current_member->assignDouble( the_event->evt.asmt.lhs,
+                                  the_event->evt.asmt.rhs.dval );
+    return 1;
+    break;
+    
+  case INT:
+    current_member->assignInt( the_event->evt.asmt.lhs,
+                               the_event->evt.asmt.rhs.ival );
+    return 1;
+    break;
+    
+  default:
+    the_event->err_msg = strdup( "MakeStamp error. Invalid member"
+				 " assignment type" );
+    return 0;
+    break;
+  }
+  return 0;
+}
+
+int MakeStamps::memberEnd( event* the_event ){
+  
+  the_event->err_msg = current_member->checkMe();
+  if( the_event->err_msg != NULL ) return 0;
+  
+  return 1;
+}