Index: trunk/MagicSoft/Mars/Changelog
===================================================================
--- trunk/MagicSoft/Mars/Changelog	(revision 6892)
+++ trunk/MagicSoft/Mars/Changelog	(revision 6893)
@@ -100,4 +100,11 @@
    * mfbase/MF.[h,cc], mfilter/MFSupercuts.cc:
      - treat "inverted" with MFilter::ReadEnv
+
+   * manalysis/MCompProbCalc.[h,cc], mranforest/MRanForestCalc.[h,cc]:
+     - replaced MHadronness by MParameterD
+
+   * mdata/MDataFormula.[h,cc]:
+     - removed comments from SetVariables
+     - replaced GetExpFormula by GetTitle
 
 
Index: trunk/MagicSoft/Mars/manalysis/MCompProbCalc.h
===================================================================
--- trunk/MagicSoft/Mars/manalysis/MCompProbCalc.h	(revision 6892)
+++ trunk/MagicSoft/Mars/manalysis/MCompProbCalc.h	(revision 6893)
@@ -8,10 +8,10 @@
 class MMcEvt;
 class MParList;
-class MHadronness;
+class MParameterD;
 
 class MCompProbCalc : public MTask
 {
 private:
-    MHadronness *fHadronness; //! Output container (Hadronness)
+    MParameterD *fHadronness; //! Output container (Hadronness)
 
     TList *fData;           //! List of MDataChains to be used
Index: trunk/MagicSoft/Mars/mdata/MDataFormula.h
===================================================================
--- trunk/MagicSoft/Mars/mdata/MDataFormula.h	(revision 6892)
+++ trunk/MagicSoft/Mars/mdata/MDataFormula.h	(revision 6893)
@@ -36,5 +36,5 @@
     //    TString GetDataMember() const;
 
-    //void SetVariables(const TArrayD &arr);
+    void SetVariables(const TArrayD &arr);
 
     ClassDef(MDataFormula, 1) // A concatenation of MData objects by one operator
Index: trunk/MagicSoft/Mars/mranforest/MRanForestCalc.cc
===================================================================
--- trunk/MagicSoft/Mars/mranforest/MRanForestCalc.cc	(revision 6892)
+++ trunk/MagicSoft/Mars/mranforest/MRanForestCalc.cc	(revision 6893)
@@ -49,5 +49,5 @@
 #include "MRanForest.h"
 
-#include "MHadronness.h"
+#include "MParameters.h"
 
 #include "MEvtLoop.h"
@@ -143,5 +143,5 @@
     }
 
-    fHadroness = (MHadronness*)plist->FindCreateObj("MHadronness", fHadronnessName);
+    fHadroness = (MParameterD*)plist->FindCreateObj("MParameterD", fHadronnessName);
     if (!fHadroness)
         return kFALSE;
@@ -160,5 +160,5 @@
 
     Double_t hadroness=fRanForest->CalcHadroness(event);
-    fHadroness->SetHadronness(hadroness);
+    fHadroness->SetVal(hadroness);
 
     return kTRUE;
Index: trunk/MagicSoft/Mars/mranforest/MRanForestCalc.h
===================================================================
--- trunk/MagicSoft/Mars/mranforest/MRanForestCalc.h	(revision 6892)
+++ trunk/MagicSoft/Mars/mranforest/MRanForestCalc.h	(revision 6893)
@@ -11,5 +11,5 @@
 
 class MParList;
-class MHadronness;
+class MParameterD;
 class MDataArray;
 class MRanTree;
@@ -23,5 +23,5 @@
     TString fHadronnessName;  // Name of container storing hadronness
 
-    MHadronness *fHadroness;  //! Output container for calculated hadroness
+    MParameterD *fHadroness;  //! Output container for calculated hadroness
     MDataArray  *fData;       //! Used to store the MDataChains to get the event values
     MRanForest  *fRanForest;