Changeset 13387 for trunk/Mars

Timestamp:

04/19/12 09:53:17 (13 years ago)

Author:

tbretz

Message:

Added fIsRatio; propagate weights; added a possibility to also fill a ratio into a camera histogram.

Location:

trunk/Mars/mhist

Files:

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

trunk/Mars/mhist/MHCamEvent.cc

@@ -54 +54 @@
 // ----------------
 //  + fNameSub
+//  + fIsRatio
 //
 /////////////////////////////////////////////////////////////////////////////
@@ -96 +97 @@
 MHCamEvent::MHCamEvent(const char *name, const char *title)
 : fSum(NULL), fErr(NULL), fEvt(NULL), fSub(0), fType(0), fErrorSpread(kTRUE), fErrorRelative(kFALSE),
-fThreshold(0), fUseThreshold(0)
+fThreshold(0), fUseThreshold(0), fIsRatio(false)
 {
     Init(name, title);
@@ -109 +110 @@
 MHCamEvent::MHCamEvent(Int_t type, const char *name, const char *title)
 : fSum(NULL), fErr(NULL), fEvt(NULL), fSub(0), fType(type), fErrorSpread(kTRUE), fErrorRelative(kFALSE),
-fThreshold(0), fUseThreshold(0)
+fThreshold(0), fUseThreshold(0), fIsRatio(false)
 {
     Init(name, title);
@@ -226 +227 @@
     case kNoBound:
         if (fSub)
-            fSum->AddCamDifference(*evt, *fSub, fType);
+        {
+            if (fIsRatio)
+                fSum->AddCamRatio(*evt, *fSub, fType, w);
+            else
+                fSum->AddCamDifference(*evt, *fSub, fType, w);
+        }
         else
             fSum->AddCamContent(*evt, fType, w);

trunk/Mars/mhist/MHCamEvent.h

@@ -32 +32 @@
     Char_t fUseThreshold;  // Use a threshold? Which direction has it?
 
+    Bool_t fIsRatio;       // If NameSub is set: Use Ratio or difference
+
     Int_t fNumReInit;      //!
 
@@ -51 +53 @@
 
     void SetNameEvt(const TString name)  { fNameEvt = name; }
-    void SetNameSub(const TString name)  { fNameSub = name; }
+    void SetNameSub(const TString name, Bool_t ratio=kFALSE)  { fNameSub = name; fIsRatio = ratio;  }
     void SetNameGeom(const TString name) { fNameGeom = name; }
     void SetType(Int_t type) { fType = type; }