Index: trunk/MagicSoft/Mars/Changelog
===================================================================
--- trunk/MagicSoft/Mars/Changelog	(revision 9366)
+++ trunk/MagicSoft/Mars/Changelog	(revision 9367)
@@ -18,4 +18,35 @@
 
                                                  -*-*- END OF LINE -*-*-
+ 2009/03/01 Thomas Bretz
+
+   * ganymed.rc, ganymed_onoff.rc, ganymed_wobble.rc:
+     - added pointing model 328198
+
+   * mbase/MSpline3.h:
+     - added a cast to make it compile with root 5.18
+
+   * melectronics/MPulseShape.cc:
+     - included TH1 to make it compile with root 5.18
+
+   * mhflux/MAlphaFitter.[h,cc]:
+     - convert MString::Format to Data() 
+     - added type SignificanceSqrtExcess
+
+   * mhflux/MHFalseSource.cc, mjobs/MJSpectrum.cc:
+     - convert MString::Format to Data() 
+
+   * mhist/MHCamera.cc:
+     - changed some const TString to const char to resolve 
+       ambiguity in root 5.18 in TF1 constructor
+
+   * msim/MHPhotonEvent.cc:
+     - use TMath::Abs instead of abs 
+
+   * msim/MSimPointingPos.[h,cc]:
+     - moved getter and setter to source file to avoid including of
+       TMath
+
+
+
  2009/02/26 Daniel Hoehne-Moench
 
Index: trunk/MagicSoft/Mars/NEWS
===================================================================
--- trunk/MagicSoft/Mars/NEWS	(revision 9366)
+++ trunk/MagicSoft/Mars/NEWS	(revision 9367)
@@ -93,4 +93,8 @@
 
    * Now outputs MSrcPosCam for Monte Carlos in the Events tree.
+
+ ;ganymed
+ 
+   * added pointing model 328198
 
  ;sponde
Index: trunk/MagicSoft/Mars/ganymed.rc
===================================================================
--- trunk/MagicSoft/Mars/ganymed.rc	(revision 9366)
+++ trunk/MagicSoft/Mars/ganymed.rc	(revision 9367)
@@ -56,5 +56,5 @@
 #MPointingDevCalc.MaxAge       1.0
 
-MPointingDevCalc.PointingModels: 1 81855 83722 89180 267253 291104
+MPointingDevCalc.PointingModels: 1 81855 83722 89180 267253 291104 328198
 
 # -------------------------------------------------------------------------
Index: trunk/MagicSoft/Mars/ganymed_onoff.rc
===================================================================
--- trunk/MagicSoft/Mars/ganymed_onoff.rc	(revision 9366)
+++ trunk/MagicSoft/Mars/ganymed_onoff.rc	(revision 9367)
@@ -56,5 +56,5 @@
 #MPointingDevCalc.MaxAge       1.0
 
-MPointingDevCalc.PointingModels: 1 81855 83722 89180 267253 291104
+MPointingDevCalc.PointingModels: 1 81855 83722 89180 267253 291104 328198
 
 # -------------------------------------------------------------------------
Index: trunk/MagicSoft/Mars/ganymed_wobble.rc
===================================================================
--- trunk/MagicSoft/Mars/ganymed_wobble.rc	(revision 9366)
+++ trunk/MagicSoft/Mars/ganymed_wobble.rc	(revision 9367)
@@ -56,5 +56,5 @@
 #MPointingDevCalc.MaxAge       1.0
 
-MPointingDevCalc.PointingModels: 1 81855 83722 89180 267253 291104
+MPointingDevCalc.PointingModels: 1 81855 83722 89180 267253 291104 328198
 
 # -------------------------------------------------------------------------
Index: trunk/MagicSoft/Mars/mbase/MSpline3.h
===================================================================
--- trunk/MagicSoft/Mars/mbase/MSpline3.h	(revision 9366)
+++ trunk/MagicSoft/Mars/mbase/MSpline3.h	(revision 9367)
@@ -54,5 +54,5 @@
    Int_t GetNp() const { return fNp; }
 
-   TH1 *GetHistogram() const { return fHistogram; }
+   TH1 *GetHistogram() const { return (TH1*)fHistogram; }
 
    ClassDef(MSpline3, 1) // An extension of the TSpline3
Index: trunk/MagicSoft/Mars/melectronics/MPulseShape.cc
===================================================================
--- trunk/MagicSoft/Mars/melectronics/MPulseShape.cc	(revision 9366)
+++ trunk/MagicSoft/Mars/melectronics/MPulseShape.cc	(revision 9367)
@@ -33,4 +33,5 @@
 
 #include <TF1.h>
+#include <TH1.h>
 
 #include "MLog.h"
