Index: unk/Mars/Makefile
===================================================================
--- /trunk/Mars/Makefile	(revision 19868)
+++ 	(revision )
@@ -1,203 +1,0 @@
-##################################################################
-#
-#   makefile
-# 
-#   for the MARS software
-#
-##################################################################
-# @maintitle
-
-# @code
-
-#
-#  please change all system depend values in the 
-#  config.mk.${OSTYPE} file 
-#
-#
-
-include Makefile.conf.general
-include Makefile.conf.$(OSTYPE)
-
-#
-#PROGRAMS = readraw merpp mars test mona status
-PROGRAMS := readdaq readraw readcorsika ceres merpp callisto star ganymed sponde showlog showplot mars mars-config mirrorSimulation
-SOLIB    := libmars.so
-
-CINT      = M
-
-#
-#  connect the include files defined in the config.mk file
-#
-#    WARNING: the result (whether the linkage works or not) depends on the
-#             order of the libraries. It seems, that the most base library
-#             must be the last one
-#
-
-#
-#  ----->>>   mars libraries
-#
-SUBDIRS := mbase \
-	  mastro \
-	  mmain \
-          mcorsika \
-	  mdrs \
-          mfbase \
-          mfilter \
-          mdata \
-          mhbase \
-          mhvstime \
-          mhist \
-          manalysis \
-          mextralgo \
-          msignal \
-          mbadpixels \
-          mhcalib \
-          mhflux \
-	  mcalib \
-          mpedestal \
-          mfileio \
-          mgeom \
-	  melectronics \
-	  msim \
-	  msimreflector \
-	  msimcamera \
-          msql \
-          mimage \
-          mhft \
-          mmc \
-          mraw \
-          mcamera \
-	  mtrigger \
-          mpointing \
-          mreport \
-          mgui \
-          mranforest \
-          mjobs \
-          mjoptim \
-          mjtrain \
-          mmovie \
-          mtools \
-          mmuon
-
-LIBNOVA_PATH := `which libnovaconfig`
-
-ifeq ($(shell basename "$(LIBNOVA_PATH)X"), libnovaconfigX)
-#SUBDIRS += libnova
-LIBNOVA = -lnova
-endif
-
-# Insert here "-I" and the path to your libnova installation, 
-# e.g. -ImyFolder/libnova/include.
-# Leave it empty, if libnova is installed 
-# to the default location (i.e. /usr/include/libnova).
-LIBNOVA_INCLUDE_PATH :=
-
-#LIBRARIES = $(SUBDIRS:%=lib/lib%.a)
-LIBRARIES := $(SUBDIRS:=.a)
-CONDOR    := $(SUBDIRS:=.condor)
-SGE       := $(SUBDIRS:=.sge)
-MRPROPERS := $(SUBDIRS:=.mrproper)
-CLEANERS  := $(SUBDIRS:=.clean)
-LIBS      := $(SOLIB)
-
-#------------------------------------------------------------------------------
-.SUFFIXES: .c .cc .h .o .cxx .hxx .gch
-
-SRCFILES = \
-	   mcore/factofits.h \
-	   mcore/factfits.h \
-	   mcore/DrsCalib.h \
-	   mcore/PixelMap.h \
-	   mcore/Interpolator2D.h \
-	   mcore/nova.h \
-	   mcore/Prediction.h
-
-############################################################
-RNDMNAME:=$(shell mktemp)
-
-all: $(SOLIB) $(PROGRAMS)
-	@echo " Done. "
-	@echo " "
-
-static: LIBS=$(SUBDIRS:=/*.o) $(OBJS)
-#static: rmlib $(LIBRARIES) $(PROGRAMS)
-static: $(LIBRARIES) $(PROGRAMS)
-	@echo " Done. "
-	@echo " "
-
-include Makefile.rules
-
-#
-# Use $(CXX) -v ... for a more verbose output
-#
-# ROOTGLIBS must be there - why? How can I link the libraries?
-$(SOLIB): $(LIBRARIES) $(OBJS) $(HEADERS)
-	@echo " Linking shared object $@ ..."
-	$(LINKER) $(CXXFLAGS) $(SOFLAG) $(OBJS) $(SUBDIRS:=/*.o) $(ROOTGLIBS) $(LIBNOVA) -o ${RNDMNAME}
-	mv ${RNDMNAME} $@
-	chmod go+r $@
-
-# This is a special workaround to create the shared object (bundle, plugin)
-# for root and the dynlib (to be linked with the executable) on Mac OSX
-ifneq ($(OSTYPE),darwin)
-$(PROGRAMS): $(PROGRAMS:=.o) $(SOLIB)
-	@echo " Linking $@ ..." 
-	$(LINKER) $(CXXFLAGS) $@.o $(MARS_LIB) $(SOLIB) $(ROOTGLIBS) -o $@
-
-# Use this to link the programs statically - for gprof
-#$(PROGRAMS): $(OBJS) $(HEADERS) $(PROGRAMS:=.o)
-#	@echo " Linking $@ ..." 
-#	$(CXX) $(CXXFLAGS) $(ROOTGLIBS) $(OBJS) $(SUBDIRS:=/*.o) $@.o $(MARS_LIB) -o $@
-else
-$(DYLIB): $(LIBRARIES) $(OBJS) $(HEADERS)
-	@echo " Linking dylib $(DYLIB) ..."
-	$(LINKER) $(CXXFLAGS) $(DYFLAG) $(OBJS) $(SUBDIRS:=/*.o) $(ROOTGLIBS) -o $@
-
-$(PROGRAMS): $(PROGRAMS:=.o) $(DYLIB)
-	@echo " Linking mac executable $@ ..." 
-	$(LINKER) $(CXXFLAGS) $(ROOTGLIBS) $(DYLIB) $@.o $(MARS_LIB) -o $@
-endif
-
-rmcondor:
-	rm -f .makecondor.log
-
-condor:	rmcondor $(CONDOR)
-	echo Waiting for jobs to finish...
-	condor_wait .makecondor.log
-	rm .makecondor.log
-	make -j2 $(PROGRAMS)
-#	find -name "*/.makecondor.*"
-#	find -maxdepth 2 -name ".makecondor.*" -exec echo {}\\\; cat {}\\\; echo {}\\\; \;
-
-sge:	$(SGE)
-	make -j16 $(PROGRAMS)
-
-dox: $(SOLIB)
-	@echo
-	@echo " Creating html documentation and logfile dohtml.log..."
-	rm -f dohtml.log
-	root -b -q dohtml.C 2>&1 >> dohtml.log | tee -a dohtml.log
-	@echo " done."
-	@echo
-
-#clean:	rmcint rmobjs rmdep rmcore rmlib
-
-mrproper:	$(MRPROPERS) rmbin rmbak rmbakmac rmhtml clean
-	@echo " Done."
-	@echo " "
-
-tar:	mrproper
-	@echo "Making tar-file"
-	root -b -q -l -n tar.C
-#	@tar cvf ../mars.tar --exclude=Root .rootrc *
-#	@gzip -9 ../mars.tar
-
-#Makefile.depend:
-#	(! find ./ Makefile.depend -maxdepth 1 -empty 2> /dev/null && \
-#	echo " Generating dependancies into Makefile.depend" && \
-#	makedepend -- $(INCLUDES) -- $(PROGRAMS:=.cc) $(SRCS) $(SUBDIRS:=/*.cc) -w1024 -f- 2> /dev/null | grep -v Cint | grep -v "/usr/" > Makefile.depend && \
-#	echo " ") || find -maxdepth 0 -true > /dev/null
-#
-#depend:	Makefile.depend	
-
-# @endcode
Index: unk/Mars/Makefile.conf.darwin
===================================================================
--- /trunk/Mars/Makefile.conf.darwin	(revision 19868)
+++ 	(revision )
@@ -1,48 +1,0 @@
-##################################################################
-#
-# config.mk
-#
-# @file        config.mk
-# 
-##################################################################
-# @maintitle
-
-# @code
-
-# compilers
-
-CC       = gcc
-CXX      = g++
-F77      = f77
-AR       = ar -src
-
-#
-#  ----->>>   settings for compilation
-#
-OPTIM    = -O -Wall -Wpointer-arith -Wcast-align -Wconversion -Woverloaded-virtual
-# ggc 3.2: removed -fnonnull-objects -Wtraditional -Wnested-externs
-DEBUG    = 
-ARCHDEF  = -D__LINUX__
-
-# For Mac OSX we need to kind of shared objects. One which can be plugged
-# into root (bundle) and one which can be linked to the executables (dynlib)
-SOFLAG   = -bundle -flat_namespace -Xlinker -bind_at_load
-DYFLAG   = -dynamiclib -single_module -flat_namespace
-
-DYLIB    = $(SOLIB:.so=.dylib)
-
-# For debugging information use '-g'
-# For producing gmon.out use    '-pg'
-
-#MARS_LIB = -Llib $(SUBDIRS:%=-l%) $(MARSLIBS)
-MARS_LIB = -Llib $(MARSLIBS)
-INCLUDES = -I. $(SUBDIRS:%=-I%)
-
-# uncomment this for quiet compilation
-
-.SILENT:
-
-# @endcode
-##EOF
-
-
Index: unk/Mars/Makefile.conf.general
===================================================================
--- /trunk/Mars/Makefile.conf.general	(revision 19868)
+++ 	(revision )
@@ -1,30 +1,0 @@
-#
-#  ----->>>   root libraries
-#
-
-ROOTLIBS   := $(shell root-config --libs) -lASImage -lMinuit -lHistPainter -lThread
-ROOTGLIBS  := $(shell root-config --glibs) -lASImage -lMinuit -lHistPainter -lThread
-ROOTCFLAGS := $(shell root-config --cflags)
-
-SVN_REVISION := -DREVISION=\"$(shell svnversion -n .)\"
-
-#
-#  compiler flags
-#
-
-#
-# You can use this flags to further costumize compilation:
-#   export MARSDEFINES="-DHAVE_DARKBACKGROUND -DHAVE_XPM"
-#   export MARSFLAGS=
-#   export MARSLIBS="-lX11 -lXpm -L/usr/X11R6/lib"
-#
-OSTYPE   = $(shell uname -s | tr '[:upper:]' '[:lower:]')
-
-DEFINES	 := -DMARSVER=\"\<cvs\>\" -DPACKAGE_VERSION=\"2.4\" -D__MARS__ $(MARSDEFINES) -DHAVE_ZLIB -DPACKAGE_NAME=\"MARS\ CheObs\" ${SVN_REVISION}
-
-CXXFLAGS = $(ROOTCFLAGS) $(INCLUDES) $(OPTIM) $(DEBUG) $(ARCHDEF) $(DEFINES)
-CFLAGS   = $(CXXFLAGS) $(MARSFLAGS)
-FFLAGS   = $(CXXFLAGS)
-
-HEADERS  = $(subst .cxx,.hxx,$(subst .cc,.h,$(SRCFILES)))
-OBJS     = $(subst .cxx,.o,  $(subst .cc,.o,$(SRCFILES))) $(CINT)Cint.o
Index: unk/Mars/Makefile.conf.linux
===================================================================
--- /trunk/Mars/Makefile.conf.linux	(revision 19868)
+++ 	(revision )
@@ -1,41 +1,0 @@
-##################################################################
-#
-# config.mk
-#
-# @file        config.mk
-# 
-##################################################################
-
-# compilers
-
-ifeq ($(shell which colorgcc), )
-CC       := gcc
-CXX      := g++
-else
-CC       := colorgcc
-CXX      := colorgcc
-endif
-
-LINKER   := g++
-F77      := f77
-AR       := ar -rc
-
-#
-#  ----->>>   settings for compilation
-#
-OPTIM    := -O5 -std=c++0x -Wall -Winit-self -fPIC -Wpointer-arith -Wcast-align -Woverloaded-virtual
-# ggc 4.3: removed -Wshadow -fnonnull-objects -Wtraditional -Wnested-externs -Wconversion
-DEBUG    :=
-ARCHDEF  := -D__LINUX__
-SOFLAG   := -shared
-
-# For debugging information use '-g'
-# For producing gmon.out use    '-pg' (needs static linking)
-
-#MARS_LIB = -Llib $(SUBDIRS:%=-l%) $(MARSLIBS)
-MARS_LIB := -Llib $(MARSLIBS)
-INCLUDES  = -I. $(SUBDIRS:%=-I%)
-
-# uncomment this for quiet compilation
-
-.SILENT:
Index: unk/Mars/Makefile.conf.linux-gnu
===================================================================
--- /trunk/Mars/Makefile.conf.linux-gnu	(revision 19868)
+++ 	(revision )
@@ -1,45 +1,0 @@
-##################################################################
-#
-# config.mk
-#
-# @file        config.mk
-# 
-##################################################################
-# @maintitle
-
-# @code
-
-# compilers
-
-CC       = gcc
-CXX      = g++
-F77      = f77
-AR       = ar -rc
-#
-#  ----->>>   settings for compilation
-#
-
-OPTIM    = -O5 -Wall -fno-rtti -fnonnull-objects -fno-exceptions -fPIC -Wtraditional -Wpointer-arith -Wcast-align -Wconversion -Wstrict-prototypes -Wmissing-prototypes -Wnested-externs -Woverloaded-virtual
-DEBUG    = 
-ARCHDEF  = -D__LINUX__
-DYNLIB   = -shared
-
-# To be tested:
-# OPTIM    = -pipe  
-# OPTIM2   = -fomit-frame-pointer -ffast-math -march=i686 -mcpu=i686
-
-# For debugging information use '-g'
-# For producing gmon.out use    '-pg'
-
-#MARS_LIB = -Llib $(SUBDIRS:%=-l%)  $(MARSLIBS)
-MARS_LIB = -Llib  $(MARSLIBS)
-INCLUDES = -I. $(SUBDIRS:%=-I%)
-
-# uncomment this for quiet compilation
-
-.SILENT:
-
-# @endcode
-##EOF
-
-
Index: unk/Mars/Makefile.conf.osf1
===================================================================
--- /trunk/Mars/Makefile.conf.osf1	(revision 19868)
+++ 	(revision )
@@ -1,42 +1,0 @@
-##################################################################
-#
-# config.mk
-#
-# @file        config.mk
-# 
-##################################################################
-# @maintitle
-
-# @code
-
-#
-# compilers
-#
-
-CC       = cc
-CXX      = cxx
-F77      = f77
-AR       = ar -c -r
-
-#
-#  ----->>>   settings for compilation
-#
-
-OPTIM    = -O2 -ieee -arch host -lpthread
-DEBUG    = -g  -w0 -msg_display_tag -msg_disable castqualtyp,undpreid,unrfunprm,extrasemi,intconlosbit,nonfundec,partovrd,stoclsnotfirst,boolexprconst
-ARCHDEF  = -D__OSF__ -D__USE_STD_IOSTREAM -DR__ANSISTREAM
-DYNLIB   = -shared
-
-#MARS_LIB = -Llib $(SUBDIRS/*/-l&)  $(MARSLIBS)
-MARS_LIB = -Llib $(MARSLIBS)
-INCLUDES = -I. $(SUBDIRS/*/-I&)
-
-# uncomment this for quiet compilation
-
-.SILENT:
-
-# @endcode
-##EOF
-
-
-
Index: unk/Mars/Makefile.conf.osf5.1
===================================================================
--- /trunk/Mars/Makefile.conf.osf5.1	(revision 19868)
+++ 	(revision )
@@ -1,41 +1,0 @@
-##################################################################
-#
-# config.mk
-#
-# @file        config.mk
-# 
-##################################################################
-# @maintitle
-
-# @code
-
-#
-# compilers
-#
-
-CC       = cc
-CXX      = cxx
-F77      = f77
-AR       = ar -c -r
-
-#
-#  ----->>>   settings for compilation
-#
-
-OPTIM    = -O2 -ieee -arch host
-DEBUG    = -g3  -w0 -msg_display_tag -msg_disable castqualtyp,undpreid,unrfunprm,extrasemi,intconlosbit,nonfundec,partovrd,stoclsnotfirst,boolexprconst
-ARCHDEF  = -D__OSF__ -D__USE_STD_IOSTREAM -DR__ANSISTREAM
-DYNLIB   = -shared
-
-#MARS_LIB = -Llib $(SUBDIRS/*/-l&)  $(MARSLIBS)
-MARS_LIB = -Llib $(MARSLIBS)
-INCLUDES = -I. $(SUBDIRS/*/-I&)
-
-# uncomment this for quiet compilation
-
-.SILENT:
-
-# @endcode
-##EOF
-
-
Index: unk/Mars/Makefile.rules
===================================================================
--- /trunk/Mars/Makefile.rules	(revision 19868)
+++ 	(revision )
@@ -1,113 +1,0 @@
-include $(CINT)Dep.d
-
-$(MRPROPERS):
-	@echo " Doing Mr.Proper in $(@:.mrproper=)"
-	(cd $(@:.mrproper=); ($(MAKE) -f Makefile mrproper > /dev/null); cd ..;) 
-
-$(CONDOR):
-	@echo " Starting make in $(@:.condor=) via condor"
-	(echo universe=vanilla; \
-         echo executable=/bin/bash; \
-         echo arguments=-c make; \
-         echo log=../.makecondor.log;    \
-         echo initialdir=$(@:.condor=); \
-         echo getenv=true;     \
-         echo notification=never; \
-         echo queue) | condor_submit > /dev/null
-#	(cd $(@:.condor=); (condor_run $(MAKE) &); cd ..;)
-#         echo output=.makecondor.out; \
-#         echo error=.makecondor.err;  \
-
-$(SGE):
-	@echo " Starting make in $(@:.sge=) via sge"
-	(cd $(@:.sge=); qsub -N $@ -sync y -b yes -q test -cwd /bin/bash -l -c make; cd ..;)
-
-$(CLEANERS):
-	@echo "Cleaning $(@:.clean=):"
-	(cd $(@:.clean=); $(MAKE) -f Makefile clean; cd ..;) 
-
-$(LIBRARIES):
-	@echo " Calling make in $(@:.a=)"
-	$(MAKE) -C $* -f Makefile all
-
-$(LIB): $(OBJS) $(CINT)Cint.o
-	@echo " - Building Library $(LIB)"
-	$(CXX) $(CXXFLAGS) $(DYNLIB) $(OBJS) $(CINT)Cint.o -o $(LIB)
-	@echo " "
-
-$(CINT)Cint.cc: $(HEADERS) $(CINT)LinkDef.h
-	@echo " - Generating dictionary $(CINT)Cint.cc"
-	rootcint -f $(CINT)Cint.cc \
-	-c -p $(INCLUDES) $(LIBNOVA_INCLUDE_PATH) $(DEFINES) $(HEADERS) $(CINT)Incl.h $(CINT)LinkDef.h 
-
-%.d:
-	@echo " - Generating dependencies" $@
-	rmkdepend -f- -Y -w 3000 -- $(INCLUDES) -- $(SRCFILES) -- $(PROGRAMS:=.cc) 2> /dev/null | \
-        sed 's/^\(.*\).o:/$@ \1.o:/' > $@
-	echo "$@: Makefile" >> $@
-
-%.o:	%.cxx
-	@echo " - Compiling" $<
-	$(CXX) $(CXXFLAGS) -c $< -o $@
-
-%.o:	%.cc
-	@echo " - Compiling" $<
-	$(CXX) $(CXXFLAGS) -c $< -o $@
-
-%.o:	 %.c
-	@echo " - Compiling" $<
-	$(CC) $(CFLAGS) -c $< -o $@
-
-#
-# The cleaning facility
-#
-
-rmcint:	
-	@echo " Removing cint-stuff..."
-	@rm -f *Cint.*
-
-rmlib:	
-	@echo " Removing libraries..."
-	@echo " "
-	@rm -f lib/lib*.a lib*.a
-
-rmobjs:	
-	@echo " Removing object files..."
-	@rm -f *.o
-
-rmdep:	
-	@echo " Removing dependency files..."
-	@rm -f *Dep.d */*Dep.d
-
-rmcore:	
-	@echo " Removing core files..."
-	@rm -f core*
-
-rmbin:	
-	@echo " Removing binary files..."
-	@rm -f $(PROGRAMS) $(SOLIB) $(DYLIB) so_locations
-
-rmbak:
-	@echo " Removing backup files..."
-	@rm -f *~ kk.kk *.bak .#* .*~
-
-rmbakmac:
-	@echo " Removing backup files in macros"
-	@rm -f macros/*~
-
-rmhtml:
-	@echo " Removing htmldoc-tree"
-	rm -rf htmldoc/examples
-	rm -rf htmldoc/src
-	ls htmldoc/* | grep "htmldoc/" | grep -v images | grep -v CVS | xargs rm -f
-
-clean:	rmcint rmobjs rmdep rmcore rmlib
-
-cflags: 
-	@echo $(INCLUDES) $(CXXFLAGS)
-
-diff:
-	@svn diff | grep -v "^? " > mars.diff
-
-#zdiff:
-#	@cvs -z9 diff | grep -v "^? " > mars.diff