Index: trunk/FACT++/Makefile.am
===================================================================
--- trunk/FACT++/Makefile.am	(revision 11719)
+++ trunk/FACT++/Makefile.am	(revision 11720)
@@ -14,5 +14,5 @@
    $(SVN_REVISION)
 
-AM_CXXFLAGS = $(AM_CPPFLAGS) $(QT4_INCLUDES) \
+AM_CXXFLAGS = $(AM_CPPFLAGS) \
    -Woverloaded-virtual -Wnon-virtual-dtor -Wshadow -std=c++0x
 
@@ -241,4 +241,7 @@
 fadctrl_SOURCES = src/fadctrl.cc src/LocalControl.h src/HeadersFAD.cc \
 	src/EventBuilder.c src/EventBuilder.h
+if HAS_FITS
+fadctrl_SOURCES += src/FitsFile.h src/FitsFile.cc
+endif
 fadctrl_LDADD   = libDim.la libDim++.la  libDimExtension.la \
 	libTime.la libTools.la libStateMachine.la \
@@ -286,5 +289,5 @@
 datalogger_SOURCES = src/datalogger.cc src/LocalControl.h
 if HAS_FITS
-datalogger_SOURCES += src/Fits.cc
+datalogger_SOURCES += src/FitsFile.h src/FitsFile.cc src/Fits.h src/Fits.cc
 endif
 datalogger_LDADD  = libDim.la libDim++.la libDimExtension.la \
Index: trunk/FACT++/Makefile.in
===================================================================
--- trunk/FACT++/Makefile.in	(revision 11719)
+++ trunk/FACT++/Makefile.in	(revision 11720)
@@ -66,14 +66,17 @@
 @IS_FALSE@	readfits
 
-@HAS_FITS_TRUE@am__append_5 = src/Fits.cc
-@HAS_GROFF_TRUE@am__append_6 = $(dist_man1_MANS:.man=.html)
-@HAS_GROFF_TRUE@am__append_7 = $(dist_man1_MANS:.man=.html) 
+@HAS_FITS_TRUE@am__append_5 = src/FitsFile.h src/FitsFile.cc
+@HAS_FITS_TRUE@am__append_6 = src/FitsFile.h src/FitsFile.cc src/Fits.h src/Fits.cc
+@HAS_GROFF_TRUE@am__append_7 = $(dist_man1_MANS:.man=.html)
 @HAS_GROFF_TRUE@am__append_8 = $(dist_man1_MANS:.man=.html) 
-@HAS_GROFF_TRUE@@HAS_PS2PDF_TRUE@am__append_9 = $(dist_man1_MANS:.man=.pdf)
+@HAS_GROFF_TRUE@am__append_9 = $(dist_man1_MANS:.man=.html) 
 @HAS_GROFF_TRUE@@HAS_PS2PDF_TRUE@am__append_10 = $(dist_man1_MANS:.man=.pdf)
 @HAS_GROFF_TRUE@@HAS_PS2PDF_TRUE@am__append_11 = $(dist_man1_MANS:.man=.pdf)
+@HAS_GROFF_TRUE@@HAS_PS2PDF_TRUE@am__append_12 = $(dist_man1_MANS:.man=.pdf)
 subdir = .
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/.macro_dir/ac_check_package.m4 \
+am__aclocal_m4_deps = $(top_srcdir)/.macro_dir/ac_check_class.m4 \
+	$(top_srcdir)/.macro_dir/ac_check_cpp.m4 \
+	$(top_srcdir)/.macro_dir/ac_check_package.m4 \
 	$(top_srcdir)/.macro_dir/ac_check_readline.m4 \
 	$(top_srcdir)/.macro_dir/ac_find_motif.m4 \
@@ -187,6 +190,7 @@
 	libDimExtension.la
 am__datalogger_SOURCES_DIST = src/datalogger.cc src/LocalControl.h \
-	src/Fits.cc
-@HAS_FITS_TRUE@am__objects_1 = src/Fits.$(OBJEXT)
+	src/FitsFile.h src/FitsFile.cc src/Fits.h src/Fits.cc
+@HAS_FITS_TRUE@am__objects_1 = src/FitsFile.$(OBJEXT) \
+@HAS_FITS_TRUE@	src/Fits.$(OBJEXT)
 am_datalogger_OBJECTS = src/datalogger.$(OBJEXT) $(am__objects_1)
 datalogger_OBJECTS = $(am_datalogger_OBJECTS)
