Changeset 7784 for trunk


Ignore:
Timestamp:
07/11/06 16:46:32 (18 years ago)
Author:
tbretz
Message:
*** empty log message ***
Location:
trunk/MagicSoft/Mars
Files:
12 edited

Legend:

Unmodified
Added
Removed

  • trunk/MagicSoft/Mars/Changelog

    r7780 r7784  
    1818
    1919                                                 -*-*- END OF LINE -*-*-
     20
     21 2006/07/11 Thomas Bretz
     22
     23   *  mbase/MStatusArray.cc, mdata/MDataChain.cc, mdata/MDataFormula.cc,
     24      mhflux/MMcSpectrumWeight.cc, mimage/MHillasExt.cc, mjobs/MJCut.cc,
     25      msignal/MExtractTimeAndChargeDigitalFilter.cc,
     26      mranforest/MRanForestCalc.cc:
     27     - fixed some compiler warning of the kind
     28         ambiguous overload for `Bool_t ? const char[14] : const TString &'
     29       to make gcc 2.95.3 happy (used to get cosy working with the
     30       latest Mars version)
     31
     32   * mastro/MAstroCamera.cc:
     33     - removed path from include
     34   
     35   * mastro/Makefile:
     36     - added directory for MHCamera
     37
     38   * mhflux/MHThetaSqN.cc:
     39      - removed the const-qualifier from the static_cast when setting
     40        tghe MParameterD
     41
     42
    2043
    2144 2006/07/06 Thomas Bretz

  • trunk/MagicSoft/Mars/mastro/MAstroCamera.cc

    r6979 r7784  
    9090#include "MObservatory.h"
    9191
    92 #include "../mhist/MHCamera.h" // FIXME: This dependancy is very bad!
     92#include "MHCamera.h" // FIXME: This dependancy is very bad!
    9393                      // HOW TO GET RID OF IT? Move MHCamera to mgeom?
    9494

  • trunk/MagicSoft/Mars/mastro/Makefile

    r4977 r7784  
    1919#  connect the include files defined in the config.mk file
    2020#
    21 INCLUDES =  -I. -I../mbase -I../mgeom -I../mtemp -I../mstarcam
     21INCLUDES =  -I. -I../mbase -I../mgeom -I../mtemp -I../mstarcam -I../mhist
    2222# mgeom (MAstroCamera): MGeomCam, MGeomMirror
    2323

  • trunk/MagicSoft/Mars/mbase/MStatusArray.cc

    r6976 r7784  
    241241
    242242        if (o->InheritsFrom(TVirtualPad::Class()))
    243             PrintObjectsInPad(((TVirtualPad*)o)->GetListOfPrimitives(), print?"":name, lvl+1);
     243            PrintObjectsInPad(((TVirtualPad*)o)->GetListOfPrimitives(), print?TString():name, lvl+1);
    244244    }
    245245}

  • trunk/MagicSoft/Mars/mdata/MDataChain.cc

    r7142 r7784  
    832832TString MDataChain::GetDataMember() const
    833833{
    834     return fMember ? fMember->GetDataMember() : "";
     834    return fMember ? fMember->GetDataMember() : TString();
    835835}
    836836

  • trunk/MagicSoft/Mars/mdata/MDataFormula.cc

    r7421 r7784  
    140140    fFormula = new TFormula;
    141141    // Must have a name otherwise all axis labels disappear like a miracle
    142     fFormula->SetName(fName.IsNull()?"TFormula":fName);
     142    fFormula->SetName(fName.IsNull()?"TFormula":fName.Data());
    143143
    144144    if (fFormula->Compile(txt))

  • trunk/MagicSoft/Mars/mhflux/MHThetaSqN.cc

    r7775 r7784  
    198198void MHThetaSqN::SetVal(Double_t val)
    199199{
    200     static_cast<const MParameterD*>(fParameter)->SetVal(val);
     200    static_cast<MParameterD*>(fParameter)->SetVal(val);
    201201}
    202202

  • trunk/MagicSoft/Mars/mhflux/MMcSpectrumWeight.cc

    r7688 r7784  
    225225TString MMcSpectrumWeight::GetFormulaSpecNew() const
    226226{
    227     TString str = fFormula.IsNull() ? Form("pow(%s.fEnergy, %.3f)", fNameMcEvt.Data(), fNewSlope) : fFormula;
     227    TString str = fFormula.IsNull() ? Form("pow(%s.fEnergy, %.3f)", fNameMcEvt.Data(), fNewSlope) : fFormula.Data();
    228228    if (!fFormula.IsNull())
    229229        str.ReplaceAll("X", Form("(%s.fEnergy)", fNameMcEvt.Data()));

  • trunk/MagicSoft/Mars/mimage/MHillasExt.cc

    r7538 r7784  
    263263    const TString name(opt);
    264264
    265     const MHillas *hil = dynamic_cast<const MHillas*>(gPad->FindObject(name.IsNull() ? "MHillas" : name));
     265    const MHillas *hil = dynamic_cast<const MHillas*>(gPad->FindObject(name.IsNull() ? "MHillas" : name.Data()));
    266266    if (!hil)
    267267        return;

  • trunk/MagicSoft/Mars/mjobs/MJCut.cc

    r7753 r7784  
    411411MH *MJCut::CreateNewHistFS(MParList &plist, const char *name) const
    412412{
    413     const TString cname(fNameHistFS.IsNull()?"MHFalseSource":fNameHistFS);
     413    const TString cname(fNameHistFS.IsNull()?"MHFalseSource":fNameHistFS.Data());
    414414
    415415    TClass *cls = gROOT->GetClass(cname);

  • trunk/MagicSoft/Mars/mranforest/MRanForestCalc.cc

    r7780 r7784  
    137137    // last entry of your rules
    138138    MDataArray rules(usedrules);
    139     rules.AddEntry(ver<3?"Classification":dcol[ncols-1].GetRule());
     139    rules.AddEntry(ver<3?"Classification":dcol[ncols-1].GetRule().Data());
    140140
    141141    // prepare train-matrix finally used

  • trunk/MagicSoft/Mars/msignal/MExtractTimeAndChargeDigitalFilter.cc

    r7430 r7784  
    12961296    *fLog << " Window Size HiGain: " << fWindowSizeHiGain        << "  LoGain: " << fWindowSizeLoGain << endl;
    12971297    *fLog << " Binning Res HiGain: " << fBinningResolutionHiGain << "  LoGain: " << fBinningResolutionHiGain << endl;
    1298     *fLog << " Weights File desired: " << (fNameWeightsFile.IsNull()?"-":fNameWeightsFile) << endl;
     1298    *fLog << " Weights File desired: " << (fNameWeightsFile.IsNull()?"-":fNameWeightsFile.Data()) << endl;
    12991299    if (!fNameWeightsFileSet.IsNull())
    13001300        *fLog << " Weights File set:     " << fNameWeightsFileSet << endl;
Note: See TracChangeset for help on using the changeset viewer.