Index: trunk/MagicSoft/Mars/Changelog
===================================================================
--- trunk/MagicSoft/Mars/Changelog	(revision 8651)
+++ trunk/MagicSoft/Mars/Changelog	(revision 8652)
@@ -19,5 +19,14 @@
                                                  -*-*- END OF LINE -*-*-
 
- 2007/07/2 Thomas Bretz
+ 2007/07/29 Thomas Bretz
+
+   * ganymed.rc, ganymed_wobble.rc, ganymed_onoff.rc:
+     - reordered pre-cuts
+     - removed conc1-spark cut
+     - changed cut coefficients to new algorithm
+
+
+
+ 2007/07/28 Thomas Bretz
 
    * mjobs/MJSpectrum.[h,cc]:
Index: trunk/MagicSoft/Mars/ganymed.rc
===================================================================
--- trunk/MagicSoft/Mars/ganymed.rc	(revision 8651)
+++ trunk/MagicSoft/Mars/ganymed.rc	(revision 8652)
@@ -116,12 +116,11 @@
 
 # Get rid of triangular events...
-CutQ.Condition: ({0} || {1}) && {2} && {3} && {4} && {5} && {6}
-CutQ.0: MImagePar.fNumSatPixelsHG < 1
-CutQ.1: MHillas.GetArea*(MGeomCam.fConvMm2Deg^2) > (0.003*MImagePar.fNumSatPixelsHG) + 0.0325
-CutQ.2: MNewImagePar.fNumUsedPixels>5
-CutQ.3: MNewImagePar.fLeakage1 < 0.3
-CutQ.4: MImagePar.fNumSatPixelsLG<2
-CutQ.5: MImagePar.fNumIslands<3
-CutQ.6: log10(MNewImagePar.fConc1) < (-0.371)*log10(MHillas.fSize) + 0.596
+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: MImagePar.fNumSatPixelsHG < 1
+CutQ.4: MHillas.GetArea*(MGeomCam.fConvMm2Deg^2) > (0.003*MImagePar.fNumSatPixelsHG) + 0.0325
+CutQ.5: MImagePar.fNumSatPixelsLG<2
 
 # ---------- SETUP FOR ONOFF-MODE -----------
@@ -138,18 +137,20 @@
 Cut1.ThetaCut: None
 # Parametrization of Disp
-Cut1.Param0:  1.3245
-Cut1.Param6:  8.2957
-Cut1.Param7:  0.8677
-# Parametrization for sign of disp (m3long)
-Cut1.Param5: -0.07
-# Parametrization for sign of disp (slope)
-Cut1.Param8:  7.2
-Cut1.Param9:  0.5
+Cut1.Param0:   1.266195
+Cut1.Param8:   0
+#0.100577
+Cut1.Param9:   1.80309
+Cut1.Param10:  2.87177
+Cut1.Param11:  0.616823
+# Parametrization for sign of disp (m3long, slope)
+Cut1.Param5:  -0.07
+Cut1.Param6:   7.2
+Cut1.Param7:   0.5
 # ThetaSq-Cut
-Cut1.Param1:  0.22
+Cut1.Param1:   0.215
 # Area-Cut
-Cut1.Param2:  0.215
-Cut1.Param3:  5.486
-Cut1.Param4:  0.0897
+Cut1.Param2:   0.215468
+Cut1.Param3:   5.63973
+Cut1.Param4:   0.0836169
 
 # ---------- SETUP FOR WOBBLE-MODE -----------
@@ -160,33 +161,13 @@
 #MAlphaFitter.SignalFunction: ThetaSq
 
-# For more details on the magic cuts see its class reference
-#Cut1.Condition: MFMagicCuts
-#Cut1.ThetaCut: Off
-# Parametrization of Disp
-#Cut1.Param0:  1.221
-#Cut1.Param6:  13.425
-#Cut1.Param7:  1.04343
-# Parametrization for sign of disp (m3long)
-#Cut1.Param5: -0.07
-# Parametrization for sign of disp (slope)
-#Cut1.Param8:  7.2
-#Cut1.Param9:  0.5
-# ThetaSq-Cut
-#Cut1.Param1:  0.22
-# Area-Cut
-#Cut1.Param2:  0.222
-#Cut1.Param3:  5.524
-#Cut1.Param4:  0.0878
-
 # ---------- SETUP TO USE RANDOM FOREST -----------
 
 # To switch on random forest uncomment the following lines
 #Cut1.HadronnessCut: Hadronness
