Changeset 8284

Timestamp:

02/01/07 14:42:02 (18 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars

Files:

• mbase/MStatusArray.cc (modified) (2 diffs)
• mbase/MStatusArray.h (modified) (1 diff)
• mhist/MHCamEvent.cc (modified) (1 diff)
• mhist/MHCamera.cc (modified) (2 diffs)
• mhist/MHCamera.h (modified) (2 diffs)

trunk/MagicSoft/Mars/mbase/MStatusArray.cc

@@ -260 +260 @@
             SetCanDelete(((TVirtualPad*)o)->GetListOfPrimitives());
         else
-            o->SetBit(kCanDelete);
+            o->SetBit(kCanDelete|kMustCleanup);
     }
 }
@@ -282 +282 @@
     // Make sure that all kCanDelete bits are properly set
     SetCanDelete(this);
+    SetOwner();
 
     return rc;

trunk/MagicSoft/Mars/mbase/MStatusArray.h

@@ -22 +22 @@
 public:
     MStatusArray() : TObjArray() { }
+
     TObject *DisplayIn(Option_t *o=0) const;         // *MENU*
     void     DisplayIn(MStatusDisplay &d, const char *tab=0) const;

trunk/MagicSoft/Mars/mhist/MHCamEvent.cc

@@ -214 +214 @@
 }
 
+// --------------------------------------------------------------------------
+//
+// Set the camera histogram to a clone of cam
+//
 void MHCamEvent::SetHist(const MHCamera &cam)
 {

trunk/MagicSoft/Mars/mhist/MHCamera.cc

@@ -1 +1 @@
 /* ======================================================================== *\
-! $Name: not supported by cvs2svn $:$Id: MHCamera.cc,v 1.98 2007-02-01 11:24:18 tbretz Exp $
+! $Name: not supported by cvs2svn $:$Id: MHCamera.cc,v 1.99 2007-02-01 14:42:02 tbretz Exp $
 ! --------------------------------------------------------------------------
 !
@@ -157 +157 @@
 }
 
+// ------------------------------------------------------------------------
+//
+// Clone the MHCamera via TH1D::Clone and make sure that the new object is
+// not removed from the current directory.
+//
+TObject *MHCamera::Clone(const char *newname="") const
+{
+    TObject *rc = TH1D::Clone(newname);
+    rc->SetDirectory(NULL);
+    return rc;
+}
+
 void MHCamera::SetGeometry(const MGeomCam &geom, const char *name, const char *title)
 {

trunk/MagicSoft/Mars/mhist/MHCamera.h

@@ -1 +1 @@
 /* ======================================================================== *\
-!  $Name: not supported by cvs2svn $:$Id: MHCamera.h,v 1.62 2007-02-01 11:24:18 tbretz Exp $
+!  $Name: not supported by cvs2svn $:$Id: MHCamera.h,v 1.63 2007-02-01 14:42:02 tbretz Exp $
 \* ======================================================================== */
 #ifndef MARS_MHCamera
@@ -122 +122 @@
     MHCamera(const MGeomCam &geom, const char *name="", const char *title="");
     ~MHCamera();
+
+    TObject *Clone(const char *newname="") const;
 
     void SetGeometry(const MGeomCam &geom, const char *name="", const char *title="");