Anylyzer: fixed double run analysis

diff --git a/MABS_run_analyzer/ChargeSpektrum.c b/MABS_run_analyzer/ChargeSpektrum.c
index d43a9c23d84de486877d842f8ec708e6f168bc3d..dba54e9f19e3979ad7ad59e338aee267c5e76dca 100644 (file)
--- 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 e9059d898eecf68d01deddc5016f7ef5fb23e880..ae515ba07d47197453eb4852c794b60569df0ee7 100644 (file)
--- 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;
 }