Changeset 1600 for trunk/MagicSoft/Mars/mhist

Timestamp:

11/13/02 17:03:19 (22 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars/mhist

Files:

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

trunk/MagicSoft/Mars/mhist/MHFadcCam.cc

@@ -112 +112 @@
     return kTRUE;
 }
+
+void MHFadcCam::ResetHistograms()
+{
+    for (Int_t i=0; i<577; i++)
+    {
+        GetHistHi(i)->Reset();
+        GetHistLo(i)->Reset();
+    }
+}

trunk/MagicSoft/Mars/mhist/MHFadcCam.h

@@ -36 +36 @@
     Bool_t Fill(const MParContainer *par);
 
+    void ResetHistograms();
+
     //
     // FIXME! This should be replaced by a Draw(Option_t)-function

trunk/MagicSoft/Mars/mhist/MHMatrix.cc

@@ -614 +614 @@
     return fData ? fData->GetDataMember() : TString("");
 }
+
+// --------------------------------------------------------------------------
+//
+// Return a comma seperated list of all data members used in the matrix.
+// This is mainly used in MTask::AddToBranchList
+//
+void MHMatrix::ReduceNumberOfRows(UInt_t numrows, const TString opt)
+{
+    UInt_t rows = fM.GetNrows();
+
+    if (rows==numrows)
+    {
+        *fLog << warn << "Matrix has already the correct number of rows..." << endl;
+        return;
+    }
+
+    Float_t ratio = (Float_t)numrows/fM.GetNrows();
+
+    if (ratio>=1)
+    {
+        *fLog << warn << "Matrix cannot be enlarged..." << endl;
+        return;
+    }
+
+    Double_t sum = 0;
+
+    UInt_t oldrow = 0;
+    UInt_t newrow = 0;
+
+    while (oldrow<rows)
+    {
+        sum += ratio;
+
+        if (newrow<=(unsigned int)sum)
+        {
+            TVector vold(fM.GetNcols());
+            vold = TMatrixRow(fM, oldrow);
+
+            TMatrixRow rownew(fM, newrow);
+            rownew = vold;
+            newrow++;
+        }
+
+        oldrow++;
+    }
+
+/*
+
+    TMatrix m(n, fM.GetNcols());
+    for (int i=0; i<n; i++)
+    {
+        TVector vold(n);
+        vold = TMatrixRow(fM, idx[i]);
+
+        TMatrixRow rownew(m, i);
+        rownew = vold;
+    }
+*/
+
+}

trunk/MagicSoft/Mars/mhist/MHMatrix.h

@@ -29 +29 @@
     TMatrix fM;         // Matrix to be filled
 
-    TMatrix fM2;        //!
+    TMatrix fM2;        //! Covariance Matrix
 
     MDataArray *fData;  // List of data members (columns)
@@ -89 +89 @@
     TString GetDataMember() const;
 
+    void ReduceNumberOfRows(UInt_t numrows, const TString opt);
+
     ClassDef(MHMatrix, 1) // Multidimensional Matrix to store events
 };