Changeset 1018 for trunk/MagicSoft


Ignore:
Timestamp:
10/31/01 13:47:45 (23 years ago)
Author:
tbretz
Message:
*** empty log message ***
Location:
trunk/MagicSoft/Mars
Files:
26 edited

Legend:

Unmodified
Added
Removed

  • trunk/MagicSoft/Mars/Makefile

    r959 r1018  
    2020#
    2121
    22 PROGRAMS = merpp readraw mars
     22PROGRAMS = readraw merpp mars
    2323SOLIB    = mars.so
    2424CINT     = M
    … …  
    9393
    9494mrproper:       clean rmbak
     95        @echo "Removing backup files in macros/"
    9596        @rm -f macros/*~
     97        @echo "Removing htmldoc-tree"
    9698        @rm -rf htmldoc
    97         @echo "cd mbase"
    98         @cd mbase; make mrproper; cd ..
    99         @echo "cd .."
    100         @echo "cd mraw"
    101         @cd mraw; make mrproper; cd ..
    102         @echo "cd .."
    103         @echo "cd mhist"
    104         @cd mhist; make mrproper; cd ..
    105         @echo "cd .."
    106         @echo "cd mfilter"
    107         @cd mfilter; make mrproper; cd ..
    108         @echo "cd .."
    109         @echo "cd mgui"
    110         @cd mgui; make mrproper; cd ..
    111         @echo "cd .."
    112         @echo "cd mdatacheck"
    113         @cd mdatacheck; make mrproper; cd ..
    114         @echo "cd .."
    115         @echo "cd mmc"
    116         @cd mmc; make mrproper; cd ..
    117         @echo "cd .."
    118         @echo "cd meventdisp"
    119         @cd meventdisp; make mrproper; cd ..
    120         @echo "cd .."
    121         @echo "cd manalysis"
    122         @cd manalysis; make mrproper; cd ..
    123         @echo "cd .."
    124         @echo "cd mmontecarlo"
    125         @cd mmontecarlo; make mrproper; cd ..
    126         @echo "cd .."
    127         @echo "cd mmain"
    128         @cd mmain; make mrproper; cd ..
    129         @echo "cd .."
     99        @echo "Doing Mr.Proper in mbase"
     100        @cd mbase; (make mrproper > /dev/null); cd ..
     101        @echo "Doing Mr.Proper in mraw"
     102        @cd mraw; (make mrproper > /dev/null); cd ..
     103        @echo "Doing Mr.Proper in mhist"
     104        @cd mhist; (make mrproper > /dev/null); cd ..
     105        @echo "Doing Mr.Proper in mfilter"
     106        @cd mfilter; (make mrproper > /dev/null); cd ..
     107        @echo "Doing Mr.Proper in mgui"
     108        @cd mgui; (make mrproper > /dev/null); cd ..
     109        @echo "Doing Mr.Proper in mdatacheck"
     110        @cd mdatacheck; (make mrproper > /dev/null); cd ..
     111        @echo "Doing Mr.Proper in mmc"
     112        @cd mmc; (make mrproper > /dev/null); cd ..
     113        @echo "Doing Mr.Proper in mevtdisp"
     114        @cd meventdisp; (make mrproper > /dev/null); cd ..
     115        @echo "Doing Mr.Proper in manalysis"
     116        @cd manalysis; (make mrproper > /dev/null); cd ..
     117        @echo "Doing Mr.Proper in mmontecarlo"
     118        @cd mmontecarlo; (make mrproper > /dev/null); cd ..
     119        @echo "Doing Mr.Proper in mmain"
     120        @cd mmain; (make mrproper > /dev/null); cd ..
     121        @echo "Done."
    130122
    131123tar:    mrproper

  • trunk/MagicSoft/Mars/Makefile.conf.general

    r716 r1018  
    1212#
    1313
    14 DEFINES   = -D__MARS__ -DROOTVER=\"$(ROOTVER)\"
     14DEFINES   = -D__MARS__ -DROOTVER=\"$(ROOTVER)\" $(ARCHDEF)
    1515
    1616CXXFLAGS  = $(ROOTCFLAGS) $(INCLUDES) $(OPTIM) $(DEBUG) $(DEFINES)

  • trunk/MagicSoft/Mars/Makefile.conf.linux

    r931 r1018  
    1212# compilers
    1313
    14 CC            = gcc
    15 CXX           = g++
    16 F77           = f77
    17 AR            = ar -rc
     14CC       = gcc
     15CXX      = g++
     16F77      = f77
     17AR       = ar -rc
    1818#
    1919#  ----->>>   settings for compilation
    … …  
    2222OPTIM    = -O2 -Wall -fno-rtti -fno-exceptions -fPIC -Wtraditional -Wpointer-arith -Wcast-align -Wconversion -Wstrict-prototypes -Wmissing-prototypes -Wnested-externs
    2323DEBUG    = -g
     24ARCHDEF  = -D__LINUX__
    2425
    25 MARS_LIB  = -Llib $(SUBDIRS:%=-l%)
    26 INCLUDES  = -I. $(SUBDIRS:%=-I%)
     26MARS_LIB = -Llib $(SUBDIRS:%=-l%)
     27INCLUDES = -I. $(SUBDIRS:%=-I%)
    2728
    2829# uncomment this for quiet compilation

  • trunk/MagicSoft/Mars/Makefile.conf.linux-gnu

    r927 r1018  
    1212# compilers
    1313
    14 CC            = gcc
    15 CXX           = g++
    16 F77           = f77
    17 AR            = ar -rc
     14CC       = gcc
     15CXX      = g++
     16F77      = f77
     17AR       = ar -rc
    1818#
    1919#  ----->>>   settings for compilation
    … …  
    2222OPTIM    = -O2 -Wall -fno-rtti -fno-exceptions -fPIC -Wtraditional -Wpointer-arith -Wcast-align -Wwrite-strings -Wconversion -Wstrict-prototypes -Wmissing-prototypes -Wnested-externs
    2323DEBUG    = -g
     24ARCHDEF  = -D__LINUX__
    2425
    25 MARS_LIB  = -Llib $(SUBDIRS:%=-l%)
    26 INCLUDES  = -I. $(SUBDIRS:%=-I%)
     26MARS_LIB = -Llib $(SUBDIRS:%=-l%)
     27INCLUDES = -I. $(SUBDIRS:%=-I%)
    2728
    2829# uncomment this for quiet compilation

  • trunk/MagicSoft/Mars/Makefile.conf.osf1

    r856 r1018  
    1414#
    1515
    16 CC  = cc
    17 CXX = cxx
    18 F77 = f77
    19 AR  = ar -c -r
     16CC       = cc
     17CXX      = cxx
     18F77      = f77
     19AR       = ar -c -r
    2020
    2121#
    … …  
    2323#
    2424
    25 OPTIM = -O2 -ieee -arch host
    26 DEBUG = -g  -w0 -msg_display_tag -msg_disable castqualtyp,undpreid,unrfunprm,extrasemi
     25OPTIM    = -O2 -ieee -arch host
     26DEBUG    = -g  -w0 -msg_display_tag -msg_disable castqualtyp,undpreid,unrfunprm,extrasemi
     27ARCHDEF  = -D__OSF__
    2728
    28 MARS_LIB  = -Llib $(SUBDIRS/*/-l&)
    29 INCLUDES  = -I. $(SUBDIRS/*/-I&)
     29MARS_LIB = -Llib $(SUBDIRS/*/-l&)
     30INCLUDES = -I. $(SUBDIRS/*/-I&)
    3031
    3132# uncomment this for quiet compilation

  • trunk/MagicSoft/Mars/manalysis/MHillas.cc

    r1003 r1018  
    9595{
    9696    *fLog << "Hillas Parameter:" << endl;
    97     *fLog << " - Alpha  = " << fabs(fAlpha)  << endl;
    98     *fLog << " - Width  = " << fWidth  << endl;
    99     *fLog << " - Length = " << fLength << endl;
    100     *fLog << " - Size   = " << fSize   << endl;
    101     *fLog << " - Dist   = " << fDist   << endl;
    102 }
    103 
     97    *fLog << " - Alpha  = " << fabs(fAlpha) << "°"    << endl;
     98    *fLog << " - Width  = " << fWidth  << " mm"       << endl;
     99    *fLog << " - Length = " << fLength << " mm"       << endl;
     100    *fLog << " - Size   = " << fSize   << " #CerPhot" << endl;
     101    *fLog << " - Dist   = " << fDist   << " mm"       << endl;
     102}
     103
     104/*
    104105// --------------------------------------------------------------------------
    105106//
    … …  
    113114    fEllipse->Paint();
    114115}
     116*/
    115117
    116118// --------------------------------------------------------------------------
    … …  
    122124// (s. Clear() )
    123125//
    124 void MHillas::Draw(Option_t *)
     126void MHillas::Draw(Option_t *opt)
    125127{
    126128    Clear();
    … …  
    132134    fEllipse->SetLineWidth(2);
    133135    fEllipse->Draw();
     136    //AppendPad(opt);
    134137
    135138    /*

  • trunk/MagicSoft/Mars/manalysis/MHillas.h

    r1014 r1018  
    1616    Float_t fAlpha;     // [deg] Angle between the length axis of the ellipse and the camera center
    1717    Float_t fTheta;     // [rad] Angle between the x axis and the center of the ellipse
    18     Float_t fWidth;     // Width of the ellipse
    19     Float_t fLength;    // Length of the ellipse
    20     Float_t fSize;      // Size of the ellipse
    21     Float_t fDist;      // Distance of the ellipse COM from the camera center
     18    Float_t fWidth;     // [mm]  Width of the ellipse
     19    Float_t fLength;    // [mm]  Length of the ellipse
     20    Float_t fSize;      // [#CerPhot] Size of the ellipse
     21    Float_t fDist;      // [mm] Distance of the ellipse COM from the camera center
    2222
    2323    TEllipse *fEllipse; //! Graphical Object to Display Ellipse
    … …  
    3333    void Print(Option_t *opt=NULL) const;
    3434    void Draw(Option_t *opt=NULL);
    35     void Paint(Option_t *opt=NULL);
     35    //void Paint(Option_t *opt=NULL);
    3636
    3737    void Clear(Option_t *opt=NULL);

  • trunk/MagicSoft/Mars/manalysis/Makefile

    r803 r1018  
    2929
    3030SRCFILES = MCT1ReadAscii.cc \
     31           MPedestalPix.cc \
    3132           MPedestalCam.cc \
    32            MPedestalPix.cc \
    3333           MMcPedestalCopy.cc \
    3434           MImgCleanStd.cc \

  • trunk/MagicSoft/Mars/mbase/BaseLinkDef.h

    r1014 r1018  
    4646#pragma link C++ class MArrayS;
    4747
    48 #pragma link C++ class MTime;
     48#pragma link C++ class MTime+;
    4949
    50 #pragma link C++ class MHtml;
     50#pragma link C++ class MHtml+;
    5151
    5252

  • trunk/MagicSoft/Mars/mbase/MAGIC.h

    r1014 r1018  
    3737//This will be fixed soon. It doesn't work with Alphas at the moment
    3838class MLog;
    39 #ifndef __CINT__
     39#if !defined __CINT__ || defined __LINUX__
    4040extern MLog gLog;
    4141#endif

  • trunk/MagicSoft/Mars/mbase/MHtml.h

    r1014 r1018  
    1 // @(#)root/html:$Name: not supported by cvs2svn $:$Id: MHtml.h,v 1.2 2001-10-30 13:26:36 tbretz Exp $
     1// @(#)root/html:$Name: not supported by cvs2svn $:$Id: MHtml.h,v 1.3 2001-10-31 13:46:12 tbretz Exp $
    22// Author: Nenad Buncic   18/10/95
    33
    … …  
    2222//                                                                        //
    2323////////////////////////////////////////////////////////////////////////////
    24 
    25 //#ifndef ROOT_TNamed
    26 //#include "TNamed.h"
    27 //#endif
    2824
    2925

  • trunk/MagicSoft/Mars/mbase/Makefile

    r991 r1018  
    3131.SUFFIXES: .c .cc .cxx .h .hxx .o
    3232
    33 SRCFILES = MTask.cc \
     33SRCFILES = MParContainer.cc \
     34           MParList.cc \
     35           MInputStreamID.cc \
     36           MTask.cc \
    3437           MTaskList.cc \
    35            MParContainer.cc \
    36            MParList.cc \
    3738           MFilter.cc \
    3839           MFilterList.cc \
    39            MInputStreamID.cc \
    4040           MEvtLoop.cc \
    4141           MReadTree.cc \

  • trunk/MagicSoft/Mars/mdatacheck/DataCheckLinkDef.h

    r1013 r1018  
    55#pragma link off all functions;
    66
    7 //#pragma link C++ class MShowSpect;
    8 //#pragma link C++ class MViewAdcSpectra;
    97#pragma link C++ class MDumpEvtHeader+;
    108

  • trunk/MagicSoft/Mars/mgui/MCamDisplay.cc

    r981 r1018  
    142142    else
    143143        fDrawingPad = gPad;
     144
     145    fDrawingPad->SetBorderMode(0);
    144146
    145147    //
    … …  
    185187        txt->Draw();
    186188    }
     189
     190    //fDrawingPad->SetEditable(kFALSE);
    187191}
    188192

  • trunk/MagicSoft/Mars/mgui/MHexagon.cc

    r986 r1018  
    159159}
    160160
     161/*
    161162// ------------------------------------------------------------------------
    162163//
    … …  
    166167void MHexagon::ExecuteEvent(Int_t event, Int_t px, Int_t py)
    167168{
    168 
    169169    switch (event)
    170170    {
    … …  
    184184    }
    185185}
     186*/
    186187
    187188// ------------------------------------------------------------------------
    … …  
    245246void MHexagon::Print(Option_t *) const
    246247{
    247     cout << GetName() << ": X=" << fX << " Y=" << fY << "R=" << fD << endl;
    248 
    249     cout << " Color="     << GetLineColor() << endl;
    250     cout << " Style="     << GetLineStyle() << endl;
    251     cout << " Width="     << GetLineWidth() << endl;
     248    cout << GetName() << ": x=" << fX << "mm y=" << fY << "mm r=" << fD << "mm" << endl;
     249
     250    cout << " Color="     << GetLineColor() << ",";
     251    cout << " Style="     << GetLineStyle() << ",";
     252    cout << " Width="     << GetLineWidth() << ",";
    252253    cout << " FillColor=" << GetFillColor() << endl;
    253254}

  • trunk/MagicSoft/Mars/mgui/MHexagon.h

    r1015 r1018  
    4949    virtual void  DrawHexagon( Float_t x, Float_t y, Float_t d);
    5050
    51     virtual void  ExecuteEvent(Int_t event, Int_t px, Int_t py);
     51    //virtual void  ExecuteEvent(Int_t event, Int_t px, Int_t py);
    5252
    5353    virtual void  ls (Option_t *Option="");
    5454    virtual void  Paint(Option_t *Option="");
    5555    virtual void  PaintHexagon(Float_t x, Float_t y, Float_t d);
    56     virtual void  Print(Option_t *Option="") const;
     56    virtual void  Print(Option_t *Option="") const; // *MENU*
    5757
    5858    ClassDef(MHexagon, 0)    // A hexagon for MAGIC

  • trunk/MagicSoft/Mars/mgui/Makefile

    r715 r1018  
    2828.SUFFIXES: .c .cc .cxx .h .hxx .o
    2929
    30 SRCFILES = MCamDisplay.cc \
     30SRCFILES = MHexagon.cc \
     31           MGeomPix.cc \
     32           MGeomCam.cc \
     33           MCamDisplay.cc \
    3134           MGeomCamCT1.cc \
    32            MGeomCamMagic.cc \
    33            MGeomCam.cc \
    34            MGeomPix.cc \
    35            MHexagon.cc
     35           MGeomCamMagic.cc
    3636
    3737SRCS    = $(SRCFILES)

  • trunk/MagicSoft/Mars/mmain/Makefile

    r959 r1018  
    2929.SUFFIXES: .c .cc .cxx .h .hxx .o
    3030
    31 SRCFILES = MDataCheck.cc \
     31SRCFILES = MBrowser.cc \
     32           MDataCheck.cc \
    3233           MEvtDisp.cc \
    3334           MMars.cc \
    3435           MAnalysis.cc \
    3536           MMonteCarlo.cc \
    36            MCameraDisplay.cc \
    37            MBrowser.cc
     37           MCameraDisplay.cc
    3838
    3939SRCS    = $(SRCFILES)

  • trunk/MagicSoft/Mars/mraw/MRawCrateArray.h

    r765 r1018  
    1 #ifndef MRAWCRATEARRAY_H
    2 #define MRAWCRATEARRAY_H
     1#ifndef MARS_MRawCrateArray
     2#define MARS_MRawCrateArray
    33///////////////////////////////////////////////////////////////////////
    44//                                                                   //
    … …  
    77///////////////////////////////////////////////////////////////////////
    88
    9 #ifndef MPARCONTAINER_H
     9#ifndef MARS_MParContainer
    1010#include "MParContainer.h"
    1111#endif

  • trunk/MagicSoft/Mars/mraw/MRawCrateData.h

    r1004 r1018  
    1 #ifndef MRAWCRATEDATA_H
    2 #define MRAWCRATEDATA_H
     1#ifndef MARS_MRawCrateData
     2#define MARS_MRawCrateData
    33
    4 #ifndef MAGIC_H
     4#ifndef MARS_MAGIC
    55#include "MAGIC.h"
    66#endif

  • trunk/MagicSoft/Mars/mraw/MRawEvtData.h

    r718 r1018  
    1 #ifndef MRAWEVTDATA_H
    2 #define MRAWEVTDATA_H
     1#ifndef MARS_MRawEvtData
     2#define MARS_MRawEvtData
    33
    4 #ifndef MPARCONTAINER_H
     4#ifndef MARS_MParContainer
    55#include "MParContainer.h"
    66#endif

  • trunk/MagicSoft/Mars/mraw/MRawEvtHeader.h

    r1004 r1018  
    1 #ifndef MRAWEVTHEADER_H
    2 #define MRAWEVTHEADER_H
     1#ifndef MARS_MRawEvtHeader
     2#define MARS_MRawEvtHeader
    33
    4 #ifndef MPARCONTAINER_H
     4#ifndef MARS_MParContainer
    55#include "MParContainer.h"
    66#endif

  • trunk/MagicSoft/Mars/mraw/MRawEvtPixelIter.h

    r749 r1018  
    1 #ifndef MRAWEVTPIXELITER_H
    2 #define MRAWEVTPIXELITER_H
     1#ifndef MARS_MRawEvtPixelIter
     2#define MARS_MRawEvtPixelIter
    33///////////////////////////////////////////////////////////////////////////////
    44//
    … …  
    88//
    99///////////////////////////////////////////////////////////////////////////////
    10 #ifndef MAGIC_H
     10#ifndef MARS_MAGIC
    1111#include "MAGIC.h"
    1212#endif
    … …  
    1414class MRawEvtData;
    1515
    16 class MRawEvtPixelIter
     16class MRawEvtPixelIter : public TObject
    1717{
    1818private:

  • trunk/MagicSoft/Mars/mraw/MRawFileRead.h

    r860 r1018  
    1 #ifndef MRAWFILEREAD_H
    2 #define MRAWFILEREAD_H
     1#ifndef MARS_MRawFileRead
     2#define MARS_MRawFileRead
    33
    4 #ifndef MTASK_H
     4#ifndef MARS_MTASK
    55#include "MTask.h"
    66#endif

  • trunk/MagicSoft/Mars/mraw/MRawFileWrite.h

    r1004 r1018  
    1 #ifndef MRAWFILEWRITE_H
    2 #define MRAWFILEWRITE_H
     1#ifndef MARS_MRawFileWrite
     2#define MARS_MRawFileWrite
    33
    4 #ifndef MTASK_H
     4#ifndef MARS_MTask
    55#include "MTask.h"
    66#endif
    … …  
    3636    MRawFileWrite(const char *fname,
    3737                  const Option_t *opt="UPDATE",
    38                   const char *ftitle="Unnamed",
     38                  const char *ftitle="Untitled",
    3939                  const Int_t comp=9,
    4040                  const char *name=NULL, const char *title=NULL);

  • trunk/MagicSoft/Mars/mraw/MRawRunHeader.h

    r1004 r1018  
    1 #ifndef MRAWRUNHEADER_H
    2 #define MRAWRUNHEADER_H
     1#ifndef MARS_MRawRunHeader
     2#define MARS_MRawRunHeader
    33///////////////////////////////////////////////////////////////////////
    44//                                                                   //
    … …  
    77///////////////////////////////////////////////////////////////////////
    88
    9 #ifndef MPARCONTAINER_H
     9#ifndef MARS_MParContainer
    1010#include "MParContainer.h"
    1111#endif
Note: See TracChangeset for help on using the changeset viewer.