--- trunk/madProps/madProps.c	2002/07/23 16:08:35	45
+++ trunk/madProps/madProps.c	2002/07/23 20:10:49	46
@@ -223,8 +223,6 @@ int main(argc, argv)
     if( calcMuCorr || calcCosCorr ){
           dumpArray[j].v = 
 	    (struct vect *)calloc(n_atoms, sizeof(struct vect));
-	  printf( " (Note: reading in vectors)... " );
-	  fflush( stdout );
     }
 
     //read the time and the box sizes
@@ -402,8 +400,7 @@ int main(argc, argv)
 	     cosCorr1, cosCorr2 );
     fflush( stdout );
     
-    // cosCorr call
-
+    cosCorr( out_prefix, cosCorr1, cosCorr2, dumpArray, nFrames );
     
     fprintf( stdout, 
 	     " done.\n"
@@ -414,7 +411,16 @@ int main(argc, argv)
   return 0;
   
 }
+
+
+void map( double *x, double *y, double *z, 
+	  double boxX, double boxY, double boxZ ){ 
+  
+  *x -= boxX * copysign(1.0,*x) * floor( fabs( *x/boxX ) + 0.5  );
+  *y -= boxY * copysign(1.0,*y) * floor( fabs( *y/boxY ) + 0.5  );
+  *z -= boxZ * copysign(1.0,*z) * floor( fabs( *z/boxZ ) + 0.5  );
 
+}
 
 
 /***************************************************************************