Changeset 8073

Timestamp:

10/16/06 19:43:37 (18 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars

Files:

• manalysis/MEnergyEstimate.cc (modified) (1 diff)
• manalysis/MParameterCalc.cc (modified) (6 diffs)
• manalysis/MParameterCalc.h (modified) (1 diff)
• mbase/MMath.cc (modified) (4 diffs)
• mdata/DataLinkDef.h (modified) (1 diff)
• mdata/MDataList.cc (modified) (1 diff)
• mdata/MDataMember.cc (modified) (1 diff)
• mdata/Makefile (modified) (1 diff)
• mhbase/MH.cc (modified) (2 diffs)

trunk/MagicSoft/Mars/manalysis/MEnergyEstimate.cc

@@ -34 +34 @@
 //             "(4.4*MHillas.fSize*MHillas.fLength) + (5.5*MHillasSrc.fDist*MHillas.fLength)");
 //
-// For description of rules, see MDataChain.
+// For description of rules, see MDataPhrase.
 //
 // The default rule is "MMcEvt.fEnergy"

trunk/MagicSoft/Mars/manalysis/MParameterCalc.cc

@@ -33 +33 @@
 //             "(4.4*MHillas.fSize*MHillas.fLength) + (5.5*MHillasSrc.fDist*MHillas.fLength)");
 //
-// For description of rules, see MDataChain.
+// For description of rules, see MDataPhrase.
 //
 // Output:
@@ -43 +43 @@
 #include "MParList.h"
 
-#include "MDataChain.h"
+#include "MDataPhrase.h"
 #include "MParameters.h"
 
@@ -63 +63 @@
     fTitle = title ? title : "Task to calculate a MParameterD";
 
-    fData = new MDataChain(def);
+    fData = new MDataPhrase(def);
 }
 
@@ -77 +77 @@
 // --------------------------------------------------------------------------
 //
-// Delete fData. Initialize a new MDataChain with rule.
+// Delete fData. Initialize a new MDataPhrase with rule.
 // Returns if fData->IsValid()
 //
@@ -83 +83 @@
 {
     delete fData;
-    fData = new MDataChain(rule);
+    fData = new MDataPhrase(rule);
 
     return fData->IsValid();
@@ -183 +183 @@
 //     MyEstimator.1: 5.5
 //
-// For more details see MDataChain::ReadEnv
+// For more details see MDataPhrase::ReadEnv
 //
 Int_t MParameterCalc::ReadEnv(const TEnv &env, TString prefix, Bool_t print)
 {
-    MDataChain *f = new MDataChain;
+    MDataPhrase *f = new MDataPhrase;
     f->SetName(fName);
 

trunk/MagicSoft/Mars/manalysis/MParameterCalc.h

@@ -12 +12 @@
 {
 private:
-    MData       *fData;          //-> Input MDataChain with rule
+    MData       *fData;          //-> Input MDataPhrase with rule
     MParameterD *fParameter;     //!  Output parameter
 

trunk/MagicSoft/Mars/mbase/MMath.cc

@@ -554 +554 @@
 // An exact solution of the cubic polynomial equation:
 //
-// x^3 + a*x^2 + b*x + c = 0
+//   x^3 + a*x^2 + b*x + c = 0
 //
 // was first published by Gerolamo Cardano (1501-1576) in his treatise,
@@ -563 +563 @@
 // discovered. Zeno source code
 //
+// http://home.att.net/~srschmitt/cubizen.html
+//
 // % compute real or complex roots of cubic polynomial
 // function cubic( var z1, z2, z3 : real, a, b, c : real ) : real
@@ -598 +600 @@
 // end function
 //
+// see also http://en.wikipedia.org/wiki/Cubic_equation
+//
 Int_t MMath::SolvePol3(Double_t a, Double_t b, Double_t c,
                        Double_t &x1, Double_t &x2, Double_t &x3)
 {
+    //    Double_t coeff[4] = { 1, a, b, c };
+    //    return TMath::RootsCubic(coeff, x1, x2, x3) ? 1 : 3;
+
     const Double_t Q = (a*a - 3*b)/9;
     const Double_t R = (9*b*a - 27*c - 2*a*a*a)/54;
@@ -607 +614 @@
     // ----- The single-real / duplicate-roots solution -----
 
+    // D<0:  three real roots
+    // D>0:  one real root
+    // D==0: maximum two real roots (two identical roots)
+
+    // R==0: only one unique root
+    // R!=0: two roots
+
     if (D==0)
     {
         const Double_t r = MMath::Sqrt3(R);
 
-        x1 = 2*r - a/3.;               // real root
-        x2 =   r - a/3.;               // real root
-
+        x1 = r - a/3.;               // real root
+        if (R==0)
+            return 1;
+
+        x2 = 2*r - a/3.;               // real root
         return 2;
     }

trunk/MagicSoft/Mars/mdata/DataLinkDef.h

@@ -14 +14 @@
 #pragma link C++ class MDataFormula+;
 
+#pragma link C++ class MDataPhrase+;
+
 #endif

trunk/MagicSoft/Mars/mdata/MDataList.cc

@@ -310 +310 @@
 //
 // Builds a rule from all the list members. This is a rule which could
-// be used to rebuild the list using the constructor of a MDataChain
+// be used to rebuild the list using the constructor of a MDataPhrase
 //
 TString MDataList::GetRule() const

trunk/MagicSoft/Mars/mdata/MDataMember.cc

@@ -187 +187 @@
 // --------------------------------------------------------------------------
 //
-// Builds a rule which cn be used in a MDataChain to describe this object
+// Builds a rule which can be used in a MDataPhrase to describe this object
 //
 TString MDataMember::GetRule() const

trunk/MagicSoft/Mars/mdata/Makefile

@@ -16 +16 @@
 
 SRCFILES = MData.cc \
+           MDataPhrase.cc \
            MDataArray.cc \
            MDataElement.cc \

trunk/MagicSoft/Mars/mhbase/MH.cc

@@ -1322 +1322 @@
 //
 // see http://root.cern.ch/phpBB2/viewtopic.php?p=14818
+// see http://savannah.cern.ch/bugs/?20722
 //
 void MH::SetBinomialErrors(TH1 &hres, const TH1 &h1, const TH1 &h2, Double_t c1, Double_t c2)
@@ -1329 +1330 @@
         const Double_t b1 = h1.GetBinContent(binx);
         const Double_t b2 = h2.GetBinContent(binx);
-        const Double_t w  = c2*b2 ? (c1*b1)/(c2*b2) : 0;
         const Double_t e1 = h2.GetBinError(binx);
         const Double_t e2 = h1.GetBinError(binx);
 
-        const Double_t rc = ((1-2*w)*e1*e1+w*w*e2*e2)/(b2*b2);
+        //const Double_t w  = c2*b2 ? (c1*b1)/(c2*b2) : 0;
+        //const Double_t rc = ((1-2*w)*e1*e1+w*w*e2*e2)/(b2*b2);
+
+        const Double_t c = c2==0 ? 1 : c1/c2;
+        const Double_t u = b2==0 ? 0 : b1/b2;
+
+        const Double_t rc = c*((1-2*u)*e1*e1+u*u*e2*e2)/(b2*b2);
 
         hres.SetBinError(binx, TMath::Sqrt(TMath::Abs(rc)));