--- trunk/src/brains/Register.cpp	2005/04/12 22:33:50	487
+++ trunk/src/brains/Register.cpp	2005/12/05 22:23:57	788
@@ -1,4 +1,4 @@
- /*
+/*
  * Copyright (c) 2005 The University of Notre Dame. All Rights Reserved.
  *
  * The University of Notre Dame grants you ("Licensee") a
@@ -49,6 +49,9 @@
 #include "integrators/NPTi.hpp"
 #include "integrators/NPTf.hpp"
 #include "integrators/NPTxyz.hpp"
+#include "integrators/NPAT.hpp"
+#include "integrators/NPrT.hpp"
+
 #include "minimizers/MinimizerFactory.hpp"
 #include "minimizers/MinimizerCreator.hpp"
 #include "minimizers/PRCG.hpp"
@@ -57,14 +60,28 @@
 #include "UseTheForce/EAM_FF.hpp"
 #include "UseTheForce/ForceFieldFactory.hpp"
 #include "UseTheForce/ForceFieldCreator.hpp"
+#include "UseTheForce/SHAPES_FF.hpp"
+#include "UseTheForce/SC_FF.hpp"
+#include "UseTheForce/CLAYFF.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 {
 
 
-void registerForceFields() {
+  void registerForceFields() {
     /** @todo move to a seperate initialization module */
     //DUFF, WATER and LJ are merged into one force field
     ForceFieldFactory::getInstance()->registerForceField(new ForceFieldBuilder<DUFF>("DUFF"));
@@ -72,29 +89,48 @@ void registerForceFields() {
     ForceFieldFactory::getInstance()->registerForceField(new ForceFieldBuilder<DUFF>("LJ"));
     //in theory, EAM can also be merged
     ForceFieldFactory::getInstance()->registerForceField(new ForceFieldBuilder<EAM_FF>("EAM"));
-}
+    //heck, that worked...  let's try merging SHAPES
+    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"));
+    ForceFieldFactory::getInstance()->registerForceField(new ForceFieldBuilder<CLAYFF>("CLAY"));
+  }
 
-void registerIntegrators() {
+  void registerIntegrators() {
     IntegratorFactory::getInstance()->registerIntegrator(new IntegratorBuilder<NVE>("NVE"));
     IntegratorFactory::getInstance()->registerIntegrator(new IntegratorBuilder<NVT>("NVT"));
-    IntegratorFactory::getInstance()->registerIntegrator(new IntegratorBuilder<NPTi>("NPTi"));
-    IntegratorFactory::getInstance()->registerIntegrator(new IntegratorBuilder<NPTf>("NPTf"));
-    IntegratorFactory::getInstance()->registerIntegrator(new IntegratorBuilder<NPTxyz>("NPTxyz"));
-}
+    IntegratorFactory::getInstance()->registerIntegrator(new IntegratorBuilder<NPTi>("NPTI"));
+    IntegratorFactory::getInstance()->registerIntegrator(new IntegratorBuilder<NPTf>("NPTF"));
+    IntegratorFactory::getInstance()->registerIntegrator(new IntegratorBuilder<NPTxyz>("NPTXYZ"));
+    IntegratorFactory::getInstance()->registerIntegrator(new IntegratorBuilder<NPAT>("NPAT"));
+    IntegratorFactory::getInstance()->registerIntegrator(new IntegratorBuilder<NPrT>("NPRT"));
 
-void registerMinimizers() {
+  }
+
+  void registerMinimizers() {
     MinimizerFactory::getInstance()->registerMinimizer(new MinimizerBuilder<SDMinimizer>("SD"));
     MinimizerFactory::getInstance()->registerMinimizer(new MinimizerBuilder<PRCGMinimizer>("CG"));
-}
+  }
 
-void registerLattice(){
+  void registerLattice(){
     LatticeFactory::getInstance()->registerLattice(new LatticeBuilder<FCCLattice>("FCC"));
-}
+  }
 
-void registerAll() {
+  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();
     registerMinimizers();
-}
+  }
 
 }