Index: trunk/MagicSoft/Mars/ganymed.rc
===================================================================
--- trunk/MagicSoft/Mars/ganymed.rc	(revision 8720)
+++ trunk/MagicSoft/Mars/ganymed.rc	(revision 8721)
@@ -45,4 +45,5 @@
 # Using the starguider for pointing correction. 
 # To switch it off use "MPointingDevCalc.MaxAbsDev: -1"
+# For details see the class reference of MPointingDevCalc
 # -------------------------------------------------------------------------
 #MPointingDevCalc.MaxAbsDev:   15
@@ -51,10 +52,10 @@
 #MPointingDevCalc.NsbMin:      30
 #MPointingDevCalc.NsbMax:      60
-#MPointingDevCalc.Dx           -7
-#MPointingDevCalc.Dy           16
+#MPointingDevCalc.Dx          -2
+#MPointingDevCalc.Dy          -12
 #MPointingDevCalc.MaxAge       1.0
 
 # -------------------------------------------------------------------------
-# Setup the misfocussing correction
+# Setup misfocussing correction (see class reference for MSrcPosCorrect)
 # -------------------------------------------------------------------------
 #MSrcPosCorrect.Dx: 0
@@ -117,13 +118,12 @@
 Cut3.Inverted: Yes
 
-# Get rid of triangular events...
-CutQ.Condition: {0} && {1} && {2} && ({3} || {4})
-#CutQ.Condition: {0} && {1} && {2} && ({3} || {4}) && {5}
+# Quality-cuts (remove unphysical and obvious non-gamma events)
+CutQ.Condition: {0} && {1} && {2} && {3} && {4} && {5}
 CutQ.0: MImagePar.fNumIslands<3
 CutQ.1: MNewImagePar.fNumUsedPixels>5
 CutQ.2: MNewImagePar.fLeakage1 < 0.3
-CutQ.3: MNewImagePar.fConcCOG<0.25
-CutQ.4: log10(MNewImagePar.fConcCOG)<-0.3*(log10(MHillas.fSize)-2.5)-0.24
-CutQ.5: MImagePar.fNumSatPixelsLG < 2
+CutQ.3: log10(MNewImagePar.fConcCOG)<-0.45+0.08*(log10(MHillas.fSize)<3.9)*(log10(MHillas.fSize)-3.9)^2
+CutQ.4: log10(MNewImagePar.fConc1)  <-0.75+0.10*(log10(MHillas.fSize)<3.8)*(log10(MHillas.fSize)-3.8)^2
+CutQ.5: MHillas.fLength>-(log10(MHillas.fSize)-4.7)^2*5+50
 
 # -------------------------------------------------------------------------
@@ -206,4 +206,9 @@
 # Cut1.CalcDisp: No
 
+# CalcDisp: MParameterCalc
+# CalcDisp.Rule: 1.15*(1-MHillas.fWidth/MHillas.fLength)
+# CalcDisp.NameOutput: Disp
+# Cut1.CalcDisp: No
+
 # -------------------------------------------------------------------------
 # Use this to executa a task (eg to estimate energy) after all Cuts
Index: trunk/MagicSoft/Mars/ganymed_onoff.rc
===================================================================
--- trunk/MagicSoft/Mars/ganymed_onoff.rc	(revision 8720)
+++ trunk/MagicSoft/Mars/ganymed_onoff.rc	(revision 8721)
@@ -45,4 +45,5 @@
 # Using the starguider for pointing correction. 
 # To switch it off use "MPointingDevCalc.MaxAbsDev: -1"
+# For details see the class reference of MPointingDevCalc
 # -------------------------------------------------------------------------
 #MPointingDevCalc.MaxAbsDev:   15
@@ -51,10 +52,10 @@
 #MPointingDevCalc.NsbMin:      30
 #MPointingDevCalc.NsbMax:      60
