Changeset 463 for trunk/MagicSoft/Mars

Timestamp:

01/11/01 12:54:21 (24 years ago)

Author:

harald

Message:

The first implementation of a gui to test the data of Octobertest
was implemented. Therefore the two subdirs mgui and mdatacheck
were introduced. The program for the gui is called -> mars <-.

Location:

trunk/MagicSoft/Mars

Files:

• Changelog (modified) (1 diff)
• LinkDef.h (modified) (1 diff)
• Makefile (modified) (5 diffs)
• Makefile.conf.osf1 (modified) (1 diff)
• Makefile.rules (modified) ( previous)
• mars.cc (added)
• mbase/MParList.cc (modified) (2 diffs)
• mbase/MReadTree.cc (modified) (1 diff)
• mbase/MReadTree.h (modified) (2 diffs)
• mbase/Makefile (modified) (2 diffs)
• mraw/Makefile (modified) (2 diffs)
• readraw.cc (modified) (2 diffs)

trunk/MagicSoft/Mars/Changelog

@@ -1 +1 @@
                                                                -*-*- END -*-*-
+ 2001/01/11: Harald Kornmayer
+
+ * ./: 
+   readraw.c, Makefile, Makefile.rules, LinkDef.h, MParList.cc, MReadTree.cc, 
+   MReadTree.h, mbase/Makefile, mraw/Makefile      
+   - small changes in this files. Not really critical. 
+
+   mars.cc 
+   - added the main file for the gui
+
+   mgui/
+   GuiIncl.h, MGMarsMain.cc, GuiLinkDef.h, MGMarsMain.h, MGDataCheckMain.cc,
+   Makefile, MGDataCheckMain.h
+   - added the subdir mgui and this files 
+
+   mdatacheck/
+   DataCheckIncl.h, DataCheckLinkDef.h, MHistosAdc.cc, MHistosAdc.h, 
+   MDumpEvtHeader.cc, MDumpEvtHeader.h, MShowSpect.cc, MShowSpect.h,
+   MFillAdcSpect.cc, MFillAdcSpect.h, MViewAdcSpectra.cc, MViewAdcSpectra.h,
+   MGDisplayAdc.cc, MGDisplayAdc.h, Makefile
+   - added the subdir mdatacheck and this files
+        
  2000/12/28: Thomas Bretz
   

trunk/MagicSoft/Mars/LinkDef.h

@@ -6 +6 @@
 
 #endif
+
+

trunk/MagicSoft/Mars/Makefile

@@ -22 +22 @@
 # @code 
 
-PROGRAM1 = merpp
-PROGRAM2 = readraw
+PROGRAMS = merpp readraw mars
 SOLIB    = mars.so
 
@@ -29 +28 @@
 #  connect the include files defined in the config.mk file
 #
-INCLUDES = -I. -Imbase -Imraw
+#    WARNING: the result (whether the linkage works or not) depends on the
+#             order of the libraries
+#
+#
+INCLUDES = -I. -Imgui -Imbase -Imraw -Imdatacheck
 
 #
@@ -35 +38 @@
 #
 
-MARS_LIB = -Llib -lmbase  -lmraw 
-MARS_LIBB = libmbase.a libmraw.a
+MARS_LIB = -Llib -lmgui -lmdatacheck -lmraw -lmbase 
+MARS_LIBB = libmbase.a libmgui.a libmraw.a libmdatacheck.a
 
 
 #------------------------------------------------------------------------------
 
-#.SILENT:
-
-.SUFFIXES: .c .cc .cxx .h .hxx .o 
+.SUFFIXES: .c .cc .h .o 
 
 
@@ -51 +52 @@
 HEADERS = $(SRCFILES:.cc=.h)
 OBJS    = $(SRCFILES:.cc=.o) 
-OBJS1   = merpp.o 
-OBJS2   = readraw.o
 
 ############################################################
 
-all: rmlib $(PROGRAM1) $(PROGRAM2) $(SOLIB)
+all: rmlib $(PROGRAMS) $(SOLIB)
 
-$(PROGRAM1): $(MARS_LIBB) $(OBJS1) $(OBJS) MCint.o 
-        @echo " Linking $(PROGRAM1) ..." 
-        $(CXX) $(CXXFLAGS) $(OBJS1) $(OBJS) $(MARS_LIB) MCint.o $(ROOTLIBS) $(ROOTGLIBS) -o $@
- 
-$(PROGRAM2): $(MARS_LIBB) $(OBJS2) $(OBJS) MCint.o 
-        @echo " Linking $(PROGRAM2) ..." 
-        $(CXX) $(CXXFLAGS) $(OBJS2) $(OBJS) $(MARS_LIB) MCint.o $(ROOTLIBS) $(ROOTGLIBS) -o $@
-        
+# Use $(CXX) -v ... for a more verbose output
+$(PROGRAMS): $(MARS_LIBB) $(PROGRAMS:=.o) $(OBJS) MCint.o 
+        @echo " Linking $@ ..." 
+        $(CXX) $(CXXFLAGS) $@.o $(OBJS) $(MARS_LIB) MCint.o $(ROOTGLIBS) -o $@
+
 $(SOLIB): $(MARS_LIBB) $(OBJS) MCint.o
         @echo " Linking $(SOLIB) ..."
