Run analyzer: resolved conflicts while merging without_FSBB with master 2

diff --cc MABS_run_analyzer/ChargeSpektrum.c
Simple merge

diff --cc MABS_run_analyzer/ChargeSpektrumFunctions.c
index 4f8ed94325c3bdbd8d5834a6a5ab9fd708d64ffc,030273fd7c5cc423fc607579a42a95a9e4ea6c60..ec9ea9b1864784f62043d78920b2916b3aacf3f1
--- 1/MABS_run_analyzer/ChargeSpektrumFunctions.c
--- 2/MABS_run_analyzer/ChargeSpektrumFunctions.c
+++ b/MABS_run_analyzer/ChargeSpektrumFunctions.c
@@@ -141,7 -135,8 +141,12 @@@ Bool_t writeObservableToFile(
              }
          }
      }
++<<<<<<< HEAD
 +    TString filename= runs[0]->savepathresults + "/" + ownpath + runnumberListe + "histograms.dat";
++=======
+     runnumberListe+=Form("%s_",plothistogrampointer->GetName());
+     TString filename= runs[0]->savepathresults + "/" + runnumberListe + "histograms.dat";
++>>>>>>> without_FSBB
      fstream* fout = new fstream(filename,ios::out);
      *fout << headerInfo << endl;
      *fout << header << endl;

diff --cc MABS_run_analyzer/MAPS.h
Simple merge

diff --cc MABS_run_analyzer/Run.c
index a94b05f3eb587fa86fa7da9e836826cb770d449d,18fc5fb176fcfecac4c37eb4544c4a5464576725..6ad77e9abc84d6aff1d41850567f0de8e877708c
--- 1/MABS_run_analyzer/Run.c
--- 2/MABS_run_analyzer/Run.c
+++ b/MABS_run_analyzer/Run.c
@@@ -98,21 -98,38 +98,39 @@@ Run::Run(Int_t runnumber, Int_t loopi
              labbook.CCE_in_Perc_1DB = (rowsql->GetField(17) != NULL)?atoi(rowsql->GetField(17)):-1;
              labbook.CCE_in_Perc_25DB = (rowsql->GetField(18) != NULL)?atoi(rowsql->GetField(18)):-1;
              labbook.frames_foundDB = (rowsql->GetField(19) != NULL)?atoi(rowsql->GetField(19)):-1;
 +              //      labbook.frames_Analyzed = (rowsql->GetField(20) != NULL)?atoi(rowsql->GetField(20)):-1;
              delete res;
-             if (labbook.chip.Length() > 0 && labbook.chipGen.Length() > 0) // versuche infos zum Chip aus der ChipDatenbank zu bekommen
+             if (labbook.chipGen.Length() > 0)
              {
-                 selectquery=prepareSQLStatement("select `epi_thickness`, `resistivity`, `ChipRadiation Ion`, `ChipRadiation NonIon` from `radhard`.`chips` WHERE `no`='" + numberToString<>(labbook.chip) + "' AND `chipgen`='" + labbook.chipGen + "'");
-                 res = db->Query(selectquery.c_str());
-                 nrows = res->GetRowCount();
-                 if (nrows > 0)
+                 if (labbook.chip.Length() > 0) // versuche infos zum Chip aus der ChipDatenbank zu bekommen
                  {
-                     rowsql = res->Next();
-                     labbook.epi_thickness = (rowsql->GetField(0) != NULL)?atol(rowsql->GetField(0)):-1; 
-                     labbook.resistivity = (rowsql->GetField(1) != NULL)?atof(rowsql->GetField(1)):-1; 
-                     labbook.radDoseIon = (rowsql->GetField(2) != NULL)?atof(rowsql->GetField(2)):-1;
-                     labbook.radDoseNonIon = (rowsql->GetField(3) != NULL)?atof(rowsql->GetField(3)):-1;                    
-                     delete res;
+                     selectquery=prepareSQLStatement("select `epi_thickness`, `resistivity`, `ChipRadiation Ion`, `ChipRadiation NonIon` from `radhard`.`chips` WHERE `no`='" + numberToString<>(labbook.chip) + "' AND `chipgen`='" + labbook.chipGen + "'");
+                     res = db->Query(selectquery.c_str());
+                     nrows = res->GetRowCount();
+                     if (nrows > 0)
+                     {
+                         rowsql = res->Next();
+                         labbook.epi_thickness = (rowsql->GetField(0) != NULL)?atol(rowsql->GetField(0)):-1; 
+                         labbook.resistivity = (rowsql->GetField(1) != NULL)?atof(rowsql->GetField(1)):-1; 
+                         labbook.radDoseIon = (rowsql->GetField(2) != NULL)?atof(rowsql->GetField(2)):-1;
+                         labbook.radDoseNonIon = (rowsql->GetField(3) != NULL)?atof(rowsql->GetField(3)):-1;                    
+                         delete res;
+                     }
+                 }
+                 if (labbook.matrix.Length() > 0) // versuche infos zum Pixel aus der ChipDatenbank zu bekommen
+                 {
+                     selectquery=prepareSQLStatement("select `pitchX`, `pitchY`, `num_diod`, `staggered` from `radhard`.`pixelinfo` WHERE `matrix`='" + labbook.matrix + "' AND `ChipGen`='" + labbook.chipGen + "'");
+                     res = db->Query(selectquery.c_str());
+                     nrows = res->GetRowCount();
+                     if (nrows > 0)
+                     {
+                         rowsql = res->Next();
+                         curpixelinfo.pitchX = (rowsql->GetField(0) != NULL)?atof(rowsql->GetField(0)):-1;
+                         curpixelinfo.pitchY = (rowsql->GetField(1) != NULL)?atof(rowsql->GetField(1)):-1;
+                         curpixelinfo.ndiods = (rowsql->GetField(2) != NULL)?atoi(rowsql->GetField(2)):-1;
+                         curpixelinfo.staggered = (rowsql->GetField(3) != NULL)?atoi(rowsql->GetField(3)):0;                 
+                         delete res;
+                     }
                  }
              }
  //             if (!(labbook.posVetoDB > 0) && (labbook.source != "Fe55")) // no veto peak position found for this run

diff --cc MABS_run_analyzer/Run.h
Simple merge