--- trunk/OOPSE/staticProps/staticProps.cpp	2003/10/17 21:19:07	810
+++ trunk/OOPSE/staticProps/staticProps.cpp	2004/02/09 20:38:38	1043
@@ -96,7 +96,7 @@ int main(int argC,char* argV[]){
 	// parse long word options
 	
 	if( !strcmp( argV[i], "--gofr" ) ){
-	  
+
 	  i++;
 	  if( i>=argC ){
 	    sprintf( painCave.errMsg,
@@ -124,6 +124,64 @@ int main(int argC,char* argV[]){
 	  havePairCorrs = true;
 	}
 
+	else if( !strcmp( argV[i], "--gofrTheta" ) ){
+	  
+	  i++;
+	  if( i>=argC ){
+	    sprintf( painCave.errMsg,
+		     "\n"
+		     "not enough arguments for --gofrTheta\n");
+	    usage();
+	    painCave.isFatal = 1;
+	    simError();
+	  }	  
+	  pair1 = argV[i];
+
+	  i++;
+	  if( i>=argC ){
+	    sprintf( painCave.errMsg,
+		     "\n"
+		     "not enough arguments for --gofrTheta\n");
+	    usage();
+	    painCave.isFatal = 1;
+	    simError();
+	  }	  
+	  pair2 = argV[i];
+
+	  pairType = gofrTheta;
+	  theList.push_back(PairCorrList( pairType, pair1, pair2 ));
+	  havePairCorrs = true;
+	}
+
+	else if( !strcmp( argV[i], "--gofrOmega" ) ){
+	  
+	  i++;
+	  if( i>=argC ){
+	    sprintf( painCave.errMsg,
+		     "\n"
+		     "not enough arguments for --gofrOmega\n");
+	    usage();
+	    painCave.isFatal = 1;
+	    simError();
+	  }	  
+	  pair1 = argV[i];
+
+	  i++;
+	  if( i>=argC ){
+	    sprintf( painCave.errMsg,
+		     "\n"
+		     "not enough arguments for --gofrOmega\n");
+	    usage();
+	    painCave.isFatal = 1;
+	    simError();
+	  }	  
+	  pair2 = argV[i];
+
+	  pairType = gofrOmega;
+	  theList.push_back(PairCorrList( pairType, pair1, pair2 ));
+	  havePairCorrs = true;
+	}
+
 	else if( !strcmp( argV[i], "--version") ){
 	  
 	  printf("\n"
@@ -383,14 +441,15 @@ int main(int argC,char* argV[]){
 	 nFrames );
   fflush(stdout);
 
-  infoArray = new SimInfo[nFrames];
+  infoArray = new SimInfo;
 
   printf("Parsing the bass file, and initializing the "
 	 "Simulation Frames..." );
   fflush(stdout);
   
   startMe = new SimSetup();
-  startMe->setSimInfo( infoArray, nFrames );
+  startMe->setSimInfo( infoArray );
+  startMe->suspendInit();
   startMe->parseFile( inName );
   startMe->createSim();
 
@@ -443,10 +502,14 @@ void usage(){
 		"\n"
 		"   long:\n"
 		"   -----\n"
-		"   --gofr <atom1> <atom2>    g(r) for atom1 and atom2\n"
-		"                                *note: \"_ALL_\" matches all atoms\n"
-		"   --version                 displays the version number\n"
-		"   --help                    displays this help message.\n"
+		"   --gofr <atom1> <atom2>         g(r) for atom1 and atom2\n"
+		"                                    *note: \"_ALL_\" matches all atoms\n"
+		"   --gofrTheta <atom1> <atom2>    g(r, theta) for atom1 and atom2\n"
+		"                                    *note: \"_ALL_\" matches all atoms\n"
+		"   --gofrOmega <atom1> <atom2>    g(r, omega) for atom1 and atom2\n"
+		"                                    *note: \"_ALL_\" matches all atoms\n"
+		"   --version                      displays the version number\n"
+		"   --help                         displays this help message.\n"
 		
 		"\n"
 		"\n",