Changeset 3710 for trunk/MagicSoft/Mars/mgeom

Timestamp:

04/13/04 10:27:53 (21 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars/mgeom

Files:

• MGeomCorsikaCT.h (modified) (1 diff)
• MGeomMirror.cc (modified) (4 diffs)
• MGeomMirror.h (modified) (2 diffs)

trunk/MagicSoft/Mars/mgeom/MGeomCorsikaCT.h

@@ -2 +2 @@
 #define MARS_MGeomCorsikaCT
 
-#ifndef ROOT_TArrayF
-#include <TArrayF.h>
-#endif
 #ifndef MARS_MParContainer
 #include "MParContainer.h"

trunk/MagicSoft/Mars/mgeom/MGeomMirror.cc

@@ -30 +30 @@
 //
 /////////////////////////////////////////////////////////////////////////////
+#include "MGeomMirror.h"
 
-#include "MGeomMirror.h"
+#include <TRotation.h>
 
 #include "MLog.h"
@@ -45 +46 @@
 //
 MGeomMirror::MGeomMirror(Int_t mir, const char *name, const char *title)
+    : fReflector(0)
 {
     fName  = name  ? name  : "MGeomMirror";
@@ -131 +133 @@
 TVector3 MGeomMirror::GetReflection(const TVector3 &star, Double_t dist)
 {
-    if (fReflector==TRotation())
+    if (!fReflector)
     {
-        fReflector = TRotation(); // unit matrix
-        fReflector.Rotate(TMath::Pi(), GetMirrorNorm());
+        fReflector = new TRotation; // unit matrix
+        fReflector->Rotate(TMath::Pi(), GetMirrorNorm());
     }
 
@@ -140 +142 @@
     // around the normal vector of the mirror center
     TVector3 light(star);
-    light *= fReflector;
+    light *= *fReflector;
 
     if (dist<0)

trunk/MagicSoft/Mars/mgeom/MGeomMirror.h

@@ -10 +10 @@
 #endif
 
-#ifndef ROOT_TRotation
-#include <TRotation.h>
-#endif
+class TRotation;
 
 class MGeomMirror : public MParContainer
@@ -37 +35 @@
     TArrayF fReflectivity; // Mirror reflectivity
 
-    TRotation fReflector;  //! Store this for acceleration
+    TRotation *fReflector; //! Store this for acceleration
 
 public: