Changeset 463


Ignore:
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:
1 added
11 edited

Legend:

Unmodified
Added
Removed
  • trunk/MagicSoft/Mars/Changelog

    r458 r463  
    11                                                               -*-*- END -*-*-
     2 2001/01/11: Harald Kornmayer
     3
     4 * ./:
     5   readraw.c, Makefile, Makefile.rules, LinkDef.h, MParList.cc, MReadTree.cc,
     6   MReadTree.h, mbase/Makefile, mraw/Makefile     
     7   - small changes in this files. Not really critical.
     8
     9   mars.cc
     10   - added the main file for the gui
     11
     12   mgui/
     13   GuiIncl.h, MGMarsMain.cc, GuiLinkDef.h, MGMarsMain.h, MGDataCheckMain.cc,
     14   Makefile, MGDataCheckMain.h
     15   - added the subdir mgui and this files
     16
     17   mdatacheck/
     18   DataCheckIncl.h, DataCheckLinkDef.h, MHistosAdc.cc, MHistosAdc.h,
     19   MDumpEvtHeader.cc, MDumpEvtHeader.h, MShowSpect.cc, MShowSpect.h,
     20   MFillAdcSpect.cc, MFillAdcSpect.h, MViewAdcSpectra.cc, MViewAdcSpectra.h,
     21   MGDisplayAdc.cc, MGDisplayAdc.h, Makefile
     22   - added the subdir mdatacheck and this files
     23       
    224 2000/12/28: Thomas Bretz
    325 
  • trunk/MagicSoft/Mars/LinkDef.h

    r454 r463  
    66
    77#endif
     8
     9
  • trunk/MagicSoft/Mars/Makefile

    r454 r463  
    2222# @code
    2323
    24 PROGRAM1 = merpp
    25 PROGRAM2 = readraw
     24PROGRAMS = merpp readraw mars
    2625SOLIB    = mars.so
    2726
     
    2928#  connect the include files defined in the config.mk file
    3029#
    31 INCLUDES = -I. -Imbase -Imraw
     30#    WARNING: the result (whether the linkage works or not) depends on the
     31#             order of the libraries
     32#
     33#
     34INCLUDES = -I. -Imgui -Imbase -Imraw -Imdatacheck
    3235
    3336#
     
    3538#
    3639
    37 MARS_LIB = -Llib -lmbase  -lmraw
    38 MARS_LIBB = libmbase.a libmraw.a
     40MARS_LIB = -Llib -lmgui -lmdatacheck -lmraw -lmbase
     41MARS_LIBB = libmbase.a libmgui.a libmraw.a libmdatacheck.a
    3942
    4043
    4144#------------------------------------------------------------------------------
    4245
    43 #.SILENT:
    44 
    45 .SUFFIXES: .c .cc .cxx .h .hxx .o
     46.SUFFIXES: .c .cc .h .o
    4647
    4748
     
    5152HEADERS = $(SRCFILES:.cc=.h)
    5253OBJS    = $(SRCFILES:.cc=.o)
    53 OBJS1   = merpp.o
    54 OBJS2   = readraw.o
    5554
    5655############################################################
    5756
    58 all: rmlib $(PROGRAM1) $(PROGRAM2) $(SOLIB)
     57all: rmlib $(PROGRAMS) $(SOLIB)
    5958
    60 $(PROGRAM1): $(MARS_LIBB) $(OBJS1) $(OBJS) MCint.o
    61         @echo " Linking $(PROGRAM1) ..."
    62         $(CXX) $(CXXFLAGS) $(OBJS1) $(OBJS) $(MARS_LIB) MCint.o $(ROOTLIBS) $(ROOTGLIBS) -o $@
    63  
    64 $(PROGRAM2): $(MARS_LIBB) $(OBJS2) $(OBJS) MCint.o
    65         @echo " Linking $(PROGRAM2) ..."
    66         $(CXX) $(CXXFLAGS) $(OBJS2) $(OBJS) $(MARS_LIB) MCint.o $(ROOTLIBS) $(ROOTGLIBS) -o $@
    67        
     59# Use $(CXX) -v ... for a more verbose output
     60$(PROGRAMS): $(MARS_LIBB) $(PROGRAMS:=.o) $(OBJS) MCint.o
     61        @echo " Linking $@ ..."
     62        $(CXX) $(CXXFLAGS) $@.o $(OBJS) $(MARS_LIB) MCint.o $(ROOTGLIBS) -o $@
     63
    6864$(SOLIB): $(MARS_LIBB) $(OBJS) MCint.o
    6965        @echo " Linking $(SOLIB) ..."
     
    7975        (cd mraw; make; cd ..; mv mraw/libmraw.a lib)
    8076
    81 libmocttest.a:
    82         @echo " Creating libmocttest.a:"
    83         (cd mocttest; make; cd .., mv mocttest/libmocttest.a lib)
     77libmgui.a:
     78        @echo " Creating libmgui.a:"
     79        (cd mgui; make; cd ..; mv mgui/libmgui.a lib)
     80
     81libmdatacheck.a:
     82        @echo " Creating libmdatacheck.a:"
     83        (cd mdatacheck; make; cd ..; mv mdatacheck/libmdatacheck.a lib)
    8484       
    8585dox:
  • trunk/MagicSoft/Mars/Makefile.conf.osf1

    r454 r463  
    1414#
    1515
    16 INCLUDE_ROOT    = ${ROOTSYS}/include
     16INCLUDE_ROOT    = $(ROOTSYS)/include
    1717INCLUDE_CPLUS   = /usr/include/cxx
    18 INCLUDE_MBASE   = ./mbase
    1918
    2019#
  • trunk/MagicSoft/Mars/mbase/MParList.cc

    r458 r463  
    5454  //  check if the object (you want to add) exists
    5555  //
     56
    5657  if (!obj) return kTRUE;
    5758
     
    9798void MParList::Print(Option_t *t)
    9899{
    99     //
    100     //   print some information about the current status of MParList
    101     //
    102     cout << "ParList: " << this->GetName() << " <" << this->GetTitle() << ">" << endl;
    103     cout << endl;
     100  //
     101  //   print some information about the current status of MParList
     102  //
     103  cout << "ParList: " << this->GetName() << " <" << this->GetTitle() << ">" << endl;
     104  cout << endl;
     105 
    104106}
    105107
  • trunk/MagicSoft/Mars/mbase/MReadTree.cc

    r458 r463  
    142142    // get entry
    143143    //
    144     fTree->GetEntry(fNumEntry/*++*/);
     144    fTree->GetEntry(fNumEntry );
     145
     146    fNumEntry ++ ;
     147
    145148    return kTRUE;
    146149}
  • trunk/MagicSoft/Mars/mbase/MReadTree.h

    r454 r463  
    1515    TTree  *fTree;       // Pointer to tree
    1616
    17     UInt_t  fNumEntry;   // Namber of actual entry
     17    UInt_t  fNumEntry;   // Number of actual entry
    1818    UInt_t  fNumEntries; // Number of Events in Tree
    1919
     
    2828    Bool_t PostProcess();
    2929
     30    //    Bool_t GetEvent(Int_t num ) ;
     31
    3032    Bool_t DecEventNum(UInt_t dec=1); // decrease number of event (position in tree)
    3133    Bool_t IncEventNum(UInt_t inc=1); // increase number of event (position in tree)
  • trunk/MagicSoft/Mars/mbase/Makefile

    r454 r463  
    7878$(LIB): $(OBJS) BaseCint.o
    7979        @echo " - Building Library $(LIB) ... "
    80         @$(AR) $(LIB) *.o
     80        $(AR) $(LIB) *.o
    8181
    8282BaseCint.cc: $(HEADERS)
     
    8484        @echo " - Generating dictionary BaseCint.cc ..."
    8585
    86         @$(ROOTSYS)/bin/rootcint -f BaseCint.cc \
     86        $(ROOTSYS)/bin/rootcint -f BaseCint.cc \
    8787        -c $(INCLUDES) $(HEADERS) BaseIncl.h BaseLinkDef.h
    8888
  • trunk/MagicSoft/Mars/mraw/Makefile

    r454 r463  
    7777$(LIB): $(OBJS) RawCint.o
    7878        @echo " - Building Library $(LIB) ... "
    79         @$(AR) $(LIB) *.o
     79        $(AR) $(LIB) *.o
    8080
    8181RawCint.cc: $(HEADERS)
     
    8383        @echo " - Generating dictionary RawCint.cc ..."
    8484
    85         @$(ROOTSYS)/bin/rootcint -f RawCint.cc \
     85        $(ROOTSYS)/bin/rootcint -f RawCint.cc \
    8686        -c $(INCLUDES) $(HEADERS) RawIncl.h RawLinkDef.h
    8787
  • trunk/MagicSoft/Mars/readraw.cc

    r456 r463  
    1717#include "MRawCrateArray.h"
    1818#include "MInputStreamID.h"
     19
     20#include "MGMarsMain.h"
    1921
    2022/////////////////////////////////////////////////////////////////////////////
     
    6668    //  open the file
    6769    //
    68     TFile input("delme.root", "READ");
     70    TFile input(argv[1], "READ");
    6971
    7072    //
Note: See TracChangeset for help on using the changeset viewer.