Remove timing stuff (and trailing whitespace)

2 files changed, 7 insertions, 80 deletions

diff --git a/libcrystfel/src/index.c b/libcrystfel/src/index.c
index 5b46edcb..3d0f164b 100644
--- a/libcrystfel/src/index.c
+++ b/libcrystfel/src/index.c
@@ -50,35 +50,6 @@
 #include "reax.h"
 #include "geometry.h"
 
-#ifdef HAVE_CLOCK_GETTIME
-#include <time.h>
-#else
-#include <sys/time.h>
-#endif
-#ifdef HAVE_CLOCK_GETTIME
-static double get_time()
-{
-	struct timespec tp;
-	clock_gettime(CLOCK_MONOTONIC, &tp);
-	double sec = (double) tp.tv_sec+ (double) tp.tv_nsec/1000000000;
-	return sec; //nano resolution
-}
-#else
-/* Fallback version of the above.  The time according to gettimeofday() is not
- * monotonic, so measuring intervals based on it will screw up if there's a
- * timezone change (e.g. daylight savings) while the program is running. */
-static double get_time()
-{
-	struct timeval tp;
-	gettimeofday(&tp, NULL);
-	double sec = (double) tp.tv_sec+ (double) tp.tv_usec/1000000;
-	return sec; //micro resolution
-}
-#endif
-
-
-
-
 
 /* Base class constructor for unspecialised indexing private data */
 IndexingPrivate *indexing_private(IndexingMethod indm)
@@ -188,8 +159,6 @@ void index_pattern(struct image *image, UnitCell *cell, IndexingMethod *indm,
                    int cellr, int verbose, IndexingPrivate **ipriv,
                    int config_insane, float *ltl)
 {
-//double t1,t2;  
-//t1 = get_time();
 	int i;
 	int n = 0;
 
@@ -198,9 +167,6 @@ void index_pattern(struct image *image, UnitCell *cell, IndexingMethod *indm,
 	map_all_peaks(image);
 	image->indexed_cell = NULL;
 
-double tDI,tDO;
-double tMI,tMO;
-
 	while ( indm[n] != INDEXING_NONE ) {
 
 		image->ncells = 0;
@@ -210,16 +176,10 @@ double tMI,tMO;
 		case INDEXING_NONE :
 			return;
 		case INDEXING_DIRAX :
-tDI = get_time();
 			run_dirax(image);
-tDO = get_time();
-ERROR("run_dirax DONE %.2f %.2f %.2f\n",tDI,tDO,tDO-tDI);
 			break;
 		case INDEXING_MOSFLM :
-tMI = get_time();
 			run_mosflm(image, cell);
-tMO = get_time();
-ERROR("run_mosflm DONE %.2f %.2f %.5f\n",tMI,tMO,tMO-tMI);
 			break;
 		case INDEXING_REAX :
 			reax_index(ipriv[n], image, cell);
@@ -291,8 +251,6 @@ done:
 		/* May free(NULL) if all algorithms were tried and no success */
 		cell_free(image->candidate_cells[i]);
 	}
-        //t2 = get_time();
-        //ERROR("index_pattern DONE %.2f %.2f %.5f\n",t1,t2,t2-t1);
 }
 
 
diff --git a/libcrystfel/src/mosflm.c b/libcrystfel/src/mosflm.c
index 03e6cbeb..a2dcae32 100644
--- a/libcrystfel/src/mosflm.c
+++ b/libcrystfel/src/mosflm.c
@@ -82,37 +82,6 @@
 #include "peaks.h"
 
 
-
-
-#ifdef HAVE_CLOCK_GETTIME
-#include <time.h>
-#else
-#include <sys/time.h>
-#endif
-#ifdef HAVE_CLOCK_GETTIME
-static double get_time()
-{
-	struct timespec tp;
-	clock_gettime(CLOCK_MONOTONIC, &tp);
-	double sec = (double) tp.tv_sec+ (double) tp.tv_nsec/1000000000;
-	return sec; //nano resolution
-}
-#else
-/* Fallback version of the above.  The time according to gettimeofday() is not
- * monotonic, so measuring intervals based on it will screw up if there's a
- * timezone change (e.g. daylight savings) while the program is running. */
-static double get_time()
-{
-	struct timeval tp;
-	gettimeofday(&tp, NULL);
-	double sec = (double) tp.tv_sec+ (double) tp.tv_usec/1000000;
-	return sec; //micro resolution
-}
-#endif
-
-
-
-
 #define MOSFLM_VERBOSE 0
 
 
@@ -546,7 +515,7 @@ void run_mosflm(struct image *image, UnitCell *cell)
 
         // fork a new process operating in pseudoterminal
 	mosflm->pid = forkpty(&mosflm->pty, NULL, NULL, NULL);
-//ERROR("forkpty: %d\n",mosflm->pid);        
+//ERROR("forkpty: %d\n",mosflm->pid);
 	if ( mosflm->pid == -1 ) {
 		ERROR("Failed to fork for MOSFLM\n");
 		free(mosflm);
@@ -593,10 +562,10 @@ void run_mosflm(struct image *image, UnitCell *cell)
 		int sval;
 
 //t3 = get_time();
-	
+
 		FD_ZERO(&fds);
 		FD_SET(mosflm->pty, &fds); // file descriptor set
-	
+
 //t4 = get_time();
 
 		tv.tv_sec = 30;            // 30 second timeout
@@ -605,7 +574,7 @@ void run_mosflm(struct image *image, UnitCell *cell)
 //t5 = get_time();
                 //sval = 1;
 		sval = select(mosflm->pty+1, &fds, NULL, NULL, &tv); // is mosflm ready for reading?
-                
+
                 if (sval != 1){
                         ERROR("******************* sval: %d ",sval);
                 }
@@ -616,7 +585,7 @@ void run_mosflm(struct image *image, UnitCell *cell)
 			ERROR("select() failed: %s\n", strerror(err));
 			rval = 1;
 		} else if ( sval != 0 ) {
-//ERROR("mosflm_readable: %d %d %d ===",mosflm->pty,mosflm->rbuffer+mosflm->rbufpos, (int) mosflm->rbuflen-mosflm->rbufpos);                    
+//ERROR("mosflm_readable: %d %d %d ===",mosflm->pty,mosflm->rbuffer+mosflm->rbufpos, (int) mosflm->rbuflen-mosflm->rbufpos);
 			rval = mosflm_readable(image, mosflm); // read mosflm results
 		} else {
 			ERROR("No response from MOSFLM..\n");
@@ -627,11 +596,11 @@ void run_mosflm(struct image *image, UnitCell *cell)
                 //}
 
 //t7 = get_time();
-//ERROR("mosflm_do DONE %.5f %.5f %.5f %.5f %.5f %.5f\n",t2-t1,t3-t2,t4-t3,t5-t4,t6-t5,t7-t6);	
+//ERROR("mosflm_do DONE %.5f %.5f %.5f %.5f %.5f %.5f\n",t2-t1,t3-t2,t4-t3,t5-t4,t6-t5,t7-t6);
 
 	} while ( !rval );
         //ERROR("DONE\n");
-	
+