Changeset 8112 for trunk/MagicSoft

Timestamp:

10/17/06 20:13:53 (18 years ago)

Author:

tbretz

Message:

*** empty log message ***

File:

• trunk/MagicSoft/Mars/macros/optim/optimonoff.C (modified) (3 diffs)

trunk/MagicSoft/Mars/macros/optim/optimonoff.C

@@ -11 +11 @@
 
     // --------------- Theta Sq ---------------------
-    opt.SetParameter(1, 0.2087);
+    opt.SetParameter(1, 0.204);
 
     // ----------------- Area -----------------------
-    opt.SetParameter(2, 0.2292);
-    opt.SetParameter(3, 5.2652);
-    opt.SetParameter(4, 0.09893);
+    opt.SetParameter(2, 0.215);
+    opt.SetParameter(3, 5.486);
+    opt.SetParameter(4, 0.0897);
 
     // ----------------- M3L ------------------------
-    opt.SetParameter(5, -0.08295);
+    opt.FixParameter(5, -0.07);
 
     // ----------------- Fit ------------------------
@@ -25 +25 @@
     MAlphaFitter fit;
     fit.SetScaleMode(MAlphaFitter::kBackground);
-    fit.SetBackgroundFitMin(0.12);
-    fit.SetBackgroundFitMax(0.5);
+    fit.SetBackgroundFitMin(0.137);
+    fit.SetBackgroundFitMax(0.640);
     fit.SetPolynomOrder(1);
     fit.SetSignalFunction(MAlphaFitter::kThetaSq);
@@ -36 +36 @@
     cuts.SetThetaCut(MFMagicCuts::kNone);
 
-    // -----------------------------------------------------------
+    // ---------------- Quality-Cuts ----------------
+
+    opt.AddPreCut("MNewImagePar.fNumUsedPixels>5");
+    opt.AddPreCut("(MNewImagePar.fLeakage1 < 0.3)");
+    opt.AddPreCut("(MImagePar.fNumSatPixelsLG<2)");
+    opt.AddPreCut("(MImagePar.fNumIslands<3)");
+    opt.AddPreCut("(log10(MNewImagePar.fConc1) < (-0.371)*log10(MHillas.fSize) + 0.596)");
+    opt.AddPreCut("(MImagePar.fNumSatPixelsHG < 1) || (MHillas.GetArea*(MGeomCam.fConvMm2Deg^2) > (0.003*MImagePar.fNumSatPixelsHG) + 0.0325)");
+
+    // ----------------------------------------------
 
     MStatusDisplay *d = new MStatusDisplay;
     opt.SetDisplay(d);
 
-    opt.RunOnOff("1218phd/ganymed00001220-summary.root", &cuts, &fit);
+    opt.RunOnOff("ganymed00000001-summary.root", &cuts, &fit);
 }