--- trunk/src/brains/Register.cpp	2005/12/05 22:23:57	788
+++ trunk/src/brains/Register.cpp	2008/07/01 13:28:23	1269
@@ -51,6 +51,8 @@
 #include "integrators/NPTxyz.hpp"
 #include "integrators/NPAT.hpp"
 #include "integrators/NPrT.hpp"
+#include "integrators/NgammaT.hpp"
+#include "integrators/LangevinDynamics.hpp"
 
 #include "minimizers/MinimizerFactory.hpp"
 #include "minimizers/MinimizerCreator.hpp"
@@ -62,22 +64,13 @@
 #include "UseTheForce/ForceFieldCreator.hpp"
 #include "UseTheForce/SHAPES_FF.hpp"
 #include "UseTheForce/SC_FF.hpp"
+#include "UseTheForce/MnM_FF.hpp"
 #include "UseTheForce/CLAYFF.hpp"
+#include "UseTheForce/Amber_FF.hpp"
 #include "lattice/LatticeFactory.hpp"
 #include "lattice/LatticeCreator.hpp"
 #include "lattice/FCCLattice.hpp"
 
-#include "openbabel/amberformat.hpp"
-#include "openbabel/fingerprintformat.hpp"
-#include "openbabel/gromos96format.hpp"
-#include "openbabel/oopseformat.hpp"
-#include "openbabel/pdbformat.hpp"
-#include "openbabel/povrayformat.hpp"
-#include "openbabel/smilesformat.hpp"
-#include "openbabel/tinkerformat.hpp"
-#include "openbabel/xyzformat.hpp"
-
-
 namespace oopse {
 
 
@@ -93,9 +86,13 @@ namespace oopse {
     ForceFieldFactory::getInstance()->registerForceField(new ForceFieldBuilder<SHAPES_FF>("SHAPES"));
     //Well if EAM worked... then Sutton-Chen should work like a CHARMM(Hopefully not).
     ForceFieldFactory::getInstance()->registerForceField(new ForceFieldBuilder<SC_FF>("SC"));
+    //Well if Sutton-Chen worked... then lets just mangle all of the forcefields together in MnM.
+    //That sounds like a good idea right......
+    ForceFieldFactory::getInstance()->registerForceField(new ForceFieldBuilder<MnM_FF>("MnM"));
     ForceFieldFactory::getInstance()->registerForceField(new ForceFieldBuilder<CLAYFF>("CLAY"));
+    ForceFieldFactory::getInstance()->registerForceField(new ForceFieldBuilder<Amber_FF>("Amber"));
   }
-
+  
   void registerIntegrators() {
     IntegratorFactory::getInstance()->registerIntegrator(new IntegratorBuilder<NVE>("NVE"));
     IntegratorFactory::getInstance()->registerIntegrator(new IntegratorBuilder<NVT>("NVT"));
@@ -104,6 +101,12 @@ namespace oopse {
     IntegratorFactory::getInstance()->registerIntegrator(new IntegratorBuilder<NPTxyz>("NPTXYZ"));
     IntegratorFactory::getInstance()->registerIntegrator(new IntegratorBuilder<NPAT>("NPAT"));
     IntegratorFactory::getInstance()->registerIntegrator(new IntegratorBuilder<NPrT>("NPRT"));
+    IntegratorFactory::getInstance()->registerIntegrator(new IntegratorBuilder<NPrT>("NPGT"));
+    IntegratorFactory::getInstance()->registerIntegrator(new IntegratorBuilder<NgammaT>("NGT"));
+    IntegratorFactory::getInstance()->registerIntegrator(new IntegratorBuilder<NgammaT>("NGAMMAT"));
+    IntegratorFactory::getInstance()->registerIntegrator(new IntegratorBuilder<LangevinDynamics>("LANGEVINDYNAMICS"));
+    IntegratorFactory::getInstance()->registerIntegrator(new IntegratorBuilder<LangevinDynamics>("LD"));
+    
 
   }
 
@@ -116,17 +119,6 @@ namespace oopse {
     LatticeFactory::getInstance()->registerLattice(new LatticeBuilder<FCCLattice>("FCC"));
   }
 
-  void registerOBFormats(){
-    static OpenBabel::AmberPrepFormat amberFormatInstance;
-    static OpenBabel::FingerprintFormat fingerprintFormatInstance;
-    static OpenBabel::OOPSEFormat oopseFormatInstance;    
-    static OpenBabel::PDBFormat pdbFormatInstance;
-    static OpenBabel::PovrayFormat povaryFormatInstance;
-    static OpenBabel::SMIFormat smilesFormatInstance;
-    static OpenBabel::TinkerFormat tinkerFormatInstance;
-    static OpenBabel::XYZFormat xyzFormatInstance;    
-  }
-  
   void registerAll() {
     registerForceFields();
     registerIntegrators();