Index: /trunk/MagicSoft/Mars/macros/comprob.C
===================================================================
--- /trunk/MagicSoft/Mars/macros/comprob.C	(revision 1608)
+++ /trunk/MagicSoft/Mars/macros/comprob.C	(revision 1609)
@@ -57,6 +57,6 @@
     compprob.Add("MHillas.fLength",             500,    0, 300);
     compprob.Add("abs(MHillas.fAsym)",          500,    0, 400);
-    compprob.Add("HillasSource.fDist",          500,    0, 400);
-    compprob.Add("abs(HillasSource.fHeadTail)", 500,    0, 400);
+    compprob.Add("MHillasSrc.fDist",            500,    0, 400);
+    compprob.Add("abs(MHillasSrc.fHeadTail)",   500,    0, 400);
     compprob.Add("abs(MHillas.fM3Long)",        500,    0, 300);
     compprob.Add("abs(MHillas.fM3Trans)",       500,    0, 150);
Index: /trunk/MagicSoft/Mars/macros/multidimdist.C
===================================================================
--- /trunk/MagicSoft/Mars/macros/multidimdist.C	(revision 1608)
+++ /trunk/MagicSoft/Mars/macros/multidimdist.C	(revision 1609)
@@ -40,15 +40,49 @@
 
     //
-    // Now setup the tasks and tasklist:
-    // ---------------------------------
+    // This is an example program which reads image parameters for gammas 
+    // and hadrons, builds a 'matrix' of look-alike events,
+    // and then finds quality numbers and acceptances for the same sample
+
+    // Create an empty Parameter List and an empty Task List
+    // The tasklist is identified in the eventloop by its name
     //
-    // The first argument is the tree you want to read.
-    //   Events:     Cosmic ray events
-    //   PedEvents:  Pedestal Events
-    //   CalEvents:  Calibration Events
+    MParList  plist;
+    MTaskList tlistg;
+    plist.AddToList(&tlistg);
+
     //
-    MReadMarsFile  read("Events", "~/Mars/star.root");
+    // ------------- user attention -----------------
+    //
+
+    // cut used both for the matrices and the sample
+    // for more information see the documentation of MF and MDataChain
+    MF filterenergy("MMcEvt.fEnergy > 0");
+
+    // matrix limitation for look-alike events (approximate number)
+    MFEventSelector selector;
+    selector.SetNumSelectEvts(2000);
+
+    // setup an AND-Filterlist from the two filters to be used
+    // in the event selection for the filling of the matrices
+    MFilterList flist;
+    flist.AddToList(&filterenergy);
+    flist.AddToList(&selector);
+
+    //
+    // ---------------------------------------------------------------
+    //  Now set up the tasks and tasklist (first event loop, gammas)
+    // ---------------------------------------------------------------
+    //
+
+    // --------------- user change -----------------
+    //  Give the names of the star-files to be read
+    //   Here you give the trainings sample(s) for
+    //                 the hadrons
+    // ---------------------------------------------
+    MReadMarsFile read("Events");
+    read.AddFile("star_gammas.root");
+    read.AddFile("star_protons.root");
     read.DisableAutoScheme();
-    tlist.AddToList(&read);
+    tlistg.AddToList(&read);
 
     MFParticleId fgamma("MMcEvt", '=', kGAMMA);
@@ -65,8 +99,8 @@
     matrix.AddColumn("abs(MHillas.fM3Long)");
     matrix.AddColumn("abs(MHillas.fM3Trans)");
-    matrix.AddColumn("abs(HillasSource.fHeadTail)");
+    matrix.AddColumn("abs(MHillasSrc.fHeadTail)");
     matrix.AddColumn("MHillas.fConc");
     matrix.AddColumn("MHillas.fConc1");
-    matrix.AddColumn("HillasSource.fDist");
+    matrix.AddColumn("MHillasSrc.fDist");
     matrix.AddColumn("log10(MHillas.fSize)");
     plist.AddToList(&matrix);
@@ -107,12 +141,13 @@
     plist.Replace(&tlist2);
 
-    MReadMarsFile read2("Events", "~/Mars/star.root");
-//    read2.AddFile("~/Mars/star2.root");
+    MReadMarsFile read2("Events");
+    read2.("gammas2.root");
+    read2.AddFile("hadrons2.root");
     read2.DisableAutoScheme();
     tlist2.AddToList(&read2);
 
     MMultiDimDistCalc calc;
-    calc.SetUseNumRows(15);
-    //calc.SetUseKernelMethod(kTRUE);
+    calc.SetUseNumRows(0);
+    calc.SetUseKernelMethod(kTRUE);
     tlist2.AddToList(&calc);
 
