Commit 10b9a9c6 authored by flechsig's avatar flechsig
Browse files

some improvements

parent 1f5be5b9
*.tif
*.txt
*.o
main
......@@ -3,11 +3,13 @@
myfftwlib=/home/optics/Software/fftw/lib
myfftwinc=/home/optics/Software/fftw/include
myhdf5inc=/usr/include/hdf5/serial
FFTW_INCLUDE = /home/optics/Software/fftw/include
HDF5_INCLUDE = /usr/include/hdf5/serial
############################################
CC = g++
DOUBLE_PRECISION = defined
FFTW_INCLUDE = /home/optics/Software/fftw/include
ifdef DOUBLE_PRECISION
PREC = -DUSE_DOUBLE_PRECISION
#FFTW = -L /home/optics/Software/fftw/lib -lfftw3
......@@ -18,7 +20,7 @@ FFTW = -lfftw3f
endif
CFLAGS = -O3 -std=c++0x $(PREC) -DHAVE_TIFF -DHAVE_HDF5 -I/usr/include/hdf5/serial -I${FFTW_INCLUDE}
CFLAGS = -O3 -std=c++0x $(PREC) -DHAVE_TIFF -DHAVE_HDF5 -I$(HDF5_INCLUDE) -I${FFTW_INCLUDE}
LDFLAGS = -lm -ltiff -lpng -lhdf5 $(FFTW)
src = $(wildcard *.cpp)
obj = $(src:.cpp=.o)
......@@ -32,3 +34,5 @@ all: $(obj)
clean:
rm $(obj)
# end
......@@ -5,7 +5,7 @@ C-implementation
================
This folder contains C++ code for wavefront analysis (XGI) of an image saved in sfb_0087.h5 file. The code is subtacting an average of two dark images ( sfb_0061.h5 and sfb_0062.h5 ) before proceeding with the analysis. The code processing the XGI is generating images in order to follow and verify the processing pipeline, as described in Ref.[1]. The final output is a text file containig the wavefront profile in nanometers.
It should be noted that the C++ code was not generated by Matlab but is written from scratch. The Makefile contains FFTW_INCLUDE = /home/optics/Software/fftw/include variable which points to a separate fftw3 installation downloaded from http://www.fftw.org/download.html. The reason was the default FFTPACK library available on default Scientific Linux installation was very slow. On the other hand the hdf5 library accessed with -I/usr/include/hdf5/serial is used referring to the pre-installed HDF software.
It should be noted that the C++ code was not generated by Matlab but is written from scratch. The Makefile contains FFTW_INCLUDE = /home/optics/Software/fftw/include variable which points to a separate fftw3 installation downloaded from http://www.fftw.org/download.html. The reason was the default FFTPACK library available on default Scientific Linux installation was very slow. On the other hand the hdf5 library accessed with -I/usr/include/hdf5/serial is used referring to the pre-installed HDF software. The paths in the Makefile must be adjusted to build the software on your computer (see comments in the Makefile).
Matlab
======
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment