--- trunk/src/io/RestWriter.cpp	2009/09/07 16:31:51	1360
+++ trunk/src/io/RestWriter.cpp	2009/11/25 20:02:06	1390
@@ -6,19 +6,10 @@
  * redistribute this software in source and binary code form, provided
  * that the following conditions are met:
  *
- * 1. Acknowledgement of the program authors must be made in any
- *    publication of scientific results based in part on use of the
- *    program.  An acceptable form of acknowledgement is citation of
- *    the article in which the program was described (Matthew
- *    A. Meineke, Charles F. Vardeman II, Teng Lin, Christopher
- *    J. Fennell and J. Daniel Gezelter, "OOPSE: An Object-Oriented
- *    Parallel Simulation Engine for Molecular Dynamics,"
- *    J. Comput. Chem. 26, pp. 252-271 (2005))
- *
- * 2. Redistributions of source code must retain the above copyright
+ * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  *
- * 3. Redistributions in binary form must reproduce the above copyright
+ * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the
  *    distribution.
@@ -37,6 +28,15 @@
  * arising out of the use of or inability to use software, even if the
  * University of Notre Dame has been advised of the possibility of
  * such damages.
+ *
+ * SUPPORT OPEN SCIENCE!  If you use OpenMD or its source code in your
+ * research, please cite the appropriate papers when you publish your
+ * work.  Good starting points are:
+ *                                                                      
+ * [1]  Meineke, et al., J. Comp. Chem. 26, 252-271 (2005).             
+ * [2]  Fennell & Gezelter, J. Chem. Phys. 124, 234104 (2006).          
+ * [3]  Sun, Lin & Gezelter, J. Chem. Phys. 128, 24107 (2008).          
+ * [4]  Vardeman & Gezelter, in progress (2009).                        
  */
 
 
@@ -49,7 +49,7 @@
 #include <mpi.h>
 #endif
 
-namespace oopse {
+namespace OpenMD {
   RestWriter::RestWriter(SimInfo* info, const std::string& filename, 
                          std::vector<Restraint*> restraints ) : 
     info_(info){
@@ -74,23 +74,26 @@ namespace oopse {
       // TODO:  get Restraint info from slave nodes:
       std::vector<Restraint*>::const_iterator resti;
       for(resti=restraints.begin(); resti != restraints.end(); ++resti){
-        std::string myName = (*resti)->getRestraintName();
-        int myType = (*resti)->getRestraintType();
-        
-        output_ << myName << ":";
-        
-        if (myType & Restraint::rtDisplacement)
-          output_ << "\tPosition(angstroms)\tEnergy(kcal/mol)";
-        
-        if (myType & Restraint::rtTwist)
-          output_ << "\tTwistAngle(radians)\tEnergy(kcal/mol)";
-        
-        if (myType & Restraint::rtSwingX)
-          output_ << "\tSwingXAngle(radians)\tEnergy(kcal/mol)";
-        
-        if (myType & Restraint::rtSwingY)
-          output_ << "\tSwingYAngle(radians)\tEnergy(kcal/mol)";
-        
+
+        if ((*resti)->getPrintRestraint()) {
+          std::string myName = (*resti)->getRestraintName();
+          int myType = (*resti)->getRestraintType();
+          
+          output_ << myName << ":";
+          
+          if (myType & Restraint::rtDisplacement)
+            output_ << "\tPosition(angstroms)\tEnergy(kcal/mol)";
+          
+          if (myType & Restraint::rtTwist)
+            output_ << "\tTwistAngle(radians)\tEnergy(kcal/mol)";
+          
+          if (myType & Restraint::rtSwingX)
+            output_ << "\tSwingXAngle(radians)\tEnergy(kcal/mol)";
+          
+          if (myType & Restraint::rtSwingY)
+            output_ << "\tSwingYAngle(radians)\tEnergy(kcal/mol)";
+          
+        }
       }
       output_ << "\n";
 #ifdef IS_MPI
@@ -124,5 +127,5 @@ namespace oopse {
     }
   }
   
-}// end oopse
+}// end namespace OpenMD