Index: /trunk/MagicSoft/Mars/mjobs/MJSpectrum.cc
===================================================================
--- /trunk/MagicSoft/Mars/mjobs/MJSpectrum.cc	(revision 8701)
+++ /trunk/MagicSoft/Mars/mjobs/MJSpectrum.cc	(revision 8702)
@@ -73,11 +73,9 @@
 // Tasks/Filter
 #include "MReadMarsFile.h"
-#include "MReadMarsFile.h"
-#include "MFEventSelector2.h"
-#include "MFDataMember.h"
 #include "MEnergyEstimate.h"
 #include "MTaskEnv.h"
 #include "MFillH.h"
-#include "MHillasCalc.h"
+#include "MFDataPhrase.h"
+#include "MFDataMember.h"
 #include "MContinue.h"
 
@@ -738,4 +736,5 @@
 }
 
+/*
 Bool_t MJSpectrum::IntermediateLoop(MParList &plist, MH3 &mh1, TH1D &temp1, const MDataSet &set, MMcSpectrumWeight &weight) const
 {
@@ -811,4 +810,5 @@
     return kTRUE;
 }
+*/
 
 TString MJSpectrum::FormString(const TF1 &f, Byte_t type)
@@ -1252,20 +1252,22 @@
 void MJSpectrum::SetupHistEnergyEst(MHn &hist) const
 {
-    hist.AddHist("MHillas.fSize", "log10(MEnergyEst.fVal)-log10(MMcEvt.fEnergy)");
+    const char *res = "log10(MEnergyEst.fVal)-log10(MMcEvt.fEnergy)";
+
+    hist.AddHist("MHillas.fSize", res);
     hist.InitName("ResSize;Size;EnergyResidual");
     hist.InitTitle(";S [phe];\\Delta lg E;");
     hist.SetDrawOption("colz profx");
 
-    hist.AddHist("MPointingPos.fZd", "log10(MEnergyEst.fVal)-log10(MMcEvt.fEnergy)");
+    hist.AddHist("MPointingPos.fZd", res);
     hist.InitName("ResTheta;Theta;EnergyResidual");
     hist.InitTitle(";Zd [\\circ];\\Delta lg E;");
     hist.SetDrawOption("colz profx");
 
-    hist.AddHist("MNewImagePar.fLeakage1", "log10(MEnergyEst.fVal)-log10(MMcEvt.fEnergy)");
+    hist.AddHist("MNewImagePar.fLeakage1", res);
     hist.InitName("ResLeak;Leakage;EnergyResidual");
     hist.InitTitle(";Leak;\\Delta lg E;");
     hist.SetDrawOption("colz profx");
 
-    hist.AddHist("MHillasSrc.fDist*3.37e-3", "log10(MEnergyEst.fVal)-log10(MMcEvt.fEnergy)");
+    hist.AddHist("MHillasSrc.fDist*3.37e-3", res);
     hist.InitName("ResDist;Dist;EnergyResidual");
     hist.InitTitle(";D [\\circ];\\Delta lg E;");
@@ -1275,22 +1277,24 @@
 void MJSpectrum::SetupHistDisp(MHn &hist) const
 {
-    hist.AddHist("MHillas.fSize", "MHillasSrc.fDist*3.37e-3/Disp.fVal");
-    hist.InitName("ResSize;Size;Xi");
-    hist.InitTitle(";S [phe];\\Delta Xi;");
+    const char *res = "-Disp.fVal*sign(MHillasSrc.fCosDeltaAlpha)-MHillasSrc.fDist*3.37e-3";
+
+    hist.AddHist("MHillas.fSize", res);
+    hist.InitName("ResSize;Size;ResidualDist");
+    hist.InitTitle(";S [phe];Disp-Dist [\\circ];");
     hist.SetDrawOption("colz profx");
 
-    hist.AddHist("MPointingPos.fZd", "MHillasSrc.fDist*3.37e-3/Disp.fVal");
-    hist.InitName("ResTheta;Theta;Xi");
-    hist.InitTitle(";Zd [\\circ];\\Delta Xi;");
+    hist.AddHist("MPointingPos.fZd", res);
+    hist.InitName("ResTheta;Theta;ResidualDist");
+    hist.InitTitle(";Zd [\\circ];Disp-Dist [\\circ];");
     hist.SetDrawOption("colz profx");
 
-    hist.AddHist("MNewImagePar.fLeakage1", "MHillasSrc.fDist*3.37e-3/Disp.fVal");
-    hist.InitName("ResLeak;Leakage;Xi");
-    hist.InitTitle(";Leak;\\Delta Xi;");
+    hist.AddHist("MNewImagePar.fLeakage1", res);
+    hist.InitName("ResLeak;Leakage;ResidualDist");
+    hist.InitTitle(";Leak;Disp-Dist [\\circ];");
     hist.SetDrawOption("colz profx");
 
-    hist.AddHist("MHillasExt.fSlopeLong*sign(MHillasSrc.fCosDeltaAlpha)/3.37e-3", "MHillasSrc.fDist*3.37e-3/Disp.fVal");
-    hist.InitName("ResSlope;Slope;Xi");
-    hist.InitTitle(";Slope;\\Delta Xi;");
+    hist.AddHist("MHillasExt.fSlopeLong*sign(MHillasSrc.fCosDeltaAlpha)/3.37e-3", res);
+    hist.InitName("ResSlope;Slope;ResidualDist");
+    hist.InitTitle(";Slope;Disp-Dist [\\circ];");
     hist.SetDrawOption("colz profx");
 }
@@ -1490,7 +1494,7 @@
 
     MBinning binsA(50, 10, 100000, "BinningSize",           "log");
-    MBinning binsB(50, -1, 1,      "BinningEnergyResidual", "lin");
     MBinning binsC(50,  0, 0.3,    "BinningLeakage",        "lin");
-    MBinning binsD(50,  0, 3,      "BinningXi",             "lin");
+    MBinning binsB(51, -1, 1,      "BinningEnergyResidual", "lin");
+    MBinning binsD(51, -3, 1,      "BinningResidualDist",   "lin");
 
     plist.AddToList(&binsA);
@@ -1502,5 +1506,5 @@
     SetupHistEnergyEst(heest);
 
-    MHn hdisp("Disp", "Xi (Dist/Disp)");
+    MHn hdisp("Disp", "Dist residual (Disp-Dist)");
     SetupHistDisp(hdisp);