From: Dennis Doering <doering@physik.uni-frankfurt.de>
Date: Tue, 25 Aug 2015 12:39:31 +0000 (+0200)
Subject: Bugfix
X-Git-Url: https://jspc29.x-matter.uni-frankfurt.de/git/?a=commitdiff_plain;h=3d902bd5ae6f564b1003433d5afc4f1931dbc84e;p=radhard.git

Bugfix
---

diff --git a/MABS_run_analyzer/ChargeSpektrumFunctions.c b/MABS_run_analyzer/ChargeSpektrumFunctions.c
index ec9ea9b..82c404b 100644
--- a/MABS_run_analyzer/ChargeSpektrumFunctions.c
+++ b/MABS_run_analyzer/ChargeSpektrumFunctions.c
@@ -141,12 +141,7 @@ 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;