Index: trunk/MagicSoft/Mars/Changelog
===================================================================
--- trunk/MagicSoft/Mars/Changelog	(revision 6895)
+++ trunk/MagicSoft/Mars/Changelog	(revision 6896)
@@ -91,7 +91,9 @@
      - added MHVsSize to the tabs which are shown
 
-   * mjobs/MJOptimize.h:
+   * mjobs/MJOptimize.[h,cc]:
      - added dummy parameters to FixParameter for compatibility
        with SetParemeter
+     - replaced MFSupercuts by MFMagicCuts
+     - use Energy in MHAlpha instead of size
 
    * mbase/MFilter.[h,cc]:
Index: trunk/MagicSoft/Mars/mfilter/FilterLinkDef.h
===================================================================
--- trunk/MagicSoft/Mars/mfilter/FilterLinkDef.h	(revision 6895)
+++ trunk/MagicSoft/Mars/mfilter/FilterLinkDef.h	(revision 6896)
@@ -13,5 +13,4 @@
 #pragma link C++ class MFSoftwareTrigger+;
 #pragma link C++ class MFCosmics+;
-#pragma link C++ class MFSupercuts+;
 #pragma link C++ class MFMagicCuts+;
 
Index: trunk/MagicSoft/Mars/mfilter/Makefile
===================================================================
--- trunk/MagicSoft/Mars/mfilter/Makefile	(revision 6895)
+++ trunk/MagicSoft/Mars/mfilter/Makefile	(revision 6896)
@@ -27,4 +27,5 @@
            MFSoftwareTrigger.cc \
            MFCosmics.cc \
+           MFMagicCuts.cc \
 	   MFEnergySlope.cc
 
Index: trunk/MagicSoft/Mars/mjobs/MJOptimize.cc
===================================================================
--- trunk/MagicSoft/Mars/mjobs/MJOptimize.cc	(revision 6895)
+++ trunk/MagicSoft/Mars/mjobs/MJOptimize.cc	(revision 6896)
@@ -108,5 +108,6 @@
 #include "MF.h"
 #include "MFilterList.h"
-#include "../mfilter/MFSupercuts.h"
+#include "../mfilter/MFMagicCuts.h"
+//#include "../mfilter/MFSupercuts.h"
 #include "MContinue.h"
 #include "MGeomCamMagic.h"
@@ -801,6 +802,6 @@
     hist.InitMapping(&m); 
 
-    if (filter && filter->InheritsFrom(MFSupercuts::Class()))
-        ((MFSupercuts*)filter)->InitMapping(&m);
+    if (filter && filter->InheritsFrom(MFMagicCuts::Class()))
+        ((MFMagicCuts*)filter)->InitMapping(&m);
 
     MReadTree read("Events");
@@ -873,10 +874,11 @@
     histof.SkipHistTheta();
     //histof.SkipHistEnergy();
-    // FIXME: MHillasSrc.fAlpha is added twice!
-    histon.InitMapping(&m, 1);
-    histof.InitMapping(&m, 1);
-
-    if (filter && filter->InheritsFrom(MFSupercuts::Class()))
-        ((MFSupercuts*)filter)->InitMapping(&m);
+    histon.InitMapping(&m, 0);
+    histof.InitMapping(&m, 0);
+
+//    if (filter && filter->InheritsFrom(MFSupercuts::Class()))
+//        ((MFSupercuts*)filter)->InitMapping(&m);
+    if (filter && filter->InheritsFrom(MFMagicCuts::Class()))
+        ((MFMagicCuts*)filter)->InitMapping(&m);
 
     parlist.AddToList(&histon);
@@ -975,13 +977,14 @@
     parlist.AddToList(&m);
 
+    MHEnergyEst hist;
+    hist.InitMapping(&m); 
+
     MEnergyEstimate est("MParameters");
     est.SetRule(rule);
     parlist.AddToList(&est);
 
-    MHEnergyEst hist;
-    hist.InitMapping(&m); 
-
     MReadTree read("Events");
-    //read.DisableAutoScheme();
+    // NECESSARY BECAUSE OF MDataFormula GetRules missing
+    read.DisableAutoScheme();
     if (fname)
         read.AddFile(fname);
Index: trunk/MagicSoft/Mars/mjobs/MJOptimize.h
===================================================================
--- trunk/MagicSoft/Mars/mjobs/MJOptimize.h	(revision 6895)
+++ trunk/MagicSoft/Mars/mjobs/MJOptimize.h	(revision 6896)
@@ -129,5 +129,5 @@
             fStep[idx] = step;
     }
-    void FixParameter(Int_t idx, Double_t start)
+    void FixParameter(Int_t idx, Double_t start, Double_t lo=0, Double_t up=0, Double_t step=-1)
     {
         if (fParameters.GetSize()<=idx)