Changeset 8912 for trunk

Timestamp:

06/02/08 10:43:07 (16 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars

Files:

• Changelog (modified) (1 diff)
• mfilter/MFCosmics.cc (modified) (3 diffs)
• mpedestal/MPedestalCam.cc (modified) (2 diffs)
• mpedestal/MPedestalPix.cc (modified) (1 diff)
• mpointing/MPointingDev.cc (modified) (1 diff)
• mpointing/MPointingDev.h (modified) (1 diff)
• mpointing/MSrcPosCam.cc (modified) (1 diff)
• mpointing/MSrcPosCam.h (modified) (2 diffs)

trunk/MagicSoft/Mars/Changelog

@@ -18 +18 @@
 
                                                  -*-*- END OF LINE -*-*-
+
+
+ 2008/06/02 Thomas Bretz
+
+   * mars.cc, sinope.cc:
+     - added include of TClass for TIgnoreStreamer (root 5.18)
+
+   * manalysis/MEventRate.[h,cc]:
+     - moved GetError to source file and included TMath (root 5.18)
+
+   * manalysis/MMultiDimDistCalc.cc, mdata/MDataList.cc:
+     - included math.h (root 5.18)
+
+   * mastro/MAstro.[h,cc], mastro/MVector3.[h,cc], mbase/MRunIter.[h,cc],
+     mbase/MTime.[h,cc], mdata/MDataPhrase.[h,cc], mgeom/MGeomPix.[h,cc],
+     mhcalib/MHCalibrationChargeBlindPix.[h,cc],
+     mhflux/MHCollectionArea.[h,cc], mhft/MHexagonFreqSpace.[h,cc],
+     mimage/MHillas.[h,cc], mmuon/MMuonSearchPar..[h,cc],
+     mpedestal/MPedestalPix.[h,cc], mpointing/MPointingDev.[h,cc],
+     mpointing/MSrcPosCam.[h,cc]:
+     - moved some code to source file to prevent TMath inclusion in
+       header (root 5.18)
+
+   * mbase/MEnv.cc:
+     - added missing include TObjArray (root 5.18)
+     - removed obsolete EmarkerStyles (root 5.18)
+
+   * mbase/MDirIter.cc:
+     - added missing include TList (root 5.18)
+
+   * mastro/MAstroCatalog.cc, mhist/MHHadronness.cc, mhist/MHWeather.cc,
+     mhvstime/MHPixVsTime.cc, mhvstime/MHVsTime.cc, 
+     mpointing/MHPointing.cc, mranforest/MHRanForest.cc,
+     mranforest/MHRanForestGini.cc, mranforest/MRanForest.cc,
+     mreflector/MHReflector.cc:
+     - added missing inlcude TH1 (root 5.18)
+
+   * mbase/MFilter.cc, mbase/MGMap.cc, mbase/MTask.cc,
+     mcalib/MCalibrationBlindPix.cc, mdata/MDataChain.cc,
+     mfilter/MFEnergySlope.cc, mgeom/MGeomMirror.cc,
+     mgui/MCamEvent.cc, mhbase/MBinning.cc, mhbase/MHMatrix.cc,
+     mhcalib/MHCalibrationPix.cc, mhcalib/MHGausEvents.cc,
+     mhflux/MHEnergyEst.cc, mhist/MHCamEventRot.cc,
+     mhist/MHHadronness.cc, mranforest/MHRanForest.cc,
+     mreflector/MRflEvtHeader.cc, mreflector/MRflSinglePhoton.cc,
+     msql/MSQLServer.cc, mtools/MSimulatedAnnealing.cc,
+     mtools/MTFillMatrix.cc, mcalib/MCalibrationPix.cc,
+     mcalib/MCalibrationQEPix.cc, manalysis/MParameterCalc.cc, 
+     mcalib/MCalibrationTestCalc.cc, mdata/MDataArray.cc, 
+     mgeom/MGeomCamDwarf.cc, mhbase/MH3.cc, mtools/MagicJam.cc,
+     mhcalib/MHCalibrationRelTimeCam.cc, mhft/MGeomCamMagicXT.cc, 
+     mranforest/MRanForestCalc.cc, mtools/MagicDomino.cc,
+     mhflux/MHThreshold.cc, mimage/MStereoPar.cc,
+     mfilter/MFCosmics.cc, mpedestal/MPedestalCam.cc:
+     - added missing include of TMath (root 5.18)
+
+   * mbase/MGTask.cc, mdata/MDataChain.cc, mhbase/MHArray.cc,
+     mjobs/MJCut.cc, mjoptim/MJOptimizeCuts.cc, mmc/MMcEvt.cxx:
+     - added missing include of TClass (root 5.18)
+
+   * mhbase/MH3.cc:
+     - added missing include of THashList (root 5.18)
+
+   * mcalib/MCalibrationChargeCalc.[h,cc], msignal/MExtractor.[h,cc],
+     mpedestal/MPedestalSubtract.[h,cc], msignal/MExtractTime.[h,cc]:
+     - for convinience (rootcint of 5.18) changed "static const TString"
+       to "static const char *"
+
+   * mhflux/MMcSpectrumWeight.cc:
+     - Use TString::Data() for second argument in TF1 constructor.
+       Otherwise it is ambiguous in root 5.18
+
 
 

trunk/MagicSoft/Mars/mfilter/MFCosmics.cc

@@ -1 +1 @@
 /* ======================================================================== *\
-! $Name: not supported by cvs2svn $:$Id: MFCosmics.cc,v 1.17 2008-05-19 14:04:11 tbretz Exp $
+! $Name: not supported by cvs2svn $:$Id: MFCosmics.cc,v 1.18 2008-06-02 09:42:06 tbretz Exp $
 ! --------------------------------------------------------------------------
 !
@@ -21 +21 @@
 !   Author(s): Thomas Bretz <mailto:tbretz@astro.uni-wuerzburg.de>
 !
-!   Copyright: MAGIC Software Development, 2000-2006
+!   Copyright: MAGIC Software Development, 2000-2008
 !
 !
@@ -53 +53 @@
 //////////////////////////////////////////////////////////////////////////////
 #include "MFCosmics.h"
+
+#include <TMath.h>
 
 #include "MLog.h"

trunk/MagicSoft/Mars/mpedestal/MPedestalCam.cc

@@ -20 +20 @@
 !   Author(s): Florian Goebel 06/2004 <mailto:fgoebel@mppmu.mpg.de>
 !
-!   Copyright: MAGIC Software Development, 2000-2007
+!   Copyright: MAGIC Software Development, 2000-2008
 !
 !
@@ -43 +43 @@
 #include "MPedestalCam.h"
 #include "MPedestalPix.h"
+
+#include <TMath.h>
 
 #include <TArrayI.h>

trunk/MagicSoft/Mars/mpedestal/MPedestalPix.cc

@@ -58 +58 @@
 /////////////////////////////////////////////////////////////////////////////
 #include "MPedestalPix.h"
+
+#include <TMath.h>
 
 #include "MLog.h"

trunk/MagicSoft/Mars/mpointing/MPointingDev.cc

@@ -32 +32 @@
 #include "MPointingDev.h"
 
+#include <TMath.h>
+
 ClassImp(MPointingDev);
 

trunk/MagicSoft/Mars/mpointing/MPointingDev.h

@@ -37 +37 @@
     TVector2 GetDevXY() const { return TVector2(fDevX, fDevY); }
 
-    Double_t GetDevZdRad() const  { return fDevZd*TMath::DegToRad(); }
-    Double_t GetDevAzRad() const  { return fDevAz*TMath::DegToRad(); }
+    Double_t GetDevZdRad() const;//  { return fDevZd*TMath::DegToRad(); }
+    Double_t GetDevAzRad() const;//  { return fDevAz*TMath::DegToRad(); }
 
     ClassDef(MPointingDev, 1) //Container storing the telescope mispointing

trunk/MagicSoft/Mars/mpointing/MSrcPosCam.cc

@@ -115 +115 @@
 // -----------------------------------------------------------------------
 //
+//    return TMath::Hypot(fX, fY);
+//
+Float_t MSrcPosCam::GetDist() const
+{
+    return TMath::Hypot(fX, fY);
+}
+
+// -----------------------------------------------------------------------
+//
 // Get TVector2(fX, fY)
 //

trunk/MagicSoft/Mars/mpointing/MSrcPosCam.h

@@ -5 +5 @@
 #include "MParContainer.h"
 #endif
+
+#include <TMath.h>
 
 class TVector2;
@@ -27 +29 @@
     void Add(const TVector2 &v);
 
-    Float_t GetDist() const { return TMath::Hypot(fX, fY); }
+    Float_t GetDist() const;
 
     Float_t GetX() const             { return fX; }