Changeset 8988 for trunk/MagicSoft/Mars/mhist

Timestamp:

06/30/08 10:37:00 (17 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars/mhist

Files:

• MHCamera.cc (modified) (6 diffs)
• MHCamera.h (modified) (3 diffs)

trunk/MagicSoft/Mars/mhist/MHCamera.cc

@@ -1 +1 @@
 /* ======================================================================== *\
-! $Name: not supported by cvs2svn $:$Id: MHCamera.cc,v 1.108 2008-06-14 14:32:15 tbretz Exp $
+! $Name: not supported by cvs2svn $:$Id: MHCamera.cc,v 1.109 2008-06-30 09:36:38 tbretz Exp $
 ! --------------------------------------------------------------------------
 !
@@ -675 +675 @@
 // and added to gROOT such the gROOT->FindObject can find the histogram.
 //
-// If the standard name "_py" is given "_py" is appended to the name
+// If the standard name "_proj" is given "_proj" is appended to the name
 // of the MHCamera and the corresponding histogram is searched using
 // gROOT->FindObject and updated with the present projection.
@@ -718 +718 @@
     //check if histogram with identical name exist
     TObject *h1obj = gROOT->FindObject(pname);
-    if (h1obj && h1obj->InheritsFrom("TH1D")) {
+    if (h1obj && h1obj->InheritsFrom(TH1D::Class())) {
         h1 = (TH1D*)h1obj;
         h1->Reset();
@@ -812 +812 @@
     //check if histogram with identical name exist
     TObject *h1obj = gROOT->FindObject(pname);
-    if (h1obj && h1obj->InheritsFrom("TProfile")) {
+    if (h1obj && h1obj->InheritsFrom(TProfile::Class())) {
         h1 = (TProfile*)h1obj;
         h1->Reset();
@@ -859 +859 @@
 // and added to gROOT such the gROOT->FindObject can find the histogram.
 //
-// If the standard name "_azi" is given "_azi" is appended to the name
+// If the standard name "_az" is given "_az" is appended to the name
 // of the MHCamera and the corresponding histogram is searched using
 // gROOT->FindObject and updated with the present projection.
@@ -892 +892 @@
     //check if histogram with identical name exist
     TObject *h1obj = gROOT->FindObject(pname);
-    if (h1obj && h1obj->InheritsFrom("TProfile")) {
+    if (h1obj && h1obj->InheritsFrom(TProfile::Class())) {
         h1 = (TProfile*)h1obj;
         h1->Reset();

trunk/MagicSoft/Mars/mhist/MHCamera.h

@@ -1 +1 @@
 /* ======================================================================== *\
-!  $Name: not supported by cvs2svn $:$Id: MHCamera.h,v 1.64 2007-05-10 12:14:54 tbretz Exp $
+!  $Name: not supported by cvs2svn $:$Id: MHCamera.h,v 1.65 2008-06-30 09:36:38 tbretz Exp $
 \* ======================================================================== */
 #ifndef MARS_MHCamera
@@ -284 +284 @@
     UInt_t   GetNumPixels() const;
 
-    TH1D    *Projection(const char *name="_py", const Int_t nbins=50) const
-      {
+    TH1D    *Projection(const char *name="_proj", const Int_t nbins=50) const
+    {
         return ProjectionS(TArrayI(), TArrayI(), name,nbins);
-      }
-    TH1D    *ProjectionS(Int_t sector, Int_t aidx, const char *name="_py", const Int_t nbins=50) const
+    }
+    TH1D    *ProjectionS(Int_t sector, Int_t aidx, const char *name="_proj", const Int_t nbins=50) const
     {
         return ProjectionS(TArrayI(1, &sector), TArrayI(1, &aidx), name, nbins);
     }
-    TH1D    *ProjectionS(const TArrayI &sector, const TArrayI &aidx, const char *name="_py", const Int_t nbins=50) const;
+    TH1D    *ProjectionS(const TArrayI &sector, const TArrayI &aidx, const char *name="_proj", const Int_t nbins=50) const;
 
     TProfile *RadialProfile(const char *name="_rad", Int_t nbins=25) const { return  RadialProfileS(TArrayI(), TArrayI(), name, nbins);}
@@ -301 +301 @@
     TProfile *RadialProfileS(const TArrayI &sector, const TArrayI &aidx, const char *name="_rad", const Int_t nbins=25) const;
 
-    TProfile *AzimuthProfile(const char *name="_azi", Int_t nbins=25) const { return  AzimuthProfileA(TArrayI(), name, nbins);  }
-    TProfile *AzimuthProfile(Int_t aidx, const char *name="_rad", const Int_t nbins=25) const
-      {
+    TProfile *AzimuthProfile(const char *name="_az", Int_t nbins=25) const { return  AzimuthProfileA(TArrayI(), name, nbins);  }
+    TProfile *AzimuthProfile(Int_t aidx, const char *name="_az", const Int_t nbins=25) const
+    {
         return AzimuthProfileA(TArrayI(1, &aidx), name, nbins);
-      }
-    TProfile *AzimuthProfileA(const TArrayI &aidx, const char *name="_rad", const Int_t nbins=25) const;
+    }
+    TProfile *AzimuthProfileA(const TArrayI &aidx, const char *name="_az", const Int_t nbins=25) const;
     
     void CamDraw(TCanvas &c, const Int_t x, const Int_t y,