Changeset 8288 for trunk/MagicSoft

Timestamp:

02/02/07 13:50:45 (18 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars

Files:

• Changelog (modified) (1 diff)
• mreflector/MRflEvtData.cc (modified) (2 diffs)
• mreflector/MRflEvtData.h (modified) (2 diffs)
• mreflector/MRflSinglePhoton.cc (modified) (2 diffs)
• mreflector/MRflSinglePhoton.h (modified) (3 diffs)

trunk/MagicSoft/Mars/Changelog

@@ -18 +18 @@
 
                                                  -*-*- END OF LINE -*-*-
+
+ 2007/02/02 Thomas Bretz
+
+   * mreflector/MRflSinglePhoton.[h,cc], mreflector/MRflEvtData.[h,cc]:
+     - added new Fill functions allowing to fill photons versus 
+       a z-value, e.g. energy.
+
+
 
  2007/02/01 Thomas Bretz

trunk/MagicSoft/Mars/mreflector/MRflEvtData.cc

@@ -147 +147 @@
 // --------------------------------------------------------------------------
 //
+// Fills all photon distances into a TH1 scaled with scale (default=1)
+//
+void MRflEvtData::FillRad(TH2 &hist, Double_t z, Float_t scale) const
+{
+    MRflSinglePhoton *ph=NULL;
+
+    TIter Next(&fList);
+    while ((ph=(MRflSinglePhoton*)Next()))
+        ph->FillRad(hist, z, scale);
+}
+
+// --------------------------------------------------------------------------
+//
 // Fills all photons into a TH2 scaled with scale (default=1)
 //
@@ -156 +169 @@
     while ((ph=(MRflSinglePhoton*)Next()))
         ph->Fill(hist, scale);
+}
+
+// --------------------------------------------------------------------------
+//
+// Fills all photons into a TH2 scaled with scale (default=1)
+//
+void MRflEvtData::Fill(TH3 &hist, Double_t z, Float_t scale) const
+{
+    MRflSinglePhoton *ph=NULL;
+
+    TIter Next(&fList);
+    while ((ph=(MRflSinglePhoton*)Next()))
+        ph->Fill(hist, z, scale);
 }
 

trunk/MagicSoft/Mars/mreflector/MRflEvtData.h

@@ -16 +16 @@
 class TH1;
 class TH2;
+class TH3;
+
 class MRflSinglePhoton;
 
@@ -39 +41 @@
 
     void FillRad(TH1 &hist, Float_t scale=1) const;
+    void FillRad(TH2 &hist, Double_t z, Float_t scale=1) const;
     void Fill(TH2 &hist, Float_t scale=1) const;
+    void Fill(TH3 &hist, Double_t z, Float_t scale=1) const;
 
     void Print(Option_t *o="") const;

trunk/MagicSoft/Mars/mreflector/MRflSinglePhoton.cc

@@ -33 +33 @@
 
 #include <TH2.h>
+#include <TH3.h>
 
 #include "MLog.h"
@@ -52 +53 @@
 // --------------------------------------------------------------------------
 //
+// Fill radial photon distance into histogram scaled by scale.
+//
+void MRflSinglePhoton::FillRad(TH2 &hist, Double_t z, Float_t scale) const
+{
+    hist.Fill(TMath::Hypot(fX, fY)*scale, z);
+}
+
+// --------------------------------------------------------------------------
+//
 // Fill photon position into histogram scaled by scale.
 //
 void MRflSinglePhoton::Fill(TH2 &hist, Float_t scale) const
+{
+    hist.Fill(fX*scale, fY*scale);
+}
+
+// --------------------------------------------------------------------------
+//
+// Fill photon position into histogram scaled by scale.
+//
+void MRflSinglePhoton::Fill(TH3 &hist, Double_t z, Float_t scale) const
 {
     hist.Fill(fX*scale, fY*scale);

trunk/MagicSoft/Mars/mreflector/MRflSinglePhoton.h

@@ -8 +8 @@
 class TH1;
 class TH2;
+class TH3;
 
 class MRflSinglePhoton : public MParContainer
@@ -19 +20 @@
     Float_t fHeight; // [cm] production height
     Float_t fPhi;    // [rad] camera inc. angle (rad)
+
 public:
     MRflSinglePhoton() { }
@@ -37 +39 @@
 
     void FillRad(TH1 &hist, Float_t scale=1) const;
+    void FillRad(TH2 &hist, Double_t z, Float_t scale=1) const;
     void Fill(TH2 &hist, Float_t scale=1) const;
+    void Fill(TH3 &hist, Double_t z, Float_t scale=1) const;
 
     void Print(Option_t *o="") const;