Changeset 8907 for trunk/MagicSoft/Mars


Ignore:
Timestamp:
06/02/08 09:52:26 (16 years ago)
Author:
tbretz
Message:
*** empty log message ***
Location:
trunk/MagicSoft/Mars
Files:
64 edited

Legend:

Unmodified
Added
Removed

  • trunk/MagicSoft/Mars/manalysis/MEventRate.cc

    r2780 r8907  
    4646#include "MEventRate.h"
    4747
     48#include <TMath.h>
     49
    4850#include "MLog.h"
    4951#include "MLogManip.h"
    … …  
    6264    fTitle = title ? title : "Storage container for the event rate [Hz]";
    6365}
     66
     67Double_t MEventRate::GetError() const
     68{
     69    return TMath::Sqrt(1./fNumEvents);
     70}

  • trunk/MagicSoft/Mars/manalysis/MEventRate.h

    r2779 r8907  
    1717    void SetRate(Double_t r, UInt_t n) { fRate = r; fNumEvents = n; }
    1818    Double_t GetRate() const { return fRate; }
    19     Double_t GetError() const { return TMath::Sqrt(1./fNumEvents); }
     19    Double_t GetError() const;// { return TMath::Sqrt(1./fNumEvents); }
    2020    UInt_t GetNumEvents() const { return fNumEvents; }
    2121

  • trunk/MagicSoft/Mars/manalysis/MMultiDimDistCalc.cc

    r8075 r8907  
    4747#include <fstream>
    4848
     49#include <math.h>
     50
    4951#include <TVector.h>
    5052

  • trunk/MagicSoft/Mars/mars.cc

    r8684 r8907  
     1#include <TClass.h>
    12#include <TApplication.h>
    23

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

    r8765 r8907  
    4444
    4545ClassImp(MAstro);
     46
     47Double_t MAstro::RadToHor()
     48{
     49    return 24/TMath::TwoPi();
     50}
     51
     52Double_t MAstro::HorToRad()
     53{
     54    return TMath::TwoPi()/24;
     55}
    4656
    4757Double_t MAstro::Trunc(Double_t val)

  • trunk/MagicSoft/Mars/mastro/MAstro.h

    r8765 r8907  
    3131    static Double_t HorToDeg()        { return 1./15; }
    3232
    33     static Double_t RadToHor()        { return 24/TMath::TwoPi(); }
    34     static Double_t HorToRad()        { return TMath::TwoPi()/24; }
     33    static Double_t RadToHor(); // { return 24/TMath::TwoPi(); }
     34    static Double_t HorToRad(); // { return TMath::TwoPi()/24; }
    3535
    3636    // Angle/Time conversion functions

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

    r8725 r8907  
    11/* ======================================================================== *\
    2 ! $Name: not supported by cvs2svn $:$Id: MAstroCatalog.cc,v 1.29 2007-09-02 13:53:55 tbretz Exp $
     2! $Name: not supported by cvs2svn $:$Id: MAstroCatalog.cc,v 1.30 2008-06-02 08:46:39 tbretz Exp $
    33! --------------------------------------------------------------------------
    44!
    … …  
    2020!   Author(s): Thomas Bretz, 03/2004 <mailto:tbretz@astro.uni-wuerzburg.de>
    2121!
    22 !   Copyright: MAGIC Software Development, 2002-2005
     22!   Copyright: MAGIC Software Development, 2002-2008
    2323!
    2424!
    … …  
    143143#include <TPaveText.h>  // TPaveText
    144144
    145 #include <TGraph.h>
     145#include <TH1.h>        // TH1F
     146#include <TGraph.h>     // TGraph
    146147
    147148#include "MLog.h"
    … …  
    218219    }
    219220}
     221
     222// --------------------------------------------------------------------------
     223//
     224// Set Radius of FOV using the pixsize [arcsec/pix], width
     225// and height [pixel] of image
     226//
     227void MAstroCatalog::SetRadiusFOV(Double_t pixsize, Double_t w, Double_t h)
     228{
     229    // pixsize [arcsec/pixel]
     230    // w       [pixel]
     231    // h       [pixel]
     232    const Double_t scale = TMath::Hypot(w, h)/2;
     233    SetRadiusFOV(scale*pixsize/3600);
     234}
    220235
    221236// --------------------------------------------------------------------------

  • trunk/MagicSoft/Mars/mastro/MAstroCatalog.h

    r8066 r8907  
    108108    void SetObservatory(const MObservatory &obs);
    109109    void SetLimMag(Double_t mag) { fLimMag=mag; Update(); } // *MENU* *ARGS={mag=>fLimMag}
     110
     111    void SetRadiusFOV(Double_t pixsize, Double_t w, Double_t h);
    110112    void SetRadiusFOV(Double_t deg)
    111113    {
    … …  
    121123        Update();
    122124    } // *MENU* *ARGS={deg=>fRadiusFOV}
    123     void SetRadiusFOV(Double_t pixsize, Double_t w, Double_t h)
    124     {
    125         // pixsize [arcsec/pixel]
    126         // w       [pixel]
    127         // h       [pixel]
    128         const Double_t scale = TMath::Hypot(w, h)/2;
    129         SetRadiusFOV(scale*pixsize/3600);
    130     } // Set Radius of FOV using the pixsize [arcsec/pix], width and height [pixel] of image
    131125
    132126    void     SetRaDec(Double_t ra, Double_t dec) { fRaDec.SetRaDec(ra, dec, 1); Update(); }

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

    r4977 r8907  
    1818!   Author(s): Thomas Bretz, 03/2004 <mailto:tbretz@astro.uni-wuerzburg.de>
    1919!
    20 !   Copyright: MAGIC Software Development, 2002-2004
     20!   Copyright: MAGIC Software Development, 2002-2008
    2121!
    2222!
    … …  
    3333#include <iostream>
    3434
     35#include <TMath.h>
     36
    3537#include "MLog.h"
    3638#include "MLogManip.h"
    … …  
    3941
    4042using namespace std;
     43
     44void MVector3::SetThetaPhiMag(Double_t theta, Double_t phi, Double_t mag)
     45{
     46    SetMagThetaPhi(TMath::Power(10, -mag/2.5), theta, phi);
     47}
     48
     49Double_t MVector3::Magnitude() const
     50{
     51    return -2.5*TMath::Log10(Mag());
     52}
     53
     54void MVector3::SetRaDec(Double_t ra, Double_t dec, Double_t mag)
     55{
     56    fType = kIsRaDec;
     57    SetThetaPhiMag(TMath::Pi()/2-dec, ra, mag);
     58}
     59
     60void MVector3::SetAltAz(Double_t alt, Double_t az, Double_t mag)
     61{
     62    fType = kIsAltAz;
     63    SetThetaPhiMag(TMath::Pi()/2-alt, az, mag);
     64}
    4165
    4266void MVector3::WriteBinary(ostream &out) const

  • trunk/MagicSoft/Mars/mastro/MVector3.h

    r8725 r8907  
    2222    TString fName;
    2323
    24     void SetThetaPhiMag(Double_t theta, Double_t phi, Double_t mag)
    25     {
    26         SetMagThetaPhi(TMath::Power(10, -mag/2.5), theta, phi);
    27     }
     24    void SetThetaPhiMag(Double_t theta, Double_t phi, Double_t mag); // SetMagThetaPhi(TMath::Power(10, -mag/2.5), theta, phi);
    2825
    2926public:
    … …  
    3532    }
    3633    MVector3(const TVector3 &v3) : TVector3(v3) { fType=kIsArbitrary; }
    37     Double_t Magnitude() const { return -2.5*TMath::Log10(Mag()); }
     34    Double_t Magnitude() const;// { return -2.5*TMath::Log10(Mag()); }
    3835
    3936    Bool_t IsValid() const { return fType!=kIsInvalid; }
    4037
    41     void SetRaDec(Double_t ra, Double_t dec, Double_t mag=0)
    42     {
    43         fType = kIsRaDec;
    44         SetThetaPhiMag(TMath::Pi()/2-dec, ra, mag);
    45     }
    46     void SetName(const TString &str) { fName = str.Strip(TString::kBoth); }
     38    void SetRaDec(Double_t ra, Double_t dec, Double_t mag=0); // SetThetaPhiMag(TMath::Pi()/2-dec, ra, mag);
     39    void SetAltAz(Double_t alt, Double_t az, Double_t mag=0); // SetThetaPhiMag(TMath::Pi()/2-alt, az, mag);
    4740    void SetZdAz(Double_t zd, Double_t az, Double_t mag=0)
    4841    {
    … …  
    5043        SetThetaPhiMag(zd, az, mag);
    5144    }
    52     void SetAltAz(Double_t alt, Double_t az, Double_t mag=0)
    53     {
    54         fType = kIsAltAz;
    55         SetThetaPhiMag(TMath::Pi()/2-alt, az, mag);
    56     }
    5745
     46    void SetName(const TString &str) { fName = str.Strip(TString::kBoth); }
    5847    const char *GetName() const { return fName; }
    5948

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

    r7808 r8907  
    1818!   Author(s): Thomas Bretz, 6/2003 <mailto:tbretz@astro.uni-wuerzburg.de>
    1919!
    20 !   Copyright: MAGIC Software Development, 2000-2003
     20!   Copyright: MAGIC Software Development, 2000-2008
    2121!
    2222!
    … …  
    6565#include <iostream>
    6666
     67#include <TList.h>
    6768#include <TNamed.h>
    6869#include <TRegexp.h>

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

    r8741 r8907  
    4949#include <Gtypes.h>
    5050#include <TObjString.h>
     51#include <TObjArray.h>
    5152
    5253#include <TPave.h>
    … …  
    594595    case kFullDotMedium:    val = "fulldotmedium";
    595596    case kFullDotLarge:     val = "fulldotlarge";
    596     case kOpenTriangleDown: val = "opentriangledown";
    597     case kFullCross:        val = "fullcross";
     597//    case kOpenTriangleDown: val = "opentriangledown";
     598//    case kFullCross:        val = "fullcross";
    598599    case kFullCircle:       val = "fullcircle";
    599600    case kFullSquare:       val = "fullsquare";

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

    r6892 r8907  
    1818!   Author(s): Thomas Bretz, 07/2001 <mailto:tbretz@astro.uni-wuerzburg.de>
    1919!
    20 !   Copyright: MAGIC Software Development, 2000-2004
     20!   Copyright: MAGIC Software Development, 2000-2008
    2121!
    2222!
    … …  
    7171/////////////////////////////////////////////////////////////////////////////
    7272#include "MFilter.h"
     73
     74#include <TMath.h>
    7375
    7476#include "MLog.h"

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

    r7808 r8907  
    1818!   Author(s): Thomas Bretz, 05/2004 <mailto:tbretz@astro.uni-wuerzburg.de>
    1919!
    20 !   Copyright: MAGIC Software Development, 2002-2004
     20!   Copyright: MAGIC Software Development, 2002-2008
    2121!
    2222!
    … …  
    3939#include "MGMap.h"
    4040
    41 #include <limits.h>  // INT_MAX
     41//#include <limits.h>  // INT_MAX
     42
     43#include <TMath.h>
    4244
    4345#include <TPad.h>    // gPad, TPad::GetMaxDistance()

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

    r2206 r8907  
    1616!
    1717!
    18 !   Author(s): Thomas Bretz  11/2001 <mailto:tbretz@uni-sw.gwdg.de>
     18!   Author(s): Thomas Bretz  11/2001 <mailto:tbretz@astro.uni-wuerzburg.de>
    1919!
    20 !   Copyright: MAGIC Software Development, 2000-2001
     20!   Copyright: MAGIC Software Development, 2000-2008
    2121!
    2222!
    … …  
    3333#include "MGTask.h"
    3434
     35#include <TClass.h>
    3536#include <TMethod.h>
    3637

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

    r7808 r8907  
    1919!   Author(s): Javier Rico,  4/2004 <mailto:jrico@ifae.es>
    2020!
    21 !   Copyright: MAGIC Software Development, 2000-2004
     21!   Copyright: MAGIC Software Development, 2000-2008
    2222!
    2323!
    … …  
    3535#include "MRunIter.h"
    3636
     37#include <iostream>
     38
     39#include <TMath.h>
    3740#include <TSystem.h>
    38 #include <iostream>
    3941
    4042ClassImp(MRunIter);
    4143
    4244using namespace std;
     45
     46void MRunIter::SortRuns()
     47{
     48    const int n = GetNumRuns();
     49
     50    TArrayI idx(n);
     51    TMath::Sort(n, fRuns.GetArray(), idx.GetArray(), kFALSE);
     52
     53    for (int i=0; i<n; i++)
     54        idx[i] = fRuns[idx[i]];
     55
     56    fRuns = idx;
     57}
    4358
    4459Int_t MRunIter::AddRun(UInt_t run, const char *path)

  • trunk/MagicSoft/Mars/mbase/MRunIter.h

    r5469 r8907  
    2828    }
    2929
    30     void SortRuns()
    31     {
    32         const int n = GetNumRuns();
    33 
    34         TArrayI idx(n);
    35         TMath::Sort(n, fRuns.GetArray(), idx.GetArray(), kFALSE);
    36 
    37         for (int i=0; i<n; i++)
    38             idx[i] = fRuns[idx[i]];
    39 
    40         fRuns = idx;
    41     }
     30    void SortRuns();
    4231
    4332public:

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

    r8642 r8907  
    9898#include <fstream>
    9999
     100#include <TClass.h>
    100101#include <TBaseClass.h> // OverwritesProcess
    101102#include <TStopwatch.h> // TStopwatch

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

    r8765 r8907  
    1818!   Author(s): Thomas Bretz  12/2000 <mailto:tbretz@astro.uni-wuerzburg.de>
    1919!
    20 !   Copyright: MAGIC Software Development, 2000-2003
     20!   Copyright: MAGIC Software Development, 2000-2008
    2121!
    2222!
    … …  
    510510    return fmod(sum, 1)*TMath::TwoPi();//+TMath::TwoPi();
    511511}
     512
     513// --------------------------------------------------------------------------
     514//
     515// Return Day of the week: Sun=0, Mon=1, ..., Sat=6
     516//
     517Byte_t MTime::WeekDay() const
     518{
     519    return TMath::FloorNint(GetMjd()+3)%7;
     520}
    512521
    513522// --------------------------------------------------------------------------

  • trunk/MagicSoft/Mars/mbase/MTime.h

    r8765 r8907  
    2121#include <TTime.h>
    2222#endif
     23
     24#include <TMath.h>
    2325
    2426struct timeval;
    … …  
    131133    UInt_t Month() const    { UShort_t y; Byte_t m, d; GetDate(y,m,d); return m; }
    132134    UInt_t Day() const      { UShort_t y; Byte_t m, d; GetDate(y,m,d); return d; }
    133     Byte_t WeekDay() const  { return TMath::Nint(TMath::Floor(GetMjd()+3))%7; } // Return Day of the week: Sun=0, Mon=1, ..., Sat=6
     135    Byte_t WeekDay() const; // { return TMath::FloorNint(GetMjd()+3)%7; } // Return Day of the week: Sun=0, Mon=1, ..., Sat=6
    134136    UInt_t Hour() const     { Byte_t h, m, s; GetTime(h,m,s); return h; }
    135137    UInt_t Min() const      { Byte_t h, m, s; GetTime(h,m,s); return m; }

  • trunk/MagicSoft/Mars/mcalib/MCalibrationBlindPix.cc

    r8106 r8907  
    11/* ======================================================================== *\
    2 ! $Name: not supported by cvs2svn $:$Id: MCalibrationBlindPix.cc,v 1.15 2006-10-17 17:15:59 tbretz Exp $
     2! $Name: not supported by cvs2svn $:$Id: MCalibrationBlindPix.cc,v 1.16 2008-06-02 08:46:44 tbretz Exp $
    33! --------------------------------------------------------------------------
    44!
    … …  
    5656#include "MCalibrationBlindPix.h"
    5757
     58#include <TMath.h>
    5859#include <TH1.h>
    5960

  • trunk/MagicSoft/Mars/mcalib/MCalibrationChargeCalc.cc

    r8644 r8907  
    11/* ======================================================================== *\
    2 ! $Name: not supported by cvs2svn $:$Id: MCalibrationChargeCalc.cc,v 1.183 2007-07-24 13:36:35 tbretz Exp $
     2! $Name: not supported by cvs2svn $:$Id: MCalibrationChargeCalc.cc,v 1.184 2008-06-02 08:46:44 tbretz Exp $
    33! --------------------------------------------------------------------------
    44!
    … …  
    261261const Float_t MCalibrationChargeCalc::fgUnsuitablesLimit       = 0.1;
    262262const Float_t MCalibrationChargeCalc::fgUnreliablesLimit       = 0.3;
    263 const TString MCalibrationChargeCalc::fgNamePedestalCam = "MPedestalCam";
     263
     264const char *MCalibrationChargeCalc::fgNamePedestalCam = "MPedestalCam";
    264265
    265266

  • trunk/MagicSoft/Mars/mcalib/MCalibrationChargeCalc.h

    r8478 r8907  
    4949  static const Float_t fgUnreliablesLimit;     //! Default for fUnreliableLimit    (now set to: 0.3)
    5050 
    51   static const TString fgNamePedestalCam;      //! "MPedestalCam"
     51  static const char *fgNamePedestalCam;      //! "MPedestalCam"
    5252 
    5353  // Variables
    … …  
    213213  void SetExternalNumPhes      ( const Float_t f=0.                       ) { fExternalNumPhes       = f; }
    214214  void SetExternalNumPhesRelVar( const Float_t f=0.                       ) { fExternalNumPhesRelVar = f; } 
    215   void SetNamePedestalCam      ( const char *name=fgNamePedestalCam.Data()) { fNamePedestalCam    = name; }
     215  void SetNamePedestalCam      ( const char *name=fgNamePedestalCam       ) { fNamePedestalCam    = name; }
    216216  void SetPheErrLowerLimit     ( const Float_t f=fgPheErrLowerLimit       ) { fPheErrLowerLimit  = f;    }
    217217  void SetPheErrUpperLimit     ( const Float_t f=fgPheErrUpperLimit       ) { fPheErrUpperLimit  = f;    }   

  • trunk/MagicSoft/Mars/mcalib/MCalibrationPix.cc

    r5916 r8907  
    4343#include "MCalibrationPix.h"
    4444
     45#include <TMath.h>
     46
    4547ClassImp(MCalibrationPix);
    4648

  • trunk/MagicSoft/Mars/mcalib/MCalibrationQEPix.cc

    r7829 r8907  
    183183#include "MCalibrationQEPix.h"
    184184
     185#include <TMath.h>
     186
    185187#include "MLog.h"
    186188#include "MLogManip.h"

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

    r7784 r8907  
    168168#include <stdlib.h>       // strtod, ...
    169169
     170#include <TMath.h>
     171#include <TClass.h>
    170172#include <TRegexp.h>
    171173#include <TRandom.h>

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

    r8073 r8907  
    3131#include "MDataList.h"
    3232
     33#include <math.h>
     34
    3335#include "MLog.h"
    3436#include "MLogManip.h"

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

    r8719 r8907  
    1818!   Author(s): Thomas Bretz, 04/2004 <mailto:tbretz@astro.uni-wuerzburg.de>
    1919!
    20 !   Copyright: MAGIC Software Development, 2000-2006
     20!   Copyright: MAGIC Software Development, 2000-2008
    2121!
    2222!
    … …  
    111111#include "MDataPhrase.h"
    112112
     113#include <TMath.h>
    113114#include <TArrayI.h>
    114115#include <TPRegexp.h>
    … …  
    677678}
    678679
     680// --------------------------------------------------------------------------
     681//
     682// Return the value converted to a Bool_t
     683//
     684Bool_t MDataPhrase::GetBool() const
     685{
     686    return TMath::Nint(GetValue())!=0;
     687}
     688
    679689/*
    680690// --------------------------------------------------------------------------

  • trunk/MagicSoft/Mars/mdata/MDataPhrase.h

    r8704 r8907  
    1616class TFormula;
    1717class MParList;
    18 
    1918
    2019class MDataPhrase : public MData
    … …  
    6059
    6160    // MDataPhrase
    62     Bool_t   GetBool() const { return TMath::Nint(GetValue())!=0; }
     61    Bool_t   GetBool() const;
    6362    Bool_t   SetRule(const TString &phrase);
    6463

  • trunk/MagicSoft/Mars/mfilter/MFEnergySlope.cc

    r7724 r8907  
    4949
    5050#include <fstream>
     51
     52#include <TMath.h>
    5153#include <TRandom.h>
    5254

  • trunk/MagicSoft/Mars/mgeom/MGeomMirror.cc

    r3710 r8907  
    3232#include "MGeomMirror.h"
    3333
     34#include <TMath.h>
    3435#include <TRotation.h>
    3536

  • trunk/MagicSoft/Mars/mgui/MCamEvent.cc

    r7438 r8907  
    3939//////////////////////////////////////////////////////////////////////////////
    4040#include "MCamEvent.h"
     41
     42#include <TMath.h>
    4143
    4244#include "MGeomCam.h"

  • trunk/MagicSoft/Mars/mhbase/MBinning.cc

    r8679 r8907  
    11/* ======================================================================== *\
    2 ! $Name: not supported by cvs2svn $:$Id: MBinning.cc,v 1.18 2007-08-19 21:35:00 tbretz Exp $
     2! $Name: not supported by cvs2svn $:$Id: MBinning.cc,v 1.19 2008-06-02 08:46:47 tbretz Exp $
    33! --------------------------------------------------------------------------
    44!
    … …  
    4646
    4747#include <TH1.h>        // InheritsFrom
     48#include <TMath.h>
    4849
    4950#include "MLog.h"

  • trunk/MagicSoft/Mars/mhbase/MH3.cc

    r8895 r8907  
    150150
    151151#include <TObjString.h>
     152#include <THashList.h>
    152153
    153154//#include <TPad.h>

  • trunk/MagicSoft/Mars/mhbase/MHArray.cc

    r2735 r8907  
    6464#include <TH2.h>
    6565#include <TH3.h>
     66#include <TClass.h>
    6667#include <TStyle.h>
    6768#include <TGaxis.h>

  • trunk/MagicSoft/Mars/mhbase/MHMatrix.cc

    r8075 r8907  
    4949#include <fstream>
    5050
     51#include <TMath.h>
     52
    5153#include <TList.h>
    5254#include <TArrayF.h>

  • trunk/MagicSoft/Mars/mhcalib/MHCalibrationPix.cc

    r8020 r8907  
    4444#include <TH1.h>
    4545#include <TF1.h>
     46#include <TMath.h>
    4647#include <TGraph.h>
    4748

  • trunk/MagicSoft/Mars/mhcalib/MHGausEvents.cc

    r8023 r8907  
    7979#include "MHGausEvents.h"
    8080
     81#include <TMath.h>
    8182#include <TH1.h>
    8283#include <TF1.h>

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

    r8709 r8907  
    3737#include <TF1.h>
    3838#include <TLine.h>
     39#include <TMath.h>
    3940#include <TCanvas.h>
    4041#include <TStyle.h>

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

    r8883 r8907  
    282282Double_t MMcSpectrumWeight::GetSpecNewIntegral(Double_t emin, Double_t emax) const
    283283{
    284     TF1 funcnew("Dummy", GetFormulaSpecNewX());
     284    TF1 funcnew("Dummy", GetFormulaSpecNewX().Data());
    285285    return funcnew.Integral(emin, emax);
    286286}
    … …  
    293293Double_t MMcSpectrumWeight::GetSpecOldIntegral(Double_t emin, Double_t emax) const
    294294{
    295     TF1 funcold("Dummy", GetFormulaSpecOldX());
     295    TF1 funcold("Dummy", GetFormulaSpecOldX().Data());
    296296    return funcold.Integral(emin, emax);
    297297}
    … …  
    304304Double_t MMcSpectrumWeight::CalcSpecNew(Double_t e) const
    305305{
    306     TF1 funcnew("Dummy", GetFormulaSpecNewX());
     306    TF1 funcnew("Dummy", GetFormulaSpecNewX().Data());
    307307    return funcnew.Eval(e);
    308308}
    … …  
    315315Double_t MMcSpectrumWeight::CalcSpecOld(Double_t e) const
    316316{
    317     TF1 funcnew("Dummy", GetFormulaSpecOldX());
     317    TF1 funcnew("Dummy", GetFormulaSpecOldX().Data());
    318318    return funcnew.Eval(e);
    319319}
    … …  
    412412    }
    413413
    414     fFunc = new TF1("", GetFormulaWeightsX());
     414    fFunc = new TF1("", GetFormulaWeightsX().Data());
    415415    gROOT->GetListOfFunctions()->Remove(fFunc);
    416416    fFunc->SetName("SpectralWeighs");

  • trunk/MagicSoft/Mars/mhist/MHCamEventRot.cc

    r5158 r8907  
    5555#include <TF1.h>
    5656#include <TH2.h>
     57#include <TMath.h>
    5758#include <TGraph.h>
    5859#include <TStyle.h>

  • trunk/MagicSoft/Mars/mhist/MHHadronness.cc

    r8022 r8907  
    6464#include "MHHadronness.h"
    6565
     66#include <TH1.h>
    6667#include <TPad.h>
     68#include <TMath.h>
    6769#include <TGraph.h>
    6870#include <TStyle.h>

  • trunk/MagicSoft/Mars/mhist/MHWeather.cc

    r7971 r8907  
    3232#include "MHWeather.h"
    3333
     34#include <TH1.h>
    3435#include <TPad.h>
    3536#include <TCanvas.h>

  • trunk/MagicSoft/Mars/mhvstime/MHPixVsTime.cc

    r8022 r8907  
    4343#include "MHPixVsTime.h"
    4444
     45#include <TH1.h>
    4546#include <TCanvas.h>
    4647

  • trunk/MagicSoft/Mars/mhvstime/MHVsTime.cc

    r8478 r8907  
    7373#include <TCanvas.h>
    7474
     75#include <TH1.h>
    7576#include <TGraphErrors.h>
    7677

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

    r8724 r8907  
    3333#include <TEnv.h>
    3434#include <TFile.h>
     35#include <TClass.h>
    3536
    3637// Environment

  • trunk/MagicSoft/Mars/mjoptim/MJOptimizeCuts.cc

    r8671 r8907  
    8080#include "MJOptimizeCuts.h"
    8181
     82#include <TClass.h>
     83
    8284#include "MHMatrix.h"
    8385

  • trunk/MagicSoft/Mars/mpedestal/MPedestalSubtract.cc

    r8891 r8907  
    11/* ======================================================================== *\
    2 ! $Name: not supported by cvs2svn $:$Id: MPedestalSubtract.cc,v 1.11 2008-05-15 18:37:26 tbretz Exp $
     2! $Name: not supported by cvs2svn $:$Id: MPedestalSubtract.cc,v 1.12 2008-06-02 08:46:54 tbretz Exp $
    33! --------------------------------------------------------------------------
    44!
    … …  
    6767using namespace std;
    6868
    69 const TString MPedestalSubtract::fgNamePedestalCam           = "MPedestalCam";
    70 const TString MPedestalSubtract::fgNamePedestalSubtractedEvt = "MPedestalSubtractedEvt";
     69const char *MPedestalSubtract::fgNamePedestalCam           = "MPedestalCam";
     70const char *MPedestalSubtract::fgNamePedestalSubtractedEvt = "MPedestalSubtractedEvt";
    7171
    7272// --------------------------------------------------------------------------

  • trunk/MagicSoft/Mars/mpedestal/MPedestalSubtract.h

    r8888 r8907  
    1414{
    1515private:
    16     static const TString fgNamePedestalCam;            //! "MPedestalCam"
    17     static const TString fgNamePedestalSubtractedEvt;  //! "MPedestalSubtractedEvt"
     16    static const char *fgNamePedestalCam;            //! "MPedestalCam"
     17    static const char *fgNamePedestalSubtractedEvt;  //! "MPedestalSubtractedEvt"
    1818
    1919    MRawRunHeader          *fRunHeader;      //! Run Header
    … …  
    3535
    3636    void SetPedestalCam(MPedestalCam *pedcam) { fPedestals = pedcam; }
    37     void SetNamePedestalCam(const char *name=fgNamePedestalCam.Data()) { fNamePedestalCam  = name; }
     37    void SetNamePedestalCam(const char *name=fgNamePedestalCam) { fNamePedestalCam  = name; }
    3838
    39     void SetNamePedestalSubtractedEvt(const char *name=fgNamePedestalSubtractedEvt.Data()) { fNamePedestalSubtractedEvt = name; }
     39    void SetNamePedestalSubtractedEvt(const char *name=fgNamePedestalSubtractedEvt) { fNamePedestalSubtractedEvt = name; }
    4040
    4141    ClassDef(MPedestalSubtract, 0)   // Class to subtract pedestal including AB-noise

  • trunk/MagicSoft/Mars/mpointing/MHPointing.cc

    r7971 r8907  
    3737#include "MHPointing.h"
    3838
     39#include <TH1.h>
    3940#include <TPad.h>
    4041#include <TCanvas.h>

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

    r3325 r8907  
    3434#include "MHRanForest.h"
    3535
     36#include <TH1.h>
    3637#include <TPad.h>
     38#include <TMath.h>
    3739#include <TGraph.h>
    3840#include <TStyle.h>

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

    r8203 r8907  
    11/* ======================================================================== *\
    2 ! $Name: not supported by cvs2svn $:$Id: MHRanForestGini.cc,v 1.7 2006-11-02 08:57:00 tbretz Exp $
     2! $Name: not supported by cvs2svn $:$Id: MHRanForestGini.cc,v 1.8 2008-06-02 08:46:43 tbretz Exp $
    33! --------------------------------------------------------------------------
    44!
    … …  
    3636#include "MHRanForestGini.h"
    3737
     38#include <TH1.h>
    3839#include <TPad.h>
    3940#include <TGraph.h>

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

    r8644 r8907  
    11/* ======================================================================== *\
    2 ! $Name: not supported by cvs2svn $:$Id: MRanForest.cc,v 1.27 2007-07-24 13:35:39 tbretz Exp $
     2! $Name: not supported by cvs2svn $:$Id: MRanForest.cc,v 1.28 2008-06-02 08:46:43 tbretz Exp $
    33! --------------------------------------------------------------------------
    44!
    … …  
    4545#include "MRanForest.h"
    4646
     47#include <TMath.h>
    4748#include <TRandom.h>
    4849

  • trunk/MagicSoft/Mars/mreflector/MHReflector.cc

    r8695 r8907  
    3030#include "MHReflector.h"
    3131
     32#include <TMath.h>
    3233#include <TLegend.h>
    3334#include <TCanvas.h>

  • trunk/MagicSoft/Mars/mreflector/MRflEvtHeader.cc

    r8765 r8907  
    3030#include "MRflEvtHeader.h"
    3131
     32#include <TMath.h>
     33
    3234#include "MLog.h"
    3335#include "MLogManip.h"

  • trunk/MagicSoft/Mars/mreflector/MRflSinglePhoton.cc

    r8290 r8907  
    3131/////////////////////////////////////////////////////////////////////////////
    3232#include "MRflSinglePhoton.h"
     33
     34#include <TMath.h>
    3335
    3436#include <TH2.h>

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

    r8358 r8907  
    11/* ======================================================================== *\
    2 ! $Name: not supported by cvs2svn $:$Id: MExtractTime.cc,v 1.24 2007-03-03 22:48:30 tbretz Exp $
     2! $Name: not supported by cvs2svn $:$Id: MExtractTime.cc,v 1.25 2008-06-02 08:46:53 tbretz Exp $
    33! --------------------------------------------------------------------------
    44!
    … …  
    8585using namespace std;
    8686
    87 const TString MExtractTime::fgNameTimeCam  = "MArrivalTimeCam";
     87const char *MExtractTime::fgNameTimeCam = "MArrivalTimeCam";
    8888
    8989// --------------------------------------------------------------------------

  • trunk/MagicSoft/Mars/msignal/MExtractTime.h

    r8154 r8907  
    1313protected:
    1414 
    15   static const TString fgNameTimeCam; //! "MArrivalTimeCam"
     15  static const char *fgNameTimeCam;  //! "MArrivalTimeCam"
    1616  TString  fNameTimeCam;              // Name of the 'MArrivalTimeCam' container
    1717 
    … …  
    3333  void Print(Option_t *o) const; //*MENU*
    3434
    35   void SetNameTimeCam   ( const char *name=fgNameTimeCam.Data()) { fNameTimeCam = name; }
     35  void SetNameTimeCam(const char *name=fgNameTimeCam) { fNameTimeCam = name; }
    3636 
    3737  ClassDef(MExtractTime, 3)   // Arrival Time Extractor Base Class

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

    r8744 r8907  
    119119
    120120const UInt_t  MExtractor::fgSaturationLimit = 245;
    121 const TString MExtractor::fgNameSignalCam   = "MExtractedSignalCam";
     121const char   *MExtractor::fgNameSignalCam   = "MExtractedSignalCam";
    122122const Float_t MExtractor::fgOffsetLoGain    = 1.51;   // 5 ns
    123123

  • trunk/MagicSoft/Mars/msignal/MExtractor.h

    r8502 r8907  
    3232protected:
    3333  static const UInt_t  fgSaturationLimit;  //! Default for fSaturationLimit (now set to: 254)
    34   static const TString fgNameSignalCam;    //! "MExtractedSignalCam"
     34  static const char   *fgNameSignalCam;    //! "MExtractedSignalCam"
    3535 
    3636  Float_t fOffsetLoGain;                   // Offset of the low-gain signal w.r.t. the High-Gain slices
    … …  
    103103  void SetOffsetLoGain    ( const Float_t  f=fgOffsetLoGain          ) { fOffsetLoGain     = f;    }
    104104  void SetSaturationLimit ( const UInt_t lim=fgSaturationLimit       ) { fSaturationLimit  = lim;  }
    105   void SetNameSignalCam   ( const char *name=fgNameSignalCam.Data() ) { fNameSignalCam    = name; }
     105  void SetNameSignalCam   ( const char *name=fgNameSignalCam ) { fNameSignalCam    = name; }
    106106  void SetNoiseCalculation( const Bool_t   b=kTRUE                   ) { fNoiseCalculation = b;    }
    107107

  • trunk/MagicSoft/Mars/msql/MSQLServer.cc

    r8709 r8907  
    11/* ======================================================================== *\
    2 ! $Name: not supported by cvs2svn $:$Id: MSQLServer.cc,v 1.14 2007-08-25 15:30:26 tbretz Exp $
     2! $Name: not supported by cvs2svn $:$Id: MSQLServer.cc,v 1.15 2008-06-02 08:46:49 tbretz Exp $
    33! --------------------------------------------------------------------------
    44!
    … …  
    4646
    4747#include <TROOT.h>
     48#include <TMath.h>
    4849
    4950#include <TH1.h>

  • trunk/MagicSoft/Mars/mtools/MSimulatedAnnealing.cc

    r5837 r8907  
    121121#include <iostream>
    122122
     123#include <TMath.h>
    123124#include <TRandom.h>
    124125

  • trunk/MagicSoft/Mars/mtools/MTFillMatrix.cc

    r8644 r8907  
    8080
    8181#include <TFile.h>
     82#include <TMath.h>
    8283
    8384// environment

  • trunk/MagicSoft/Mars/sinope.cc

    r8106 r8907  
    11/* ======================================================================== *\
    2 ! $Name: not supported by cvs2svn $:$Id: sinope.cc,v 1.12 2006-10-17 17:15:58 tbretz Exp $
     2! $Name: not supported by cvs2svn $:$Id: sinope.cc,v 1.13 2008-06-02 08:46:36 tbretz Exp $
    33! --------------------------------------------------------------------------
    44!
    … …  
    1919!
    2020!   Author(s): Thomas Bretz
    21 !   Author(s): Daniela Doener
     21!   Author(s): Daniela Dorner
    2222!
    2323!   Copyright: MAGIC Software Development, 2000-2006
    … …  
    2929
    3030#include <TROOT.h>
     31#include <TClass.h>
    3132#include <TApplication.h>
    3233#include <TObjectTable.h>
Note: See TracChangeset for help on using the changeset viewer.