From c4ebbf4666549ec35f694e4a9c8accb7b30b4658 Mon Sep 17 00:00:00 2001 From: redford_s Date: Fri, 8 Feb 2019 14:19:50 +0100 Subject: [PATCH] Since all analysis files now use the same range finding functions, moved them to jungfrauCommonFunctions. --- BP_analysis.cpp | 48 ------------------------------------------------ CS_analysis.cpp | 48 ------------------------------------------------ DB_analysis.cpp | 48 ------------------------------------------------ 3 files changed, 144 deletions(-) diff --git a/BP_analysis.cpp b/BP_analysis.cpp index bfc3c0b..effc4b1 100644 --- a/BP_analysis.cpp +++ b/BP_analysis.cpp @@ -14,54 +14,6 @@ #include "TLegend.h" #include "TPaveText.h" -double highestPointBeforeSwitching(const vector &lower_filter, const vector &higher_filter) { - - double highest_point_before_switching; - - if (higher_filter.size() > 0) { - // find the highest value in lower_filter that is lower than all entries in higher_filter - highest_point_before_switching = *min_element(lower_filter.begin(),lower_filter.end())-1; - - double lowest_entry_in_higher_filter = *min_element(higher_filter.begin(),higher_filter.end()); - for(vector::const_iterator it = lower_filter.begin(); it != lower_filter.end(); ++it) { - if (*it < lowest_entry_in_higher_filter) { - if (*it > highest_point_before_switching) { - highest_point_before_switching = *it; - } - } - } - } else { - highest_point_before_switching = *max_element(lower_filter.begin(),lower_filter.end()); - } - - return highest_point_before_switching; - -} - -double lowestPointAfterSwitching(const vector &higher_filter, const vector &lower_filter) { - - double lowest_point_after_switching; - - if (lower_filter.size() > 0) { - // find the lowest value in higher_filter that is higher than all entries in lower_filter - lowest_point_after_switching = *max_element(higher_filter.begin(),higher_filter.end())+1; - - double highest_entry_in_lower_filter = *max_element(lower_filter.begin(),lower_filter.end()); - for(vector::const_iterator it = higher_filter.begin(); it != higher_filter.end(); ++it) { - if (*it > highest_entry_in_lower_filter) { - if (*it < lowest_point_after_switching) { - lowest_point_after_switching = *it; - } - } - } - } else { - lowest_point_after_switching = *min_element(higher_filter.begin(),higher_filter.end()); - } - - return lowest_point_after_switching; - -} - int main(int argc, char* argv[]) { jungfrauStyle(); diff --git a/CS_analysis.cpp b/CS_analysis.cpp index 34f2946..d675426 100644 --- a/CS_analysis.cpp +++ b/CS_analysis.cpp @@ -18,54 +18,6 @@ #include #include -double highestPointBeforeSwitching(const vector &lower_filter, const vector &higher_filter) { - - double highest_point_before_switching; - - if (higher_filter.size() > 0) { - // find the highest value in lower_filter that is lower than all entries in higher_filter - highest_point_before_switching = *min_element(lower_filter.begin(),lower_filter.end())-1; - - double lowest_entry_in_higher_filter = *min_element(higher_filter.begin(),higher_filter.end()); - for(vector::const_iterator it = lower_filter.begin(); it != lower_filter.end(); ++it) { - if (*it < lowest_entry_in_higher_filter) { - if (*it > highest_point_before_switching) { - highest_point_before_switching = *it; - } - } - } - } else { - highest_point_before_switching = *max_element(lower_filter.begin(),lower_filter.end()); - } - - return highest_point_before_switching; - -} - -double lowestPointAfterSwitching(const vector &higher_filter, const vector &lower_filter) { - - double lowest_point_after_switching; - - if (lower_filter.size() > 0) { - // find the lowest value in higher_filter that is higher than all entries in lower_filter - lowest_point_after_switching = *max_element(higher_filter.begin(),higher_filter.end())+1; - - double highest_entry_in_lower_filter = *max_element(lower_filter.begin(),lower_filter.end()); - for(vector::const_iterator it = higher_filter.begin(); it != higher_filter.end(); ++it) { - if (*it > highest_entry_in_lower_filter) { - if (*it < lowest_point_after_switching) { - lowest_point_after_switching = *it; - } - } - } - } else { - lowest_point_after_switching = *min_element(higher_filter.begin(),higher_filter.end()); - } - - return lowest_point_after_switching; - -} - double checkRangeMinForRCEffect(double range_min) { // check that the range minimum is at least 2 us, to avoid non-linearity of RC effect diff --git a/DB_analysis.cpp b/DB_analysis.cpp index fb0ff82..0799ecb 100644 --- a/DB_analysis.cpp +++ b/DB_analysis.cpp @@ -11,54 +11,6 @@ #include "TPaveStats.h" #include "TLegend.h" -double highestPointBeforeSwitching(const vector &lower_filter, const vector &higher_filter) { - - double highest_point_before_switching; - - if (higher_filter.size() > 0) { - // find the highest value in lower_filter that is lower than all entries in higher_filter - highest_point_before_switching = *min_element(lower_filter.begin(),lower_filter.end())-1; - - double lowest_entry_in_higher_filter = *min_element(higher_filter.begin(),higher_filter.end()); - for(vector::const_iterator it = lower_filter.begin(); it != lower_filter.end(); ++it) { - if (*it < lowest_entry_in_higher_filter) { - if (*it > highest_point_before_switching) { - highest_point_before_switching = *it; - } - } - } - } else { - highest_point_before_switching = *max_element(lower_filter.begin(),lower_filter.end()); - } - - return highest_point_before_switching; - -} - -double lowestPointAfterSwitching(const vector &higher_filter, const vector &lower_filter) { - - double lowest_point_after_switching; - - if (lower_filter.size() > 0) { - // find the lowest value in higher_filter that is higher than all entries in lower_filter - lowest_point_after_switching = *max_element(higher_filter.begin(),higher_filter.end())+1; - - double highest_entry_in_lower_filter = *max_element(lower_filter.begin(),lower_filter.end()); - for(vector::const_iterator it = higher_filter.begin(); it != higher_filter.end(); ++it) { - if (*it > highest_entry_in_lower_filter) { - if (*it < lowest_point_after_switching) { - lowest_point_after_switching = *it; - } - } - } - } else { - lowest_point_after_switching = *min_element(higher_filter.begin(),higher_filter.end()); - } - - return lowest_point_after_switching; - -} - int main(int argc, char* argv[]) { jungfrauStyle(); gROOT->SetBatch(1);