Changeset 9594


Ignore:
Timestamp:
Jun 24, 2010, 2:55:04 PM (10 years ago)
Author:
tbretz
Message:
*** empty log message ***
Location:
trunk/MagicSoft/Mars
Files:
4 edited

Legend:

Unmodified
Added
Removed
  • trunk/MagicSoft/Mars/Changelog

    r9593 r9594  
    1919                                                 -*-*- END OF LINE -*-*-
    2020
     21 2010/06/24 Thomas Bretz
     22
     23   * mgeom/MGeomCam.h:
     24     - call constructor of base class in copy-constructor
     25
     26   * mhbase/MH.h:
     27     - remove argument name where obsolete
     28
     29   * mjobs/MJSimulation.cc:
     30     - fixed some axis labels
     31
     32   * msimreflector/MMirrorDisk.cc:
     33     - changed interpretation from file from radius to diameter
     34
     35
     36
    2137 2010/06/24 Daniela Dorner
    2238
  • trunk/MagicSoft/Mars/mgeom/MGeomCam.h

    r9398 r9594  
    5555public:
    5656    MGeomCam(UInt_t npix=0, Float_t dist=1, const char *name=NULL, const char *title=NULL);
    57     MGeomCam(const MGeomCam &cam) { cam.Copy(*this); }
     57    MGeomCam(const MGeomCam &cam) : MParContainer(cam) { cam.Copy(*this); }
    5858
    5959    TObject *Clone(const char *name="") const;
  • trunk/MagicSoft/Mars/mhbase/MH.h

    r9312 r9594  
    4646    Bool_t OverwritesDraw(TClass *cls=NULL) const;
    4747
    48     virtual Bool_t SetupFill(const MParList *pList) { return kTRUE; }
    49     virtual Bool_t ReInit(MParList *pList) { return kTRUE; }
     48    virtual Bool_t SetupFill(const MParList *) { return kTRUE; }
     49    virtual Bool_t ReInit(MParList *) { return kTRUE; }
    5050    virtual Int_t  Fill(const MParContainer *par, const Stat_t weight=1);
    5151    virtual Bool_t Finalize() { return kTRUE; }
  • trunk/MagicSoft/Mars/msimreflector/MMirrorDisk.cc

    r9371 r9594  
    157157        return -1;
    158158
    159     Double_t r = atof(tok[0]->GetName());
     159    const Double_t d = atof(tok[0]->GetName());
    160160
    161     if (r<=0)
     161    if (d<=0)
    162162        return -1;
    163163
    164     fR = r;
     164    fR = d/2;
    165165
    166166    return 1;
Note: See TracChangeset for help on using the changeset viewer.