-#MPointingDevCalc.Dx           -7
-#MPointingDevCalc.Dy           16
+#MPointingDevCalc.Dx          -2
+#MPointingDevCalc.Dy          -12
 #MPointingDevCalc.MaxAge       1.0
 
 # -------------------------------------------------------------------------
-# Setup the misfocussing correction
+# Setup misfocussing correction (see class reference for MSrcPosCorrect)
 # -------------------------------------------------------------------------
 #MSrcPosCorrect.Dx: 0
@@ -116,22 +117,21 @@
 Cut3.Inverted: Yes
 
-# Get rid of triangular events...
-CutQ.Condition: {0} && {1} && {2} && ({3} || {4})
-#CutQ.Condition: {0} && {1} && {2} && ({3} || {4}) && {5}
+# Quality-cuts (remove unphysical and obvious non-gamma events)
+CutQ.Condition: {0} && {1} && {2} && {3} && {4} && {5}
 CutQ.0: MImagePar.fNumIslands<3
 CutQ.1: MNewImagePar.fNumUsedPixels>5
 CutQ.2: MNewImagePar.fLeakage1 < 0.3
-CutQ.3: MNewImagePar.fConcCOG<0.25
-CutQ.4: log10(MNewImagePar.fConcCOG)<-0.3*(log10(MHillas.fSize)-2.5)-0.24
-CutQ.5: MImagePar.fNumSatPixelsLG < 2
-
-# -------------------------------------------------------------------------
-# Such a cut could be used to exclude starnge pointing positions. like
-# the camera center in wobble mode. However this directly influences the
-# effective observation time, which must then be corrected manually!
-# It is currently not recommended to use such a cut except for tests!
+CutQ.3: log10(MNewImagePar.fConcCOG)<-0.45+0.08*(log10(MHillas.fSize)<3.9)*(log10(MHillas.fSize)-3.9)^2
+CutQ.4: log10(MNewImagePar.fConc1)  <-0.75+0.10*(log10(MHillas.fSize)<3.8)*(log10(MHillas.fSize)-3.8)^2
+CutQ.5: MHillas.fLength>-5*(log10(MHillas.fSize)-4.7)^2+50
+
+# -------------------------------------------------------------------------
+# Such a cut could be used to exclude strange pointing positions. like
+# the camera center in wobble mode. Note, that a cut in the poiting
+# position directly influences the effective observation time and should
+# only be applied if the events are lost anyhow. In both cases you must
+# correct for the loss of observation time calculating your flux!
 # -------------------------------------------------------------------------
 #Cut0.Condition: MSrcPosCam.GetDist*MGeomCam.fConvMm2Deg>0.3
-
 
 # ---------- SETUP FOR ONOFF-MODE -----------
@@ -173,4 +173,11 @@
 
 # -------------------------------------------------------------------------
+# This cut is applied exclusively to the plots in the tab CutT. It is
+# resonable to show the events within your signal region here to
+# see if your signal region is clean from strange events (e.g. sparks)
+# -------------------------------------------------------------------------
+CutT.Condition: ThetaSquared.fVal < ThetaSquaredCut.fVal
+
+# -------------------------------------------------------------------------
 # Use this to executa a task (eg to calc hadronness) before Cut1
 # -------------------------------------------------------------------------
@@ -189,4 +196,9 @@
 # Cut1.CalcDisp: No
 
+# CalcDisp: MParameterCalc
+# CalcDisp.Rule: 1.15*(1-MHillas.fWidth/MHillas.fLength)
+# CalcDisp.NameOutput: Disp
+# Cut1.CalcDisp: No
+
 # -------------------------------------------------------------------------
 # Use this to executa a task (eg to estimate energy) after all Cuts
Index: trunk/MagicSoft/Mars/ganymed_wobble.rc
===================================================================
--- trunk/MagicSoft/Mars/ganymed_wobble.rc	(revision 8720)
+++ trunk/MagicSoft/Mars/ganymed_wobble.rc	(revision 8721)
@@ -45,4 +45,5 @@
 # Using the starguider for pointing correction. 
 # To switch it off use "MPointingDevCalc.MaxAbsDev: -1"
