Index: trunk/MagicSoft/Mars/Changelog
===================================================================
--- trunk/MagicSoft/Mars/Changelog	(revision 7720)
+++ trunk/MagicSoft/Mars/Changelog	(revision 7721)
@@ -47,4 +47,5 @@
      - implemented fitting of the off-data for background determination
      - the result values are not yet accessible
+     - increased class version by 1
 
    * mhflux/MHThetaSqN.[h,cc]:
Index: trunk/MagicSoft/Mars/mhflux/MHThetaSqN.cc
===================================================================
--- trunk/MagicSoft/Mars/mhflux/MHThetaSqN.cc	(revision 7720)
+++ trunk/MagicSoft/Mars/mhflux/MHThetaSqN.cc	(revision 7721)
@@ -189,4 +189,8 @@
 }
 
+// --------------------------------------------------------------------------
+//
+// Abbreviation to set the value used by MHAlpha to fill the histogram
+//
 void MHThetaSqN::SetVal(Double_t val)
 {
@@ -194,4 +198,8 @@
 }
 
+// --------------------------------------------------------------------------
+//
+// Abbreviation to set the value used by MHAlpha to fill the histogram
+//
 TVector2 MHThetaSqN::GetVec(const TVector2 &v, Int_t n1) const
 {
@@ -216,20 +224,4 @@
     const UInt_t  n   = fNumOffSourcePos+1;
     const Float_t rad = TMath::TwoPi()/n;
-
-/*
-    for (UInt_t i=0; i<n; i++)
-    {
-        //   off: is in src region   on: is in off regions
-        /// if (!fOffData && i==0) || (fOffData && i!=0)
-        if ((bool)fOffData ^ (i==0) )
-            continue;
-
-        const TVector2 src = const_cast<TVector2&>(src0).Rotate(i*rad);
-        SetVal((src-org).Mod2());
-
-        if (!MHAlpha::Fill(NULL, weight))
-            return kFALSE;
-    }
-    */
 
     // Calculate distance (theta-sq) to all (off-)source regions
@@ -279,99 +271,4 @@
     }
 
-    /*
-
-    // Calculate distance (theta-sq) to all (off-)source regions
-    TArrayD dist(n);
-    for (UInt_t i=0; i<n; i++)
-    {
-        const TVector2 src = const_cast<TVector2&>(src0).Rotate(i*rad);
-        dist[i] = (src-org).Mod2();
-    }
-
-    for (UInt_t i=0; i<n; i++)
-    {
-        //   off: is in src region   on: is in off regions
-        /// if (!fOffData && i==0) || (fOffData && i!=0)
-        if ((bool)fOffData ^ (i==0) )
-            continue;
-
-        if (fDoOffCut)
-        {
-                UInt_t j;
-                for (j=0; j<n; j++)
-                {
-                    if (i==j)
-                        continue;
-
-                    // *1.5: 99%
-                    // *1.4: 98%
-                    // *1.3: 97%
-                    // *1.2: 96%
-                    // *1.1: 94%
-                    // *1.0: 91%
-
-                    if (dist[j]<fThetaSqCut)
-                        break;
-                }
-                if (j<n)
-                    continue;
-        }
-
-        SetVal(dist[i]);
-
-        if (!MHAlpha::Fill(NULL, weight))
-            return kFALSE;
-    }
-  */
-    /*
-    for (UInt_t i=0; i<n; i++)
-    {
-        //   off: is in src region   on: is in off regions
-        /// if (!fOffData && i==0) || (fOffData && i!=0)
-        if ((bool)fOffData ^ (i==0) )
-            continue;
-
-        if (fDoOffCut)
-        {
-           const TVector2 src1 = const_cast<TVector2&>(src0).Rotate(i*rad+TMath::Pi());
-           const Double_t d1   = (src1-org).Mod2();
-
-           if (d1<fFit.GetSignalIntegralMax())
-               continue;
-        }
-
-        const TVector2 src = const_cast<TVector2&>(src0).Rotate(i*rad);
-        const Double_t d0  = (src-org).Mod2();
-
-        SetVal(d0);
-
-        if (!MHAlpha::Fill(NULL, weight))
-            return kFALSE;
-    }
-    */
-
-/*
-    for (UInt_t i=0; i<n; i++)
-    {
-        const TVector2 src = const_cast<TVector2&>(src0).Rotate(i*rad);
-        const Double_t d   = (src-org).Mod2();
-
-        //   off: is in src region   on: is in off regions
-        /// if (!fOffData && i==0) || (fOffData && i!=0)
-        if ((bool)fOffData ^ (i==0) )
-        {
-            if (d<fFit.GetSignalIntegralMax() && fDoOffCut)
-                return kTRUE;
-
-            // do not fill off data when aiming for on and vice versa
-            continue;
-        }
-
-        SetVal(d);
-
-        if (!MHAlpha::Fill(NULL, weight))
-            return kFALSE;
-    }
-  */
     if (!fOffData)
     {