Changeset 2328 for trunk/MagicSoft/Mars/mhist

Timestamp:

09/10/03 13:38:45 (21 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars/mhist

Files:

• MHMatrix.cc (modified) (2 diffs)
• MHMatrix.h (modified) (1 diff)

trunk/MagicSoft/Mars/mhist/MHMatrix.cc

@@ -1120 +1120 @@
 }
 
+// --------------------------------------------------------------------------
+//
+// Reduces the number of rows to the given number num by cutting out the
+// last rows.
+//
 void MHMatrix::ReduceRows(UInt_t num)
 {
@@ -1135 +1140 @@
         TMatrixRow(fM, irow) = tmp = TMatrixRow(m, irow);
 }
+
+// --------------------------------------------------------------------------
+//
+// Remove rows which contains numbers not fullfilling TMath::Finite
+//
+Bool_t MHMatrix::RemoveInvalidRows()
+{
+    TMatrix m(fM);
+
+    const Int_t ncol=fM.GetNcols();
+    TVector vold(ncol);
+    int irow=0;
+
+    for (int i=0; i<m.GetNrows(); i++)
+    {
+        const TMatrixRow &row = TMatrixRow(m, i);
+
+        // finite (-> math.h) checks for NaN as well as inf
+        int jcol;
+        for (jcol=0; jcol<ncol; jcol++)
+            if (!TMath::Finite(vold(jcol)))
+                break;
+
+        if (jcol==ncol)
+            TMatrixRow(fM, irow++) = vold = row;
+        else
+            *fLog << warn << "Warning - MHMatrix::RemoveInvalidRows: row #" << i<< " removed." << endl;
+    }
+
+    // Do not use ResizeTo (in older root versions this doesn't save the contents
+    ReduceRows(irow);
+
+    return kTRUE;
+}
+

trunk/MagicSoft/Mars/mhist/MHMatrix.h

@@ -103 +103 @@
 
     void ReduceNumberOfRows(UInt_t numrows, const TString opt);
+    Bool_t RemoveInvalidRows();
 
     Int_t Read(const char *name);