Changeset 8082 for trunk/MagicSoft/Mars/mhbase

Timestamp:

10/17/06 09:38:43 (18 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars/mhbase

Files:

• MH3.cc (modified) (6 diffs)
• MH3.h (modified) (3 diffs)

trunk/MagicSoft/Mars/mhbase/MH3.cc

@@ -69 +69 @@
 //   plist.AddToList(&bins);
 //
+//
+// Class Version 2:
+// ----------------
+//   - MDataChain *fData[3];        // Object from which the data is filled
+//   + MData      *fData[3];        // Object from which the data is filled
+//
+//
 /////////////////////////////////////////////////////////////////////////////
 #include "MH3.h"
@@ -89 +96 @@
 #include "MParList.h"
 #include "MBinning.h"
-#include "MDataChain.h"
+#include "MDataPhrase.h"
 
 ClassImp(MH3);
@@ -148 +155 @@
     fHist = new TH1D;
 
-    fData[0] = new MDataChain(memberx);
+    fData[0] = new MDataPhrase(memberx);
     fData[1] = NULL;
     fData[2] = NULL;
@@ -178 +185 @@
     {
     case 3:
-        fData[2] = new MDataChain(h1.GetZaxis()->GetTitle());
-    case 2:
-        fData[1] = new MDataChain(h1.GetYaxis()->GetTitle());
-    case 1:
-        fData[0] = new MDataChain(h1.GetXaxis()->GetTitle());
+        fData[2] = new MDataPhrase(h1.GetZaxis()->GetTitle());
+    case 2:
+        fData[1] = new MDataPhrase(h1.GetYaxis()->GetTitle());
+    case 1:
+        fData[0] = new MDataPhrase(h1.GetXaxis()->GetTitle());
     }
 
@@ -207 +214 @@
     fHist = new TH2D;
 
-    fData[0] = new MDataChain(memberx);
-    fData[1] = new MDataChain(membery);
+    fData[0] = new MDataPhrase(memberx);
+    fData[1] = new MDataPhrase(membery);
     fData[2] = NULL;
 
@@ -234 +241 @@
     fHist = new TH3D;
 
-    fData[0] = new MDataChain(memberx);
-    fData[1] = new MDataChain(membery);
-    fData[2] = new MDataChain(memberz);
+    fData[0] = new MDataPhrase(memberx);
+    fData[1] = new MDataPhrase(membery);
+    fData[2] = new MDataPhrase(memberz);
 
     fName  = gsDefName;

trunk/MagicSoft/Mars/mhbase/MH3.h

@@ -11 +11 @@
 class TH1;
 class TMethodCall;
-class MDataChain;
+class MData;
 
 class MH3 : public MH
@@ -23 +23 @@
     Int_t       fDimension;      // Number of dimensions of histogram
     TH1        *fHist;           // Histogram to fill
-    MDataChain *fData[3];        // Object from which the data is filled
+    MData      *fData[3];        // Object from which the data is filled
     Double_t    fScale[3];       // Scale for the three axis (eg unit)
 
@@ -86 +86 @@
     void Paint(Option_t *opt="");
 
-    ClassDef(MH3, 1) // Generalized 1/2/3D-histogram for Mars variables
+    ClassDef(MH3, 2) // Generalized 1/2/3D-histogram for Mars variables
 };