Changeset 712 for trunk


Ignore:
Timestamp:
03/30/01 12:08:08 (24 years ago)
Author:
tbretz
Message:
*** empty log message ***
Location:
trunk/MagicSoft/Mars
Files:
15 edited

Legend:

Unmodified
Added
Removed

  • trunk/MagicSoft/Mars/Makefile

    r710 r712  
    6262
    6363# Use $(CXX) -v ... for a more verbose output
    64 $(PROGRAMS): $(LIBRARIES) $(OBJS) $(HEADERS) MCint.o $(PROGRAMS:=.o)
     64$(PROGRAMS): $(LIBRARIES) mars.so $(HEADERS) MCint.o $(PROGRAMS:=.o)
    6565        @echo " Linking $@ ..."
    66         $(CXX) $(CXXFLAGS) $@.o $(OBJS) $(MARS_LIB) MCint.o $(ROOTGLIBS) -o $@
     66        $(CXX) $(CXXFLAGS) $@.o lib/mars.so $(MARS_LIB) MCint.o $(ROOTGLIBS) -o $@
    6767
    6868$(SOLIB): $(LIBRARIES) $(OBJS) $(HEADERS) MCint.o

  • trunk/MagicSoft/Mars/mhist/MFillHFadc.h

    r711 r712  
    2525  Bool_t Process() ;
    2626 
    27   ClassDef(MFillHFadc, 0)       // Task to fill a MHistosAdc Container with data
     27  ClassDef(MFillHFadc, 0)  // Task to fill the fadc data into histograms
    2828
    2929};

  • trunk/MagicSoft/Mars/mhist/MFillHHillas.h

    r710 r712  
    2525  Bool_t Process() ;
    2626 
    27   ClassDef(MFillHHillas, 0)     // Task to fill the Hillas histograms
    28 
     27  ClassDef(MFillHHillas, 0) // Task to fill the Hillas parameters into histograms
    2928};
    3029   

  • trunk/MagicSoft/Mars/mhist/MFillHStarMap.h

    r710 r712  
    2525  Bool_t Process() ;
    2626 
    27   ClassDef(MFillHStarMap, 0)    // Task to fill the Hillas histograms
     27  ClassDef(MFillHStarMap, 0) // Task to fill a 2-dim histogram by the Hillas parameters
    2828
    2929};

  • trunk/MagicSoft/Mars/mhist/MHFadcCam.h

    r710 r712  
    4848    }
    4949
    50     ClassDef(MHFadcCam, 1)      // list of Histograms with ADC spectra
     50    ClassDef(MHFadcCam, 1) // A list of histograms storing the Fadc spektrum of one pixel
    5151};
    5252

  • trunk/MagicSoft/Mars/mhist/MHFadcPix.h

    r711 r712  
    3131    void Draw(Option_t *opt=NULL);
    3232
    33     ClassDef(MHFadcPix, 1)
     33    ClassDef(MHFadcPix, 1) // Conatiner to hold two histograms container spektrums for the lo-/hi gain of one pixel
    3434};
    3535

  • trunk/MagicSoft/Mars/mhist/MHHillas.cc

    r710 r712  
    3232
    3333    //
    34     //   loop over all Pixels and create two histograms
    35     //   one for the Low and one for the High gain
    36     //   connect all the histogram with the container fHist
     34    // loop over all Pixels and create two histograms
     35    // one for the Low and one for the High gain
     36    // connect all the histogram with the container fHist
     37    //
     38    // FIXME! Make the histograms looking that they can be used for
     39    //        presentations (axis title, ...)
    3740    //
    3841    fAlpha  = new TH1F("Alpha [deg]", "Alpha of Hillas",   90, 0,  90);

  • trunk/MagicSoft/Mars/mhist/MHHillas.h

    r710 r712  
    3434    void Draw(Option_t *opt=NULL);
    3535
    36     ClassDef(MHHillas, 1)       // list of Histograms with ADC spectra
     36    ClassDef(MHHillas, 1) // Container which holds hostograms for the Hillas parameters
    3737};
    3838

  • trunk/MagicSoft/Mars/mhist/MHStarMap.cc

    r710 r712  
    22//
    33// MHStarMap
     4//
     5// This class contains a 2-dimensional histogram. It should show some
     6// kind of star map. The algorith which calculates the star map
     7// from the Hillas parameters (Fill) can be enhanced.
    48//
    59///////////////////////////////////////////////////////////////////////

  • trunk/MagicSoft/Mars/mhist/MHStarMap.h

    r710 r712  
    3232    void Draw(Option_t *opt=NULL);
    3333
    34     ClassDef(MHStarMap, 1)      // list of Histograms with ADC spectra
     34    ClassDef(MHStarMap, 1) // Container to hold 2-dim histogram (starmap)
    3535};
    3636

  • trunk/MagicSoft/Mars/mmontecarlo/MCollArea.h

    r710 r712  
    1 #ifndef __MCollArea__
    2 #define __MCollArea__
     1#ifndef MCOLLAREA_H
     2#define MCOLLAREA_H
    33
     4#ifndef MAGIC_H
     5#include "MAGIC.h"
     6#endif
     7#ifndef MPARCONTAINER_H
    48#include "MParContainer.h"
     9#endif
    510
    6 #include <TH2.h>
     11//
     12// because of some strange reason this cannot be put into MonteCarloIncl
     13//
     14#ifndef TH1_H
     15#include <TH1.h>
     16#endif
     17
     18class TH2D;
    719
    820class MCollArea : public MParContainer {

  • trunk/MagicSoft/Mars/mmontecarlo/MCollAreaTrigger.cc

    r708 r712  
    6565  //
    6666
    67   fCollArea->CalculateEffi() ;
     67  fCollArea->CalcEfficiency() ;
    6868
    6969  return kTRUE ;

  • trunk/MagicSoft/Mars/mmontecarlo/MonteCarloIncl.h

    r686 r712  
    11#ifndef __CINT__
    22
    3 #include "MParContainer.h"
    4 
    53#endif // __CINT__

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

    r664 r712  
    1414//     //   pixel.GetPixelId();
    1515//     //   pixel.GetHiGainFadcSamples()[i]; // i is the number of the slice
    16 //     //   pixel.IsLoGain();                // check if pixel has
     16//     //   pixel.HasLoGain();               // check if pixel has
    1717//     //   pixel.GetLoGainFadcSamples()[i]; // i is the number of the slice
    1818//
    … …  
    123123    // return the sum of the lo gain samples of the present pixel
    124124    //
    125     if (!IsLoGain())
     125    if (!HasLoGain())
    126126        return 0;
    127127

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

    r698 r712  
    6666    ULong_t GetSumHiGainFadcSamples() const;
    6767
    68     Bool_t IsLoGain() const
     68    Bool_t HasLoGain() const
    6969    {
    7070        //
    … …  
    8080        // for the actual pixel, else return zero
    8181        //
    82         return IsLoGain() ? fLoGainPos : NULL;
     82        return HasLoGain() ? fLoGainPos : NULL;
    8383    }
    8484
Note: See TracChangeset for help on using the changeset viewer.