Changeset 1276

Timestamp:

04/15/02 13:13:25 (23 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars

Files:

• Changelog (modified) (1 diff)
• mfilter/MFAlpha.cc (modified) (1 diff)
• mfilter/MFAlpha.h (modified) (1 diff)
• mgui/MGeomCam.cc (modified) (1 diff)
• mhist/MH.cc (modified) (6 diffs)

trunk/MagicSoft/Mars/Changelog

@@ -1 +1 @@
                                                                   -*-*- END -*-*-
+
+ 2002/04/15: Thomas Bretz
+
+   * mgui/MGeomCam.cc:
+     - Added SetReadyToSave to Constructor
+
+   * mhist/MH.cc:
+     - Added some #ifdef conditionals for a fix in root
+
+   * mfilter/MFAlpha.[h,cc]:
+     - made IsExpressionTrue inline
+
+
 
  2002/04/05: Thomas Bretz

trunk/MagicSoft/Mars/mfilter/MFAlpha.cc

@@ -79 +79 @@
 // --------------------------------------------------------------------------
 //
-Bool_t MFAlpha::IsExpressionTrue() const
-{
-    return fResult;
-}
-
-// --------------------------------------------------------------------------
-//
 Bool_t MFAlpha::PreProcess(MParList *pList)
 {

trunk/MagicSoft/Mars/mfilter/MFAlpha.h

@@ -36 +36 @@
             const char *name=NULL, const char *title=NULL);
 
-    Bool_t IsExpressionTrue() const;
+    Bool_t IsExpressionTrue() const { return fResult; }
     Bool_t PreProcess(MParList *pList);
     Bool_t Process();

trunk/MagicSoft/Mars/mgui/MGeomCam.cc

@@ -64 +64 @@
     for (UInt_t i=0; i<npix; i++)
         (*fPixels)[i] = new MGeomPix;
+
+    SetReadyToSave();
 }
 

trunk/MagicSoft/Mars/mhist/MH.cc

@@ -121 +121 @@
     TAxis &x = *h->GetXaxis();
 
+#if ROOT_VERSION_CODE < ROOT_VERSION(3,03,03)
     TString xtitle = x.GetTitle();
+#endif
 
     //
@@ -135 +137 @@
     //
     x.Set(binsx->GetNumBins(), binsx->GetEdges());
+#if ROOT_VERSION_CODE < ROOT_VERSION(3,03,03)
     x.SetTitle(xtitle);
+#endif
 }
 
@@ -146 +150 @@
     // Another strange behaviour: TAxis::Set deletes the axis title!
     //
+#if ROOT_VERSION_CODE < ROOT_VERSION(3,03,03)
     TString xtitle = x.GetTitle();
     TString ytitle = y.GetTitle();
+#endif
 
     //
@@ -163 +169 @@
     x.Set(binsx->GetNumBins(), binsx->GetEdges());
     y.Set(binsy->GetNumBins(), binsy->GetEdges());
+#if ROOT_VERSION_CODE < ROOT_VERSION(3,03,03)
     x.SetTitle(xtitle);
     y.SetTitle(ytitle);
+#endif
 }
 
@@ -176 +184 @@
     TAxis &z = *h->GetZaxis();
 
+#if ROOT_VERSION_CODE < ROOT_VERSION(3,03,03)
     TString xtitle = x.GetTitle();
     TString ytitle = y.GetTitle();
     TString ztitle = z.GetTitle();
+#endif
 
     //
@@ -196 +206 @@
     y.Set(binsy->GetNumBins(), binsy->GetEdges());
     z.Set(binsz->GetNumBins(), binsz->GetEdges());
+#if ROOT_VERSION_CODE < ROOT_VERSION(3,03,03)
     x.SetTitle(xtitle);
     y.SetTitle(ytitle);
     z.SetTitle(ztitle);
+#endif
 }