--- trunk/src/brains/SimInfo.cpp	2006/09/21 18:25:17	1045
+++ trunk/src/brains/SimInfo.cpp	2006/12/05 00:17:24	1095
@@ -59,6 +59,7 @@
 #include "UseTheForce/DarkSide/fElectrostaticScreeningMethod.h"
 #include "UseTheForce/DarkSide/fSwitchingFunctionType.h"
 #include "UseTheForce/doForces_interface.h"
+#include "UseTheForce/DarkSide/neighborLists_interface.h"
 #include "UseTheForce/DarkSide/electrostatic_interface.h"
 #include "UseTheForce/DarkSide/switcheroo_interface.h"
 #include "utils/MemoryUtils.hpp"
@@ -67,6 +68,7 @@
 #include "io/ForceFieldOptions.hpp"
 #include "UseTheForce/ForceField.hpp"
 
+
 #ifdef IS_MPI
 #include "UseTheForce/mpiComponentPlan.h"
 #include "UseTheForce/DarkSide/simParallel_interface.h"
@@ -669,13 +671,14 @@ namespace oopse {
     // set the useRF logical
     useRF = 0;
     useSF = 0;
+    useSP = 0;
 
 
     if (simParams_->haveElectrostaticSummationMethod()) {
       std::string myMethod = simParams_->getElectrostaticSummationMethod();
       toUpper(myMethod);
       if (myMethod == "REACTION_FIELD"){
-        useRF=1;
+        useRF = 1;
       } else if (myMethod == "SHIFTED_FORCE"){
 	useSF = 1;
       } else if (myMethod == "SHIFTED_POTENTIAL"){
@@ -783,21 +786,6 @@ namespace oopse {
     fInfo_.SIM_uses_SF = useSF;
     fInfo_.SIM_uses_SP = useSP;
     fInfo_.SIM_uses_BoxDipole = useBoxDipole;
-
-    if( myMethod == "REACTION_FIELD") {
-      
-      if (simParams_->haveDielectric()) {
-	fInfo_.dielect = simParams_->getDielectric();
-      } else {
-	sprintf(painCave.errMsg,
-		"SimSetup Error: No Dielectric constant was set.\n"
-		"\tYou are trying to use Reaction Field without"
-		"\tsetting a dielectric constant!\n");
-	painCave.isFatal = 1;
-	simError();
-      }      
-    }
-
   }
 
   void SimInfo::setupFortranSim() {
@@ -882,6 +870,13 @@ namespace oopse {
 	     "succesfully sent the simulation information to fortran.\n");
     MPIcheckPoint();
 #endif // is_mpi
+
+    // Setup number of neighbors in neighbor list if present
+    if (simParams_->haveNeighborListNeighbors()) {
+      setNeighbors(simParams_->getNeighborListNeighbors());
+    }
+   
+
   }
 
 
@@ -1075,7 +1070,6 @@ namespace oopse {
     RealType dielectric;
     
     errorOut = isError;
-    dielectric = simParams_->getDielectric();
 
     if (simParams_->haveElectrostaticSummationMethod()) {
       std::string myMethod = simParams_->getElectrostaticSummationMethod();
@@ -1092,8 +1086,17 @@ namespace oopse {
 	    if (myMethod == "SHIFTED_FORCE") {            
 	      esm = SHIFTED_FORCE;
 	    } else {
-	      if (myMethod == "REACTION_FIELD") {	      
+	      if (myMethod == "REACTION_FIELD") {
 		esm = REACTION_FIELD;
+		dielectric = simParams_->getDielectric();
+		if (!simParams_->haveDielectric()) {
+		  // throw warning
+		  sprintf( painCave.errMsg,
+			   "SimInfo warning: dielectric was not specified in the input file\n\tfor the reaction field correction method.\n"
+			   "\tA default value of %f will be used for the dielectric.\n", dielectric);
+		  painCave.isFatal = 0;
+		  simError();
+		}
 	      } else {
 		// throw error        
 		sprintf( painCave.errMsg,
@@ -1132,7 +1135,10 @@ namespace oopse {
                      "\tA default value of %f (1/ang) will be used for the cutoff of\n\t%f (ang).\n", alphaVal, rcut_);
 	    painCave.isFatal = 0;
 	    simError();
+	  } else {
+	    alphaVal = simParams_->getDampingAlpha();
 	  }
+	  
 	} else {
 	  // throw error        
 	  sprintf( painCave.errMsg,