Index: trunk/MagicSoft/Mars/mhist/MHCamEvent.cc
===================================================================
--- trunk/MagicSoft/Mars/mhist/MHCamEvent.cc	(revision 5807)
+++ trunk/MagicSoft/Mars/mhist/MHCamEvent.cc	(revision 6032)
@@ -236,7 +236,7 @@
 
     pad->cd(2);
-    if (gPad->FindObject(Form("Proj_%p", this)))
-    {
-        TH1 *h=fSum->Projection(Form("Proj_%p", this));
+    if (gPad->FindObject(Form("%s;proj", fName.Data())))
+    {
+        TH1 *h=fSum->Projection(Form("%s;proj", fName.Data()));
         if (h->GetMaximum()>0)
             gPad->SetLogy();
@@ -244,14 +244,14 @@
 
     pad->cd(5);
-    if (gPad->FindObject(Form("ProfR_%p", this)))
-        fSum->RadialProfile(Form("ProfR_%p", this));
+    if (gPad->FindObject(Form("%s;rad", fName.Data())))
+        fSum->RadialProfile(Form("%s;rad", fName.Data()));
 
     pad->cd(6);
-    if (gPad->FindObject(Form("ProfA_%p", this)))
-        fSum->AzimuthProfile(Form("ProfA_%p", this));
+    if (gPad->FindObject(Form("%s;az", fName.Data())))
+        fSum->AzimuthProfile(Form("%s;az", fName.Data()));
 
     pad->cd(4);
     gPad->cd(1);
-    MHCamera *cam = (MHCamera*)gPad->FindObject(Form("Err_%p", this));
+    MHCamera *cam = (MHCamera*)gPad->FindObject(Form("%s;err", fName.Data()));
     if (cam)
         cam->SetCamContent(*fSum, 1);
@@ -285,5 +285,5 @@
     gPad->SetBorderMode(0);
     gPad->SetPad(0.66, 0.5, 0.99, 0.99);
-    TH1 *h = fSum->Projection(Form("Proj_%p", this), 50);
+    TH1 *h = fSum->Projection(Form("%s;proj", fName.Data()), 50);
     h->SetTitle("Projection");
     h->SetBit(kCanDelete);
@@ -300,5 +300,5 @@
 
     MHCamera *cam = new MHCamera(*fSum->GetGeometry());
-    cam->SetName(Form("Err_%p", this));
+    cam->SetName(Form("%s;err", fName.Data()));
     cam->SetTitle(fSum->TestBit(MHCamera::kVariance)?"Variance":"Root Mean Squared (rms)");
     cam->SetYTitle(fSum->GetYaxis()->GetTitle());
@@ -308,5 +308,5 @@
 
     pad->cd(5);
-    h = (TH1*)fSum->RadialProfile(Form("ProfR_%p", this), 20);
+    h = (TH1*)fSum->RadialProfile(Form("%s;rad", fName.Data()), 20);
     h->SetTitle("Radial Profile");
     h->SetBit(kCanDelete|TH1::kNoStats);
@@ -314,5 +314,5 @@
 
     pad->cd(6);
-    h = (TH1*)fSum->AzimuthProfile(Form("ProfA_%p", this), 30);
+    h = (TH1*)fSum->AzimuthProfile(Form("%s;az", fName.Data()), 30);
     h->SetTitle("Azimuth Profile");
     h->SetBit(kCanDelete|TH1::kNoStats);
