Changeset 10090 for trunk/Mars/mgeom

Timestamp:

01/06/11 16:53:13 (14 years ago)

Author:

tbretz

Message:

Implemented improved handling for the obscuration by the detector.

Location:

trunk/Mars/mgeom

Files:

• MGeomCam.cc (modified) (2 diffs)
• MGeomCam.h (modified) (1 diff)
• MGeomCamDwarf.cc (modified) (1 diff)

trunk/Mars/mgeom/MGeomCam.cc

@@ -422 +422 @@
 // --------------------------------------------------------------------------
 //
+// Check if the photon which is flying along the trajectory u has passed
+// (or will pass) the frame of the camera (and consequently get
+// absorbed). The position p and direction u must be in the
+// telescope coordinate frame, which is z parallel to the focal plane,
+// x to the right and y upwards, looking from the mirror towards the camera.
+//
+// The units are cm.
+//
+Bool_t MGeomCam::HitFrame(MQuaternion p, const MQuaternion &u, Double_t margin) const
+{
+    if (margin<=0)
+        return HitFrame(p, u);
+
+    // z is defined from the mirror (0) to the camera (z>0).
+    // Thus we just propagate to the focal plane (z=fDist)
+    p.PropagateZ(u, GetCameraDist()*100); // m->cm
+    return p.R()<margin;
+}
+
+// --------------------------------------------------------------------------
+//
 // Check if the position given in the focal plane (so z can be ignored)
 // is a position which might hit the detector. It is meant to be a rough
@@ -583 +604 @@
 //  at the end.
 //
-// All pixel swith a center withing 1.75*GetT() are considered neiighbors,
+// All pixels with a center withing 1.75*GetT() are considered neighbors,
 // Only six neighbors are allowed.
 //

trunk/Mars/mgeom/MGeomCam.h

@@ -122 +122 @@
 
     virtual Bool_t HitFrame(MQuaternion p, const MQuaternion &u) const { return kFALSE; }
+            Bool_t HitFrame(MQuaternion p, const MQuaternion &u, Double_t margin) const;
     virtual Bool_t HitDetector(const MQuaternion &p, Double_t offset=0) const;
 

trunk/Mars/mgeom/MGeomCamDwarf.cc

@@ -101 +101 @@
 Bool_t MGeomCamDwarf::HitFrame(MQuaternion p, const MQuaternion &u) const
 {
-    // z is defined from the mirror (0) to the camera (z>0).
-    // Thus we just propagate to the focal plane (z=fDist)
-    //p -= 1700./u.Z()*u;
-    p.PropagateZ(u, GetCameraDist()*100); // m->cm
-
     // Add 10% to the max radius and convert from mm to cm
-    return p.R()<GetMaxRadius()*0.11;//TMath::Abs(p.X())<65 && TMath::Abs(p.Y())<65;
+    // FIXME: Why does the compiler complain without this cast?
+    return static_cast<const MGeomCam*>(this)->HitFrame(p, u, GetMaxRadius()*0.11);
 }