Index: trunk/rebuild_c++11
===================================================================
--- trunk/rebuild_c++11	(revision 39)
+++ trunk/rebuild_c++11	(revision 40)
@@ -1,7 +1,7 @@
 autoreconf --force --install
 
 setenv PKG_CONFIG_PATH /usr/local/lib/pkgconfig
-setenv CXXFLAGS "-std=c++11 -Wall -W -Werror"
+setenv CXXFLAGS "-std=c++11 -O3 -Wall -W -Werror"
 
 ./configure --with-pic
 make
Index: trunk/tests/Makefile
===================================================================
--- trunk/tests/Makefile	(revision 39)
+++ trunk/tests/Makefile	(revision 40)
@@ -1,157 +1,157 @@
 # Set the following variable correctly
 UTESTPP_DIR = /home/igv/Code/UnitTest++
 
 KINEM_DIR = ../examples/kinematics
 FFTW_LIBDIR = /usr/local/lib
 CUDA_LIBDIR = /usr/local/cuda/lib
 
 OFILES_COMMON = SegIntersect.o test_utils.o aip.o
 
 OTESTS_FAST = test_Kernels.o test_PeakFinder.o test_StatAccumulator.o \
               test_Instantiation.o test_Matrix.o test_SimpleFunctors.o \
               test_SpecialFunctions.o test_invertJetResponse.o \
               test_JetMagnitudeMapper.o test_SmallVector.o test_Grid2d.o \
               test_ClusteringTree_cmh.o
 
 OTESTS_COMPREHENSIVE = test_rectangleOverlap_cmh.o \
                        test_Kernels_cmh.o test_JetMagnitudeMapper2d_cmh.o
 
 CXX = g++
 OPTIMIZE = -g
 INCLUDES = -I. -I.. -I$(KINEM_DIR) -I$(UTESTPP_DIR)/src \
            -I$(FFTW_LIBDIR)/../include
 CXXFLAGS = -std=c++11 $(OPTIMIZE) $(INCLUDES) -Wall -W -Werror -Wno-unused-parameter
 CFLAGS = $(OPTIMIZE) $(INCLUDES) -Wall -W -Werror -Wno-unused-parameter
 
 LIBS = -L../fftjet/.libs -lfftjet -L$(UTESTPP_DIR) -lUnitTest++ \
        -L$(KINEM_DIR)/.libs -lrk -L/usr/lib \
        -L$(FFTW_LIBDIR) -lfftw3 -lfftw3f -lm
 
 LD_LIBRARY_PATH := ../fftjet/.libs:$(LD_LIBRARY_PATH)
 
 %.o : %.cc
 	$(CXX) -c $(CXXFLAGS) -fPIC -MD $< -o $@
 	@sed -i 's,\($*\.o\)[:]*\(.*\),$@: $$\(wildcard\2\)\n\1:\2,g' $*.d
 
 %.o : %.c
 	gcc -c $(CFLAGS) -fPIC -MD $< -o $@
 	@sed -i 's,\($*\.o\)[:]*\(.*\),$@: $$\(wildcard\2\)\n\1:\2,g' $*.d
 
 # Change the "all" target below to suit your development needs.
 # Useful targets which can be included are:
 #
 #   fast fast_run
 #   comprehensive comprehensive_run
 #   regression regression_run
 #   cuda cuda_run
 #
 # The tests inside the "fast" target are a subset of tests from the
 # "comprehensive" target
 
 # all: fast fast_run
 all: fast regression fast_run regression_run
 # all: comprehensive comprehensive_run regression regression_run
 
 fast: test_main.o $(OTESTS_FAST) $(OFILES_COMMON)
 	rm -f $@
 	$(CXX) $(OPTIMIZE) -fPIC -o $@ $^ $(LIBS)
 
 fast_run:
 	./fast
 
 comprehensive: test_main.o $(OTESTS_FAST) \
                $(OTESTS_COMPREHENSIVE) $(OFILES_COMMON)
 	rm -f $@
 	$(CXX) $(OPTIMIZE) -fPIC -o $@ $^ $(LIBS)
 
 comprehensive_run: comprehensive
 	./comprehensive
 
 regression: test_FFTWEngine test_FloatEngine find_resolution \
             print_kernel_properties weight_Kernel2d detect_central_bump
 
 regression_run:
 	@ echo Running regression tests.
 	./test_FFTWEngine engine.out 128 128 0.5 0.7 Gauss2d
 	./numcompare engine.out data/test_Engine_128_128_0.5_0.7_Gauss2d.dat
 	./test_FloatEngine engine.out 128 128 0.5 0.7 Gauss2d
 	./numcompare engine.out data/test_Engine_128_128_0.5_0.7_Gauss2d.dat 1.0e-6
 	./kernel_properties.tcl reg1.out reg2.out reg3.out
 	./numcompare reg1.out data/kernel_properties.dat
 	./numcompare reg2.out reg3.out 1.0e-4
