Change yml file to be consistent with new post-processing hierarchy.

Issue #370

src/AnalysisConfigFiles/RecognizerConfigFiles/Towsey.NinoxStrenua.yml

@@ -39,43 +39,50 @@ Profiles:
 
 #################### POST-PROCESSING of EVENTS ###################
 
-# The first two post-processing steps are to combine overlapping/proximal/sequential events 
-# 1: Combine overlapping events
-CombineOverlappingEvents: true
+PostProcessing:
+# The following generic post-processing steps are determined by config settings.
+# Step 1: Combine overlapping events - events derived from all profiles.
+# Step 2: Combine possible syllable sequences and filter on excess syllable count.
+# Step 3: Remove events whose bandwidth is too small or large.
+# Step 4: Remove events that have excessive noise in their side-bands.
 
-# 2: Combine possible syllable sequences
-SyllableSequence:
-    CombinePossibleSyllableSequence: true
-    SyllableStartDifference: 1.4
-    SyllableHertzGap: 100
-    FilterSyllableSequence: false
-    SyllableMaxCount: 6
-    ExpectedPeriod: 0.92
+    # 1: Combine overlapping events
+    CombineOverlappingEvents: true
 
-# 3: Remove events whose bandwidth lies outside 3 SDs of an expected value.
-ExpectedBandwidth: 120
-BandwidthStandardDeviation: 30
+    # 2: Combine possible syllable sequences
+    SyllableSequence:
+        CombinePossibleSyllableSequence: true
+        SyllableStartDifference: 1.4
+        SyllableHertzGap: 100
+        FilterSyllableSequence: false
+        SyllableMaxCount: 6
+        ExpectedPeriod: 0.92
 
-# 4: Filter the events for excess activity in their sidebands, i.e. upper and lower buffer zones
-NeighbourhoodLowerHertzBuffer: 0
-NeighbourhoodUpperHertzBuffer: 0
-#NeighbourhoodDecibelBuffer: 18.0  # use this value if not combining sequences
-NeighbourhoodDecibelBuffer: 3.0   # use this value when combining sequences
+    # 3: Remove events whose bandwidth lies outside 3 SDs of an expected value.
+    Bandwidth:
+        ExpectedBandwidth: 120
+        BandwidthStandardDeviation: 30
 
-# Options to save results files
-# 5: Available options for saving spectrograms (case-sensitive): [False/Never | True/Always | WhenEventsDetected]
+    # 4: Filter the events for excess activity in their sidebands, i.e. upper and lower buffer zones
+    SidebandActivity:
+        LowerHertzBuffer: 0
+        UpperHertzBuffer: 0
+        DecibelBuffer: 3.0   # use this value when combining sequences
+
+# Various options to save results files
+# 1: Available options for saving spectrograms (case-sensitive): [False/Never | True/Always | WhenEventsDetected]
 # "True" is useful when debugging but "WhenEventsDetected" is required for operational use.
 #SaveSonogramImages: True
 SaveSonogramImages: WhenEventsDetected
 
-# 6: Available options for saving data files (case-sensitive): [False/Never | True/Always | WhenEventsDetected]
+# 2: Available options for saving data files (case-sensitive): [False/Never | True/Always | WhenEventsDetected]
 SaveIntermediateWavFiles: Never
 SaveIntermediateCsvFiles: false
 
-# 7: DisplayCsvImage is obsolete - ensure it remains set to: false
+# 3: DisplayCsvImage is obsolete - ensure it remains set to: false
 DisplayCsvImage: false
 ## End section for AnalyzeLongRecording
 
-# Other config files to reference
+# 4: Other config files to reference
 HighResolutionIndicesConfig: "../Towsey.Acoustic.HiResIndicesForRecognisers.yml"
 ...

src/AnalysisPrograms/Recognizers/Birds/NinoxStrenua.cs

@@ -54,7 +54,7 @@ public override AnalyzerConfig ParseConfig(FileInfo file)
         /// <param name="segmentStartOffset">when recording starts.</param>
         /// <param name="getSpectralIndexes">not sure what this is.</param>
         /// <param name="outputDirectory">where the recognizer results can be found.</param>
-        /// <param name="imageWidth"> assuming ????.</param>
+        /// <param name="imageWidth"> Should be same as number of frames in the expected spectrogram.</param>
         /// <returns>recognizer results.</returns>
         public override RecognizerResults Recognize(
             AudioRecording audioRecording,