Changeset 7413 for trunk/MagicSoft/Mars/mjoptim

Timestamp:

11/21/05 11:09:12 (20 years ago)

Author:

tbretz

Message:

*** empty log message ***

File:

• trunk/MagicSoft/Mars/mjoptim/MJOptimizeDisp.cc (modified) (5 diffs)

trunk/MagicSoft/Mars/mjoptim/MJOptimizeDisp.cc

@@ -71 +71 @@
 
 // histograms
+#include "MH3.h"
+#include "MBinning.h"
 #include "../mhflux/MAlphaFitter.h"
 #include "../mhflux/MHThetaSq.h"
@@ -91 +93 @@
 //
 // Read all events from file which do match rules and optimize
-// energy estimator.
+// disp estimator.
 //
 Bool_t MJOptimizeDisp::RunDisp(const char *fname, const char *rule, MTask *weights)
 {
-    fLog->Separator("Preparing Energy optimization");
+    fLog->Separator("Preparing Disp optimization");
 
     MParList parlist;
@@ -124 +126 @@
     const Int_t num1 = m.AddColumn("MHillasSrc.fDist*MGeomCam.fConvMm2Deg");
     const Int_t num2 = m.AddColumn("MHillasSrc.fAlpha*kDegToRad");
+    const Int_t num3 = m.AddColumn("MHillas.fSize");
 
     MHThetaSq hist;
     hist.SkipHistTime();
     hist.SkipHistTheta();
-    hist.SkipHistEnergy();
-    hist.InitMapping(&m); 
+    //hist.SkipHistEnergy();
+    //hist.ForceUsingSize();
+    hist.InitMapping(&m, 1);
 
     MFDataMember filter("DataType.fVal", '>', 0.5);
@@ -171 +175 @@
     MMatrixLoop loop(&m);
 
+    const char *n3   = Form("M[%d]", num3);
+    MH3 hdisp(n3, "sqrt(ThetaSquared.fVal)");
+    hdisp.SetTitle("\\vartheta^{2} distribution vs. Size:Size [phe]:\\vartheta^{2} [\\circ^{2}]");
+
+    MBinning binsx(100, 10, 100000, "BinningMH3X", "log");
+    MBinning binsy(100, 0,  2,      "BinningMH3Y", "lin");
+
+    parlist.AddToList(&binsx);
+    parlist.AddToList(&binsy);
+
+    MFillH fillh2(&hdisp);
+    fillh2.SetDrawOption("blue profx");
+
     tasklist.AddToList(&loop);
     tasklist.AddToList(&calc1);
@@ -177 +194 @@
         tasklist.AddToList(weights);
     tasklist.AddToList(&fill);
+    tasklist.AddToList(&fillh2);
     tasklist.AddToList(&eval);