Changeset 8628 for trunk

Timestamp:

06/29/07 22:16:57 (17 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars

Files:

• Changelog (modified) (1 diff)
• ganymed.rc (modified) (5 diffs)
• ganymed_onoff.rc (modified) (2 diffs)
• ganymed_wobble.rc (modified) (5 diffs)

trunk/MagicSoft/Mars/Changelog

@@ -77 +77 @@
    * scripts/merppupdate:
      - the second argument was silently ignored
+
+   * ganymed.rc, ganymed_wobble.rc, ganymed_onoff.rc:
+     - updates to the latest changes
 
 

trunk/MagicSoft/Mars/ganymed.rc

@@ -101 +101 @@
 # -------------------------------------------------------------------------
 # There are three cuts:
-#   Cut0: After energy estimation, before writing summary file
+#   CutQ: Cut after reading file
+#   Cut0: After calculation of src dependant parameters, energy estimation
+#         and disp calculation, before writing summary file
 #   Cut1: After writing summary file before filling false source plots
 #   Cut2: After filling false source plots before filling alpha plots
 #   Cut3: After filling alpha plots (eg. Alpha cuts) for image parameter
-#         display
-# -------------------------------------------------------------------------
+#         display, eg. write only events after alpha cut to ganymed file
+# -------------------------------------------------------------------------
+CutQ.Inverted: Yes
 Cut0.Inverted: Yes
 Cut1.Inverted: Yes
@@ -113 +116 @@
 
 # Get rid of triangular events...
-Cut0.Condition: ({0} || {1}) && {2} && {3} && {4} && {5} && {6}
-Cut0.0: MImagePar.fNumSatPixelsHG < 1
-Cut0.1: MHillas.GetArea*(MGeomCam.fConvMm2Deg^2) > (0.003*MImagePar.fNumSatPixelsHG) + 0.0325
-Cut0.2: MNewImagePar.fNumUsedPixels>5
-Cut0.3: MNewImagePar.fLeakage1 < 0.3
-Cut0.4: MImagePar.fNumSatPixelsLG<2
-Cut0.5: MImagePar.fNumIslands<3
-Cut0.6: log10(MNewImagePar.fConc1) < (-0.371)*log10(MHillas.fSize) + 0.596
+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
 
 # ---------- SETUP FOR ONOFF-MODE -----------
@@ -140 +143 @@
 # 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
@@ -163 +169 @@
 # 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
@@ -174 +183 @@
 # To switch on random forest uncomment the following lines
 #Cut1.HadronnessCut: Hadronness
-#Cut1.Param8: 0.5
-#Cut1.Param9: 100
+#Cut1.Param10: 0.5
+#Cut1.Param11: 100
 
 # To use both, hadronness and area cut do

trunk/MagicSoft/Mars/ganymed_onoff.rc

@@ -142 +142 @@
 # 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
@@ -151 +154 @@
 # To switch on random forest uncomment the following lines
 #Cut1.HadronnessCut: Hadronness
-#Cut1.Param8: 0.5
-#Cut1.Param9: 100
+#Cut1.Param10: 0.5
+#Cut1.Param11: 100
 
 # To use both, hadronness and area cut do

trunk/MagicSoft/Mars/ganymed_wobble.rc

@@ -77 +77 @@
 #MJCut.NameHist: MHAlpha
 
-# Be carefull: The spectrum might be done with a different binning
-# This might change the scale factor
-#MHThetaSq.NumBinsSignal:   3
-#MHThetaSq.NumBinsTotal:   75
+# -------------------------------------------------------------------------
+# Define here the number of off-source regions used in wobble mode
+# -------------------------------------------------------------------------
+NumOffSourcePositions: 3
 
 # -------------------------------------------------------------------------
@@ -102 +102 @@
 # -------------------------------------------------------------------------
 # There are three cuts:
-#   Cut0: After energy estimation, before writing summary file
+#   CutQ: Cut after reading file
+#   Cut0: After calculation of src dependant parameters, energy estimation
+#         and disp calculation, before writing summary file
 #   Cut1: After writing summary file before filling false source plots
 #   Cut2: After filling false source plots before filling alpha plots
 #   Cut3: After filling alpha plots (eg. Alpha cuts) for image parameter
-#         display
+#         display, eg. write only events after alpha cut to ganymed file
 # -------------------------------------------------------------------------
+CutQ.Inverted: Yes
 Cut0.Inverted: Yes
 Cut1.Inverted: Yes
@@ -114 +117 @@
 
 # Get rid of triangular events...
-Cut0.Condition: ({0} || {1}) && {2} && {3} && {4} && {5} && {6}
-Cut0.0: MImagePar.fNumSatPixelsHG < 1
-Cut0.1: MHillas.GetArea*(MGeomCam.fConvMm2Deg^2) > (0.003*MImagePar.fNumSatPixelsHG) + 0.0325
-Cut0.2: MNewImagePar.fNumUsedPixels>5
-Cut0.3: MNewImagePar.fLeakage1 < 0.3
-Cut0.4: MImagePar.fNumSatPixelsLG<2
-Cut0.5: MImagePar.fNumIslands<3
-Cut0.6: log10(MNewImagePar.fConc1) < (-0.371)*log10(MHillas.fSize) + 0.596
+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
 
 # ---------- SETUP FOR WOBBLE-MODE -----------
@@ -132 +135 @@
 # For more details on the magic cuts see its class reference
 Cut1.Condition: MFMagicCuts
-Cut1.ThetaCut: Off
+Cut1.ThetaCut: None
 # Parametrization of Disp
 Cut1.Param0:  1.221
@@ -146 +149 @@
 Cut1.Param4:  0.0878
 
+Cut1.Param8:  7.2
+Cut1.Param9:  0.5
+
 # To switch on random forest uncomment the following lines
 #Cut1.HadronnessCut: Hadronness
-#Cut1.Param8: 0.5
-#Cut1.Param9: 100
+#Cut1.Param10: 0.5
+#Cut1.Param11: 100
 
 # To use both, hadronness and area cut do