Changeset 18449 for trunk

Timestamp:

03/08/16 13:27:31 (9 years ago)

Author:

ftemme

Message:

Added an additional mirrortag, so that the information which mirror was hit is not lost later in the process

Location:

trunk/Mars

Files:

• msim/MPhotonData.cc (modified) (1 diff)
• msim/MPhotonData.h (modified) (2 diffs)
• msimreflector/MSimReflector.cc (modified) (1 diff)

trunk/Mars/msim/MPhotonData.cc

@@ -63 +63 @@
     : fPosX(0), fPosY(0), fCosU(0), fCosV(0), fTime(0), fWavelength(0),
     /*fNumPhotons(1),*/ fProductionHeight(0), fPrimary(MMcEvtBasic::kUNDEFINED),
-    fTag(-1), fWeight(1)
+      fTag(-1), fWeight(1), fMirrorTag(-1)
 {
    // fName  = name  ? name  : "MPhotonData";

trunk/Mars/msim/MPhotonData.h

@@ -43 +43 @@
 
     Int_t   fTag;    //! A tag for external use
+    Int_t   fMirrorTag;    // Tag for the mirror ID of the mirror which was hit by this photon
     Float_t fWeight; //! A weight for external use
 
@@ -108 +109 @@
     Int_t GetTag() const { return fTag; }
 
+    void SetMirrorTag(Int_t mirrorTag) { fMirrorTag=mirrorTag; }
+    Int_t GetMirrorTag() const { return fMirrorTag; }
+
     // TObject
     //void Clear(Option_t * = NULL);

trunk/Mars/msimreflector/MSimReflector.cc

@@ -532 +532 @@
         dat->SetDirection(w);
 
+        // FTemme: As dat.fTag is later changed from mirror ID to pixel ID, here
+        // also dat.fMirrorTag is set to num:
+        dat->SetMirrorTag(num);
+
         (*fMirror3)[cnt[3]++] = *dat;
         //*static_cast<MPhotonData*>(cpy3.UncheckedAt(cnt[3]++)) = *dat;