Changeset 2819

Timestamp:

01/15/04 15:36:38 (21 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars

Files:

• Changelog (modified) (1 diff)
• mhist/MHCamera.cc (modified) (5 diffs)
• mhist/MHCamera.h (modified) (1 diff)

trunk/MagicSoft/Mars/Changelog

@@ -41 +41 @@
    * mhist/MHCamera.[h,cc]:
      - added member function Projection
+     - removed fYproj
 
    * mreport/MReport*.*:

trunk/MagicSoft/Mars/mhist/MHCamera.cc

@@ -107 +107 @@
 //
 MHCamera::MHCamera(const MGeomCam &geom, const char *name, const char *title)
-: fGeomCam(NULL), /*TH1D(name, title, geom.GetNumPixels(), -0.5, geom.GetNumPixels()-0.5),
-                    fUsed(geom.GetNumPixels()),*/ fColors(kItemsLegend), fYProj(NULL)
+: fGeomCam(NULL), fColors(kItemsLegend)
 {
     //fGeomCam = (MGeomCam*)geom.Clone();
@@ -155 +154 @@
     if (fNotify)
       delete fNotify;
-    if (fYProj)
-      delete fYProj;
-
 }
 
@@ -456 +452 @@
 //
 // If no name is given the newly allocated histogram is removed from
-// the current directory calling SetDirectory(0)
+// the current directory calling SetDirectory(0) in any other case
+// the newly created histogram is removed from the current directory
+// 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
@@ -474 +472 @@
 TH1D *MHCamera::Projection(const char *name) const
 {
-
     Int_t nbins = 50;
 
@@ -501 +498 @@
 
         h1 = new TH1D(pname, GetTitle(), nbins, min, max);
-
+        h1->SetDirectory(pname.IsNull() ? NULL : gROOT);
         h1->SetXTitle(GetYaxis()->GetTitle());
         h1->SetYTitle("Counts");
         h1->Sumw2();
-        if (pname.IsNull())
-            h1->SetDirectory(NULL);
     }
 

trunk/MagicSoft/Mars/mhist/MHCamera.h

@@ -44 +44 @@
     Bool_t         fFreezed;     //! Just a dummy!!!! ([Set,Is]Freezed)
 
-    // Will be removed in the future
-    TH1D          *fYProj;       //! Y-Projection of the histogram (does not exist in ROOT)
-    
     //Int_t          fOptStat;
     //TGStatusBar   *fStatusBar;