Index: trunk/MagicSoft/Mars/Changelog
===================================================================
--- trunk/MagicSoft/Mars/Changelog	(revision 2398)
+++ trunk/MagicSoft/Mars/Changelog	(revision 2399)
@@ -12,7 +12,4 @@
      - MHMcTriggerLvl2::GetHistByName removed const-qualifier and 
        changed return type to TH1 according to definition in MH.
-
-   * Makefile.conf.general:
-     - changed MARSVERSION to 0.8.1
 
 
Index: trunk/MagicSoft/Mars/Makefile.conf.general
===================================================================
--- trunk/MagicSoft/Mars/Makefile.conf.general	(revision 2398)
+++ trunk/MagicSoft/Mars/Makefile.conf.general	(revision 2399)
@@ -18,6 +18,5 @@
 #   export MARSLIBS="-lX11 -lXpm -L/usr/X11R6/lib"
 #
-#DEFINES	  = -DMARSVER=\"\<cvs\>\" -D__MARS__ -DROOTVER=\"$(ROOTVER)\" $(ARCHDEF) $(MARSDEFINES)
-DEFINES	  = -DMARSVER=\"0.8.1\" -D__MARS__ -DROOTVER=\"$(ROOTVER)\" $(ARCHDEF) $(MARSDEFINES)
+DEFINES	  = -DMARSVER=\"\<cvs\>\" -D__MARS__ -DROOTVER=\"$(ROOTVER)\" $(ARCHDEF) $(MARSDEFINES)
 
 CXXFLAGS  = $(ROOTCFLAGS) $(INCLUDES) $(OPTIM) $(DEBUG) $(DEFINES)
Index: trunk/MagicSoft/Mars/manalysis/MMcPedestalCopy.cc
===================================================================
--- trunk/MagicSoft/Mars/manalysis/MMcPedestalCopy.cc	(revision 2398)
+++ trunk/MagicSoft/Mars/manalysis/MMcPedestalCopy.cc	(revision 2399)
@@ -138,5 +138,5 @@
         //const Float_t pedrms = pedest/sqrt((float)num);
 
-        const Float_t sigma  = fMcPed->GetPedestalRms(i);
+        const Float_t sigma  = fMcPed->GetElecNoise(i);
         //const Float_t sigrms = sigma/sqrt(num*2.);
 
Index: trunk/MagicSoft/Mars/mhistmc/MHMcTriggerLvl2.cc
===================================================================
--- trunk/MagicSoft/Mars/mhistmc/MHMcTriggerLvl2.cc	(revision 2398)
+++ trunk/MagicSoft/Mars/mhistmc/MHMcTriggerLvl2.cc	(revision 2399)
@@ -329,5 +329,5 @@
 //  so remember to cast the returned object if you want to work with it.
 //
-TObject *MHMcTriggerLvl2::GetHistByName(const TString name) const
+TH1 *MHMcTriggerLvl2::GetHistByName(const TString name)
 {
     if (name.Contains("fHistLutPseudoSize", TString::kIgnoreCase))
Index: trunk/MagicSoft/Mars/mhistmc/MHMcTriggerLvl2.h
===================================================================
--- trunk/MagicSoft/Mars/mhistmc/MHMcTriggerLvl2.h	(revision 2398)
+++ trunk/MagicSoft/Mars/mhistmc/MHMcTriggerLvl2.h	(revision 2399)
@@ -43,5 +43,5 @@
     Bool_t Fill(const MParContainer *par, const Stat_t w=1);
 
-    TObject *GetHistByName(const TString name) const;
+    TH1 *GetHistByName(const TString name);
 
     TH1F *GetHistLutPseudoSize() const { return fHistLutPseudoSize; }
Index: trunk/MagicSoft/include-Classes/MMcFormat/MMcTrig.cxx
===================================================================
--- trunk/MagicSoft/include-Classes/MMcFormat/MMcTrig.cxx	(revision 2398)
+++ trunk/MagicSoft/include-Classes/MMcFormat/MMcTrig.cxx	(revision 2399)
@@ -1,5 +1,5 @@
 #include "MMcTrig.hxx"
 
-#include <iostream.h>
+#include <iostream>