Changeset 8074

Timestamp:

10/16/06 20:09:41 (18 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars

Files:

• manalysis/MCompProbCalc.cc (modified) (2 diffs)
• mdata/MDataArray.cc (modified) (3 diffs)
• mhbase/MFillH.cc (modified) (4 diffs)
• mhbase/MHMatrix.cc (modified) (1 diff)
• mtools/MChisqEval.cc (modified) (2 diffs)

trunk/MagicSoft/Mars/manalysis/MCompProbCalc.cc

@@ -40 +40 @@
 
 #include "MParList.h"
-#include "MDataChain.h"
+#include "MDataPhrase.h"
 
 #include "MHCompProb.h"
@@ -113 +113 @@
     while ((data=Next()))
     {
-        MDataChain *chain = new MDataChain(data->GetName());
+        MDataPhrase *chain = new MDataPhrase(data->GetName());
         if (!chain->PreProcess(plist))
         {

trunk/MagicSoft/Mars/mdata/MDataArray.cc

@@ -38 +38 @@
 #include "MLogManip.h"
 
-#include "MDataChain.h"
+#include "MDataPhrase.h"
 
 ClassImp(MDataArray);
@@ -80 +80 @@
 // --------------------------------------------------------------------------
 //
-// Add a new data rule as a new entry (MDataChain)
+// Add a new data rule as a new entry (MDataPhrase)
 //
 void MDataArray::AddEntry(const TString rule)
 {
-    TObject *obj = new MDataChain(rule);
+    TObject *obj = new MDataPhrase(rule);
     obj->SetBit(kCanDelete);
     fList.Add(obj);
@@ -111 +111 @@
 Int_t MDataArray::FindRule(const char *rule) const
 {
-    const MDataChain data(rule);
+    const MDataPhrase data(rule);
     if (!data.IsValid())
         return -1;

trunk/MagicSoft/Mars/mhbase/MFillH.cc

@@ -84 +84 @@
 #include <TCanvas.h>
 
-#include "MDataChain.h"
+#include "MDataPhrase.h"
 
 #include "MLog.h"
@@ -292 +292 @@
 //
 // If the histogram to be filles is a MHArray you can specify a 'rule'
-// This rule is used to create an MDataChain. The return value of the chain
+// This rule is used to create an MDataPhrase. The return value of the chain
 // is casted to int. Each int acts as a key. For each (new) key a new
 // histogram is created in the array. (eg for the rule
@@ -299 +299 @@
 void MFillH::SetRuleForIdx(const TString rule)
 {
-    fIndex = new MDataChain(rule);
+    fIndex = new MDataPhrase(rule);
     fIndex->SetBit(kCanDelete);
 }
@@ -562 +562 @@
 //    if (save && fCanvas)
 //        save->cd();
-    return rc;
+    return rc==kFALSE ? kCONTINUE : kTRUE;
 } 
 

trunk/MagicSoft/Mars/mhbase/MHMatrix.cc

@@ -30 +30 @@
 //
 // This is a histogram container which holds a matrix with one column per
-// data variable. The data variable can be a complex rule (MDataChain).
+// data variable. The data variable can be a complex rule (MDataPhrase).
 // Each event for wich Fill is called (by MFillH) is added as a new
 // row to the matrix.

trunk/MagicSoft/Mars/mtools/MChisqEval.cc

@@ -37 +37 @@
 #include "MLogManip.h"
 
-#include "MDataChain.h"
+#include "MDataPhrase.h"
 #include "MParameters.h" // MParameterD
 
@@ -101 +101 @@
 void MChisqEval::SetY1(const TString data)
 {
-    SetY1(new MDataChain(data));
+    SetY1(new MDataPhrase(data));
 }
 
 void MChisqEval::SetY2(const TString data)
 {
-    SetY2(new MDataChain(data));
+    SetY2(new MDataPhrase(data));
 }