From: Benjamin Linnik <blinnik@jspc28.x-matter.uni-frankfurt.de>
Date: Fri, 22 May 2015 19:06:37 +0000 (+0200)
Subject: Run analyzer: Conflicts solved 1
X-Git-Url: https://jspc29.x-matter.uni-frankfurt.de/git/?a=commitdiff_plain;h=cfff2df5f07e15d1105e770362fa7dc818ad2744;p=radhard.git

Run analyzer: Conflicts solved 1
---

cfff2df5f07e15d1105e770362fa7dc818ad2744
diff --cc MABS_run_analyzer/ChargeSpektrum.c
index 4e1d79c,8c4b25d..8aaa8ac
--- a/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 4174f3e,42c6795..8ee2102
--- a/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];