Changeset 7399 for trunk/MagicSoft/Mars

Timestamp:

11/14/05 10:50:53 (19 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars

Files:

• Changelog (modified) (1 diff)
• mhbase/MHMatrix.cc (modified) (1 diff)
• mhbase/MHMatrix.h (modified) (1 diff)

trunk/MagicSoft/Mars/Changelog

@@ -45 +45 @@
    * macros/optim/rfenergyest.C:
      - added
+
+   * mhbase/MHMatrix.[h,cc]:
+     - added new constructor taking a TMatrix and a MDataArray as
+       argument
 
 

trunk/MagicSoft/Mars/mhbase/MHMatrix.cc

@@ -115 +115 @@
 // --------------------------------------------------------------------------
 //
+//  Constructor. Initializes the columns of the matrix with the entries
+//  from a MDataArray
+//
+MHMatrix::MHMatrix(const TMatrix &m, MDataArray *mat, const char *name, const char *title)
+    : fNumRows(m.GetNrows()), fM(m), fData(mat)
+{
+    fName  = name  ? name  : gsDefName.Data();
+    fTitle = title ? title : gsDefTitle.Data();
+}
+
+// --------------------------------------------------------------------------
+//
 //  Destructor. Does not deleted a user given MDataArray, except IsOwner
 //  was called.

trunk/MagicSoft/Mars/mhbase/MHMatrix.h

@@ -63 +63 @@
     MHMatrix(MDataArray *mat, const char *name=NULL, const char *title=NULL);
     MHMatrix(const TMatrix &m, const char *name=NULL, const char *title=NULL);
+    MHMatrix(const TMatrix &m, MDataArray *arr, const char *name=NULL, const char *title=NULL);
     ~MHMatrix();