Changeset 11728

Timestamp:

07/30/11 20:13:12 (13 years ago)

Author:

tbretz

Message:

Do not split DrsCalib.h until it is unified with MARS.

Location:

trunk/FACT++

Files:

• Makefile.am (modified) (1 diff)
• Makefile.in (modified) (6 diffs)
• src/DataCalib.h (modified) (1 diff)

trunk/FACT++/Makefile.am

@@ -244 +244 @@
         src/DataCalib.cc        src/DataCalib.h \
         src/DataWriteRaw.cc     src/DataWriteRaw.h \
-        src/DrsCalib.cc         src/DrsCalib.h
+        src/DrsCalib.h
 if HAS_FITS
 fadctrl_SOURCES += src/FitsFile.h src/FitsFile.cc \

trunk/FACT++/Makefile.in

@@ -252 +252 @@
         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
+        src/DataWriteRaw.h 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)
@@ -260 +259 @@
         src/EventBuilder.$(OBJEXT) src/DataProcessorImp.$(OBJEXT) \
         src/DataCalib.$(OBJEXT) src/DataWriteRaw.$(OBJEXT) \
-        src/DrsCalib.$(OBJEXT) $(am__objects_7)
+        $(am__objects_7)
 fadctrl_OBJECTS = $(am_fadctrl_OBJECTS)
 fadctrl_DEPENDENCIES = libDim.la libDim++.la libDimExtension.la \
@@ -822 +821 @@
         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)
+        src/DataWriteRaw.cc src/DataWriteRaw.h src/DrsCalib.h \
+        $(am__append_5)
 fadctrl_LDADD = libDim.la libDim++.la  libDimExtension.la \
         libTime.la libTools.la libStateMachine.la \
@@ -1267 +1266 @@
         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) \
@@ -1442 +1439 @@
         -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
@@ -1564 +1560 @@
 @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@

trunk/FACT++/src/DataCalib.h

@@ -3 +3 @@
 
 #include "DataProcessorImp.h"
+
+using namespace std;
 #include "DrsCalib.h"