@@ -242,6 +246,10 @@
 fad_DEPENDENCIES = libTime.la libTools.la libTools.la libDim.la \
 	libDim++.la libConfiguration.la libDimExtension.la
+am__fadctrl_SOURCES_DIST = src/fadctrl.cc src/LocalControl.h \
+	src/HeadersFAD.cc src/EventBuilder.c src/EventBuilder.h \
+	src/FitsFile.h src/FitsFile.cc
+@HAS_FITS_TRUE@am__objects_7 = src/FitsFile.$(OBJEXT)
 am_fadctrl_OBJECTS = src/fadctrl.$(OBJEXT) src/HeadersFAD.$(OBJEXT) \
-	src/EventBuilder.$(OBJEXT)
+	src/EventBuilder.$(OBJEXT) $(am__objects_7)
 fadctrl_OBJECTS = $(am_fadctrl_OBJECTS)
 fadctrl_DEPENDENCIES = libDim.la libDim++.la libDimExtension.la \
@@ -309,11 +317,12 @@
 	gui/RawEventsViewer/RawEventsViewer.moc.cc \
 	gui/RawEventsViewer/RawEventsViewer.cc
-@HAS_GUI_TRUE@@HAS_VIEWER_TRUE@am__objects_7 = gui/RawEventsViewer/RawEventsViewer.moc.$(OBJEXT)
-@HAS_GUI_TRUE@@HAS_VIEWER_TRUE@am__objects_8 = $(am__objects_2) \
-@HAS_GUI_TRUE@@HAS_VIEWER_TRUE@	$(am__objects_7)
-@HAS_GUI_TRUE@@HAS_VIEWER_TRUE@am__objects_9 = gui/RawEventsViewer/RawEventsViewer.$(OBJEXT)
-am_viewer_OBJECTS = $(am__objects_8) $(am__objects_9)
+@HAS_GUI_TRUE@@HAS_VIEWER_TRUE@am__objects_8 = gui/RawEventsViewer/RawEventsViewer.moc.$(OBJEXT)
+@HAS_GUI_TRUE@@HAS_VIEWER_TRUE@am__objects_9 = $(am__objects_2) \
+@HAS_GUI_TRUE@@HAS_VIEWER_TRUE@	$(am__objects_8)
+@HAS_GUI_TRUE@@HAS_VIEWER_TRUE@am__objects_10 = gui/RawEventsViewer/RawEventsViewer.$(OBJEXT)
+am_viewer_OBJECTS = $(am__objects_9) $(am__objects_10)
 viewer_OBJECTS = $(am_viewer_OBJECTS)
-viewer_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
+viewer_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
+	libConfiguration.la
 SCRIPTS = $(dist_noinst_SCRIPTS)
 DEFAULT_INCLUDES = -I.@am__isrc@
@@ -381,9 +390,9 @@
 	$(did_SOURCES) $(dimctrl_SOURCES) $(dns_SOURCES) \
 	$(drivectrl_SOURCES) $(dserver2_SOURCES) \
-	$(am__fact_SOURCES_DIST) $(fad_SOURCES) $(fadctrl_SOURCES) \
-	$(fitsdump_SOURCES) fitsgrep.c $(fitsloader_SOURCES) \
-	$(fsc_SOURCES) $(fscctrl_SOURCES) $(ftm_SOURCES) \
-	$(ftmctrl_SOURCES) $(log_SOURCES) $(logtime_SOURCES) \
-	$(mcp_SOURCES) $(readfits_SOURCES) sched.c \
+	$(am__fact_SOURCES_DIST) $(fad_SOURCES) \
+	$(am__fadctrl_SOURCES_DIST) $(fitsdump_SOURCES) fitsgrep.c \
+	$(fitsloader_SOURCES) $(fsc_SOURCES) $(fscctrl_SOURCES) \
+	$(ftm_SOURCES) $(ftmctrl_SOURCES) $(log_SOURCES) \
+	$(logtime_SOURCES) $(mcp_SOURCES) $(readfits_SOURCES) sched.c \
 	$(scheduler_SOURCES) $(test_SOURCES) $(time_SOURCES) \
 	$(triggerschedule_SOURCES) $(am__viewer_SOURCES_DIST)
