Index: /trunk/FACT++/Makefile.am
===================================================================
--- /trunk/FACT++/Makefile.am	(revision 11726)
+++ /trunk/FACT++/Makefile.am	(revision 11727)
@@ -240,7 +240,12 @@
 
 fadctrl_SOURCES = src/fadctrl.cc src/LocalControl.h src/HeadersFAD.cc \
-	src/EventBuilder.c src/EventBuilder.h
+	src/EventBuilder.c      src/EventBuilder.h \
+	src/DataProcessorImp.cc src/DataProcessorImp.h \
+	src/DataCalib.cc        src/DataCalib.h \
+	src/DataWriteRaw.cc     src/DataWriteRaw.h \
+	src/DrsCalib.cc 	src/DrsCalib.h
 if HAS_FITS
-fadctrl_SOURCES += src/FitsFile.h src/FitsFile.cc
+fadctrl_SOURCES += src/FitsFile.h src/FitsFile.cc \
+	src/DataWriteFits.cc    src/DataWriteFits.h
 endif
 fadctrl_LDADD   = libDim.la libDim++.la  libDimExtension.la \
Index: /trunk/FACT++/Makefile.in
===================================================================
--- /trunk/FACT++/Makefile.in	(revision 11726)
+++ /trunk/FACT++/Makefile.in	(revision 11727)
@@ -66,5 +66,7 @@
 @IS_FALSE@	readfits
 
-@HAS_FITS_TRUE@am__append_5 = src/FitsFile.h src/FitsFile.cc
+@HAS_FITS_TRUE@am__append_5 = src/FitsFile.h src/FitsFile.cc \
+@HAS_FITS_TRUE@	src/DataWriteFits.cc    src/DataWriteFits.h
+
 @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)
@@ -248,8 +250,15 @@
 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)
+	src/DataProcessorImp.cc src/DataProcessorImp.h \
+	src/DataCalib.cc src/DataCalib.h src/DataWriteRaw.cc \
+	src/DataWriteRaw.h src/DrsCalib.cc src/DrsCalib.h \
+	src/FitsFile.h src/FitsFile.cc src/DataWriteFits.cc \
+	src/DataWriteFits.h
+@HAS_FITS_TRUE@am__objects_7 = src/FitsFile.$(OBJEXT) \
+@HAS_FITS_TRUE@	src/DataWriteFits.$(OBJEXT)
 am_fadctrl_OBJECTS = src/fadctrl.$(OBJEXT) src/HeadersFAD.$(OBJEXT) \
-	src/EventBuilder.$(OBJEXT) $(am__objects_7)
+	src/EventBuilder.$(OBJEXT) src/DataProcessorImp.$(OBJEXT) \
+	src/DataCalib.$(OBJEXT) src/DataWriteRaw.$(OBJEXT) \
+	src/DrsCalib.$(OBJEXT) $(am__objects_7)
 fadctrl_OBJECTS = $(am_fadctrl_OBJECTS)
 fadctrl_DEPENDENCIES = libDim.la libDim++.la libDimExtension.la \
@@ -811,5 +820,8 @@
 
 fadctrl_SOURCES = src/fadctrl.cc src/LocalControl.h src/HeadersFAD.cc \
-	src/EventBuilder.c src/EventBuilder.h $(am__append_5)
+	src/EventBuilder.c src/EventBuilder.h src/DataProcessorImp.cc \
+	src/DataProcessorImp.h src/DataCalib.cc src/DataCalib.h \
+	src/DataWriteRaw.cc src/DataWriteRaw.h src/DrsCalib.cc \
+	src/DrsCalib.h $(am__append_5)
 fadctrl_LDADD = libDim.la libDim++.la  libDimExtension.la \
 	libTime.la libTools.la libStateMachine.la \
@@ -1249,4 +1261,14 @@
 	src/$(DEPDIR)/$(am__dirstamp)
 src/EventBuilder.$(OBJEXT): src/$(am__dirstamp) \
+	src/$(DEPDIR)/$(am__dirstamp)
+src/DataProcessorImp.$(OBJEXT): src/$(am__dirstamp) \
+	src/$(DEPDIR)/$(am__dirstamp)
+src/DataCalib.$(OBJEXT): src/$(am__dirstamp) \
+	src/$(DEPDIR)/$(am__dirstamp)
+src/DataWriteRaw.$(OBJEXT): src/$(am__dirstamp) \
+	src/$(DEPDIR)/$(am__dirstamp)
+src/DrsCalib.$(OBJEXT): src/$(am__dirstamp) \
+	src/$(DEPDIR)/$(am__dirstamp)
+src/DataWriteFits.$(OBJEXT): src/$(am__dirstamp) \
 	src/$(DEPDIR)/$(am__dirstamp)
 fadctrl$(EXEEXT): $(fadctrl_OBJECTS) $(fadctrl_DEPENDENCIES) 
@@ -1400,4 +1422,8 @@
 	-rm -f src/Converter.$(OBJEXT)
 	-rm -f src/Converter.lo
+	-rm -f src/DataCalib.$(OBJEXT)
+	-rm -f src/DataProcessorImp.$(OBJEXT)
+	-rm -f src/DataWriteFits.$(OBJEXT)
+	-rm -f src/DataWriteRaw.$(OBJEXT)
 	-rm -f src/Description.$(OBJEXT)
 	-rm -f src/Description.lo
@@ -1416,4 +1442,5 @@
 	-rm -f src/DimWriteStatistics.$(OBJEXT)
 	-rm -f src/DimWriteStatistics.lo
+	-rm -f src/DrsCalib.$(OBJEXT)
 	-rm -f src/Event.$(OBJEXT)
 	-rm -f src/Event.lo
@@ -1525,4 +1552,8 @@
 @AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/Console.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/Converter.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/DataCalib.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/DataProcessorImp.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/DataWriteFits.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/DataWriteRaw.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/Description.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/DimDescriptionService.Plo@am__quote@
@@ -1533,4 +1564,5 @@
 @AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/DimSetup.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/DimWriteStatistics.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/DrsCalib.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/Event.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/EventBuilder.Po@am__quote@