@@ -79 +75 @@
         (cd mraw; make; cd ..; mv mraw/libmraw.a lib) 
 
-libmocttest.a:
-        @echo " Creating libmocttest.a:"
-        (cd mocttest; make; cd .., mv mocttest/libmocttest.a lib) 
+libmgui.a:
+        @echo " Creating libmgui.a:"
+        (cd mgui; make; cd ..; mv mgui/libmgui.a lib) 
+
+libmdatacheck.a:
+        @echo " Creating libmdatacheck.a:"
+        (cd mdatacheck; make; cd ..; mv mdatacheck/libmdatacheck.a lib) 
         
 dox:

trunk/MagicSoft/Mars/Makefile.conf.osf1

@@ -14 +14 @@
 #
 
-INCLUDE_ROOT    = ${ROOTSYS}/include
+INCLUDE_ROOT    = $(ROOTSYS)/include
 INCLUDE_CPLUS   = /usr/include/cxx
-INCLUDE_MBASE   = ./mbase
 
 #

trunk/MagicSoft/Mars/mbase/MParList.cc

@@ -54 +54 @@
   //  check if the object (you want to add) exists
   //
+
   if (!obj) return kTRUE;
 
@@ -97 +98 @@
 void MParList::Print(Option_t *t)
 {
-    //
-    //   print some information about the current status of MParList
-    //
-    cout << "ParList: " << this->GetName() << " <" << this->GetTitle() << ">" << endl;
-    cout << endl;
+  //
+  //   print some information about the current status of MParList
+  //
+  cout << "ParList: " << this->GetName() << " <" << this->GetTitle() << ">" << endl;
+  cout << endl;
+  
 }
 

trunk/MagicSoft/Mars/mbase/MReadTree.cc

@@ -142 +142 @@
     // get entry
     //
-    fTree->GetEntry(fNumEntry/*++*/);
+    fTree->GetEntry(fNumEntry );
+
+    fNumEntry ++ ; 
+
     return kTRUE;
 }

trunk/MagicSoft/Mars/mbase/MReadTree.h

@@ -15 +15 @@
     TTree  *fTree;       // Pointer to tree
 
-    UInt_t  fNumEntry;   // Namber of actual entry
+    UInt_t  fNumEntry;   // Number of actual entry
     UInt_t  fNumEntries; // Number of Events in Tree
 
@@ -28 +28 @@
     Bool_t PostProcess();
 
+    //    Bool_t GetEvent(Int_t num ) ; 
+
     Bool_t DecEventNum(UInt_t dec=1); // decrease number of event (position in tree)
     Bool_t IncEventNum(UInt_t inc=1); // increase number of event (position in tree)

trunk/MagicSoft/Mars/mbase/Makefile

@@ -78 +78 @@
 $(LIB): $(OBJS) BaseCint.o
         @echo " - Building Library $(LIB) ... "
-        @$(AR) $(LIB) *.o
+        $(AR) $(LIB) *.o
 
 BaseCint.cc: $(HEADERS) 
@@ -84 +84 @@
         @echo " - Generating dictionary BaseCint.cc ..."
 
-        @$(ROOTSYS)/bin/rootcint -f BaseCint.cc \
+        $(ROOTSYS)/bin/rootcint -f BaseCint.cc \
         -c $(INCLUDES) $(HEADERS) BaseIncl.h BaseLinkDef.h
 

trunk/MagicSoft/Mars/mraw/Makefile

@@ -77 +77 @@
 $(LIB): $(OBJS) RawCint.o
         @echo " - Building Library $(LIB) ... "
-        @$(AR) $(LIB) *.o
+        $(AR) $(LIB) *.o
 
 RawCint.cc: $(HEADERS) 
@@ -83 +83 @@
         @echo " - Generating dictionary RawCint.cc ..."
 
-        @$(ROOTSYS)/bin/rootcint -f RawCint.cc \
+        $(ROOTSYS)/bin/rootcint -f RawCint.cc \
         -c $(INCLUDES) $(HEADERS) RawIncl.h RawLinkDef.h 
 

trunk/MagicSoft/Mars/readraw.cc

@@ -17 +17 @@
 #include "MRawCrateArray.h"
 #include "MInputStreamID.h"
+
+#include "MGMarsMain.h"
 
 /////////////////////////////////////////////////////////////////////////////
@@ -66 +68 @@
     //  open the file
     //
-    TFile input("delme.root", "READ");
+    TFile input(argv[1], "READ");
 
     //