Index: trunk/MagicSoft/Mars/Changelog
===================================================================
--- trunk/MagicSoft/Mars/Changelog	(revision 1646)
+++ trunk/MagicSoft/Mars/Changelog	(revision 1647)
@@ -1,8 +1,24 @@
                                                                   -*-*- END -*-*-
+ 2002/11/19: Thomas Bretz
+
+   * mmain/MMonteCarlo.cc:
+     - exchanged MReadTree with MReadMarsFile for collection area calculation
+ 
+   * mmontecarlo/MMcCollectionAreaCalc.cc:
+     - fixed the uninitialized fTheta
+
+   * macros/MagicHillas.C:
+     - removed the unnecessary second MHillasSrcCalc
+     - removed also the corresponding AddToList for the tasklist
+
+
  2002/11/19: Abelardo Moralejo
+
    * macros/collarea.C:
      - Added 2nd argument to write an output file containing the 
        collection area histogram.
 
+
+
  2002/11/18: Abelardo Moralejo
 
@@ -22,4 +38,6 @@
    * mgeom/MGeomPix.cc:
      - fixed some typos in comments
+
+
 
  2002/11/18: Thomas Bretz
@@ -90,4 +108,7 @@
      - changed comments
      - added missing manalysis-dir (strange!)
+
+   * macros/dohtml.C:
+     - added new macros
 
 
Index: trunk/MagicSoft/Mars/NEWS
===================================================================
--- trunk/MagicSoft/Mars/NEWS	(revision 1646)
+++ trunk/MagicSoft/Mars/NEWS	(revision 1647)
@@ -1,3 +1,12 @@
                                                                -*-*- END -*-*-
+
+ *** Version 0.9
+
+   - added pedstal calculation
+
+   - implemented "democratic cleaning" (cut value proportional to square
+     root of pixel area) according to Wolfgang's suggestion.
+
+
 
  *** Version 0.8 (2002/11/18)
Index: trunk/MagicSoft/Mars/manalysis/MImgCleanStd.cc
===================================================================
--- trunk/MagicSoft/Mars/manalysis/MImgCleanStd.cc	(revision 1646)
+++ trunk/MagicSoft/Mars/manalysis/MImgCleanStd.cc	(revision 1647)
@@ -117,10 +117,14 @@
         const Float_t noise = pix.GetErrorPhot();
 
+        const Int_t id = pix.GetPixId();
+
+        const Double_t ratio = TMath::Sqrt(fCam->GetPixRatio(id));
+
         // COBB: '<=' to skip entry=noise=0
-        if (entry <= fCleanLvl1 * noise / sqrt(fCam->GetPixRatio(i)))
+        if (entry <= fCleanLvl1 * noise / ratio)
             pix.SetPixelUnused();
 
-        if (pix.GetPixId()>max)
-            max = pix.GetPixId();
+        if (id>max)
+            max = id;
     }
     return max;
@@ -265,11 +269,13 @@
         const Float_t noise = pix.GetErrorPhot();
 
-        if (entry <= fCleanLvl2 * noise / sqrt(fCam->GetPixRatio(i)))
-            continue;
-
         //
         // get pixel id of this entry
         //
         const Int_t id = pix.GetPixId();
+
+        const Double_t ratio = TMath::Sqrt(fCam->GetPixRatio(id));
+
+        if (entry <= fCleanLvl2 * noise / ratio)
+            continue;
 
         //