Changeset 19543


Ignore:
Timestamp:
Jun 4, 2019, 10:26:45 AM (7 weeks ago)
Author:
tbretz
Message:
Derive from the new base class. Added a member function to test if the reflector geometry is valid, for consistency renamed EXecuteReflector to ExecuteOptics
Location:
trunk/Mars/msimreflector
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/Mars/msimreflector/MReflector.cc

    r9947 r19543  
    1616!
    1717!
    18 !   Author(s): Thomas Bretz,  1/2009 <mailto:tbretz@astro.uni-wuerzburg.de>
    19 !
    20 !   Copyright: CheObs Software Development, 2000-2009
     18!   Author(s): Thomas Bretz,  1/2009 <mailto:tbretz@physik.rwth-aachen.de>
     19!
     20!   Copyright: CheObs Software Development, 2000-2019
    2121!
    2222!
     
    2626//
    2727//  MReflector
     28//
     29//  Version 2:
     30//  ----------
     31//   * derived from common base class MOptics
    2832//
    2933//////////////////////////////////////////////////////////////////////////////
  • trunk/Mars/msimreflector/MReflector.h

    r9947 r19543  
    22#define MARS_MReflector
    33
    4 #ifndef MARS_MParContainer
    5 #include "MParContainer.h"
     4#ifndef MARS_MOptics
     5#include "MOptics.h"
    66#endif
    77
     
    1313class MMirror;
    1414
    15 class MReflector : public MParContainer
     15class MReflector : public MOptics
    1616{
    1717private:
     
    5050    virtual Bool_t CanHit(const MQuaternion &p) const;
    5151
    52     Int_t ExecuteReflector(MQuaternion &p, MQuaternion &u) const;
     52    Int_t ExecuteOptics(MQuaternion &p, MQuaternion &u) const;
    5353
    5454    void SetSigmaPSF(Double_t psf);
     55
     56    virtual Bool_t IsValid() const { return fMirrors.GetEntries(); }
    5557
    5658    // TObject
     
    5860    void Print(Option_t *o) const;
    5961
    60     ClassDef(MReflector, 1) // Parameter container storing a collection of several mirrors (reflector)
     62    ClassDef(MReflector, 2) // Parameter container storing a collection of several mirrors (reflector)
    6163};
    6264   
Note: See TracChangeset for help on using the changeset viewer.