Index: /trunk/MagicSoft/Mars/Changelog
===================================================================
--- /trunk/MagicSoft/Mars/Changelog	(revision 8984)
+++ /trunk/MagicSoft/Mars/Changelog	(revision 8985)
@@ -19,4 +19,25 @@
                                                  -*-*- END OF LINE -*-*-
 
+ 2008/06/10 Thomas Bretz
+
+   * macros/dohtml.C:
+     - added missing mmovie directory
+
+   * mhflux/MHEnergyEst.cc:
+     - changed the fit range to adapt to the new plot
+     - exchanged the two plots on the right to have the correct plot
+       near the 1D histogram
+     - fixed the title of the plot in the top right
+     - call SetNoExponent and SetMoreLoglabels
+
+   * mjobs/MJSpectrum.[h,cc]:
+     - outsources producing the spectral function as string to
+       a new static function FormFlux
+
+   * mpointing/MPointingDevCalc.cc:
+     - added some info
+
+
+
  2008/06/19 Thomas Bretz
 
@@ -29,4 +50,7 @@
      - added Format member function
 
+   * datacenter/macros/plotstat.C:
+     - fixed some axis titles
+
 
 
@@ -34,4 +58,11 @@
 
    * RELEASE 2.1
+
+
+
+ 2008/06/19 Thomas Bretz
+
+   * mraw/MRawRunHeader.cc:
+     - fixed that the line reading the fNumEventsRead vanished 
 
 
Index: /trunk/MagicSoft/Mars/NEWS
===================================================================
--- /trunk/MagicSoft/Mars/NEWS	(revision 8984)
+++ /trunk/MagicSoft/Mars/NEWS	(revision 8985)
@@ -11,4 +11,6 @@
 
    * introduced average temperature and wind speed from star-files
+
+   * introduced average values from Pyrometer (mainly Cloudiness)
 
    * introduced the ratio of accepted calibration events in the
@@ -122,5 +124,5 @@
       to distinguish them from each other (MPedestalCam, MPedestalExtracted)
 
-    * Both pedestal cams now conatain the number of events processed
+    * Both pedestal cams now contain the number of events processed
 
     * In Mars V2.0 the extraction of the fundamental pedestal was broken, 
Index: /trunk/MagicSoft/Mars/macros/dohtml.C
===================================================================
--- /trunk/MagicSoft/Mars/macros/dohtml.C	(revision 8984)
+++ /trunk/MagicSoft/Mars/macros/dohtml.C	(revision 8985)
@@ -84,4 +84,5 @@
     sourcedir += "mmontecarlo:";
     sourcedir += "mmuon:";
+    sourcedir += "mmovie:";
     sourcedir += "mpointing:";
     sourcedir += "mpedestal:";
Index: /trunk/MagicSoft/Mars/mhflux/MHEnergyEst.cc
===================================================================
--- /trunk/MagicSoft/Mars/mhflux/MHEnergyEst.cc	(revision 8984)
+++ /trunk/MagicSoft/Mars/mhflux/MHEnergyEst.cc	(revision 8985)
@@ -332,5 +332,5 @@
                 }
 
-                hx->Fit("gaus", "Q", "", -1.0, 0.25);
+                hx->Fit("gaus", "Q", "", -0.25, 1.0);
                 hx->GetFunction("gaus")->SetLineColor(kBlue);
                 hx->GetFunction("gaus")->SetLineWidth(2);
@@ -363,8 +363,8 @@
 
         pad->GetPad(2)->cd(2);
+        UpdateProf(fHResolutionMC, kFALSE);
+
+        pad->GetPad(2)->cd(3);
         UpdateProf(fHResolutionEst, kFALSE);
-
-        pad->GetPad(2)->cd(3);
-        UpdateProf(fHResolutionMC, kFALSE);
     }
 }
@@ -451,4 +451,7 @@
     h->Draw();
 
+    h->GetXaxis()->SetMoreLogLabels();
+    h->GetXaxis()->SetNoExponent();
+
     h = MakeProj("ex");
     h->SetLineColor(kBlue);
@@ -511,10 +514,11 @@
     h2->SetBit(kCanDelete);
     h2->SetFillColor(kBlue);
-    h2->SetTitle("Estimated energy E_{est} vs Monte Carlo energy E_{mc}");
-
-    TH1 *h1 = MakeProf(*h2);
+    h2->SetTitle("Estimated energy E_{mc} vs Monte Carlo energy E_{est}");
 
     h2->Draw("");
-    h1->Draw("E0 same");
+    MakeProf(*h2)->Draw("E0 same");
+
+    h2->GetXaxis()->SetMoreLogLabels();
+    h2->GetXaxis()->SetNoExponent();
 
     TLine line;
@@ -528,4 +532,19 @@
 
     pad2->cd(2);
+    gPad->SetBorderMode(0);
+    gPad->SetLogx();
+    gPad->SetGridx();
+    gPad->SetGridy();
+    fHResolutionMC.Draw();
+    MakeProf(fHResolutionMC)->Draw("E0 same");
+
+    fHResolutionMC.GetXaxis()->SetMoreLogLabels();
+    fHResolutionMC.GetXaxis()->SetNoExponent();
+
+    line.DrawLine(fHResolutionMC.GetXaxis()->GetXmin(), 0, fHResolutionMC.GetXaxis()->GetXmax(), 0);
+
+    // ----------------------------------------
+
+    pad2->cd(3);
     gPad->SetBorderMode(0);
     gPad->SetLogx();
