Changeset 19543

Timestamp:

06/04/19 10:26:45 (5 years 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:

• MReflector.cc (modified) (2 diffs)
• MReflector.h (modified) (4 diffs)

trunk/Mars/msimreflector/MReflector.cc

@@ -16 +16 @@
 !
 !
-!   Author(s): Thomas Bretz,  1/2009 <mailto:tbretz@astro.uni-wuerzburg.de>
-!
-!   Copyright: CheObs Software Development, 2000-2009
+!   Author(s): Thomas Bretz,  1/2009 <mailto:tbretz@physik.rwth-aachen.de>
+!
+!   Copyright: CheObs Software Development, 2000-2019
 !
 !
@@ -26 +26 @@
 //
 //  MReflector
+//
+//  Version 2:
+//  ----------
+//   * derived from common base class MOptics
 //
 //////////////////////////////////////////////////////////////////////////////

trunk/Mars/msimreflector/MReflector.h

@@ -2 +2 @@
 #define MARS_MReflector
 
-#ifndef MARS_MParContainer
-#include "MParContainer.h"
+#ifndef MARS_MOptics
+#include "MOptics.h"
 #endif
 
@@ -13 +13 @@
 class MMirror;
 
-class MReflector : public MParContainer
+class MReflector : public MOptics
 {
 private:
@@ -50 +50 @@
     virtual Bool_t CanHit(const MQuaternion &p) const;
 
-    Int_t ExecuteReflector(MQuaternion &p, MQuaternion &u) const;
+    Int_t ExecuteOptics(MQuaternion &p, MQuaternion &u) const;
 
     void SetSigmaPSF(Double_t psf);
+
+    virtual Bool_t IsValid() const { return fMirrors.GetEntries(); }
 
     // TObject
@@ -58 +60 @@
     void Print(Option_t *o) const;
 
-    ClassDef(MReflector, 1) // Parameter container storing a collection of several mirrors (reflector)
+    ClassDef(MReflector, 2) // Parameter container storing a collection of several mirrors (reflector)
 };