Exceloutput modified

Script for longer consecutive runlists
Pegasus parameters changed

diff --git a/MABS_run_analyzer/ChargeSpektrumFunctions.c b/MABS_run_analyzer/ChargeSpektrumFunctions.c
index 52fe9a3aad354c7d0d6ed761465f434f7c8e9539..a504d01a9f3a07a7d77b4d534ccd1bb60897eb10 100644 (file)
--- a/MABS_run_analyzer/ChargeSpektrumFunctions.c
+++ b/MABS_run_analyzer/ChargeSpektrumFunctions.c
@@ -131,11 +131,11 @@ Bool_t writeObservableToFile()
             {
                 plothistogrampointer = *runs[runi]->plothistogrampointer;
                 runnumberListe+=Form("%d_",runs[runi]->labbook.runnumber);
-                header+=Form("%d\t%s\t", runs[runi]->labbook.runnumber, plothistogrampointer->GetName());
+                header+=Form("%d\t%s\t\t\t", runs[runi]->labbook.runnumber, plothistogrampointer->GetName());
             }
         }
     }
-    TString filename= runs[0]->savepathresults + "/" + runnumberListe + "histograms.dat";
+    TString filename= runs[0]->savepathresults + "/Excel/" + runnumberListe + "histograms.dat";
     fstream* fout = new fstream(filename,ios::out);
     *fout << headerInfo << endl;
     *fout << header << endl;
@@ -149,7 +149,14 @@ Bool_t writeObservableToFile()
                 {
                     plothistogrampointer = *runs[runi]->plothistogrampointer;
                     TString outline;
-                    outline=Form("%.1f\t%.1f\t",plothistogrampointer->GetBinCenter(bini),plothistogrampointer->GetBinContent(bini));
+                                       Double_t binContentNorm=plothistogrampointer->GetBinContent(bini)/runs[runi]->labbook.frames_foundDB*10000000;
+                                       Double_t binSumme=0.0;
+                                       for(Int_t binSummei=bini;binSummei<plothistogrampointer->GetNbinsX();binSummei++)//Sum up from bini beginning (cut condition for detection eff.)
+                                       {
+                                               Double_t binContentNormInSumme=plothistogrampointer->GetBinContent(binSummei)/runs[runi]->labbook.frames_foundDB*10000000;
+                                               binSumme=binSumme+binContentNormInSumme;
+                                       }
+                                       outline=Form("%.1f\t%.1f\t%.1f\t%.1f\t",plothistogrampointer->GetBinCenter(bini),plothistogrampointer->GetBinContent(bini),binContentNorm,binSumme);
                     *fout<<outline;
                 }
             }

diff --git a/MABS_run_analyzer/CreateRunlist.C b/MABS_run_analyzer/CreateRunlist.C
new file mode 100644 (file)
index 0000000..d38fe86
--- /dev/null
+++ b/MABS_run_analyzer/CreateRunlist.C
@@ -0,0 +1,16 @@
+#include <iostream>
+#include "TString.h"
+#include <fstream>
+using namespace std;
+
+int CreateRunlist()
+{
+TString filename= "runlist.txt";
+fstream* fout = new fstream(filename,ios::out);
+for(int i=0;i<135;i++)
+{
+    *fout << 342869+i << endl;
+       }
+        fout->close();
+   return 0;
+}
\ No newline at end of file

diff --git a/MABS_run_analyzer/Run.h b/MABS_run_analyzer/Run.h
index 8b0230a749dbbc3f51234c32deb33192be87f44d..fde690130cec170877873938d388a85c5b2ddb95 100644 (file)
--- a/MABS_run_analyzer/Run.h
+++ b/MABS_run_analyzer/Run.h
@@ -227,8 +227,8 @@ private:
     };
     systemparam systemparamPegasus {
         2800, // maxbin;
-        2800/1,// nbins;
-        10, //vetothreshold
+        2800/2,// nbins;
+        20, //vetothreshold
         10,
         100
     };