-	./showWeights.tcl >& reg4.out
+	./showWeights.tcl > reg4.out
 	./numcompare reg4.out data/showWeights.dat
-	./detect_central_bump 1 2 1.01 3 Gauss2d >& reg5.out
+	./detect_central_bump 1 2 1.01 3 Gauss2d > reg5.out
 	./numcompare reg5.out data/detect_central_bump.dat
 
 cuda: test_CudaEngine
 
 cuda_run:
 	./test_CudaEngine engine.out 128 128 0.5 0.7 Gauss2d
 	./numcompare engine.out data/test_Engine_128_128_0.5_0.7_Gauss2d.dat 1.0e-6
 
 test_FFTWEngine: test_FFTWEngine.o $(OFILES_COMMON)
 	rm -f $@
 	$(CXX) $(OPTIMIZE) -fPIC -o $@ $^ $(LIBS)
 
 test_FloatEngine: test_FloatEngine.o $(OFILES_COMMON)
 	rm -f $@
 	$(CXX) $(OPTIMIZE) -fPIC -o $@ $^ $(LIBS)
 
 test_CudaEngine: test_CudaEngine.o CUFFTFloatEngine.o test_utils.o
 	rm -f $@
 	nvcc -o $@ $(OPTIMIZE) $(INCLUDES) $^ -L../fftjet/.libs -lfftjet \
 	        -L$(CUDA_LIBDIR) -lcufft -L$(FFTW_LIBDIR) -lfftw3
 
 test_CudaEngine.o : test_CudaEngine.cc
 	nvcc -M $(INCLUDES) $< -o $*.d
 	nvcc -c $(OPTIMIZE) $(INCLUDES) $< -o $@
 
 CUFFTFloatEngine.o : ../fftjet/CUFFTFloatEngine.cc
 	nvcc -M $(INCLUDES) $< -o $*.d
 	nvcc -c $(OPTIMIZE) $(INCLUDES) $< -o $@
 
 find_resolution: find_resolution.o $(OFILES_COMMON)
 	rm -f $@
 	$(CXX) $(OPTIMIZE) -fPIC -o $@ $^ $(LIBS)
 
 weight_Kernel2d: weight_Kernel2d.o $(OFILES_COMMON)
 	rm -f $@
 	$(CXX) $(OPTIMIZE) -fPIC -o $@ $^ $(LIBS)
 
 print_kernel_properties: print_kernel_properties.o $(OFILES_COMMON)
 	rm -f $@
 	$(CXX) $(OPTIMIZE) -fPIC -o $@ $^ $(LIBS)
 
 detect_central_bump: detect_central_bump.o $(OFILES_COMMON)
 	rm -f $@
 	$(CXX) $(OPTIMIZE) -fPIC -o $@ $^ $(LIBS)
 
 trigger_crash: trigger_crash.o $(OFILES_COMMON)
 	rm -f $@
 	$(CXX) $(OPTIMIZE) -fPIC -o $@ $^ $(LIBS)
 
 linear_interpolator_1d_show: linear_interpolator_1d_show.o $(OFILES_COMMON)
 	rm -f $@
 	$(CXX) $(OPTIMIZE) -fPIC -o $@ $^ $(LIBS)
 
 clean:
 	rm -f fast comprehensive test_FFTWEngine test_FloatEngine \
               test_CudaEngine find_resolution detect_central_bump \
               print_kernel_properties weight_Kernel2d trigger_crash \
               linear_interpolator_1d_show Grid2dIO.dat *.out core.* *.o *.d *~
 
 -include test_main.d
 -include $(OFILES_COMMON:.o=.d)
 -include $(OTESTS_FAST:.o=.d)
 -include $(OTESTS_COMPREHENSIVE:.o=.d)
 -include test_FFTWEngine.d
 -include test_FloatEngine.d
 -include test_CudaEngine.d
 -include CUFFTFloatEngine.d
 -include find_resolution.d
 -include linear_interpolator_1d_show.d
 -include detect_central_bump.d
 -include print_kernel_properties.d
 -include weight_Kernel2d.d
 -include trigger_crash.d