Run analyzer: resolved conflicts while merging without_FSBB with master

diff --cc MABS_run_analyzer/ChargeSpektrum.c
Simple merge

diff --cc MABS_run_analyzer/MAPS.c
index 64659623021b7b1bedb7e76236bbc9e409af0a8f,ff434a238bbb46bcdae9567af165bdd3a0dfb37a..a2e2e9987eacb6cb602ae73caa0d9dec980e779a
--- 1/MABS_run_analyzer/MAPS.c
--- 2/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/MAPS.h
Simple merge

diff --cc MABS_run_analyzer/Run.c
index b805a681de6753de8ef91d5269448c0a906e8442,959df9eae74e17dda8da4f124922116cbcfc4abe..a94b05f3eb587fa86fa7da9e836826cb770d449d
--- 1/MABS_run_analyzer/Run.c
--- 2/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;