nordic-dev.net/PAMGuard
nordic-dev.net/PAMGuard
2
0
Fork 0
mirror of https://github.com/PAMGuard/PAMGuard.git synced 2024-11-25 08:32:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixed bug in sweep classifier when using SoundTrap click detections

Browse Source
This commit is contained in:
Jamie Mac 2022-03-01 14:31:50 +00:00
parent 38c7ceb942
commit d7b5c2bad0
3 changed files with 15 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/clickDetector/ClickClassifiers/basicSweep/SweepClassifierDialog.java
View File

@ -1530,6 +1530,9 @@ public class SweepClassifierDialog extends PamDialog implements ImportExportUser
if (clickControl!=null) {
int[] chanGroups = clickControl.getClickParameters().getGroupedSourceParameters().getChannelGroups();
multiChan = false;
if (chanGroups==null) return multiChan;
for (int i=0; i<chanGroups.length; i++) {
int chans = clickControl.getClickParameters().getGroupedSourceParameters().getGroupChannels(i);
// Debug.out.println("Check multi-channel: " + chanGroups[i] + " num: " + PamUtils.getNumChannels(chans));

2
src/dataPlotsFX/clickPlotFX/ClickFFTPlotManager2.java
View File

@ -90,6 +90,8 @@ public class ClickFFTPlotManager2 extends FFTPlotManager {
double[][] spectrum=clickSpectrogram.getSpectrogram(chanClick);
double clipLevel = ArrayManager.getArrayManager().getCurrentArray().getClipLevel(PamUtils.getChannelArray(pamDataUnit.getChannelBitmap())[chanClick]);
//System.out.println("clipLevel: " + clipLevel);
drawClipSpectrogram(spectrum, pamDataUnit.getTimeMilliseconds(),
writableImage.getScrollingPLot2DSegmenter().getMaxY(), clickPlotInfoFX.getClickDisplayParams().fftHop,

13
src/rawDeepLearningClassifier/dlClassification/ketos/KetosModelTest.java
View File

@ -31,12 +31,19 @@ public class KetosModelTest {
//test on a right whale.
//File file = new File("/Volumes/GoogleDrive/My Drive/PAMGuard_dev/Deep_Learning/Meridian/right_whales/for_pamguard/narw.ktpb");
File file = new File("/Volumes/GoogleDrive-108005893101854397430/My Drive/PAMGuard_dev/Deep_Learning/Meridian/humpback_whales/SOCAL_Mn_Network.ktpb");
// File file = new File("/Volumes/GoogleDrive-108005893101854397430/My Drive/PAMGuard_dev/Deep_Learning/Meridian/humpback_whales/SOCAL_Mn_Network.ktpb");
//File file = new File("/Volumes/GoogleDrive-108005893101854397430/My Drive/PAMGuard_dev/Deep_Learning/Meridian/orca/kw_detector_v11_5s.ktpb");
//the wav file to test.
//String wavFilePath = "/Volumes/GoogleDrive/My Drive/PAMGuard_dev/Deep_Learning/Meridian/right_whales/for_pamguard/input.wav";
String wavFilePath = "/Volumes/GoogleDrive-108005893101854397430/My Drive/PAMGuard_dev/Deep_Learning/Meridian/humpback_whales/wav/5353.210403161502.wav";
// String wavFilePath = "/Volumes/GoogleDrive-108005893101854397430/My Drive/PAMGuard_dev/Deep_Learning/Meridian/humpback_whales/wav/5353.210403161502.wav";
// double windowSize = 3.52;
//Minke model
File file = new File("/Users/au671271/Desktop/Minke_test/Minke_Network_12s.ktpb");
String wavFilePath = "/Users/au671271/Desktop/Minke_test/1705_FLAC_1705_20171106_185953_253.wav";
double windowSize = 12;
try {
//the ketos model.
@ -54,7 +61,7 @@ public class KetosModelTest {
//Open wav files.
AudioData soundData = DLUtils.loadWavFile(wavFilePath);
soundData = soundData.trim(0, (int) (soundData.getSampleRate()*3.52));
soundData = soundData.trim(0, (int) (soundData.getSampleRate()*windowSize));
//generate the transforms.
ArrayList<DLTransform> transforms = DLTransformsFactory.makeDLTransforms(ketosParams.dlTransforms);