Changeset 8679 for trunk/MagicSoft/Mars/mtools

Timestamp:

08/19/07 22:40:04 (18 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars/mtools

Files:

• MChisqEval.cc (modified) (7 diffs)
• MChisqEval.h (modified) (2 diffs)

trunk/MagicSoft/Mars/mtools/MChisqEval.cc ¶

@@ -49 +49 @@
 const TString MChisqEval::gsDefTitle = "Evaluate a chisq";
 
-MChisqEval::MChisqEval(const char *name, const char *title) : fData0(NULL), fData1(NULL), fNameResult("MinimizationValue")
+MChisqEval::MChisqEval(const char *name, const char *title)
+    : fData0(NULL), fData1(NULL), fWeight(NULL), fNameResult("MinimizationValue")
 {
     fName  = name  ? name  : gsDefName.Data();
@@ -55 +56 @@
 }
 
-MChisqEval::MChisqEval(MData *y1, const char *name, const char *title) : fData0(NULL), fData1(NULL), fNameResult("MinimizationValue")
+MChisqEval::MChisqEval(MData *y1, const char *name, const char *title)
+: fData0(NULL), fData1(NULL), fWeight(NULL), fNameResult("MinimizationValue")
 {
     fName  = name  ? name  : gsDefName.Data();
@@ -62 +64 @@
 }
 
-MChisqEval::MChisqEval(MData *y1, MData *y2, const char *name, const char *title) : fData0(NULL), fData1(NULL), fNameResult("MinimizationValue")
+MChisqEval::MChisqEval(MData *y1, MData *y2, const char *name, const char *title)
+: fData0(NULL), fData1(NULL), fWeight(NULL), fNameResult("MinimizationValue")
 {
     fName  = name  ? name  : gsDefName.Data();
@@ -112 +115 @@
 {
     fChisq = 0;
+    fSumW  = 0;
 
     if (!fData0)
@@ -122 +126 @@
         if (!fData1->PreProcess(plist))
             return kFALSE;
+
+    if (!fNameWeight.IsNull())
+    {
+        fWeight = (MParameterD*)plist->FindObject(fNameWeight, "MParameterD");
+        if (!fWeight)
+            return kFALSE;
+    }
 
     fResult = (MParameterD*)plist->FindCreateObj("MParameterD", fNameResult);
@@ -138 +149 @@
     const Double_t err = fData1 ? y1*y2 : 1;
 
-    fChisq += dy*dy/err;
+    const Double_t w   = fWeight ? fWeight->GetVal() : 1;
+
+    fChisq += w*dy*dy/err;
+    fSumW  += w;
+
     return kTRUE;
 }
@@ -145 +160 @@
 {
     if (GetNumExecutions()>0)
-        fChisq /= GetNumExecutions();
+        fChisq /= fSumW;
 
     fResult->SetVal(fChisq);

trunk/MagicSoft/Mars/mtools/MChisqEval.h ¶

@@ -15 +15 @@
     static const TString gsDefTitle;
 
-    Double_t     fChisq;  //! Evaluated chi square
-    MParameterD *fResult; //! Storage for result
-
     MData   *fData0; // Data Member one (monte carlo data or chisq function)
     MData   *fData1; // Data Member two (measured data)
 
+    MParameterD *fWeight;  //! Storage for weight
+    MParameterD *fResult;  //! Storage for result
+
     TString fNameResult;
+    TString fNameWeight;
+
+    Double_t     fChisq;   //! Evaluated chi square
+    Double_t     fSumW;    //! Sum of weights
 
     void StreamPrimitive(ostream &out) const;
@@ -43 +47 @@
 
     void SetOwner(Bool_t o=kTRUE) { o ? SetBit(kIsOwner) : ResetBit(kIsOwner); }
+    void SetNameWeight(TString w="MWeight") { fNameWeight=w; }
 
     Double_t GetChisq() const { return fChisq; }