From: Benjamin Linnik <blinnik@jspc28.x-matter.uni-frankfurt.de>
Date: Tue, 25 Aug 2015 12:17:36 +0000 (+0200)
Subject: Run analyzer: resolved conflicts while merging without_FSBB with master
X-Git-Url: https://jspc29.x-matter.uni-frankfurt.de/git/?a=commitdiff_plain;h=f3efd01cfd8bb5a39e91f7e4e9569b69f113e9c9;p=radhard.git

Run analyzer: resolved conflicts while merging without_FSBB with master
---

f3efd01cfd8bb5a39e91f7e4e9569b69f113e9c9
diff --cc MABS_run_analyzer/MAPS.c
index 6465962,ff434a2..a2e2e99
--- a/MABS_run_analyzer/MAPS.c
+++ b/MABS_run_analyzer/MAPS.c
@@@ -1650,7 -1748,8 +1748,7 @@@ void MAPS::plotFrame(Int_t FrameNumber
          cout <<endl <<endl << colorwhite << "---------------- FRAME " << fFrameNumber << " ----------------" << colorreset << endl << endl;
          cout<<"CDS matrix:"<<endl;
          debugStream<>(fCdsmatrix, fPixels, fColumns, 0, 39);
-         
 -        debugStream<>(fCdsmatrix, fPixels, 512, 0, 39);
 -		cout<<fCdsmatrix[0]<<","<<fCdsmatrix[1]<<","<<fCdsmatrix[2]<<","<<fCdsmatrix[3]<<","<<fCdsmatrix[4]<<","<<fCdsmatrix[5]<<","<<fCdsmatrix[6]<<endl;
++		// cout<<fCdsmatrix[0]<<","<<fCdsmatrix[1]<<","<<fCdsmatrix[2]<<","<<fCdsmatrix[3]<<","<<fCdsmatrix[4]<<","<<fCdsmatrix[5]<<","<<fCdsmatrix[6]<<endl;
          cout<<"Hitted pixel discriminator matrix:"<<endl;
          debugStream<>(fHittedPixel, fPixels, fColumns, 1, 1);
          
diff --cc MABS_run_analyzer/Run.c
index b805a68,959df9e..a94b05f
--- a/MABS_run_analyzer/Run.c
+++ b/MABS_run_analyzer/Run.c
@@@ -288,7 -287,7 +288,6 @@@ Bool_t Run::analyzeRun(Bool_t force
              cout << colorwhite << "integrateSr90Spectra():" << endlr;
              integrateSr90Spectra(histogramthresholdCalibrated.Seed);
          }
- 	*/	
 -		
          cout << colorwhite << "updateDatabase():" << endlr;
          updateDatabase();
          cout << colorwhite << "delete MAPS class:" << endlr;