Index: trunk/MagicSoft/Mars/Makefile =================================================================== --- trunk/MagicSoft/Mars/Makefile (revision 1017) +++ trunk/MagicSoft/Mars/Makefile (revision 1018) @@ -20,5 +20,5 @@ # -PROGRAMS = merpp readraw mars +PROGRAMS = readraw merpp mars SOLIB = mars.so CINT = M @@ -93,39 +93,31 @@ mrproper: clean rmbak + @echo "Removing backup files in macros/" @rm -f macros/*~ + @echo "Removing htmldoc-tree" @rm -rf htmldoc - @echo "cd mbase" - @cd mbase; make mrproper; cd .. - @echo "cd .." - @echo "cd mraw" - @cd mraw; make mrproper; cd .. - @echo "cd .." - @echo "cd mhist" - @cd mhist; make mrproper; cd .. - @echo "cd .." - @echo "cd mfilter" - @cd mfilter; make mrproper; cd .. - @echo "cd .." - @echo "cd mgui" - @cd mgui; make mrproper; cd .. - @echo "cd .." - @echo "cd mdatacheck" - @cd mdatacheck; make mrproper; cd .. - @echo "cd .." - @echo "cd mmc" - @cd mmc; make mrproper; cd .. - @echo "cd .." - @echo "cd meventdisp" - @cd meventdisp; make mrproper; cd .. - @echo "cd .." - @echo "cd manalysis" - @cd manalysis; make mrproper; cd .. - @echo "cd .." - @echo "cd mmontecarlo" - @cd mmontecarlo; make mrproper; cd .. - @echo "cd .." - @echo "cd mmain" - @cd mmain; make mrproper; cd .. - @echo "cd .." + @echo "Doing Mr.Proper in mbase" + @cd mbase; (make mrproper > /dev/null); cd .. + @echo "Doing Mr.Proper in mraw" + @cd mraw; (make mrproper > /dev/null); cd .. + @echo "Doing Mr.Proper in mhist" + @cd mhist; (make mrproper > /dev/null); cd .. + @echo "Doing Mr.Proper in mfilter" + @cd mfilter; (make mrproper > /dev/null); cd .. + @echo "Doing Mr.Proper in mgui" + @cd mgui; (make mrproper > /dev/null); cd .. + @echo "Doing Mr.Proper in mdatacheck" + @cd mdatacheck; (make mrproper > /dev/null); cd .. + @echo "Doing Mr.Proper in mmc" + @cd mmc; (make mrproper > /dev/null); cd .. + @echo "Doing Mr.Proper in mevtdisp" + @cd meventdisp; (make mrproper > /dev/null); cd .. + @echo "Doing Mr.Proper in manalysis" + @cd manalysis; (make mrproper > /dev/null); cd .. + @echo "Doing Mr.Proper in mmontecarlo" + @cd mmontecarlo; (make mrproper > /dev/null); cd .. + @echo "Doing Mr.Proper in mmain" + @cd mmain; (make mrproper > /dev/null); cd .. + @echo "Done." tar: mrproper Index: trunk/MagicSoft/Mars/Makefile.conf.general =================================================================== --- trunk/MagicSoft/Mars/Makefile.conf.general (revision 1017) +++ trunk/MagicSoft/Mars/Makefile.conf.general (revision 1018) @@ -12,5 +12,5 @@ # -DEFINES = -D__MARS__ -DROOTVER=\"$(ROOTVER)\" +DEFINES = -D__MARS__ -DROOTVER=\"$(ROOTVER)\" $(ARCHDEF) CXXFLAGS = $(ROOTCFLAGS) $(INCLUDES) $(OPTIM) $(DEBUG) $(DEFINES) Index: trunk/MagicSoft/Mars/Makefile.conf.linux =================================================================== --- trunk/MagicSoft/Mars/Makefile.conf.linux (revision 1017) +++ trunk/MagicSoft/Mars/Makefile.conf.linux (revision 1018) @@ -12,8 +12,8 @@ # compilers -CC = gcc -CXX = g++ -F77 = f77 -AR = ar -rc +CC = gcc +CXX = g++ +F77 = f77 +AR = ar -rc # # ----->>> settings for compilation @@ -22,7 +22,8 @@ OPTIM = -O2 -Wall -fno-rtti -fno-exceptions -fPIC -Wtraditional -Wpointer-arith -Wcast-align -Wconversion -Wstrict-prototypes -Wmissing-prototypes -Wnested-externs DEBUG = -g +ARCHDEF = -D__LINUX__ -MARS_LIB = -Llib $(SUBDIRS:%=-l%) -INCLUDES = -I. $(SUBDIRS:%=-I%) +MARS_LIB = -Llib $(SUBDIRS:%=-l%) +INCLUDES = -I. $(SUBDIRS:%=-I%) # uncomment this for quiet compilation Index: trunk/MagicSoft/Mars/Makefile.conf.linux-gnu =================================================================== --- trunk/MagicSoft/Mars/Makefile.conf.linux-gnu (revision 1017) +++ trunk/MagicSoft/Mars/Makefile.conf.linux-gnu (revision 1018) @@ -12,8 +12,8 @@ # compilers -CC = gcc -CXX = g++ -F77 = f77 -AR = ar -rc +CC = gcc +CXX = g++ +F77 = f77 +AR = ar -rc # # ----->>> settings for compilation @@ -22,7 +22,8 @@ OPTIM = -O2 -Wall -fno-rtti -fno-exceptions -fPIC -Wtraditional -Wpointer-arith -Wcast-align -Wwrite-strings -Wconversion -Wstrict-prototypes -Wmissing-prototypes -Wnested-externs DEBUG = -g +ARCHDEF = -D__LINUX__ -MARS_LIB = -Llib $(SUBDIRS:%=-l%) -INCLUDES = -I. $(SUBDIRS:%=-I%) +MARS_LIB = -Llib $(SUBDIRS:%=-l%) +INCLUDES = -I. $(SUBDIRS:%=-I%) # uncomment this for quiet compilation Index: trunk/MagicSoft/Mars/Makefile.conf.osf1 =================================================================== --- trunk/MagicSoft/Mars/Makefile.conf.osf1 (revision 1017) +++ trunk/MagicSoft/Mars/Makefile.conf.osf1 (revision 1018) @@ -14,8 +14,8 @@ # -CC = cc -CXX = cxx -F77 = f77 -AR = ar -c -r +CC = cc +CXX = cxx +F77 = f77 +AR = ar -c -r # @@ -23,9 +23,10 @@ # -OPTIM = -O2 -ieee -arch host -DEBUG = -g -w0 -msg_display_tag -msg_disable castqualtyp,undpreid,unrfunprm,extrasemi +OPTIM = -O2 -ieee -arch host +DEBUG = -g -w0 -msg_display_tag -msg_disable castqualtyp,undpreid,unrfunprm,extrasemi +ARCHDEF = -D__OSF__ -MARS_LIB = -Llib $(SUBDIRS/*/-l&) -INCLUDES = -I. $(SUBDIRS/*/-I&) +MARS_LIB = -Llib $(SUBDIRS/*/-l&) +INCLUDES = -I. $(SUBDIRS/*/-I&) # uncomment this for quiet compilation Index: trunk/MagicSoft/Mars/manalysis/MHillas.cc =================================================================== --- trunk/MagicSoft/Mars/manalysis/MHillas.cc (revision 1017) +++ trunk/MagicSoft/Mars/manalysis/MHillas.cc (revision 1018) @@ -95,11 +95,12 @@ { *fLog << "Hillas Parameter:" << endl; - *fLog << " - Alpha = " << fabs(fAlpha) << endl; - *fLog << " - Width = " << fWidth << endl; - *fLog << " - Length = " << fLength << endl; - *fLog << " - Size = " << fSize << endl; - *fLog << " - Dist = " << fDist << endl; -} - + *fLog << " - Alpha = " << fabs(fAlpha) << "°" << endl; + *fLog << " - Width = " << fWidth << " mm" << endl; + *fLog << " - Length = " << fLength << " mm" << endl; + *fLog << " - Size = " << fSize << " #CerPhot" << endl; + *fLog << " - Dist = " << fDist << " mm" << endl; +} + +/* // -------------------------------------------------------------------------- // @@ -113,4 +114,5 @@ fEllipse->Paint(); } +*/ // -------------------------------------------------------------------------- @@ -122,5 +124,5 @@ // (s. Clear() ) // -void MHillas::Draw(Option_t *) +void MHillas::Draw(Option_t *opt) { Clear(); @@ -132,4 +134,5 @@ fEllipse->SetLineWidth(2); fEllipse->Draw(); + //AppendPad(opt); /* Index: trunk/MagicSoft/Mars/manalysis/MHillas.h =================================================================== --- trunk/MagicSoft/Mars/manalysis/MHillas.h (revision 1017) +++ trunk/MagicSoft/Mars/manalysis/MHillas.h (revision 1018) @@ -16,8 +16,8 @@ Float_t fAlpha; // [deg] Angle between the length axis of the ellipse and the camera center Float_t fTheta; // [rad] Angle between the x axis and the center of the ellipse - Float_t fWidth; // Width of the ellipse - Float_t fLength; // Length of the ellipse - Float_t fSize; // Size of the ellipse - Float_t fDist; // Distance of the ellipse COM from the camera center + Float_t fWidth; // [mm] Width of the ellipse + Float_t fLength; // [mm] Length of the ellipse + Float_t fSize; // [#CerPhot] Size of the ellipse + Float_t fDist; // [mm] Distance of the ellipse COM from the camera center TEllipse *fEllipse; //! Graphical Object to Display Ellipse @@ -33,5 +33,5 @@ void Print(Option_t *opt=NULL) const; void Draw(Option_t *opt=NULL); - void Paint(Option_t *opt=NULL); + //void Paint(Option_t *opt=NULL); void Clear(Option_t *opt=NULL); Index: trunk/MagicSoft/Mars/manalysis/Makefile =================================================================== --- trunk/MagicSoft/Mars/manalysis/Makefile (revision 1017) +++ trunk/MagicSoft/Mars/manalysis/Makefile (revision 1018) @@ -29,6 +29,6 @@ SRCFILES = MCT1ReadAscii.cc \ + MPedestalPix.cc \ MPedestalCam.cc \ - MPedestalPix.cc \ MMcPedestalCopy.cc \ MImgCleanStd.cc \ Index: trunk/MagicSoft/Mars/mbase/BaseLinkDef.h =================================================================== --- trunk/MagicSoft/Mars/mbase/BaseLinkDef.h (revision 1017) +++ trunk/MagicSoft/Mars/mbase/BaseLinkDef.h (revision 1018) @@ -46,7 +46,7 @@ #pragma link C++ class MArrayS; -#pragma link C++ class MTime; +#pragma link C++ class MTime+; -#pragma link C++ class MHtml; +#pragma link C++ class MHtml+; Index: trunk/MagicSoft/Mars/mbase/MAGIC.h =================================================================== --- trunk/MagicSoft/Mars/mbase/MAGIC.h (revision 1017) +++ trunk/MagicSoft/Mars/mbase/MAGIC.h (revision 1018) @@ -37,5 +37,5 @@ //This will be fixed soon. It doesn't work with Alphas at the moment class MLog; -#ifndef __CINT__ +#if !defined __CINT__ || defined __LINUX__ extern MLog gLog; #endif Index: trunk/MagicSoft/Mars/mbase/MHtml.h =================================================================== --- trunk/MagicSoft/Mars/mbase/MHtml.h (revision 1017) +++ trunk/MagicSoft/Mars/mbase/MHtml.h (revision 1018) @@ -1,3 +1,3 @@ -// @(#)root/html:$Name: not supported by cvs2svn $:$Id: MHtml.h,v 1.2 2001-10-30 13:26:36 tbretz Exp $ +// @(#)root/html:$Name: not supported by cvs2svn $:$Id: MHtml.h,v 1.3 2001-10-31 13:46:12 tbretz Exp $ // Author: Nenad Buncic 18/10/95 @@ -22,8 +22,4 @@ // // //////////////////////////////////////////////////////////////////////////// - -//#ifndef ROOT_TNamed -//#include "TNamed.h" -//#endif Index: trunk/MagicSoft/Mars/mbase/Makefile =================================================================== --- trunk/MagicSoft/Mars/mbase/Makefile (revision 1017) +++ trunk/MagicSoft/Mars/mbase/Makefile (revision 1018) @@ -31,11 +31,11 @@ .SUFFIXES: .c .cc .cxx .h .hxx .o -SRCFILES = MTask.cc \ +SRCFILES = MParContainer.cc \ + MParList.cc \ + MInputStreamID.cc \ + MTask.cc \ MTaskList.cc \ - MParContainer.cc \ - MParList.cc \ MFilter.cc \ MFilterList.cc \ - MInputStreamID.cc \ MEvtLoop.cc \ MReadTree.cc \ Index: trunk/MagicSoft/Mars/mdatacheck/DataCheckLinkDef.h =================================================================== --- trunk/MagicSoft/Mars/mdatacheck/DataCheckLinkDef.h (revision 1017) +++ trunk/MagicSoft/Mars/mdatacheck/DataCheckLinkDef.h (revision 1018) @@ -5,6 +5,4 @@ #pragma link off all functions; -//#pragma link C++ class MShowSpect; -//#pragma link C++ class MViewAdcSpectra; #pragma link C++ class MDumpEvtHeader+; Index: trunk/MagicSoft/Mars/mgui/MCamDisplay.cc =================================================================== --- trunk/MagicSoft/Mars/mgui/MCamDisplay.cc (revision 1017) +++ trunk/MagicSoft/Mars/mgui/MCamDisplay.cc (revision 1018) @@ -142,4 +142,6 @@ else fDrawingPad = gPad; + + fDrawingPad->SetBorderMode(0); // @@ -185,4 +187,6 @@ txt->Draw(); } + + //fDrawingPad->SetEditable(kFALSE); } Index: trunk/MagicSoft/Mars/mgui/MHexagon.cc =================================================================== --- trunk/MagicSoft/Mars/mgui/MHexagon.cc (revision 1017) +++ trunk/MagicSoft/Mars/mgui/MHexagon.cc (revision 1018) @@ -159,4 +159,5 @@ } +/* // ------------------------------------------------------------------------ // @@ -166,5 +167,4 @@ void MHexagon::ExecuteEvent(Int_t event, Int_t px, Int_t py) { - switch (event) { @@ -184,4 +184,5 @@ } } +*/ // ------------------------------------------------------------------------ @@ -245,9 +246,9 @@ void MHexagon::Print(Option_t *) const { - cout << GetName() << ": X=" << fX << " Y=" << fY << "R=" << fD << endl; - - cout << " Color=" << GetLineColor() << endl; - cout << " Style=" << GetLineStyle() << endl; - cout << " Width=" << GetLineWidth() << endl; + cout << GetName() << ": x=" << fX << "mm y=" << fY << "mm r=" << fD << "mm" << endl; + + cout << " Color=" << GetLineColor() << ","; + cout << " Style=" << GetLineStyle() << ","; + cout << " Width=" << GetLineWidth() << ","; cout << " FillColor=" << GetFillColor() << endl; } Index: trunk/MagicSoft/Mars/mgui/MHexagon.h =================================================================== --- trunk/MagicSoft/Mars/mgui/MHexagon.h (revision 1017) +++ trunk/MagicSoft/Mars/mgui/MHexagon.h (revision 1018) @@ -49,10 +49,10 @@ virtual void DrawHexagon( Float_t x, Float_t y, Float_t d); - virtual void ExecuteEvent(Int_t event, Int_t px, Int_t py); + //virtual void ExecuteEvent(Int_t event, Int_t px, Int_t py); virtual void ls (Option_t *Option=""); virtual void Paint(Option_t *Option=""); virtual void PaintHexagon(Float_t x, Float_t y, Float_t d); - virtual void Print(Option_t *Option="") const; + virtual void Print(Option_t *Option="") const; // *MENU* ClassDef(MHexagon, 0) // A hexagon for MAGIC Index: trunk/MagicSoft/Mars/mgui/Makefile =================================================================== --- trunk/MagicSoft/Mars/mgui/Makefile (revision 1017) +++ trunk/MagicSoft/Mars/mgui/Makefile (revision 1018) @@ -28,10 +28,10 @@ .SUFFIXES: .c .cc .cxx .h .hxx .o -SRCFILES = MCamDisplay.cc \ +SRCFILES = MHexagon.cc \ + MGeomPix.cc \ + MGeomCam.cc \ + MCamDisplay.cc \ MGeomCamCT1.cc \ - MGeomCamMagic.cc \ - MGeomCam.cc \ - MGeomPix.cc \ - MHexagon.cc + MGeomCamMagic.cc SRCS = $(SRCFILES) Index: trunk/MagicSoft/Mars/mmain/Makefile =================================================================== --- trunk/MagicSoft/Mars/mmain/Makefile (revision 1017) +++ trunk/MagicSoft/Mars/mmain/Makefile (revision 1018) @@ -29,11 +29,11 @@ .SUFFIXES: .c .cc .cxx .h .hxx .o -SRCFILES = MDataCheck.cc \ +SRCFILES = MBrowser.cc \ + MDataCheck.cc \ MEvtDisp.cc \ MMars.cc \ MAnalysis.cc \ MMonteCarlo.cc \ - MCameraDisplay.cc \ - MBrowser.cc + MCameraDisplay.cc SRCS = $(SRCFILES) Index: trunk/MagicSoft/Mars/mraw/MRawCrateArray.h =================================================================== --- trunk/MagicSoft/Mars/mraw/MRawCrateArray.h (revision 1017) +++ trunk/MagicSoft/Mars/mraw/MRawCrateArray.h (revision 1018) @@ -1,4 +1,4 @@ -#ifndef MRAWCRATEARRAY_H -#define MRAWCRATEARRAY_H +#ifndef MARS_MRawCrateArray +#define MARS_MRawCrateArray /////////////////////////////////////////////////////////////////////// // // @@ -7,5 +7,5 @@ /////////////////////////////////////////////////////////////////////// -#ifndef MPARCONTAINER_H +#ifndef MARS_MParContainer #include "MParContainer.h" #endif Index: trunk/MagicSoft/Mars/mraw/MRawCrateData.h =================================================================== --- trunk/MagicSoft/Mars/mraw/MRawCrateData.h (revision 1017) +++ trunk/MagicSoft/Mars/mraw/MRawCrateData.h (revision 1018) @@ -1,6 +1,6 @@ -#ifndef MRAWCRATEDATA_H -#define MRAWCRATEDATA_H +#ifndef MARS_MRawCrateData +#define MARS_MRawCrateData -#ifndef MAGIC_H +#ifndef MARS_MAGIC #include "MAGIC.h" #endif Index: trunk/MagicSoft/Mars/mraw/MRawEvtData.h =================================================================== --- trunk/MagicSoft/Mars/mraw/MRawEvtData.h (revision 1017) +++ trunk/MagicSoft/Mars/mraw/MRawEvtData.h (revision 1018) @@ -1,6 +1,6 @@ -#ifndef MRAWEVTDATA_H -#define MRAWEVTDATA_H +#ifndef MARS_MRawEvtData +#define MARS_MRawEvtData -#ifndef MPARCONTAINER_H +#ifndef MARS_MParContainer #include "MParContainer.h" #endif Index: trunk/MagicSoft/Mars/mraw/MRawEvtHeader.h =================================================================== --- trunk/MagicSoft/Mars/mraw/MRawEvtHeader.h (revision 1017) +++ trunk/MagicSoft/Mars/mraw/MRawEvtHeader.h (revision 1018) @@ -1,6 +1,6 @@ -#ifndef MRAWEVTHEADER_H -#define MRAWEVTHEADER_H +#ifndef MARS_MRawEvtHeader +#define MARS_MRawEvtHeader -#ifndef MPARCONTAINER_H +#ifndef MARS_MParContainer #include "MParContainer.h" #endif Index: trunk/MagicSoft/Mars/mraw/MRawEvtPixelIter.h =================================================================== --- trunk/MagicSoft/Mars/mraw/MRawEvtPixelIter.h (revision 1017) +++ trunk/MagicSoft/Mars/mraw/MRawEvtPixelIter.h (revision 1018) @@ -1,4 +1,4 @@ -#ifndef MRAWEVTPIXELITER_H -#define MRAWEVTPIXELITER_H +#ifndef MARS_MRawEvtPixelIter +#define MARS_MRawEvtPixelIter /////////////////////////////////////////////////////////////////////////////// // @@ -8,5 +8,5 @@ // /////////////////////////////////////////////////////////////////////////////// -#ifndef MAGIC_H +#ifndef MARS_MAGIC #include "MAGIC.h" #endif @@ -14,5 +14,5 @@ class MRawEvtData; -class MRawEvtPixelIter +class MRawEvtPixelIter : public TObject { private: Index: trunk/MagicSoft/Mars/mraw/MRawFileRead.h =================================================================== --- trunk/MagicSoft/Mars/mraw/MRawFileRead.h (revision 1017) +++ trunk/MagicSoft/Mars/mraw/MRawFileRead.h (revision 1018) @@ -1,6 +1,6 @@ -#ifndef MRAWFILEREAD_H -#define MRAWFILEREAD_H +#ifndef MARS_MRawFileRead +#define MARS_MRawFileRead -#ifndef MTASK_H +#ifndef MARS_MTASK #include "MTask.h" #endif Index: trunk/MagicSoft/Mars/mraw/MRawFileWrite.h =================================================================== --- trunk/MagicSoft/Mars/mraw/MRawFileWrite.h (revision 1017) +++ trunk/MagicSoft/Mars/mraw/MRawFileWrite.h (revision 1018) @@ -1,6 +1,6 @@ -#ifndef MRAWFILEWRITE_H -#define MRAWFILEWRITE_H +#ifndef MARS_MRawFileWrite +#define MARS_MRawFileWrite -#ifndef MTASK_H +#ifndef MARS_MTask #include "MTask.h" #endif @@ -36,5 +36,5 @@ MRawFileWrite(const char *fname, const Option_t *opt="UPDATE", - const char *ftitle="Unnamed", + const char *ftitle="Untitled", const Int_t comp=9, const char *name=NULL, const char *title=NULL); Index: trunk/MagicSoft/Mars/mraw/MRawRunHeader.h =================================================================== --- trunk/MagicSoft/Mars/mraw/MRawRunHeader.h (revision 1017) +++ trunk/MagicSoft/Mars/mraw/MRawRunHeader.h (revision 1018) @@ -1,4 +1,4 @@ -#ifndef MRAWRUNHEADER_H -#define MRAWRUNHEADER_H +#ifndef MARS_MRawRunHeader +#define MARS_MRawRunHeader /////////////////////////////////////////////////////////////////////// // // @@ -7,5 +7,5 @@ /////////////////////////////////////////////////////////////////////// -#ifndef MPARCONTAINER_H +#ifndef MARS_MParContainer #include "MParContainer.h" #endif