+# For details see the class reference of MPointingDevCalc
 # -------------------------------------------------------------------------
 #MPointingDevCalc.MaxAbsDev:   15
@@ -51,10 +52,10 @@
 #MPointingDevCalc.NsbMin:      30
 #MPointingDevCalc.NsbMax:      60
-#MPointingDevCalc.Dx           -7
-#MPointingDevCalc.Dy           16
+#MPointingDevCalc.Dx          -2
+#MPointingDevCalc.Dy          -12
 #MPointingDevCalc.MaxAge       1.0
 
 # -------------------------------------------------------------------------
-# Setup the misfocussing correction
+# Setup misfocussing correction (see class reference for MSrcPosCorrect)
 # -------------------------------------------------------------------------
 #MSrcPosCorrect.Dx: 0
@@ -118,19 +119,19 @@
 Cut3.Inverted: Yes
 
-# Get rid of triangular events...
-CutQ.Condition: {0} && {1} && {2} && ({3} || {4})
-#CutQ.Condition: {0} && {1} && {2} && ({3} || {4}) && {5}
+# Quality-cuts (remove unphysical and obvious non-gamma events)
+CutQ.Condition: {0} && {1} && {2} && {3} && {4} && {5}
 CutQ.0: MImagePar.fNumIslands<3
 CutQ.1: MNewImagePar.fNumUsedPixels>5
 CutQ.2: MNewImagePar.fLeakage1 < 0.3
-CutQ.3: MNewImagePar.fConcCOG<0.25
-CutQ.4: log10(MNewImagePar.fConcCOG)<-0.3*(log10(MHillas.fSize)-2.5)-0.24
-CutQ.5: MImagePar.fNumSatPixelsLG < 2
-
-# -------------------------------------------------------------------------
-# Such a cut could be used to exclude starnge pointing positions. like
-# the camera center in wobble mode. However this directly influences the
-# effective observation time, which must then be corrected manually!
-# It is currently not recommended to use such a cut except for tests!
+CutQ.3: log10(MNewImagePar.fConcCOG)<-0.45+0.08*(log10(MHillas.fSize)<3.9)*(log10(MHillas.fSize)-3.9)^2
+CutQ.4: log10(MNewImagePar.fConc1)  <-0.75+0.10*(log10(MHillas.fSize)<3.8)*(log10(MHillas.fSize)-3.8)^2
+CutQ.5: MHillas.fLength>-(log10(MHillas.fSize)-4.7)^2*5+50
+
+# -------------------------------------------------------------------------
+# Such a cut could be used to exclude strange pointing positions. like
+# the camera center in wobble mode. Note, that a cut in the poiting
+# position directly influences the effective observation time and should
+# only be applied if the events are lost anyhow. In both cases you must
+# correct for the loss of observation time calculating your flux!
 # -------------------------------------------------------------------------
 #Cut0.Condition: MSrcPosCam.GetDist*MGeomCam.fConvMm2Deg>0.3
@@ -172,4 +173,11 @@
 
 # -------------------------------------------------------------------------
+# This cut is applied exclusively to the plots in the tab CutT. It is
+# resonable to show the events within your signal region here to
+# see if your signal region is clean from strange events (e.g. sparks)
+# -------------------------------------------------------------------------
+CutT.Condition: ThetaSquared.fVal < ThetaSquaredCut.fVal
+
+# -------------------------------------------------------------------------
 # Use this to executa a task (eg to calc hadronness) before Cut1
 # -------------------------------------------------------------------------
@@ -188,4 +196,9 @@
 # Cut1.CalcDisp: No
 
+# CalcDisp: MParameterCalc
+# CalcDisp.Rule: 1.15*(1-MHillas.fWidth/MHillas.fLength)
+# CalcDisp.NameOutput: Disp
+# Cut1.CalcDisp: No
+
 # -------------------------------------------------------------------------
 # Use this to executa a task (eg to estimate energy) after all Cuts