Changeset 19586 for trunk/Mars

Timestamp:

09/02/19 17:32:07 (5 years ago)

Author:

tbretz

Message:

Propagate the wavelength to the optics to allow for refraction calculation.

Location:

trunk/Mars/msimreflector

Files:

• MReflector.h (modified) (1 diff)
• MSimReflector.cc (modified) (4 diffs)

trunk/Mars/msimreflector/MReflector.h

@@ -50 +50 @@
     virtual Bool_t CanHit(const MQuaternion &p) const;
 
-    Int_t ExecuteOptics(MQuaternion &p, MQuaternion &u) const;
+    Int_t ExecuteOptics(MQuaternion &p, MQuaternion &u, const Short_t &wavelength) const;
 
     void SetSigmaPSF(Double_t psf);

trunk/Mars/msimreflector/MSimReflector.cc

@@ -370 +370 @@
 // calling the ExecuteMirror function of the mirrors.
 //
-// If a mirror was hit its index is retuened, -1 otherwise.
+// If a mirror was hit its index is returned, -1 otherwise.
 //
 // FIXME: Do to lopping over all mirrors for all photons this is the
@@ -377 +377 @@
 // this could be accelerated a lot.
 //
-Int_t MReflector::ExecuteOptics(MQuaternion &p, MQuaternion &u) const
+Int_t MReflector::ExecuteOptics(MQuaternion &p, MQuaternion &u, const Short_t &) const
 {
     //static const TObjArray *arr = &((MMirror*)fMirrors[0])->fNeighbors;
@@ -497 +497 @@
         // w.fVectorPart.SetXYZ(0.2/17, 0.2/17, -(1-TMath::Hypot(0.3, 0.2)/17));
 
+        // FIXME: Take refractive index into account!
+
         // Now propagate the photon to the z-plane in the new coordinate system
         p.PropagateZ0(w);
@@ -522 +524 @@
         //*static_cast<MPhotonData*>(cpy2.UncheckedAt(cnt[2]++)) = *dat;
 
+        // FIXME: Set refractive index to air at 2200m!
+
         // Now execute the reflection of the photon on the mirrors' surfaces
-        const Int_t num = fReflector->ExecuteOptics(p, w);
+        const Int_t num = fReflector->ExecuteOptics(p, w, dat->GetWavelength());
         if (num<0)
             continue;