Changeset 7784 for trunk/MagicSoft/Mars

Timestamp:

07/11/06 16:46:32 (18 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars

Files:

• Changelog (modified) (1 diff)
• mastro/MAstroCamera.cc (modified) (1 diff)
• mastro/Makefile (modified) (1 diff)
• mbase/MStatusArray.cc (modified) (1 diff)
• mdata/MDataChain.cc (modified) (1 diff)
• mdata/MDataFormula.cc (modified) (1 diff)
• mhflux/MHThetaSqN.cc (modified) (1 diff)
• mhflux/MMcSpectrumWeight.cc (modified) (1 diff)
• mimage/MHillasExt.cc (modified) (1 diff)
• mjobs/MJCut.cc (modified) (1 diff)
• mranforest/MRanForestCalc.cc (modified) (1 diff)
• msignal/MExtractTimeAndChargeDigitalFilter.cc (modified) (1 diff)

trunk/MagicSoft/Mars/Changelog

@@ -18 +18 @@
 
                                                  -*-*- END OF LINE -*-*-
+
+ 2006/07/11 Thomas Bretz
+
+   *  mbase/MStatusArray.cc, mdata/MDataChain.cc, mdata/MDataFormula.cc,
+      mhflux/MMcSpectrumWeight.cc, mimage/MHillasExt.cc, mjobs/MJCut.cc,
+      msignal/MExtractTimeAndChargeDigitalFilter.cc,
+      mranforest/MRanForestCalc.cc:
+     - fixed some compiler warning of the kind
+         ambiguous overload for `Bool_t ? const char[14] : const TString &'
+       to make gcc 2.95.3 happy (used to get cosy working with the
+       latest Mars version)
+
+   * mastro/MAstroCamera.cc:
+     - removed path from include
+   
+   * mastro/Makefile: 
+     - added directory for MHCamera
+
+   * mhflux/MHThetaSqN.cc:
+      - removed the const-qualifier from the static_cast when setting
+        tghe MParameterD
+
+
 
  2006/07/06 Thomas Bretz

trunk/MagicSoft/Mars/mastro/MAstroCamera.cc

@@ -90 +90 @@
 #include "MObservatory.h"
 
-#include "../mhist/MHCamera.h" // FIXME: This dependancy is very bad!
+#include "MHCamera.h" // FIXME: This dependancy is very bad!
                       // HOW TO GET RID OF IT? Move MHCamera to mgeom?
 

trunk/MagicSoft/Mars/mastro/Makefile

@@ -19 +19 @@
 #  connect the include files defined in the config.mk file
 #
-INCLUDES =  -I. -I../mbase -I../mgeom -I../mtemp -I../mstarcam
+INCLUDES =  -I. -I../mbase -I../mgeom -I../mtemp -I../mstarcam -I../mhist
 # mgeom (MAstroCamera): MGeomCam, MGeomMirror
 

trunk/MagicSoft/Mars/mbase/MStatusArray.cc

@@ -241 +241 @@
 
         if (o->InheritsFrom(TVirtualPad::Class()))
-            PrintObjectsInPad(((TVirtualPad*)o)->GetListOfPrimitives(), print?"":name, lvl+1);
+            PrintObjectsInPad(((TVirtualPad*)o)->GetListOfPrimitives(), print?TString():name, lvl+1);
     }
 }

trunk/MagicSoft/Mars/mdata/MDataChain.cc

@@ -832 +832 @@
 TString MDataChain::GetDataMember() const
 {
-    return fMember ? fMember->GetDataMember() : "";
+    return fMember ? fMember->GetDataMember() : TString();
 }
 

trunk/MagicSoft/Mars/mdata/MDataFormula.cc

@@ -140 +140 @@
     fFormula = new TFormula;
     // Must have a name otherwise all axis labels disappear like a miracle
-    fFormula->SetName(fName.IsNull()?"TFormula":fName);
+    fFormula->SetName(fName.IsNull()?"TFormula":fName.Data());
 
     if (fFormula->Compile(txt))

trunk/MagicSoft/Mars/mhflux/MHThetaSqN.cc

@@ -198 +198 @@
 void MHThetaSqN::SetVal(Double_t val)
 {
-    static_cast<const MParameterD*>(fParameter)->SetVal(val);
+    static_cast<MParameterD*>(fParameter)->SetVal(val);
 }
 

trunk/MagicSoft/Mars/mhflux/MMcSpectrumWeight.cc

@@ -225 +225 @@
 TString MMcSpectrumWeight::GetFormulaSpecNew() const
 {
-    TString str = fFormula.IsNull() ? Form("pow(%s.fEnergy, %.3f)", fNameMcEvt.Data(), fNewSlope) : fFormula;
+    TString str = fFormula.IsNull() ? Form("pow(%s.fEnergy, %.3f)", fNameMcEvt.Data(), fNewSlope) : fFormula.Data();
     if (!fFormula.IsNull())
         str.ReplaceAll("X", Form("(%s.fEnergy)", fNameMcEvt.Data()));

trunk/MagicSoft/Mars/mimage/MHillasExt.cc

@@ -263 +263 @@
     const TString name(opt);
 
-    const MHillas *hil = dynamic_cast<const MHillas*>(gPad->FindObject(name.IsNull() ? "MHillas" : name));
+    const MHillas *hil = dynamic_cast<const MHillas*>(gPad->FindObject(name.IsNull() ? "MHillas" : name.Data()));
     if (!hil)
         return;

trunk/MagicSoft/Mars/mjobs/MJCut.cc

@@ -411 +411 @@
 MH *MJCut::CreateNewHistFS(MParList &plist, const char *name) const
 {
-    const TString cname(fNameHistFS.IsNull()?"MHFalseSource":fNameHistFS);
+    const TString cname(fNameHistFS.IsNull()?"MHFalseSource":fNameHistFS.Data());
 
     TClass *cls = gROOT->GetClass(cname);

trunk/MagicSoft/Mars/mranforest/MRanForestCalc.cc

@@ -137 +137 @@
     // last entry of your rules
     MDataArray rules(usedrules);
-    rules.AddEntry(ver<3?"Classification":dcol[ncols-1].GetRule());
+    rules.AddEntry(ver<3?"Classification":dcol[ncols-1].GetRule().Data());
 
     // prepare train-matrix finally used

trunk/MagicSoft/Mars/msignal/MExtractTimeAndChargeDigitalFilter.cc

@@ -1296 +1296 @@
     *fLog << " Window Size HiGain: " << fWindowSizeHiGain        << "  LoGain: " << fWindowSizeLoGain << endl;
     *fLog << " Binning Res HiGain: " << fBinningResolutionHiGain << "  LoGain: " << fBinningResolutionHiGain << endl;
-    *fLog << " Weights File desired: " << (fNameWeightsFile.IsNull()?"-":fNameWeightsFile) << endl;
+    *fLog << " Weights File desired: " << (fNameWeightsFile.IsNull()?"-":fNameWeightsFile.Data()) << endl;
     if (!fNameWeightsFileSet.IsNull())
         *fLog << " Weights File set:     " << fNameWeightsFileSet << endl;