Changeset 8940 for trunk/MagicSoft/Mars/mjobs

Timestamp:

06/12/08 15:35:15 (16 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars/mjobs

Files:

• MJSpectrum.cc (modified) (11 diffs)
• MJSpectrum.h (modified) (1 diff)
• MJStar.cc (modified) (1 diff)

trunk/MagicSoft/Mars/mjobs/MJSpectrum.cc

@@ -1263 +1263 @@
             // Don't do this on the original object!
             histsel->SetStats(kFALSE);
-
+          /*
             fLog->Separator("Kolmogorov Test");
             histsel->KolmogorovTest(excess, "DX");
@@ -1272 +1272 @@
             tex.SetBit(TLatex::kTextNDC);
             tex.DrawLatex(0.75, 0.93, Form("P(\\chi^{2})=%.0f%%", p*100));
+           */
         }
     }
@@ -1388 +1389 @@
     hist.InitTitle(";Slope;Disp-Dist [\\circ];");
     hist.SetDrawOption("colz profx");
+}
+
+void MJSpectrum::SetupHistEnergyRes(MHn &hist) const
+{
+    hist.AddHist("MEnergyEst.fVal", "(MMcEvt.fEnergy/MEnergyEst.fVal-1)^2", MH3::kProfile);
+    hist.InitName("ResEest;EnergyEst;");
+    hist.InitTitle(";E_{est} [GeV];Resolution (E_{mc}/E_{est}-1)^{2};");
+
+    //hist.AddHist("MMcEvt.fEnergy", "(MEnergyEst.fVal/MMcEvt.fEnergy-1)^2", MH3::kProfile);
+    //hist.InitName("ResEmc;EnergyEst;");
+    //hist.InitTitle(";E_{mc} [GeV];Resolution (E_{est}/E_{mc}-1)^{2};");
+    hist.AddHist("MHillas.fSize", "(MMcEvt.fEnergy/MEnergyEst.fVal-1)^2", MH3::kProfile);
+    hist.InitName("ResSize;Size;");
+    hist.InitTitle(";S [phe];Resolution (E_{mc}/E_{est}-1)^{2};");
+
+    hist.AddHist("MPointingPos.fZd", "(MMcEvt.fEnergy/MEnergyEst.fVal-1)^2", MH3::kProfile);
+    hist.InitName("ResTheta;Theta;");
+    hist.InitTitle(";\\Theta [\\circ];Resolution (E_{mc}/E_{est}-1)^{2};");
+
+    hist.AddHist("MMcEvt.fImpact/100", "(MMcEvt.fEnergy/MEnergyEst.fVal-1)^2", MH3::kProfile);
+    hist.InitName("ResImpact;Impact;");
+    hist.InitTitle(";I [m];Resolution (E_{mc}/E_{est}-1)^{2};");
 }
 
@@ -1533 +1556 @@
     GetThetaDistribution(htheta, hist);
 
-    // Give the zenoith angle weights to the weighting task
+    // Give the zenith angle weights to the weighting task
     weight.SetWeightsZd(&htheta);
 
@@ -1634 +1657 @@
     MBinning binsB(51, -1, 1,      "BinningEnergyResidual", "lin");
     MBinning binsD(51, -1, 1,      "BinningResidualDist",   "lin");
+    MBinning binsI(16,  0, 800,    "BinningImpact",         "lin");
 
     plist.AddToList(&binsA);
@@ -1639 +1663 @@
     plist.AddToList(&binsC);
     plist.AddToList(&binsD);
+    plist.AddToList(&binsI);
 
     MHn heest("Energy", "Energy Residual (lg E_{est} - lg E_{mc})");
@@ -1649 +1674 @@
     SetupHistEvtDist(henergy);
 
+    MHn heres("EnergyRes");
+    SetupHistEnergyRes(heres);
+
     MFillH fill4b(&heest, "", "FillEnergyResidual");
     fill4b.SetWeight();
@@ -1654 +1682 @@
     MFillH fill4c(&hdisp, "", "FillDispResidual");
     fill4c.SetWeight();
+
+    MFillH fill4d(&heres, "", "FillEnergyResolution");
+    fill4d.SetWeight();
 
     MFDataPhrase fdisp("Disp.fVal*sign(MHillasSrc.fCosDeltaAlpha)<0", "FilterDisp");
@@ -1745 +1776 @@
     tlist2.AddToList(&fill4);
     tlist2.AddToList(&fill4b);
+    tlist2.AddToList(&fill4d);
     tlist2.AddToList(&fill5);
     tlist2.AddToList(&fill0a);
@@ -1818 +1850 @@
         return kTRUE;
 
+    TNamed ganame("ganymed.root", gSystem->BaseName(fPathIn));
+
     // Write the output
     TObjArray cont;
@@ -1826 +1860 @@
     cont.Add(&area1);
     cont.Add(&hest);
+    cont.Add(&ganame);
 
     if (fDisplay)

trunk/MagicSoft/Mars/mjobs/MJSpectrum.h

@@ -43 +43 @@
     void SetupHistEnergyEst(MHn &hist) const;
     void SetupHistDisp(MHn &hist) const;
+    void SetupHistEnergyRes(MHn &hist) const;
 
     // Read Input

trunk/MagicSoft/Mars/mjobs/MJStar.cc

@@ -478 +478 @@
     MFillH fillw2("MHWeather", "MTimePyrometer", "FillPyrometer");
     fillw2.SetBit(MFillH::kDoNotDisplay);
+    fillw2.SetBit(MFillH::kCanSkip);
 
     // instantiate camera histogram containers