Changeset 8113 for trunk/MagicSoft

Timestamp:

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

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft

Files:

• Cosy/tpoint/plot.C (modified) (2 diffs)
• Mars/Changelog (modified) (1 diff)
• Mars/macros/optim/optimonoff.C (modified) (1 diff)
• Mars/macros/tutorials/threshold.C (modified) (2 diffs)

trunk/MagicSoft/Cosy/tpoint/plot.C

@@ -122 +122 @@
 };
 
-const Int_t counts = 17-4;
+const Int_t counts = 16;
 Description_t desc[counts] =
 {
@@ -149 +149 @@
     {"0510", "TPoints Residuals 10/2005" , "tpoint/tpoint0510.txt"},
     // New mirror alignment after Tenerife meeting
-    {"0511", "TPoints Residuals 11/2005" , "tpoint/tpoint0511.txt"}
+    {"0511", "TPoints Residuals 11/2005" , "tpoint/tpoint0511.txt"},
+
+    {"0512", "TPoints Residuals 12/2005" , "tpoint/tpoint0512.txt"},
+    {"0601", "TPoints Residuals 1/2006" ,  "tpoint/tpoint0601.txt"},
+    {"0603", "TPoints Residuals 3/2006" ,  "tpoint/tpoint0603.txt"}
 };
 

trunk/MagicSoft/Mars/Changelog

@@ -78 +78 @@
    * macros/checkaclic.C:
      - added (allows to check whether all macros compile)
+
+   * macros/dohtml.C:
+     - added extralgo
+     - added new macros
+
+   * mjobs/MJStar.cc:
+     - removed some obsolete includes
+
+   * macros/optim/optimonoff.C:
+     - updated start values to our current best values
+     - updated scale region
 
 

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

@@ -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)");
-
     // ----------------------------------------------
 

trunk/MagicSoft/Mars/macros/tutorials/threshold.C

@@ -46 +46 @@
     TArrayD cuts(8);
     cuts[0]=  1.3245;
-    cuts[1]=  0.2087;
-    cuts[2]=  0.2292;
-    cuts[3]=  5.2552;
-    cuts[4]=  0.09893;
-    cuts[5]= -0.08295;
+    cuts[1]=  0.22;
+    cuts[2]=  0.215;
+    cuts[3]=  5.486;
+    cuts[4]=  0.0897;
+    cuts[5]= -0.07;
     cuts[6]=  8.2957;
     cuts[7]=  0.8677;
@@ -56 +56 @@
     MFMagicCuts mcuts;
     mcuts.SetThetaCut(MFMagicCuts::kOn);
+    mcuts.SetHadronnessCut(MFMagicCuts::kArea);
     mcuts.SetVariables(cuts);