Changeset 10090 for trunk/Mars/msimreflector

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/msimreflector

Files:

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

trunk/Mars/msimreflector/MSimReflector.cc

@@ -27 +27 @@
 //  MSimReflector
 //
+//  fDetectorFrame is a radius in centimeter, defining a disk in the focal
+//  plane around the focal point, in which photons are absorbed. If
+//  fDetectorFrame<=0 the virtual HitFrame function of the camera
+//  geometry container is used instead.
+//
 //  fDetectorMargin is a margin (in mm) which is given to the
 //  MGeomCam::HitDetector. It should define a margin around the area
@@ -76 +81 @@
     fMirror4(0), /*fRunHeader(0),*/ fEvtHeader(0), fReflector(0),
     fGeomCam(0), fPointing(0), fNameReflector("MReflector"),
-    fDetectorMargin(0)
+    fDetectorFrame(0), fDetectorMargin(0)
 {
     fName  = name  ? name  : "MSimReflector";
@@ -502 +507 @@
 
         // Check if the photon has hit the camera housing and holding
-        if (fGeomCam->HitFrame(p, w))
+        if (fGeomCam->HitFrame(p, w, fDetectorFrame))
             continue;
 
@@ -579 +584 @@
 {
     Bool_t rc = kFALSE;
+    if (IsEnvDefined(env, prefix, "DetectorFrame", print))
+    {
+        rc = kTRUE;
+        fDetectorFrame = GetEnvValue(env, prefix, "DetectorFrame", 0);
+    }
     if (IsEnvDefined(env, prefix, "DetectorMargin", print))
     {

trunk/Mars/msimreflector/MSimReflector.h

@@ -33 +33 @@
     TString fNameReflector;      // Name of the container storing the reflector geometry 
 
+    Double_t fDetectorFrame;     // A disk of radius DetectorFrame around the focal point absorbing photons
     Double_t fDetectorMargin;    // A margin around the detector (MGeomCam::HitCamera) in which photons are also stored
 
@@ -49 +50 @@
     void SetNameReflector(const char *name="MReflector") { fNameReflector = name; }
 
-    void SetDetectorMargin(Double_t m=0) { fDetectorMargin = m; }
+    void SetDetectorFrame(Double_t cm=0)  { fDetectorFrame  = cm; }
+    void SetDetectorMargin(Double_t mm=0) { fDetectorMargin = mm; }
 
     ClassDef(MSimReflector, 0) // Task to calculate reflection on a mirror