@@ -645,5 +654,5 @@
    $(SVN_REVISION)
 
-AM_CXXFLAGS = $(AM_CPPFLAGS) $(QT4_INCLUDES) \
+AM_CXXFLAGS = $(AM_CPPFLAGS) \
    -Woverloaded-virtual -Wnon-virtual-dtor -Wshadow -std=c++0x
 
@@ -661,5 +670,5 @@
 
 #-------------------------------------------------------------------------
-CLEANFILES = $(BUILT_SOURCES) $(am__append_8) $(am__append_11)
+CLEANFILES = $(BUILT_SOURCES) $(am__append_9) $(am__append_12)
 dist_noinst_SCRIPTS = autogen.sh
 EXTRA_DIST = Doxyfile dim/DIM_Performance.pdf dim/LICENSE.GPL \
@@ -668,5 +677,5 @@
 	dim/README_v14.txt dim/README_v17.txt dim/README_v16.txt \
 	dim/README_v17.txt dim/README_v18.txt dim/README_v19.txt \
-	$(DIALOGS) $(RESOURCES) $(am__append_7) $(am__append_10)
+	$(DIALOGS) $(RESOURCES) $(am__append_8) $(am__append_11)
 dns_LDADD = libDim.la libDimExtension.la
 dns_SOURCES = src/dns.c
@@ -802,6 +811,5 @@
 
 fadctrl_SOURCES = src/fadctrl.cc src/LocalControl.h src/HeadersFAD.cc \
-	src/EventBuilder.c src/EventBuilder.h
-
+	src/EventBuilder.c src/EventBuilder.h $(am__append_5)
 fadctrl_LDADD = libDim.la libDim++.la  libDimExtension.la \
 	libTime.la libTools.la libStateMachine.la \
@@ -841,5 +849,5 @@
 test_LDADD = libTools.la libStateMachine.la libTime.la libDim.la libDim++.la libConfiguration.la
 datalogger_SOURCES = src/datalogger.cc src/LocalControl.h \
-	$(am__append_5)
+	$(am__append_6)
 datalogger_LDADD = libDim.la libDim++.la libDimExtension.la \
 	libTime.la libTools.la libStateMachine.la \
@@ -895,5 +903,5 @@
 	gui/fact.cc gui/FactGui.cc src/HeadersFTM.cc
 
-viewer_LDADD = $(QT4_LIB) $(QT4_LDFLAGS) -L. -lQtOpenGL -lGLU
+viewer_LDADD = $(QT4_LIB) $(QT4_LDFLAGS) -L. -lQtOpenGL -lGLU libConfiguration.la
 viewer_SOURCES = $(viewer_SRCADD) $(viewer_QT_SOURCES)
 
@@ -902,5 +910,5 @@
 
 #-------------------------------------------------------------------------
-MAN_TARGETS = $(dist_man1_MANS) $(am__append_6) $(am__append_9)
+MAN_TARGETS = $(dist_man1_MANS) $(am__append_7) $(am__append_10)
 all: $(BUILT_SOURCES)
 	$(MAKE) $(AM_MAKEFLAGS) all-am
@@ -1158,4 +1166,6 @@
 	$(AM_V_CXXLD)$(CXXLINK) $(chatserv_OBJECTS) $(chatserv_LDADD) $(LIBS)
 src/datalogger.$(OBJEXT): src/$(am__dirstamp) \
+	src/$(DEPDIR)/$(am__dirstamp)
+src/FitsFile.$(OBJEXT): src/$(am__dirstamp) \
 	src/$(DEPDIR)/$(am__dirstamp)
 src/Fits.$(OBJEXT): src/$(am__dirstamp) src/$(DEPDIR)/$(am__dirstamp)
@@ -1414,4 +1424,5 @@
 	-rm -f src/FACT.lo
 	-rm -f src/Fits.$(OBJEXT)
+	-rm -f src/FitsFile.$(OBJEXT)
 	-rm -f src/HeadersFAD.$(OBJEXT)
 	-rm -f src/HeadersFTM.$(OBJEXT)
@@ -1527,4 +1538,5 @@
 @AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/FACT.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/Fits.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/FitsFile.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/HeadersFAD.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/HeadersFTM.Po@am__quote@