From: Benjamin Linnik <blinnik@jspc28.x-matter.uni-frankfurt.de>
Date: Tue, 2 Jun 2015 13:18:52 +0000 (+0200)
Subject: Anylyzer: fixed double run analysis
X-Git-Url: https://jspc29.x-matter.uni-frankfurt.de/git/?a=commitdiff_plain;h=fda8a4b06dade4004a48daec28dffbc120033594;p=radhard.git

Anylyzer: fixed double run analysis
---

diff --git a/MABS_run_analyzer/ChargeSpektrum.c b/MABS_run_analyzer/ChargeSpektrum.c
index d43a9c2..dba54e9 100644
--- a/MABS_run_analyzer/ChargeSpektrum.c
+++ b/MABS_run_analyzer/ChargeSpektrum.c
@@ -132,8 +132,6 @@ void ChargeSpektrum(TString runnumber = "")
         /// number of runs to be analyzed, number of lines read by @c ReadRunList() 
         ReadRunList(&runList);
     }
-    numberRuns=2;
-    runList.push_back(runList.front());
     runs = new Run*[numberRuns];
     
     cout << "Found " << numberRuns << " run(s) in 'runlist.txt' or given as parameters." << endl;
@@ -165,14 +163,7 @@ void ChargeSpektrum(TString runnumber = "")
                 }
                 runs[runi]->setResultsPath("./results/");
                 runs[runi]->error=runs[runi]->initRun();
-//                 if (runi%2)
-//                 {
-                    if(runs[runi]->setDynamicalNoiseMode("simple")) cout << coloryellow << "Passed noise mode not recognized, using simple moving average" << endlr;
-//                 }
-//                 else
-//                 {
-//                     if(runs[runi]->setDynamicalNoiseMode("exponential")) cout << coloryellow << "Passed noise mode not recognized, using simple moving average" << endlr;
-//                 }
+                runs[runi]->setDynamicalNoiseMode("simple");
                 runs[runi]->useDynamicalNoise(true);
                                 
 //                 runs[runi]->analyzeFrame(15684);
diff --git a/MABS_run_analyzer/Run.c b/MABS_run_analyzer/Run.c
index e9059d8..ae515ba 100644
--- a/MABS_run_analyzer/Run.c
+++ b/MABS_run_analyzer/Run.c
@@ -209,6 +209,7 @@ Bool_t Run::setDynamicalNoiseMode(TString mode)
         processed->useexponentialdecayingnoisewindow = 0;
         return 0;
     }
+    cout << coloryellow << "Passed noise mode not recognized, using simple moving average" << endlr;
     return 1;
 }