From ff72a485907fea0d9c42b7f46f6cec57f7b6fc40 Mon Sep 17 00:00:00 2001
From: Anthony Truskinger <anthony.truskinger@gmail.com>
Date: Fri, 5 Mar 2021 15:35:35 +1000
Subject: [PATCH] Fix merge conflicts and update variables

---
 docs/guides/Ecosounds.NinoxBoobook.yml                       | 2 +-
 docs/guides/generic_recognizers.md                           | 4 ++--
 .../Truskinger.CalyptorhynchusLathami.yml                    | 2 +-
 .../RecognizerConfigFiles/Truskinger.ClimacterisPicumnus.yml | 2 +-
 src/AnalysisPrograms/Recognizers/GenericRecognizer.cs        | 5 +++--
 5 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/docs/guides/Ecosounds.NinoxBoobook.yml b/docs/guides/Ecosounds.NinoxBoobook.yml
index 720b669e3..8b7f8f147 100644
--- a/docs/guides/Ecosounds.NinoxBoobook.yml
+++ b/docs/guides/Ecosounds.NinoxBoobook.yml
@@ -69,7 +69,7 @@ PostProcessing:
 
     # 6: In the case of sets of nested/enclosed events,
     # filter/remove all but the outermost event.
-    RemoveTemporallyEnclosedEvents: true
+    RemoveEnclosedEvents: true
 
 # Options to save results files
 # Available options for saving spectrograms: [Never | Always | WhenEventsDetected]
diff --git a/docs/guides/generic_recognizers.md b/docs/guides/generic_recognizers.md
index 7dc35b395..cd9f7c5df 100644
--- a/docs/guides/generic_recognizers.md
+++ b/docs/guides/generic_recognizers.md
@@ -481,14 +481,14 @@ For details on configuring this step see <xref:AudioAnalysisTools.Events.Types.E
 Running profiles with multiple decibel thresholds can produce sets of enclosed (wholly overlapped by another event) events
 that are actually the result of detecting the same acoustic syllable. 
 This final (optional) post-processing step is to
-remove all but the outermost event of any nested set. Enable this option by setting the parameter `RemoveTemporallyEnclosedEvents` to `true`.
+remove all but the outermost event of any nested set. Enable this option by setting the parameter `RemoveEnclosedEvents` to `true`.
 You would typically do this only after reviewing the output spectrograms to confirm that you have sets of overlapping events.
 
 [!code-yaml[post_processing_sideband](./Ecosounds.NinoxBoobook.yml?start=34&end=72&highlight=36- "Post Processing: enclosed events")]
 
 <aside>
 
-##### How `RemoveTemporallyEnclosedEvents` is applied
+##### How `RemoveEnclosedEvents` is applied
 
 Suppose you have three decibel thresholds (6, 9 and 12 dB is a typical set of values) 
 in each of two profiles.
diff --git a/src/AnalysisConfigFiles/RecognizerConfigFiles/Truskinger.CalyptorhynchusLathami.yml b/src/AnalysisConfigFiles/RecognizerConfigFiles/Truskinger.CalyptorhynchusLathami.yml
index e3a008067..0c3dcbf64 100644
--- a/src/AnalysisConfigFiles/RecognizerConfigFiles/Truskinger.CalyptorhynchusLathami.yml
+++ b/src/AnalysisConfigFiles/RecognizerConfigFiles/Truskinger.CalyptorhynchusLathami.yml
@@ -132,7 +132,7 @@ PostProcessing:
 #         LowerHertzBuffer: 150
 #         UpperHertzBuffer: 400
 #         MaxAverageSidebandDecibels: 3.0
-    RemoveTemporallyEnclosedEvents: true
+    RemoveEnclosedEvents: true
 
 # Options to save results files
 # Available options for saving spectrograms (case-sensitive): [False/Never | True/Always | WhenEventsDetected]
diff --git a/src/AnalysisConfigFiles/RecognizerConfigFiles/Truskinger.ClimacterisPicumnus.yml b/src/AnalysisConfigFiles/RecognizerConfigFiles/Truskinger.ClimacterisPicumnus.yml
index 3f0138441..636cfdcba 100644
--- a/src/AnalysisConfigFiles/RecognizerConfigFiles/Truskinger.ClimacterisPicumnus.yml
+++ b/src/AnalysisConfigFiles/RecognizerConfigFiles/Truskinger.ClimacterisPicumnus.yml
@@ -103,7 +103,7 @@ PostProcessing:
         LowerHertzBuffer: 150
         UpperHertzBuffer: 400
         MaxAverageSidebandDecibels: 3.0
-    RemoveTemporallyEnclosedEvents: true
+    RemoveEnclosedEvents: true
 
 # Options to save results files
 # Available options for saving spectrograms (case-sensitive): [False/Never | True/Always | WhenEventsDetected]
diff --git a/src/AnalysisPrograms/Recognizers/GenericRecognizer.cs b/src/AnalysisPrograms/Recognizers/GenericRecognizer.cs
index 7cbe7876e..fa3cdc078 100644
--- a/src/AnalysisPrograms/Recognizers/GenericRecognizer.cs
+++ b/src/AnalysisPrograms/Recognizers/GenericRecognizer.cs
@@ -144,14 +144,15 @@ public override RecognizerResults Recognize(
 
             // ############################### PRE-PROCESSING ###############################
             // may at some future date do pre-processing
-
             // ############################### PROCESSING: DETECTION OF GENERIC EVENTS ###############################
             var results = RunProfiles(audioRecording, configuration, segmentStartOffset);
 
             // ############################### POST-PROCESSING OF GENERIC EVENTS ###############################
 
             var postprocessingConfig = configuration.PostProcessing;
-            if (postprocessingConfig is not null) {
+
+            if (postprocessingConfig is not null)
+            {
                 var postEvents = new List<EventCommon>();
                 var groups = results.NewEvents.GroupBy(x => x.DecibelDetectionThreshold);