Run analyzer: Conflicts solved 1

diff --cc MABS_run_analyzer/ChargeSpektrum.c
index 4e1d79ce0eab65b61ce2b515728cd43ec377c253,8c4b25dee24fe70d4f3b77f48ff09fb6392137d6..8aaa8acc99fd2ede550076e836bf1acd3fb517d5
--- 1/MABS_run_analyzer/ChargeSpektrum.c
--- 2/MABS_run_analyzer/ChargeSpektrum.c
+++ b/MABS_run_analyzer/ChargeSpektrum.c
@@@ -7,7 -7,7 +7,6 @@@
   * 
   */
  
--// bad c- style fix me
  #include "MAPS.c"
  #include "Run.c"
  #include "CSVRow.h"

diff --cc MABS_run_analyzer/MAPS.c
index 4174f3e2cefa6ffc0ef75e00d9b2d0aa9fe845a8,42c679558b5def4596992f87584b97893d727a2a..8ee210273bad9e8f9c101e60fbf5cb841a535d93
--- 1/MABS_run_analyzer/MAPS.c
--- 2/MABS_run_analyzer/MAPS.c
+++ b/MABS_run_analyzer/MAPS.c
@@@ -402,12 -402,12 +402,11 @@@ bool MAPS::checkConf( Int_t &PixelData 
  bool MAPS::checkDataFiles( Int_t MaxFiles ) {
      UInt_t    Frames;
      TString   FILENAME;
--
- //     if(MaxFiles>100)
 -    if(MaxFiles>5000)
 -    {
 -        cout<<"Expected Nr of Files is too big: " << MaxFiles << " ! Nr of Files reduced to 50!"<<endl;
 -        MaxFiles=50;
 -    }
++//     if(MaxFiles>50)
 +//     {
 +//         cout<<"Expected Nr of Files is too big: " << MaxFiles << " ! Nr of Files reduced to 50!"<<endl;
 +//         MaxFiles=50;
 +//     }
      fEventsSum        = 0;
      fEvents   = new Int_t             [MaxFiles];
      fInn      = new ifstream  [MaxFiles];