diff --git a/src/AnalysisConfigFiles/Towsey.Acoustic.Zooming.yml b/src/AnalysisConfigFiles/Towsey.Acoustic.Zooming.yml index 5e787d663..9e92748ee 100644 --- a/src/AnalysisConfigFiles/Towsey.Acoustic.Zooming.yml +++ b/src/AnalysisConfigFiles/Towsey.Acoustic.Zooming.yml @@ -8,7 +8,7 @@ # # -AnalysisName: Towsey.Acoustic +#AnalysisName: Towsey.Acoustic #SegmentDuration: units=seconds; SegmentDuration: 60 #SegmentOverlap: units=seconds; @@ -64,11 +64,11 @@ TileOutput: false # if true, an exception will be thrown if no such date is found # if false, and a valid date is still found in file name, it will still be parsed # supports formats like: -# prefix_20140101T235959+1000.mp3 -# prefix_20140101T235959+Z.mp3 -# prefix_20140101-235959+1000.mp3 -# prefix_20140101-235959+Z.mp3 -RequireDateInFilename: false +# prefix_20140101T235959+1000.wav +# prefix_20140101T235959Z.wav +# prefix_20140101-235959+1000.wav +# prefix_20140101_235959Z.wav +RequireDateInFilename: true IndexPropertiesConfig: './IndexPropertiesConfig.Zooming.yml' EventThreshold: 0.2 diff --git a/src/AnalysisPrograms/Sandpit.cs b/src/AnalysisPrograms/Sandpit.cs index 2701ec9eb..5b6e795cc 100644 --- a/src/AnalysisPrograms/Sandpit.cs +++ b/src/AnalysisPrograms/Sandpit.cs @@ -334,9 +334,9 @@ public static void Audio2CsvOverOneFile() //string outputPath = @"G:\SensorNetworks\Output\BradLaw\Pillaga24"; //string configPath = @"C:\Work\GitHub\audio-analysis\AudioAnalysis\AnalysisConfigFiles\Towsey.Acoustic.yml"; - string recordingPath = @"C:\Ecoacoustics\WavFiles\LizZnidersic\TasmanIsland2015_Unit2_Mez\SM304256_0+1_20151114_211652.wav"; + string recordingPath = @"C:\Ecoacoustics\WavFiles\LizZnidersic\TasmanIsland2015_Unit2_Mez\SM304256_0+1_20151114_191652+1000.wav"; //string outputPath = @"C:\Ecoacoustics\Output\Test\Test24HourRecording\TasmanIslandMez\22"; - string outputPath = @"C:\Ecoacoustics\Output\Test\TestMezOneHourHiRes\22"; + string outputPath = @"C:\Ecoacoustics\Output\Test\TestMezOneHourHiRes\20"; //string configPath = @"C:\Work\GitHub\audio-analysis\src\AnalysisConfigFiles\Towsey.Acoustic.yml"; string configPath = @"C:\Work\GitHub\audio-analysis\src\AnalysisConfigFiles\Towsey.Acoustic.Zooming.yml"; @@ -688,7 +688,7 @@ public static void DrawZoomingSpectrogramPyramid() //string ipdir = @"C:\Ecoacoustics\Output\FalseColourSpectrograms\SpectrogramFocalZoom\Towsey.Acoustic.200ms.EclipseFarmstayOLD"; //MAP "\\Sef-bigdata-10\d$\tasmania_mez\output_zooming_indices2019\Towsey.Acoustic" to Q drive //string ipdir = @"Q:\TasmaniaMez"; - string ipdir = @"C:\Ecoacoustics\Output\Test\TestMezOneHourHiRes\22\Towsey.Acoustic"; + string ipdir = @"C:\Ecoacoustics\Output\Test\TestMezOneHourHiRes\20\Towsey.Acoustic"; string opdir = @"C:\Ecoacoustics\Output\FalseColourSpectrograms\SpectrogramFocalZoom\TasmaniaMezTest"; // The default zooming LDFC spectrogram config file diff --git a/src/AudioAnalysisTools/LongDurationSpectrograms/Zooming/ZoomCommon.cs b/src/AudioAnalysisTools/LongDurationSpectrograms/Zooming/ZoomCommon.cs index 8bf194749..1000dd136 100644 --- a/src/AudioAnalysisTools/LongDurationSpectrograms/Zooming/ZoomCommon.cs +++ b/src/AudioAnalysisTools/LongDurationSpectrograms/Zooming/ZoomCommon.cs @@ -42,7 +42,7 @@ public static (Dictionary, Dictionary