-#Cut1.Param10: 0.5
-#Cut1.Param11: 100
+#Cut1.Param14: 0.5
+#Cut1.Param15: 100
 
 # To use both, hadronness and area cut do
 #Cut1.HadronnessCut: All
-
 
 # -------------------------------------------------------------------------
Index: trunk/MagicSoft/Mars/ganymed_onoff.rc
===================================================================
--- trunk/MagicSoft/Mars/ganymed_onoff.rc	(revision 8651)
+++ trunk/MagicSoft/Mars/ganymed_onoff.rc	(revision 8652)
@@ -115,12 +115,12 @@
 
 # Get rid of triangular events...
-CutQ.Condition: ({0} || {1}) && {2} && {3} && {4} && {5} && {6}
-CutQ.0: MImagePar.fNumSatPixelsHG < 1
-CutQ.1: MHillas.GetArea*(MGeomCam.fConvMm2Deg^2) > (0.003*MImagePar.fNumSatPixelsHG) + 0.0325
-CutQ.2: MNewImagePar.fNumUsedPixels>5
-CutQ.3: MNewImagePar.fLeakage1 < 0.3
-CutQ.4: MImagePar.fNumSatPixelsLG<2
-CutQ.5: MImagePar.fNumIslands<3
-CutQ.6: log10(MNewImagePar.fConc1) < (-0.371)*log10(MHillas.fSize) + 0.596
+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: MImagePar.fNumSatPixelsHG < 1
+CutQ.4: MHillas.GetArea*(MGeomCam.fConvMm2Deg^2) > (0.003*MImagePar.fNumSatPixelsHG) + 0.0325
+CutQ.5: MImagePar.fNumSatPixelsLG<2
+
 
 # ---------- SETUP FOR ONOFF-MODE -----------
@@ -137,23 +137,25 @@
 Cut1.ThetaCut: None
 # Parametrization of Disp
-Cut1.Param0:  1.3245
-Cut1.Param6:  8.2957
-Cut1.Param7:  0.8677
-# Parametrization for sign of disp (m3long)
-Cut1.Param5: -0.07
-# Parametrization for sign of disp (slope)
-Cut1.Param8:  7.2
-Cut1.Param9:  0.5
+Cut1.Param0:   1.266195
+Cut1.Param8:   0
+#0.100577
+Cut1.Param9:   1.80309
+Cut1.Param10:  2.87177
+Cut1.Param11:  0.616823
+# Parametrization for sign of disp (m3long, slope)
+Cut1.Param5:  -0.07
+Cut1.Param6:   7.2
+Cut1.Param7:   0.5
 # ThetaSq-Cut
-Cut1.Param1:  0.22
+Cut1.Param1:   0.215
 # Area-Cut
-Cut1.Param2:  0.215
-Cut1.Param3:  5.486
-Cut1.Param4:  0.0897
+Cut1.Param2:   0.215468
+Cut1.Param3:   5.63973
+Cut1.Param4:   0.0836169
 
 # To switch on random forest uncomment the following lines
 #Cut1.HadronnessCut: Hadronness
-#Cut1.Param10: 0.5
-#Cut1.Param11: 100
+#Cut1.Param14: 0.5
+#Cut1.Param15: 100
 
 # To use both, hadronness and area cut do
Index: trunk/MagicSoft/Mars/ganymed_wobble.rc
===================================================================
--- trunk/MagicSoft/Mars/ganymed_wobble.rc	(revision 8651)
+++ trunk/MagicSoft/Mars/ganymed_wobble.rc	(revision 8652)
@@ -80,5 +80,5 @@
 # Define here the number of off-source regions used in wobble mode
 # -------------------------------------------------------------------------
