Changeset 5832 for trunk/MagicSoft/Mars/mbase

Timestamp:

01/14/05 10:23:13 (20 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars/mbase

Files:

• BaseLinkDef.h (modified) (1 diff)
• MEvtLoop.cc (modified) (1 diff)
• MEvtLoop.h (modified) (1 diff)
• MMath.cc (modified) (1 diff)
• MMath.h (modified) (1 diff)

trunk/MagicSoft/Mars/mbase/BaseLinkDef.h

@@ -20 +20 @@
 
 // Basic Tools
-#pragma link C++ class MMath+;
+#pragma link C++ namespace MMath;
 #pragma link C++ class MString+;
 #pragma link C++ class MIter+;

trunk/MagicSoft/Mars/mbase/MEvtLoop.cc

@@ -883 +883 @@
 //        file.Close();
 //
-Int_t MEvtLoop::Write(const char *name, Int_t option, Int_t bufsize)
+Int_t MEvtLoop::Write(const char *name, Int_t option, Int_t bufsize) const
 {
     if (!gFile)

trunk/MagicSoft/Mars/mbase/MEvtLoop.h

@@ -74 +74 @@
 
     Int_t Read(const char *name="Evtloop");
-    Int_t Write(const char *name="Evtloop", Int_t option=0, Int_t bufsize=0);
+    Int_t Write(const char *name="Evtloop", Int_t option=0, Int_t bufsize=0) const;
+    Int_t Write(const char *name="Evtloop", Int_t option=0, Int_t bufsize=0)
+    {
+        return const_cast<MEvtLoop*>(this)->Write(name, option, bufsize);
+    }
 
     void Print(Option_t *opt="") const;

trunk/MagicSoft/Mars/mbase/MMath.cc

@@ -30 +30 @@
 #include "MMath.h"
 
-ClassImp(MMath);
-
-using namespace std;
+using namespace TMath;
 
 // --------------------------------------------------------------------------

trunk/MagicSoft/Mars/mbase/MMath.h

@@ -9 +9 @@
 #endif
 
-class MMath : public TMath
+namespace MMath
 {
-public:
-    static Double_t GaussProb(Double_t x, Double_t sigma, Double_t mean=0);
+    Double_t GaussProb(Double_t x, Double_t sigma, Double_t mean=0);
 
-    static Double_t Significance(Double_t s, Double_t b);
-    static Double_t SignificanceSym(Double_t s, Double_t b);
-    static Double_t SignificanceLiMa(Double_t s, Double_t b, Double_t alpha=1);
-    static Double_t SignificanceLiMaSigned(Double_t s, Double_t b, Double_t alpha=1);
+    Double_t Significance(Double_t s, Double_t b);
+    Double_t SignificanceSym(Double_t s, Double_t b);
+    Double_t SignificanceLiMa(Double_t s, Double_t b, Double_t alpha=1);
+    Double_t SignificanceLiMaSigned(Double_t s, Double_t b, Double_t alpha=1);
 
-    static TVector3 GetParab(const TVector3 &x, const TVector3 &y);
-    static Double_t InterpolParabLin(const TVector3 &vx, const TVector3 &vy, Double_t x);
-    static Double_t InterpolParabLog(const TVector3 &vx, const TVector3 &vy, Double_t x);
-    static Double_t InterpolParabCos(const TVector3 &vx, const TVector3 &vy, Double_t x);
-
-    ClassDef(MMath, 0)
-};
+    TVector3 GetParab(const TVector3 &x, const TVector3 &y);
+    Double_t InterpolParabLin(const TVector3 &vx, const TVector3 &vy, Double_t x);
+    Double_t InterpolParabLog(const TVector3 &vx, const TVector3 &vy, Double_t x);
+    Double_t InterpolParabCos(const TVector3 &vx, const TVector3 &vy, Double_t x);
+}
 
 #endif