@@ -539,19 +558,4 @@
 
     line.DrawLine(fHResolutionEst.GetXaxis()->GetXmin(), 0, fHResolutionEst.GetXaxis()->GetXmax(), 0);
-
-    // ----------------------------------------
-
-    pad2->cd(3);
-    gPad->SetBorderMode(0);
-    gPad->SetLogx();
-    gPad->SetGridx();
-    gPad->SetGridy();
-    fHResolutionMC.Draw();
-    MakeProf(fHResolutionMC)->Draw("E0 same");
-
-    fHResolutionMC.GetXaxis()->SetMoreLogLabels();
-    fHResolutionMC.GetXaxis()->SetNoExponent();
-
-    line.DrawLine(fHResolutionMC.GetXaxis()->GetXmin(), 0, fHResolutionMC.GetXaxis()->GetXmax(), 0);
 }
 
Index: /trunk/MagicSoft/Mars/mjobs/MJSpectrum.cc
===================================================================
--- /trunk/MagicSoft/Mars/mjobs/MJSpectrum.cc	(revision 8984)
+++ /trunk/MagicSoft/Mars/mjobs/MJSpectrum.cc	(revision 8985)
@@ -870,5 +870,12 @@
 */
 
-TString MJSpectrum::FormString(const TF1 &f, Byte_t type)
+TString MJSpectrum::FormFloat(Double_t d)
+{
+    TString s;
+    s += d;
+    return s.Strip(TString::kLeading);
+}
+
+TString MJSpectrum::FormFlux(const TF1 &f, const char *unit)
 {
     Double_t p0 = f.GetParameter(0);
@@ -881,25 +888,30 @@
     MMath::Format(p1, e1);
 
-    TString str;
+    const Int_t    i   = TMath::FloorNint(TMath::Log10(p1));
+    const Double_t exp = TMath::Power(10, i);
+
+    TString str = Form("(%s #pm %s)·10^{%d} ",
+                       FormFloat(p1/exp).Data(), FormFloat(e1/exp).Data(), i);
+
+    str += Form("#left(#frac{E}{%s}#right)^{%s #pm %s}", unit,
+                FormFloat(p0).Data(), FormFloat(e0).Data());
+
+    str += " TeV^{-1} m^{-2} s^{-1}";
+
+    return str;
+}
+
+TString MJSpectrum::FormString(const TF1 &f, Byte_t type)
+{
     switch (type)
     {
     case 0:
-        {
-            const Int_t    i   = TMath::FloorNint(TMath::Log10(p1));
-            const Double_t exp = TMath::Power(10, i);
-
-            str  = Form("(%f#pm%f)\\bullet10^{%d}",      p1/exp, e1/exp, i);
-            str += Form("(\\frac{E}{500GeV})^{%f#pm%f}", p0, e0);
-            str += "\\frac{ph}{TeVm^{2}s}";
-        }
-        break;
+        return FormFlux(f, "500GeV");
     case 1:
-        str = Form("\\chi^{2}/NDF=%.2f/%d", f.GetChisquare(),f.GetNDF());
-        break;
+        return Form("\\chi^{2}/NDF=%.2f/%d", f.GetChisquare(),f.GetNDF());
     case 2:
-        str = Form("P=%.0f%%", 100*TMath::Prob(f.GetChisquare(),  f.GetNDF()));
-        break;
-    }
-    return str;
+        return Form("P=%.0f%%", 100*TMath::Prob(f.GetChisquare(),  f.GetNDF()));
+    }
+    return "";
 }
 
Index: /trunk/MagicSoft/Mars/mjobs/MJSpectrum.h
===================================================================
--- /trunk/MagicSoft/Mars/mjobs/MJSpectrum.h	(revision 8984)
+++ /trunk/MagicSoft/Mars/mjobs/MJSpectrum.h	(revision 8985)
@@ -78,4 +78,6 @@
     void SetEnergyEstimator(const MTask *task);
 
+    static TString FormFloat(Double_t d);
+    static TString FormFlux(const TF1 &f, const char *unit);
     static TString FormString(const TF1 &f, Byte_t type=0);
 
Index: /trunk/MagicSoft/Mars/mpointing/MPointingDevCalc.cc
===================================================================
--- /trunk/MagicSoft/Mars/mpointing/MPointingDevCalc.cc	(revision 8984)
+++ /trunk/MagicSoft/Mars/mpointing/MPointingDevCalc.cc	(revision 8985)
@@ -159,5 +159,6 @@
 //   18. Oct. 2007    291104      // Correction for the offsets introduced by AMC
 //   14. Jan. 2008    328198      // Complete new pointing model
-//   11. Jun. 2008              (ca. 23:00)
+//   11. Jun. 2008              (ca. 23:00) // Before new TPoints
+//   19. Jun. 2008              (ca. 15:00) // From   new TPoints
 //
 // From 2.2.2006 beginnig of the night (21:05h, run >=81855) to 24.2.2006