Changeset 9551 for trunk/MagicSoft/Cosy


Ignore:
Timestamp:
02/23/10 10:25:15 (15 years ago)
Author:
tbretz
Message:
*** empty log message ***
Location:
trunk/MagicSoft/Cosy
Files:
7 edited

Legend:

Unmodified
Added
Removed

  • trunk/MagicSoft/Cosy/Changelog

    r9550 r9551  
    2727     - added new arguments to CELEST command
    2828     - added new MOON command
     29
     30   * Makefile.conf.linux:
     31     - removed Wconversion option
     32
     33   * caos/Leds.h, caos/Rings.h:
     34     - overloaded some more Print members to get rid of some warnings
     35
     36   * gui/MGCoordinate.h:
     37     - renamed an argument to get rid of a compiler warning
     38
     39   * tpoint/TPointGui.cc:
     40     - include TMath
     41     - return "" instead of 0 when TString is needed
    2942
    3043

  • trunk/MagicSoft/Cosy/Makefile.conf.linux

    r8809 r9551  
    1717#  ----->>>   settings for compilation
    1818#
    19 OPTIM    = -O5 -Wall -fno-exceptions -fPIC -Wpointer-arith -Wcast-align -Wconversion
     19OPTIM    = -O5 -Wall -fno-exceptions -fPIC -Wpointer-arith -Wcast-align
    2020OPTIMC   = $(OPTIM) -pedantic
    2121OPTIMCXX = $(OPTIM) -Woverloaded-virtual

  • trunk/MagicSoft/Cosy/caos/Leds.h

    r7787 r9551  
    3131    void Print(Option_t *o1, Option_t *o2) const { TClonesArray::Print(o1, o2); }
    3232
    33     ClassDef(Leds, 1)
     33    void Print(const Option_t*, Int_t) const { }
     34    void Print(const Option_t*, const char*, Int_t) const { }
     35    void Print(const Option_t*, TPRegexp&, Int_t) const { }
     36
     37ClassDef(Leds, 1)
    3438};
    3539

  • trunk/MagicSoft/Cosy/caos/Rings.h

    r9435 r9551  
    3030    void Print(Option_t *o1, Option_t *o2) const { TClonesArray::Print(o1, o2); }
    3131
     32    void Print(const Option_t*, Int_t) const { }
     33    void Print(const Option_t*, const char*, Int_t) const { }
     34    void Print(const Option_t*, TPRegexp&, Int_t) const { }
     35
    3236    const Ring &operator()(int i) const { return *(Ring*)At(i); }
    3337    Ring &operator()(int i) { return *(Ring*)At(i); }

  • trunk/MagicSoft/Cosy/gui/MGCoordinate.h

    r8376 r9551  
    4545    void   Set(TGLabel     *label, const Int_t val);
    4646    void   Set(TGTextEntry *entry, const Int_t val);
    47     Bool_t Set(TGLabel     *label, Int_t &val, TGTextEntry *label);
     47    Bool_t Set(TGLabel     *label, Int_t &val, TGTextEntry *entry);
    4848
    4949public:

  • trunk/MagicSoft/Cosy/main/MMoonPointing.cc

    r9550 r9551  
    11#include "MMoonPointing.h"
    22
     3#include <TMath.h>
    34#include <TFile.h>
    45

  • trunk/MagicSoft/Cosy/tpoint/TPointGui.cc

    r9495 r9551  
    1818#include <TF1.h>
    1919#include <TH2.h>
     20#include <TMath.h>
    2021#include <TMinuit.h>
    2122#include <TProfile.h>
    … …  
    607608
    608609    if (!fi.fFilename)
    609         return 0;
     610        return "";
    610611
    611612    dir = fi.fIniDir;
Note: See TracChangeset for help on using the changeset viewer.