Changeset 2114 for trunk/MagicSoft/Mars/mdata

Timestamp:

05/13/03 15:16:54 (21 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars/mdata

Files:

• MDataArray.cc (modified) (3 diffs)
• MDataArray.h (modified) (2 diffs)

trunk/MagicSoft/Mars/mdata/MDataArray.cc

@@ -35 +35 @@
 #include <fstream.h>
 
+#include <TVector.h>
+
 #include "MLog.h"
 #include "MLogManip.h"
@@ -89 +91 @@
 // Return the data value of the i-th entry
 //
-Double_t MDataArray::operator()(Int_t i)
-{
-    return ((MData*)fList[i])->GetValue();
+Double_t MDataArray::operator()(Int_t i) const
+{
+    return (*this)[i].GetValue();
 }
 
@@ -189 +191 @@
     return str;
 }
+
+void MDataArray::GetData(TVector &v) const
+{
+    Double_t ncols = GetNumEntries();
+
+    v.ResizeTo(ncols);
+
+    // same as: for (int i=0; i<ncols; i++) <should be faster>
+    while (ncols--)
+        v(ncols) = (*this)(ncols);
+}

trunk/MagicSoft/Mars/mdata/MDataArray.h

@@ -14 +14 @@
 #include <TObjArray.h>
 #endif
+
+class TVector;
 
 class MData;
@@ -31 +33 @@
 
     MData &operator[](Int_t i) const;
-    Double_t operator()(Int_t i);
+    Double_t operator()(Int_t i) const;
+
+    void GetData(TVector &v) const;
+
+    void operator>>(TVector &v) const
+    {
+        GetData(v);
+    }
 
     TString GetRule(int i) const;