Changeset 1567 for trunk/MagicSoft

Timestamp:

10/30/02 16:52:01 (22 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars

Files:

• manalysis/MMultiDimDistCalc.cc (modified) (1 diff)
• mhist/MHMatrix.cc (modified) (3 diffs)

trunk/MagicSoft/Mars/manalysis/MMultiDimDistCalc.cc

@@ -200 +200 @@
     Double_t dh = fMHadrons->CalcDist(event, numh);
 
+    if (dg<0 || dh<0)
+    {
+        *fLog << err << "MHMatrix::CalcDist failed (dg=" << dg << ", dh=" << dh << ")... aborting" << endl;
+        return kFALSE;
+    }
+
     //fHadronness->SetHadronness(dg/(dg+dh));
     fHadronness->SetHadronness(exp(-dh/dg));

trunk/MagicSoft/Mars/mhist/MHMatrix.cc

@@ -367 +367 @@
     if (det==0)
     {
-        *fLog << err << "ERROR - MHMatrix::InvertPosDef failed (Matrix is sigular)." << endl;
+        *fLog << err << "ERROR - MHMatrix::InvertPosDef failed (Matrix is singular)." << endl;
         delete m2;
         return NULL;
@@ -441 +441 @@
             res += exp(-dists[idx[i]]/h);
 
-        return log(res/n);
+        return -log(res/n);
     }
     else
@@ -466 +466 @@
     if (!fM2.IsValid())
     {
-        const TMatrix &m = *InvertPosDef();
-        fM2.ResizeTo(m);
-        fM2 = m;
+        const TMatrix *m = InvertPosDef();
+        if (!m)
+            return -1;
+
+        fM2.ResizeTo(*m);
+        fM2 = *m;
         fM2 *= fM.GetNrows()-1;
-        delete &m;
+        delete m;
     }