Index: trunk/MagicSoft/Mars/mhflux/MAlphaFitter.cc
===================================================================
--- trunk/MagicSoft/Mars/mhflux/MAlphaFitter.cc	(revision 9366)
+++ trunk/MagicSoft/Mars/mhflux/MAlphaFitter.cc	(revision 9367)
@@ -115,5 +115,5 @@
     {
     case kGauss:
-        fFunc=new TF1("", MString::Format("gaus(0) + pol%d(3)", fPolynomOrder));
+        fFunc=new TF1("", MString::Format("gaus(0) + pol%d(3)", fPolynomOrder).Data());
         break;
     case kThetaSq:
@@ -417,5 +417,5 @@
     /*
      cout << MMath::SignificanceLiMaSigned(hon.Integral(1, bin), fit.GetEventsBackground()/sc, sc) << " ";
-     cout << sc << " ";
+     cout << sc << " " << fit.GetEventsBackground() << " ";
      cout << fit.fChiSqBg << endl;
      */
@@ -847,4 +847,8 @@
             return 0;
         return -GetSignificance()*TMath::Log10(GetEventsExcess());
+    case kSignificanceSqrtExcess:
+        if (GetEventsExcess()<1)
+            return 0;
+        return -GetSignificance()*TMath::Sqrt(GetEventsExcess());
     case kSignificanceExcess:
         return -GetSignificance()*GetEventsExcess();
Index: trunk/MagicSoft/Mars/mhflux/MAlphaFitter.h
===================================================================
--- trunk/MagicSoft/Mars/mhflux/MAlphaFitter.h	(revision 9366)
+++ trunk/MagicSoft/Mars/mhflux/MAlphaFitter.h	(revision 9367)
@@ -30,4 +30,5 @@
         kSignificanceChi2,
         kSignificanceLogExcess,
+        kSignificanceSqrtExcess,
         kSignificanceExcess,
         kExcess,
Index: trunk/MagicSoft/Mars/mhflux/MHFalseSource.cc
===================================================================
--- trunk/MagicSoft/Mars/mhflux/MHFalseSource.cc	(revision 9366)
+++ trunk/MagicSoft/Mars/mhflux/MHFalseSource.cc	(revision 9367)
@@ -1,4 +1,4 @@
 /* ======================================================================== *\
-! $Name: not supported by cvs2svn $:$Id: MHFalseSource.cc,v 1.25 2009-02-07 20:47:33 tbretz Exp $
+! $Name: not supported by cvs2svn $:$Id: MHFalseSource.cc,v 1.26 2009-03-01 12:51:03 tbretz Exp $
 ! --------------------------------------------------------------------------
 !
@@ -1189,6 +1189,6 @@
         }
 
-        TF1 f1("f1", MString::Format("gaus(0) + pol%d(3)", fHistOff ? 0 : polynom), 0, 90);
-        TF1 f2("f2", MString::Format("gaus(0) + pol%d(3)", fHistOff ? 0 : polynom), 0, 90);
+        TF1 f1("f1", MString::Format("gaus(0) + pol%d(3)", fHistOff ? 0 : polynom).Data(), 0, 90);
+        TF1 f2("f2", MString::Format("gaus(0) + pol%d(3)", fHistOff ? 0 : polynom).Data(), 0, 90);
         f1.SetParameters(maxpar.GetArray());
         f2.SetParameters(maxpar.GetArray());
Index: trunk/MagicSoft/Mars/mhist/MHCamera.cc
===================================================================
--- trunk/MagicSoft/Mars/mhist/MHCamera.cc	(revision 9366)
+++ trunk/MagicSoft/Mars/mhist/MHCamera.cc	(revision 9367)
@@ -1,4 +1,4 @@
 /* ======================================================================== *\
-! $Name: not supported by cvs2svn $:$Id: MHCamera.cc,v 1.117 2009-02-12 20:05:06 tbretz Exp $
+! $Name: not supported by cvs2svn $:$Id: MHCamera.cc,v 1.118 2009-03-01 12:51:03 tbretz Exp $
 ! --------------------------------------------------------------------------
 !
@@ -2245,8 +2245,8 @@
     const Double_t width = xmax-xmin;
 
-    const TString dgausformula = "([0]-[3])/[2]*exp(-0.5*(x-[1])*(x-[1])/[2]/[2])"
+    const char *dgausformula = "([0]-[3])/[2]*exp(-0.5*(x-[1])*(x-[1])/[2]/[2])"
         "+[3]/[5]*exp(-0.5*(x-[4])*(x-[4])/[5]/[5])";
 
-    const TString tgausformula = "([0]-[3]-[6])/[2]*exp(-0.5*(x-[1])*(x-[1])/[2]/[2])"
+    const char *tgausformula = "([0]-[3]-[6])/[2]*exp(-0.5*(x-[1])*(x-[1])/[2]/[2])"
         "+[3]/[5]*exp(-0.5*(x-[4])*(x-[4])/[5]/[5])"
         "+[6]/[8]*exp(-0.5*(x-[7])*(x-[7])/[8]/[8])";
Index: trunk/MagicSoft/Mars/mjobs/MJSpectrum.cc
===================================================================
--- trunk/MagicSoft/Mars/mjobs/MJSpectrum.cc	(revision 9366)
+++ trunk/MagicSoft/Mars/mjobs/MJSpectrum.cc	(revision 9367)
@@ -1936,5 +1936,5 @@
 
     // Spectrum fitted (convert res[1] from TeV to GeV)
-    TF1 flx("flx", MString::Format("%e*pow(x/500, %f)", res[1]/500, res[0]));
+    TF1 flx("flx", MString::Format("%e*pow(x/500, %f)", res[1]/500, res[0]).Data());
 
     // Number of events this spectrum would produce per s and m^2
Index: trunk/MagicSoft/Mars/msim/MHPhotonEvent.cc
===================================================================
--- trunk/MagicSoft/Mars/msim/MHPhotonEvent.cc	(revision 9366)
+++ trunk/MagicSoft/Mars/msim/MHPhotonEvent.cc	(revision 9367)
@@ -266,5 +266,5 @@
     MH::FindGoodLimits(num, num, xmin, xmax, kTRUE);
 
-    MBinning(abs(num), xmin-.5, xmax-.5).Apply(fHistWL);
+    MBinning(TMath::Abs(num), xmin-.5, xmax-.5).Apply(fHistWL);
 
     return kTRUE;
Index: trunk/MagicSoft/Mars/msim/MSimPointingPos.cc
===================================================================
--- trunk/MagicSoft/Mars/msim/MSimPointingPos.cc	(revision 9366)
+++ trunk/MagicSoft/Mars/msim/MSimPointingPos.cc	(revision 9367)
@@ -92,4 +92,43 @@
 }
 
+// --------------------------------------------------------------------------
+//
+// Get the distance from the real source to the poitning position.
+//
+Double_t MSimPointingPos::GetOffTargetDistance() const
+{
+    return fOffTargetDistance==0 ? 0 : fOffTargetDistance*TMath::RadToDeg();
+}
+
+// --------------------------------------------------------------------------
+//
+// Get the phi angle counted from the upward direction the source position
+// is rotated. distance from the real source to the pointing position.
+// A negative value refers to a random distribution.
+//
+Double_t MSimPointingPos::GetOffTargetPhi() const
+{
+    return fOffTargetPhi<0 ? -1 : fOffTargetPhi*TMath::RadToDeg();
+}
+
+// --------------------------------------------------------------------------
+//
+// Set fOffTargetDistance, see also GetOffTargetDistance
+//
+void MSimPointingPos::SetOffTargetDistance(Double_t d)
+{
+    fOffTargetDistance = d==0 ? 0 : d*TMath::DegToRad();
+}
+
+// --------------------------------------------------------------------------
+//
+// Set fOffTargetPhi, see also GetOffTargetPhi
+//
+void MSimPointingPos::SetOffTargetPhi(Double_t p)
+{
+    fOffTargetPhi = p<0 ? -1 : p*TMath::DegToRad();
+}
+
+
 
 // --------------------------------------------------------------------------
@@ -153,5 +192,5 @@
     {
         dtheta = fOffTargetDistance;
-        dphi   = fOffTargetPhi>0 ? fOffTargetPhi : gRandom->Uniform(TMath::TwoPi());
+        dphi   = fOffTargetPhi>=0 ? fOffTargetPhi : gRandom->Uniform(TMath::TwoPi());
     }
     else
Index: trunk/MagicSoft/Mars/msim/MSimPointingPos.h
===================================================================
--- trunk/MagicSoft/Mars/msim/MSimPointingPos.h	(revision 9366)
+++ trunk/MagicSoft/Mars/msim/MSimPointingPos.h	(revision 9367)
@@ -36,10 +36,10 @@
 
     // Getter
-    Double_t GetOffTargetDistance() const { return fOffTargetDistance==0 ? 0 : fOffTargetDistance*TMath::RadToDeg(); }
-    Double_t GetOffTargetPhi() const { return fOffTargetPhi*TMath::RadToDeg(); }
+    Double_t GetOffTargetDistance() const;
+    Double_t GetOffTargetPhi() const;
 
     // Setter
-    void SetOffTargetDistance(Double_t d=0) { fOffTargetDistance = d==0 ? 0 : d*TMath::DegToRad(); }
-    void SetOffTargetPhi(Double_t p=0) { fOffTargetPhi = p*TMath::DegToRad(); }
+    void SetOffTargetDistance(Double_t d=0);
+    void SetOffTargetPhi(Double_t p=-1);
 
     // MSimPointingPos