Index: trunk/Mars/mmc/MMcEvt.cxx
===================================================================
--- trunk/Mars/mmc/MMcEvt.cxx	(revision 18570)
+++ trunk/Mars/mmc/MMcEvt.cxx	(revision 18571)
@@ -259,4 +259,10 @@
 Bool_t MMcEvt::SetupFits(fits &fin)
 {
+    if (fName!="MMcEvt")
+    {
+        *fLog << err << "ERROR - SetupFits only supported if name equals MMcEvt." << endl;
+        return kFALSE;
+    }
+
     if (!fin.SetRefAddress("MMcEvt.fEvtNumber",         fEvtNumber        ))  return kFALSE;
     if (!fin.SetRefAddress("MMcEvt.fThick0",            fThick0           ))  return kFALSE;
Index: trunk/Mars/mmc/MMcEvtBasic.cc
===================================================================
--- trunk/Mars/mmc/MMcEvtBasic.cc	(revision 18570)
+++ trunk/Mars/mmc/MMcEvtBasic.cc	(revision 18571)
@@ -237,4 +237,10 @@
 Bool_t MMcEvtBasic::SetupFits(fits &fin)
 {
+    if (ClassName()==TString("MMcEvtBasic") && fName!="MMcEvtBasic")
+    {
+        *fLog << err << "ERROR - SetupFits only supported if name equals MMcEvtBasic." << endl;
+        return kFALSE;
+    }
+
     //if (!fin.SetRefAddress("MMcEvtBasic.fPartId",         fPartId        ))  return kFALSE;
     if (!fin.SetRefAddress("MMcEvtBasic.fEnergy",         fEnergy        ))  return kFALSE;