--- trunk/src/utils/GenericFactory.hpp	2005/04/15 22:04:00	507
+++ trunk/src/utils/GenericFactory.hpp	2013/06/16 15:15:42	1879
@@ -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,16 @@
  * 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, 234107 (2008).          
+ * [4]  Kuang & Gezelter,  J. Chem. Phys. 133, 164101 (2010).
+ * [5]  Vardeman, Stocker & Gezelter, J. Chem. Theory Comput. 7, 834 (2011).
  */
  
 /**
@@ -52,7 +53,7 @@
 #include <string>
 #include <vector>
 
-namespace oopse {
+namespace OpenMD {
 
   /**
    * @class GenericFactory GenericFactory.hpp "utils/GenericFactory.hpp"
@@ -158,8 +159,8 @@ namespace oopse {
     /**
      * Registers a creator with a type identifier
      * @return true if registration is succeed, otherwise return false
-     * @id the identification of the concrete object
-     * @creator the object responsible to create the concrete object 
+     * @param id the identification of the concrete object
+     * @param creator the object responsible to create the concrete object 
      */
     bool registerCreator(const IdentType& id, Creator creator) {
       return creatorMap_.insert(
@@ -171,7 +172,7 @@ namespace oopse {
      * was previously registered, the function returns true.
      * @return truethe type identifier was previously registered and the creator is removed,
      * otherwise return false
-     * @id the identification of the concrete object
+     * @param id the identification of the concrete object
      */
     bool unregisterCreator(const IdentType& id) {
       return creatorMap_.erase(id) == 1;
@@ -244,6 +245,6 @@ namespace oopse {
   const bool registered##concreteObject = factory::getInstance()->registerCreator(ident, create##concreteObject); 
 
 
-}//namespace oopse
+}//namespace OpenMD
 #endif //UTIL_GENERICFACTORY_HPP