Changeset 13002 for trunk

Timestamp:

03/07/12 16:27:10 (13 years ago)

Author:

tbretz

Message:

Propagate the weight and allow to calculate the difference of two camera.

Location:

trunk/Mars/mhist

Files:

• MHCamEvent.cc (modified) (7 diffs)
• MHCamEvent.h (modified) (3 diffs)

trunk/Mars/mhist/MHCamEvent.cc

@@ -51 +51 @@
 //   MHCamEvent myhist("Titele;;y [cm]");
 //
+// Class Version 3:
+// ----------------
+//  + fNameSub
+//
 /////////////////////////////////////////////////////////////////////////////
 #include "MHCamEvent.h"
@@ -91 +95 @@
 //
 MHCamEvent::MHCamEvent(const char *name, const char *title)
-: fSum(NULL), fErr(NULL), fEvt(NULL), fType(0), fErrorSpread(kTRUE), fErrorRelative(kFALSE),
+: fSum(NULL), fErr(NULL), fEvt(NULL), fSub(0), fType(0), fErrorSpread(kTRUE), fErrorRelative(kFALSE),
 fThreshold(0), fUseThreshold(0)
 {
@@ -104 +108 @@
 //
 MHCamEvent::MHCamEvent(Int_t type, const char *name, const char *title)
-: fSum(NULL), fErr(NULL), fEvt(NULL), fType(type), fErrorSpread(kTRUE), fErrorRelative(kFALSE),
+: fSum(NULL), fErr(NULL), fEvt(NULL), fSub(0), fType(type), fErrorSpread(kTRUE), fErrorRelative(kFALSE),
 fThreshold(0), fUseThreshold(0)
 {
@@ -155 +159 @@
 Bool_t MHCamEvent::SetupFill(const MParList *plist)
 {
-    fEvt = (MCamEvent*)plist->FindObject(fNameEvt, "MCamEvent");
+    fEvt = dynamic_cast<MCamEvent*>(plist->FindObject(fNameEvt, "MCamEvent"));
     if (!fEvt)
     {
@@ -166 +170 @@
     }
 
+    fSub = 0;
+    if (!fNameSub.IsNull())
+    {
+        fSub = dynamic_cast<MCamEvent*>(plist->FindObject(fNameSub, "MCamEvent"));
+        if (!fSub)
+        {
+            *fLog << err << GetDescriptor() << ": No " << fNameSub <<" [MCamEvent] available..." << endl;
+            return kFALSE;
+        }
+        *fLog << inf << GetDescriptor() << ": Will subtract '" << fNameSub << "'" << endl;
+    }
+
     fSum->Reset();
 
@@ -209 +225 @@
     {
     case kNoBound:
-        fSum->AddCamContent(*evt, fType);
+        if (fSub)
+            fSum->AddCamDifference(*evt, *fSub, fType);
+        else
+            fSum->AddCamContent(*evt, fType, w);
         break;
 
@@ -226 +245 @@
 
     case kMeanShift:
-        fSum->AddMeanShift(*evt, fType);
+        fSum->AddMeanShift(*evt, fType, w);
         break;
 
     case kMedianShift:
-        fSum->AddMedianShift(*evt, fType);
+        fSum->AddMedianShift(*evt, fType, w);
         break;
 

trunk/Mars/mhist/MHCamEvent.h

@@ -19 +19 @@
     MHCamera  *fErr;       //! storing the err
     MCamEvent *fEvt;       //! the current event
+    MCamEvent *fSub;       //! the event to be subtracted
 
     TString fNameEvt;      // Name of MCamEvent to fill into histogram
+    TString fNameSub;      // Name of MCamEvent to fill into histogram
     TString fNameGeom;     // Name of geometry container
 
@@ -49 +51 @@
 
     void SetNameEvt(const TString name)  { fNameEvt = name; }
+    void SetNameSub(const TString name)  { fNameSub = name; }
     void SetNameGeom(const TString name) { fNameGeom = name; }
     void SetType(Int_t type) { fType = type; }
@@ -73 +76 @@
     void RecursiveRemove(TObject *obj);
 
-    ClassDef(MHCamEvent, 2) // Histogram to sum camera events
+    ClassDef(MHCamEvent, 3) // Histogram to sum camera events
 };