Changeset 19544 for trunk/Mars

Timestamp:

06/04/19 10:27:34 (5 years ago)

Author:

tbretz

Message:

Replaced MReflector by new base class MOptics.

Location:

trunk/Mars/msimreflector

Files:

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

trunk/Mars/msimreflector/MSimReflector.cc

@@ -55 +55 @@
 #include "MQuaternion.h"
 #include "MMirror.h"
+#include "MOptics.h"
 #include "MReflector.h"
 #include "MReflection.h"
@@ -109 +110 @@
         return kFALSE;
 
-    fReflector = (MReflector*)pList->FindObject(fNameReflector, "MReflector");
+    fReflector = (MOptics*)pList->FindObject(fNameReflector, "MOptics");
     if (!fReflector)
     {
-        *fLog << err << fNameReflector << " [MReflector] not found..." << endl;
-        return kFALSE;
-    }
-
-    if (fReflector->GetNumMirrors()==0)
-    {
-        *fLog << err << "ERROR - Reflector '" << fNameReflector << "' doesn't contain a single mirror." << endl;
+        *fLog << err << fNameReflector << " [MOptics] not found..." << endl;
+        return kFALSE;
+    }
+
+    if (!fReflector->IsValid())
+    {
+        *fLog << err << "ERROR - Optics '" << fNameReflector << "' invalid." << endl;
         return kFALSE;
     }
@@ -376 +377 @@
 // this could be accelerated a lot.
 //
-Int_t MReflector::ExecuteReflector(MQuaternion &p, MQuaternion &u) const
+Int_t MReflector::ExecuteOptics(MQuaternion &p, MQuaternion &u) const
 {
     //static const TObjArray *arr = &((MMirror*)fMirrors[0])->fNeighbors;
@@ -522 +523 @@
 
         // Now execute the reflection of the photon on the mirrors' surfaces
-        const Int_t num = fReflector->ExecuteReflector(p, w);
+        const Int_t num = fReflector->ExecuteOptics(p, w);
         if (num<0)
             continue;

trunk/Mars/msimreflector/MSimReflector.h

@@ -12 +12 @@
 class MCorsikaEvtHeader;
 
-class MReflector;
+class MOptics;
 
 class MSimReflector : public MTask
@@ -26 +26 @@
     MCorsikaEvtHeader *fEvtHeader;     //! Header storing event information
 
-    MReflector        *fReflector;  //!
+    MOptics           *fReflector;  //!
     MGeomCam          *fGeomCam;    //!
     MPointingPos      *fPointing;   //!