Changeset 1077 for trunk/MagicSoft/Mars


Ignore:
Timestamp:
11/14/01 15:06:39 (23 years ago)
Author:
tbretz
Message:
*** empty log message ***
Location:
trunk/MagicSoft/Mars
Files:
8 edited

Legend:

Unmodified
Added
Removed

  • trunk/MagicSoft/Mars/Changelog

    r1076 r1077  
    11                                                                  -*-*- END -*-*-
    2  2001/11/09: Thomas Bretz
    3 
     2 2001/11/14: Thomas Bretz
     3
     4   * macros/dohtml.C:
     5     - added missing path to mfilter
     6   
     7   * manalysis/MHillas.cc:
     8     - changed the degree symbol back to 'deg', it seems that the code
     9       for it isn't common
     10   
     11   * mhist/MH.cc:
     12     - added comment for MakeDefCanvas
     13
     14   * mhist/MHFadcCam.[h,cc]:
     15     - removed old comments (SaveHist)
     16
     17   * mhist/MHHillas.cc:
     18     - changed the Name of fAlpha back. Symbols are nonsens in the name.
     19     
    420   * mbase/MGList.[h,cc], mbase/MGTask.[h,cc], mbase/MGGroupFrame.[h,cc]:
    521     - added

  • trunk/MagicSoft/Mars/macros/dohtml.C

    r971 r1077  
    3636
    3737    html.SetOutputDir("htmldoc");
    38     html.SetSourceDir(".:mbase:mraw:mgui:manalysis:mdatacheck:mmain:meventdisp:mmc:mmontecarlo:mhist");
     38    html.SetSourceDir(".:mbase:mraw:mgui:manalysis:mdatacheck:mmain:meventdisp:mmc:mmontecarlo:mhist:mfilter");
    3939    html.SetXwho("http://hegra1.mppmu.mpg.de/MAGICWeb/collaborators.html?");
    4040

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

    r1018 r1077  
    9494void MHillas::Print(Option_t *) const
    9595{
    96     *fLog << "Hillas Parameter:" << endl;
    97     *fLog << " - Alpha  = " << fabs(fAlpha) << "°"    << endl;
     96    *fLog << "Hillas Parameter: " << GetDescriptor() << endl;
     97    *fLog << " - Alpha  = " << fabs(fAlpha) << " deg" << endl;
    9898    *fLog << " - Width  = " << fWidth  << " mm"       << endl;
    9999    *fLog << " - Length = " << fLength << " mm"       << endl;

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

    r1076 r1077  
    100100    virtual ~MParContainer() {}
    101101
    102     virtual const char *GetDescriptor() const { return Form("%s [%s]", GetName(), ClassName()); }
    103 
    104102    virtual TObject    *Clone(const char *newname="") const;
    105103    virtual Int_t       Compare(const TObject *obj) const;
    … …  
    107105    virtual void        FillBuffer(char *&buffer);
    108106
    109     virtual const char *GetName() const    { return fName.Data(); }
    110     virtual const char *GetTitle() const   { return fTitle.Data(); }
    111     virtual ULong_t     Hash() const       { return fName.Hash(); }
    112     virtual Bool_t      IsSortable() const { return kTRUE; }
     107    virtual const char *GetDescriptor() const { return Form("%s [%s]", fName.Data(), ClassName()); }
     108    virtual const char *GetName() const       { return fName.Data(); }
     109    virtual const char *GetTitle() const      { return fTitle.Data(); }
     110    virtual ULong_t     Hash() const          { return fName.Hash(); }
     111    virtual Bool_t      IsSortable() const    { return kTRUE; }
    113112
    114113    virtual void        SetName(const char *name); // *MENU*

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

    r1003 r1077  
    5858}
    5959
     60// --------------------------------------------------------------------------
     61//
     62// This is a function which should replace the creation of default
     63// canvases like root does. Because this is inconvinient in some aspects.
     64// need to change this.
     65// You can specify a name for the default canvas and a title. Also
     66// width and height can be given.
     67// MakeDefCanvas looks for a canvas with the given name. If now name is
     68// given the DefCanvasName of root is used. If no such canvas is existing
     69// it is created and returned. If such a canvas already exists a new canvas
     70// with a name plus anumber is created (the number is calculated by the
     71// number of all existing canvases plus one)
     72//
    6073TCanvas *MH::MakeDefCanvas(const char *name, const char *title,
    6174                           const UInt_t w, const UInt_t h)
    … …  
    7891}
    7992
     93// --------------------------------------------------------------------------
     94//
     95// This function works like MakeDefCanvas(name, title, w, h) but name
     96// and title are retrieved from the given TObject.
     97//
    8098TCanvas *MH::MakeDefCanvas(const TObject *obj,
    8199                           const UInt_t w, const UInt_t h)

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

    r1051 r1077  
    112112
    113113}
    114 /*void MHFadcCam::SaveHist(char *name)
    115 {
    116     //
    117     //   save all histogram in this class to a root file
    118     //
    119 
    120     //
    121     // FIXME: Don't open a file and write to this file!
    122     // just Fill the current container (or the two histograms
    123     // to an open file. The user must choose a file before.
    124     //
    125     TFile out( name, "recreate") ;
    126 
    127     //
    128     //  loop over all pixels and write the files out
    129     //
    130 
    131     fHistLo->Write();
    132     fHistHi->Write();
    133 }
    134 
    135   */

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

    r1030 r1077  
    2929    ~MHFadcCam();
    3030
    31     //    void SaveHist(char *name);
    32 
    3331    MHFadcPix *operator[](UInt_t i) { return (MHFadcPix*)(fArray->At(i)); }
    3432

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

    r1052 r1077  
    3636    // connect all the histogram with the container fHist
    3737    //
    38     fAlpha  = new TH1F("\\alpha [\\circ]", "Alpha of Hillas",   90, 0,  90);
     38    fAlpha  = new TH1F("Alpha [deg]", "Alpha of Hillas",   90, 0,  90);
    3939    fWidth  = new TH1F("Width [mm]",  "Width of Hillas",  100, 0, 300);
    4040    fLength = new TH1F("Length [mm]", "Length of Hillas", 100, 0, 300);
Note: See TracChangeset for help on using the changeset viewer.