Changeset 8658 for trunk

Timestamp:

08/06/07 17:32:51 (17 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars

Files:

• Changelog (modified) (1 diff)
• NEWS (modified) (1 diff)
• ganymed.rc (modified) (3 diffs)
• ganymed_onoff.rc (modified) (3 diffs)
• ganymed_wobble.rc (modified) (2 diffs)
• mfilter/MFMagicCuts.cc (modified) (1 diff)
• mfilter/MFMagicCuts.h (modified) (1 diff)
• mjobs/MJStar.cc (modified) (1 diff)

trunk/MagicSoft/Mars/Changelog

@@ -46 +46 @@
    * mpointing/MSrcPosCam.h:
      - added a function to return the distance to the camera center
+
+   * ganymed.rc, ganymed_onoff.rc, ganymed_wobble.rc:
+     - updated binnings
+     - replaced old spark-cut by a new one
+
+   * mfilter/MFMagicCuts.[h,cc]:
+     - increased version number to 2
+
+   * mjobs/MJStar.cc:
+     - replaced the old spark-cut with a new one
 
 

trunk/MagicSoft/Mars/NEWS

@@ -132 +132 @@
       + PostCleanType: 3
 
+   - star/ganymed: The old spark-cuts have been replaced by new ones.
+     These new spark cuts have been cross checked with the sequences
+     84720 (before splitter), 101041 (after splitter) and 223539 (new
+     FADCs). In all cases they seperate pretty well, but of course not
+     perfect. Monte Carlos have suggested to tighten the cuts a little
+     bit further at low sizes. This has been done.
 
    - ganymed: The old hadronness and size cuts have gotten new indices

trunk/MagicSoft/Mars/ganymed.rc

@@ -34 +34 @@
 BinningAlpha.Raw:        36    0    90
 BinningFalseSource.Raw:  91   -1.5  1.5
-#BinningTheta.Raw:       50    0    60      cos
 BinningWidth.Raw:        50    0    1
 BinningLength.Raw:       25    0    1
 BinningDist.Raw:         25    0    2
-BinningMaxDist.Raw:      25    0    2
+BinningAsym.Raw:         51   -0.7  0.7
+BinningM3Long.Raw:       51   -0.7  0.7
+BinningM3Trans.Raw:      51   -0.7  0.7
+BinningSlope.Raw:        51   -7.5  7.5
 
 # -------------------------------------------------------------------------
@@ -102 +104 @@
 # There are three cuts:
 #   CutQ: Cut after reading file
-#   Cut0: After calculation of src dependant parameters, energy estimation
+#   Cut0: After calculation of src dependent parameters, energy estimation
 #         and disp calculation, before writing summary file
 #   Cut1: After writing summary file before filling false source plots
@@ -121 +123 @@
 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
+CutQ.4: MNewImagePar.fConcCOG<0.25
+CutQ.5: log10(MNewImagePar.fConcCOG)<-0.3*(log10(MHillas.fSize)-2.5)-0.24
+
+# -------------------------------------------------------------------------
+# 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!
+# -------------------------------------------------------------------------
+#Cut0.Condition: MSrcPosCam.GetDist*MGeomCam.fConvMm2Deg>0.3
+
 
 # ---------- SETUP FOR ONOFF-MODE -----------

trunk/MagicSoft/Mars/ganymed_onoff.rc

@@ -34 +34 @@
 BinningAlpha.Raw:        36    0    90
 BinningFalseSource.Raw:  91   -1.5  1.5
-#BinningTheta.Raw:       50    0    60      cos
 BinningWidth.Raw:        50    0    1
 BinningLength.Raw:       25    0    1
 BinningDist.Raw:         25    0    2
-BinningMaxDist.Raw:      25    0    2
+BinningAsym.Raw:         51   -0.7  0.7
+BinningM3Long.Raw:       51   -0.7  0.7
+BinningM3Trans.Raw:      51   -0.7  0.7
+BinningSlope.Raw:        51   -7.5  7.5
 
 # -------------------------------------------------------------------------
@@ -101 +103 @@
 # There are three cuts:
 #   CutQ: Cut after reading file
-#   Cut0: After calculation of src dependant parameters, energy estimation
+#   Cut0: After calculation of src dependent parameters, energy estimation
 #         and disp calculation, before writing summary file
 #   Cut1: After writing summary file before filling false source plots
@@ -120 +122 @@
 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
+CutQ.4: MNewImagePar.fConcCOG<0.25
+CutQ.5: log10(MNewImagePar.fConcCOG)<-0.3*(log10(MHillas.fSize)-2.5)-0.24
+
+# -------------------------------------------------------------------------
+# 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!
+# -------------------------------------------------------------------------
+#Cut0.Condition: MSrcPosCam.GetDist*MGeomCam.fConvMm2Deg>0.3
 
 

trunk/MagicSoft/Mars/ganymed_wobble.rc

@@ -34 +34 @@
 BinningAlpha.Raw:        36    0    90
 BinningFalseSource.Raw:  91   -1.5  1.5
-#BinningTheta.Raw:       50    0    60      cos
 BinningWidth.Raw:        50    0    1
 BinningLength.Raw:       25    0    1
 BinningDist.Raw:         25    0    2
-BinningMaxDist.Raw:      25    0    2
+BinningAsym.Raw:         51   -0.7  0.7
+BinningM3Long.Raw:       51   -0.7  0.7
+BinningM3Trans.Raw:      51   -0.7  0.7
+BinningSlope.Raw:        51   -7.5  7.5
 
 # -------------------------------------------------------------------------
@@ -122 +124 @@
 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
+CutQ.4: MNewImagePar.fConcCOG<0.25
+CutQ.5: log10(MNewImagePar.fConcCOG)<-0.3*(log10(MHillas.fSize)-2.5)-0.24
+
+# -------------------------------------------------------------------------
+# 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!
+# -------------------------------------------------------------------------
+#Cut0.Condition: MSrcPosCam.GetDist*MGeomCam.fConvMm2Deg>0.3
 
 # ---------- SETUP FOR WOBBLE-MODE -----------

trunk/MagicSoft/Mars/mfilter/MFMagicCuts.cc

@@ -99 +99 @@
 //    - no:         Ghostbuster.fVal<c[12] is used as ghostbusting condition
 //
+//
+// Class Version 2:
+// ----------------
+//  + Bool_t fCalcDisp;        // Should we use Disp from the parameterlist?
+//  + Bool_t fCalcGhostbuster; // Should we use Ghostbuster from the parameterlist?
+//
+//
 //  Input Container:
 //  ------

trunk/MagicSoft/Mars/mfilter/MFMagicCuts.h

@@ -112 +112 @@
     void   Print(Option_t *o="") const;
 
-    ClassDef(MFMagicCuts, 1) // A filter to evaluate the MagicCuts
+    ClassDef(MFMagicCuts, 2) // A filter to evaluate the MagicCuts
 };
 

trunk/MagicSoft/Mars/mjobs/MJStar.cc

@@ -336 +336 @@
     }
 
-    // Spark cut
-    MFDataPhrase fsparks("log10(MNewImagePar.fConc1) < (-0.371)*log10(MHillas.fSize) + 0.596", "SparkCut");
+    // Spark cut:
+    //  This cut is a little bit different from the default cut in the
+    //  ganymed.rc, because the cut in ganymed.rc also suppresses a
+    //  little background, while the cut here only shows sparks
+    MFDataPhrase fsparks("log10(MNewImagePar.fConcCOG)<-0.45*(log10(MHillas.fSize)-2.5)-0.24", "SparkCut");
     //fill0b.SetFilter(&fsparks);
     fill0c.SetFilter(&fsparks);