Index: trunk/MagicSoft/Mars/mhist/MFillH.cc
===================================================================
--- trunk/MagicSoft/Mars/mhist/MFillH.cc	(revision 1477)
+++ trunk/MagicSoft/Mars/mhist/MFillH.cc	(revision 1481)
@@ -364,10 +364,10 @@
     else
         out << "\"" << fHName << "\"";
-    out << ", ";
 
     if (fParContainer)
-        out << "&" << ToLower(fParContainer->GetName());
+        out << ", &" << ToLower(fParContainer->GetName());
     else
-        out << "\"" << fParContainerName << "\"";
+        if (!fParContainerName.IsNull())
+            out << ", \"" << fParContainerName << "\"";
 
     out << ");" << endl;
Index: trunk/MagicSoft/Mars/mhist/MH3.cc
===================================================================
--- trunk/MagicSoft/Mars/mhist/MH3.cc	(revision 1477)
+++ trunk/MagicSoft/Mars/mhist/MH3.cc	(revision 1481)
@@ -384,5 +384,5 @@
 // gui elements to a macro-file.
 //
-void MH3::StreamPrimitive(ofstream &out)
+void MH3::StreamPrimitive(ofstream &out) const
 {
     TString name = ToLower(fName);
Index: trunk/MagicSoft/Mars/mhist/MH3.h
===================================================================
--- trunk/MagicSoft/Mars/mhist/MH3.h	(revision 1477)
+++ trunk/MagicSoft/Mars/mhist/MH3.h	(revision 1481)
@@ -24,5 +24,5 @@
     Double_t    fScale[3];
 
-    void StreamPrimitive(ofstream &out);
+    void StreamPrimitive(ofstream &out) const;
 
 public: