Changeset 713 for trunk/MagicSoft

Timestamp:

03/30/01 13:21:01 (23 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars

Files:

• Makefile (modified) (1 diff)
• manalysis/MHillas.cc (modified) (1 diff)
• mhist/MHFadcCam.h (modified) (1 diff)
• mhist/MHHillas.cc (modified) (1 diff)

trunk/MagicSoft/Mars/Makefile

@@ -62 +62 @@
 
 # Use $(CXX) -v ... for a more verbose output
-$(PROGRAMS): $(LIBRARIES) mars.so $(HEADERS) MCint.o $(PROGRAMS:=.o) 
+#
+# We could link mars.so instead of all libraries. This would need
+# some MBs less space on the HD. But this means, that the Shared
+# Library Path in your system must be set properly to be able to start
+# 'mars'
+#
+$(PROGRAMS): $(LIBRARIES) $(OBJS) $(HEADERS) MCint.o $(PROGRAMS:=.o) 
         @echo " Linking $@ ..." 
-        $(CXX) $(CXXFLAGS) $@.o lib/mars.so $(MARS_LIB) MCint.o $(ROOTGLIBS) -o $@
+        $(CXX) $(CXXFLAGS) $@.o $(OBJS) $(MARS_LIB) MCint.o $(ROOTGLIBS) -o $@
 
 $(SOLIB): $(LIBRARIES) $(OBJS) $(HEADERS) MCint.o

trunk/MagicSoft/Mars/manalysis/MHillas.cc

@@ -9 +9 @@
 /////////////////////////////////////////////////////////////////////////////
 #include "MHillas.h"
+
+#include <math.h>
 
 #include <TEllipse.h>

trunk/MagicSoft/Mars/mhist/MHFadcCam.h

@@ -38 +38 @@
     TH1F *GetHistLo(UInt_t i)  { return (*this)[i]->GetHistLo(); }
 
-    void DrawHi(UInt_t i) { GetHistHi(i)->Draw(); }
-    void DrawLo(UInt_t i) { GetHistLo(i)->Draw(); }
+    //
+    // FIXME! This should be replaced by a Draw(Option_t)-function
+    //
+    void DrawHi(UInt_t i)      { GetHistHi(i)->Draw(); }
+    void DrawLo(UInt_t i)      { GetHistLo(i)->Draw(); }
 
-    void Draw(UInt_t i) { (*this)[i]->Draw(); }
+    void DrawPix(UInt_t i)     { (*this)[i]->Draw(); }
 
-    Int_t GetEntries()
-    {
-        return fArray->GetEntries() ;
-    }
+    Int_t GetEntries()         { return fArray->GetEntries(); }
 
     ClassDef(MHFadcCam, 1) // A list of histograms storing the Fadc spektrum of one pixel

trunk/MagicSoft/Mars/mhist/MHHillas.cc

@@ -8 +8 @@
 
 #include "MHHillas.h"
+
+#include <math.h>
 
 #include <TH1.h>