-NumOffSourcePositions: 3
+MJCut.NumOffSourcePositions: 3
 
 # -------------------------------------------------------------------------
@@ -117,15 +117,14 @@
 
 # Get rid of triangular events...
-CutQ.Condition: ({0} || {1}) && {2} && {3} && {4} && {5} && {6}
-CutQ.0: MImagePar.fNumSatPixelsHG < 1
-CutQ.1: MHillas.GetArea*(MGeomCam.fConvMm2Deg^2) > (0.003*MImagePar.fNumSatPixelsHG) + 0.0325
-CutQ.2: MNewImagePar.fNumUsedPixels>5
-CutQ.3: MNewImagePar.fLeakage1 < 0.3
-CutQ.4: MImagePar.fNumSatPixelsLG<2
-CutQ.5: MImagePar.fNumIslands<3
-CutQ.6: log10(MNewImagePar.fConc1) < (-0.371)*log10(MHillas.fSize) + 0.596
+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: MImagePar.fNumSatPixelsHG < 1
+CutQ.4: MHillas.GetArea*(MGeomCam.fConvMm2Deg^2) > (0.003*MImagePar.fNumSatPixelsHG) + 0.0325
+CutQ.5: MImagePar.fNumSatPixelsLG<2
 
 # ---------- SETUP FOR WOBBLE-MODE -----------
-MAlphaFitter.ScaleMode: none
+#MAlphaFitter.ScaleMode: none
 MAlphaFitter.BackgroundFitMin: 0.09
 MAlphaFitter.BackgroundFitMax: 0.25
@@ -137,23 +136,25 @@
 Cut1.ThetaCut: None
 # Parametrization of Disp
-Cut1.Param0:  1.221
-Cut1.Param6:  13.425
-Cut1.Param7:  1.04343
-# Parametrization for sign of disp (m3long)
-Cut1.Param5: -0.07
+Cut1.Param0:   1.266195
+Cut1.Param8:   0
+#0.100577
+Cut1.Param9:   1.80309
+Cut1.Param10:  2.87177
+Cut1.Param11:  0.616823
+# Parametrization for sign of disp (m3long, slope)
+Cut1.Param5:  -0.07
+Cut1.Param6:   7.2
+Cut1.Param7:   0.5
 # ThetaSq-Cut
-Cut1.Param1:  0.22
+Cut1.Param1:   0.215
 # Area-Cut
-Cut1.Param2:  0.222
-Cut1.Param3:  5.524
-Cut1.Param4:  0.0878
-
-Cut1.Param8:  7.2
-Cut1.Param9:  0.5
+Cut1.Param2:   0.215468
+Cut1.Param3:   5.63973
+Cut1.Param4:   0.0836169
 
 # To switch on random forest uncomment the following lines
 #Cut1.HadronnessCut: Hadronness
-#Cut1.Param10: 0.5
-#Cut1.Param11: 100
+#Cut1.Param14: 0.5
+#Cut1.Param15: 100
 
 # To use both, hadronness and area cut do
Index: trunk/MagicSoft/Mars/mars.rc
===================================================================
--- trunk/MagicSoft/Mars/mars.rc	(revision 8651)
+++ trunk/MagicSoft/Mars/mars.rc	(revision 8652)
@@ -85,7 +85,14 @@
 #  e.g. Standard, Absolute, Scaled, Time
 # -------------------------------------------------------------------------
-MImgCleanStd.CleanMethod: Absolute
-MImgCleanStd.CleanLevel1: 8.5
-MImgCleanStd.CleanLevel2: 4.0
+MImgCleanStd.CleanMethod:   absolute
+#MImgCleanStd.CleanLevel0:   6.0
+MImgCleanStd.CleanLevel1:   6.0
+MImgCleanStd.CleanLevel2:   3.0
+MImgCleanStd.TimeLevel1:    1.75
+MImgCleanStd.TimeLevel2:    1.75
+MImgCleanStd.PostCleanType: 3
+
+#MImgCleanStd.CleanRings: 1
+#MImgCleanStd.KeepSinglePixels: No
 
 # -------------------------------------------------------------------------