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

Merge branch 'main' of https://github.com/douggillespie/PAMGuard into main

Browse Source
This commit is contained in:
Douglas Gillespie 2023-09-08 13:32:22 +01:00
commit 7465243169
11 changed files with 178 additions and 94 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pom.xml
View File

@ -4,7 +4,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.pamguard</groupId>
<artifactId>Pamguard</artifactId>
<version>2.02.09</version>
<version>2.02.09a</version>
<name>Pamguard Java12+</name>
<description>Pamguard for Java 12+, using Maven to control dependcies</description>
<url>www.pamguard.org</url>

2
src/PamController/PamguardVersionInfo.java
View File

@ -31,7 +31,7 @@ public class PamguardVersionInfo {
* Version number, major version.minorversion.sub-release.
* Note: can't go higher than sub-release 'f'
*/
static public final String version = "2.02.09";
static public final String version = "2.02.09a";
/**
* Release date

1
src/PamView/PamGui.java
View File

@ -249,7 +249,6 @@ public class PamGui extends PamView implements WindowListener, PamSettings {
// put it in the top corner of the main screen.
guiParameters.bounds.x = guiParameters.bounds.y = 10;
}
frame.setBounds(guiParameters.bounds);

2
src/PamView/paneloverlay/overlaymark/OverlayMarkProviders.java
View File

@ -49,7 +49,7 @@ public class OverlayMarkProviders {
continue;
}
String existingName = marker.getMarkerName();
if (existingName.equals(nameToAdd)) {
if (existingName!=null && existingName.equals(nameToAdd)) {
markProviders.remove(i);
break;
}

2
src/PamView/symbol/PamSymbolManager.java
View File

@ -125,7 +125,7 @@ abstract public class PamSymbolManager<T extends PamSymbolChooser> implements Pa
* This doesn't work since different displays will still need different options based on
* their projector - so it can work, but need to set the projector.
*/
if (managedSymbolData.useGeneric) {
if (managedSymbolData.useGeneric || displayName==null) {
displayName = GENERICNAME;
}

2
src/PamguardMVC/dataSelector/DataSelectDialog.java
View File

@ -34,7 +34,7 @@ public class DataSelectDialog extends PamDialog {
private static final String helpPoint = "displays.dataselect.docs.selectandsymbol";
public DataSelectDialog(Window parentFrame, PamDataBlock pamDataBlock, DataSelector dataSelector, PamSymbolChooser symbolChooser) {
super(parentFrame, pamDataBlock.getDataName(), false);
super(parentFrame, (pamDataBlock==null) ? "Data Selection":pamDataBlock.getDataName(), false);
this.dataSelector = dataSelector;
this.symbolChooser = symbolChooser;
tabPane = new JTabbedPane();

2
src/PamguardMVC/dataSelector/DataSelectorSettings.java
View File

@ -23,7 +23,9 @@ public class DataSelectorSettings implements Serializable, ManagedParameters {
if (selectorParams == null) {
selectorParams = new Hashtable<>();
}
if (name != null) {
selectorParams.put(name, params);
}
}
/**

23
src/annotation/userforms/UserFormSQLAddon.java
View File

@ -29,6 +29,7 @@ public class UserFormSQLAddon implements SQLLoggingAddon {
}
ArrayList<PamTableItem> loggerTableItems = new ArrayList<>();
private ArrayList<InputControlDescription> controlDescriptions;
@Override
@ -39,7 +40,13 @@ public class UserFormSQLAddon implements SQLLoggingAddon {
return;
}
UDFTableDefinition formTableDef = formDescription.getUdfTableDefinition();
ArrayList<InputControlDescription> controlDescriptions = formDescription.getInputControlDescriptions();
controlDescriptions = formDescription.getInputControlDescriptions();
/*
* It's possible the controlDescriptions get rewritten, so hold references to
* the actual items buy copying the list.
*/
controlDescriptions = new ArrayList<>(controlDescriptions);
for (ControlDescription cd:controlDescriptions) {
FormsTableItem[] ctrlTableItems = cd.getFormsTableItems();
if (ctrlTableItems != null) {
@ -74,15 +81,25 @@ public class UserFormSQLAddon implements SQLLoggingAddon {
// is created. So the inputControls list in FormDescription will only point to the last set of controls created,
// which isn't necessarily the ones that this table is pointing to. Instead, load the loggerTableItems with
// the data because loggerTableItems and pamTableDefinition both point to the same thing
/*
* That doesn't work though since some controls have > 1 field, so it all gets out of synch. HAVE to
* use the moveDataToTableItems fields for it to work.
*/
// ArrayList<ControlDescription> inputCtrls = formDescription.getInputControlDescriptions();
// ControlDescription cd;
// for (int i = 0; i < inputCtrls.size(); i++) {
// cd = inputCtrls.get(i);
// cd.moveDataToTableItems(datas[i]);
// }
for (int i = 0; i < loggerTableItems.size(); i++) {
loggerTableItems.get(i).setValue(datas[i]);
for (int i = 0; i < controlDescriptions.size(); i++) {
controlDescriptions.get(i).moveDataToTableItems(datas[i]);
}
// below doesn't work since some controls have > 1 field (e.g. latlong,
// int n = Math.min(loggerTableItems.size(), datas.length);
// for (int i = 0; i < n; i++) {
// loggerTableItems.get(i).setValue(datas[i]);
// }
return true;
}

217
src/detectiongrouplocaliser/dialogs/DetectionGroupTable.java
View File

@ -10,6 +10,7 @@ import java.awt.event.ActionListener;
import java.awt.event.MouseAdapter;
import java.awt.event.MouseEvent;
import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
import java.util.ListIterator;
@ -31,10 +32,12 @@ import PamUtils.PamCalendar;
import PamView.PamColors;
import PamView.PamSymbol;
import PamView.PamSymbolType;
import PamView.component.DataBlockTableView;
import PamView.dialog.PamGridBagContraints;
import PamView.dialog.warn.WarnOnce;
import PamView.tables.SwingTableColumnWidths;
import PamguardMVC.PamDataBlock;
import PamguardMVC.dataSelector.DataSelector;
import annotation.DataAnnotation;
import annotation.DataAnnotationType;
import detectiongrouplocaliser.DetectionGroupControl;
@ -44,12 +47,11 @@ import detectiongrouplocaliser.DetectionGroupObserver;
import detectiongrouplocaliser.DetectionGroupProcess;
import detectiongrouplocaliser.GroupAnnotationHandler;
import pamScrollSystem.AbstractScrollManager;
import pamScrollSystem.PamScroller;
import userDisplay.UserDisplayComponentAdapter;
import warnings.PamWarning;
/**
* Panel to show a table of data on all DetectionGroup data units.
* Panel to show a table of data on all DetectionGroup data units.
*
* @author dg50
*
*/
@ -75,12 +77,17 @@ public class DetectionGroupTable extends UserDisplayComponentAdapter implements
private JButton checkIntegrity;
private JButton dataSelection;
private boolean isViewer;
private DisplayOptionsHandler displayOptionsHandler;
private SwingTableColumnWidths widthManager;
// private DataBlockTableView<DetectionGroupDataUnit> groupTableView;
private ArrayList<DetectionGroupDataUnit> dataCopy;
public DetectionGroupTable(DetectionGroupProcess detectionGroupProcess) {
super();
this.detectionGroupProcess = detectionGroupProcess;
@ -104,14 +111,20 @@ public class DetectionGroupTable extends UserDisplayComponentAdapter implements
JPanel lControlPanel = new JPanel(new GridBagLayout());
controlPanel.add(BorderLayout.WEST, lControlPanel);
GridBagConstraints c = new PamGridBagContraints();
lControlPanel.add(showAll = displayOptionsHandler.createButton(DisplayOptionsHandler.SHOW_ALL, "Show all groups in database", false), c);
lControlPanel.add(showAll = displayOptionsHandler.createButton(DisplayOptionsHandler.SHOW_ALL,
"Show all groups in database", false), c);
c.gridx++;
lControlPanel.add(showCurrent = displayOptionsHandler.createButton(DisplayOptionsHandler.SHOW_CURRENT, "Show only data currently loaded", false), c);
lControlPanel.add(showCurrent = displayOptionsHandler.createButton(DisplayOptionsHandler.SHOW_CURRENT,
"Show only data currently loaded", false), c);
c.gridx++;
checkIntegrity = new JButton("Check Data Integrity");
checkIntegrity.setToolTipText("Check and fix start and end times of events against the database data");
dataSelection = new JButton("Data Selection");
dataSelection.setToolTipText("Select data to list");
lControlPanel.add(checkIntegrity, c);
checkIntegrity.setVisible(detectionGroupControl.isViewer());
c.gridx++;
lControlPanel.add(dataSelection, c);
showAll.addActionListener(new ActionListener() {
@Override
public void actionPerformed(ActionEvent e) {
@ -133,19 +146,39 @@ public class DetectionGroupTable extends UserDisplayComponentAdapter implements
detectionGroupProcess.checkDataIntegrity();
}
});
dataSelection.addActionListener(new ActionListener() {
@Override
public void actionPerformed(ActionEvent e) {
dataSelectionButton(e);
}
});
}
// sortColumnWidths();
// sortColumnWidths();
}
protected void dataSelectionButton(ActionEvent e) {
DataSelector dataSelector = getDataSelector();
if (dataSelector != null) {
boolean changed = dataSelector.showSelectDialog(null);
if (changed) {
dataChanged();
}
}
}
private DataSelector getDataSelector() {
return detectionGroupDataBlock.getDataSelector(getUniqueName(), isViewer);
}
@Override
public Component getComponent() {
return mainPanel;
}
/* (non-Javadoc)
/*
* (non-Javadoc)
*
* @see userDisplay.UserDisplayComponentAdapter#openComponent()
*/
@Override
@ -154,8 +187,9 @@ public class DetectionGroupTable extends UserDisplayComponentAdapter implements
super.openComponent();
}
/* (non-Javadoc)
/*
* (non-Javadoc)
*
* @see userDisplay.UserDisplayComponentAdapter#closeComponent()
*/
@Override
@ -166,7 +200,9 @@ public class DetectionGroupTable extends UserDisplayComponentAdapter implements
private class TableMouseHandler extends MouseAdapter {
/* (non-Javadoc)
/*
* (non-Javadoc)
*
* @see java.awt.event.MouseAdapter#mouseClicked(java.awt.event.MouseEvent)
*/
@Override
@ -176,7 +212,9 @@ public class DetectionGroupTable extends UserDisplayComponentAdapter implements
}
}
/* (non-Javadoc)
/*
* (non-Javadoc)
*
* @see java.awt.event.MouseAdapter#mousePressed(java.awt.event.MouseEvent)
*/
@Override
@ -186,7 +224,9 @@ public class DetectionGroupTable extends UserDisplayComponentAdapter implements
}
}
/* (non-Javadoc)
/*
* (non-Javadoc)
*
* @see java.awt.event.MouseAdapter#mouseReleased(java.awt.event.MouseEvent)
*/
@Override
@ -197,9 +237,17 @@ public class DetectionGroupTable extends UserDisplayComponentAdapter implements
}
}
@Override
public void dataChanged() {
long t1 = 0;
long t2 = Long.MAX_VALUE;
if (showCurrent.isSelected()) {
t1 = detectionGroupDataBlock.getCurrentViewDataStart();
t2 = detectionGroupDataBlock.getCurrentViewDataEnd();
}
dataCopy = detectionGroupDataBlock.getDataCopy(t1, t2, false, getDataSelector());
Collections.sort(dataCopy);
tableModel.fireTableDataChanged();
}
@ -208,17 +256,17 @@ public class DetectionGroupTable extends UserDisplayComponentAdapter implements
}
public void editSelectedEvent() {
DetectionGroupDataUnit dgdu = getSelectedDataRow();
if (dgdu == null) return;
if (dgdu == null)
return;
editGroup(dgdu);
}
public void showPopupMenu(MouseEvent e) {
DetectionGroupDataUnit dgdu = getSelectedDataRow();
if (dgdu == null) return;
if (dgdu == null)
return;
PamSymbol menuIcon = new PamSymbol(detectionGroupControl.getSymbolforMenuItems(dgdu));
JPopupMenu pMenu = new JPopupMenu("Detection Group UID " + dgdu.getUID());
JMenuItem menuItem;
@ -235,23 +283,23 @@ public class DetectionGroupTable extends UserDisplayComponentAdapter implements
menuItem.setIcon(menuIcon);
pMenu.add(menuItem);
int[] beforeTimesSecs = {0, 10, 60};
int[] beforeTimesSecs = { 0, 10, 60 };
pMenu.addSeparator();
for (int i = 0; i < beforeTimesSecs.length; i++) {
int before = beforeTimesSecs[i];
String title;
if (before == 0) {
title = "Scroll to Group UID " + dgdu.getUID() + " at " + PamCalendar.formatDBDateTime(dgdu.getTimeMilliseconds());
}
else {
title = "Scroll to Group UID " + dgdu.getUID() + " at "
+ PamCalendar.formatDBDateTime(dgdu.getTimeMilliseconds());
} else {
title = String.format("Scroll to %ds before Group UID %d", before, dgdu.getUID());
}
menuItem = new JMenuItem(title);
// menuItem.setIcon(menuIcon);
// menuItem.setIcon(menuIcon);
menuItem.addActionListener(new ActionListener() {
@Override
public void actionPerformed(ActionEvent e) {
scrollToEvent(dgdu.getTimeMilliseconds()-before*1000);
scrollToEvent(dgdu.getTimeMilliseconds() - before * 1000);
}
});
pMenu.add(menuItem);
@ -261,24 +309,22 @@ public class DetectionGroupTable extends UserDisplayComponentAdapter implements
}
protected void scrollToEvent(long timeMilliseconds) {
// start a it earlier.
// start a it earlier.
// timeMilliseconds -= 5000;
// now WTF - how do I tell every scroller to go to this point in time ?
// now WTF - how do I tell every scroller to go to this point in time ?
AbstractScrollManager scrollManager = AbstractScrollManager.getScrollManager();
scrollManager.startDataAt(detectionGroupDataBlock, timeMilliseconds);
}
protected void editGroup(DetectionGroupDataUnit dgdu) {
detectionGroupProcess.editDetectionGroup(dgdu);
dataChanged();
}
protected void deleteGroup(DetectionGroupDataUnit dgdu, boolean askFirst) {
if (askFirst) {
int ans = WarnOnce.showWarning(PamController.getMainFrame(), "Delete Group Detection",
int ans = WarnOnce.showWarning(PamController.getMainFrame(), "Delete Group Detection",
"Are you sure you want to permanently delete this group detection ?", WarnOnce.OK_CANCEL_OPTION);
if (ans == WarnOnce.CANCEL_OPTION) {
return;
@ -288,17 +334,17 @@ public class DetectionGroupTable extends UserDisplayComponentAdapter implements
dataChanged();
}
/**
*
* @return which data row is selected, or null.
* @return which data row is selected, or null.
*/
private DetectionGroupDataUnit getSelectedDataRow() {
int row = table.getSelectedRow();
if (row < 0) {
if (row < 0 || dataCopy == null || row >= dataCopy.size()) {
return null;
}
return (DetectionGroupDataUnit) detectionGroupDataBlock.getDataUnit(row, PamDataBlock.REFERENCE_ABSOLUTE);
return dataCopy.get(row);
// return (DetectionGroupDataUnit) detectionGroupDataBlock.getDataUnit(row, PamDataBlock.REFERENCE_ABSOLUTE);
}
@Override
@ -311,7 +357,7 @@ public class DetectionGroupTable extends UserDisplayComponentAdapter implements
private void sortColumnWidths() {
for (int i = 0; i < tableModel.getColumnCount(); i++) {
TableColumn tableCol = table.getColumnModel().getColumn(i);
tableCol.setPreferredWidth(tableModel.getRelativeWidth(i)*50);
tableCol.setPreferredWidth(tableModel.getRelativeWidth(i) * 50);
}
}
@ -319,8 +365,7 @@ public class DetectionGroupTable extends UserDisplayComponentAdapter implements
private int getViewOption() {
if (!isViewer) {
return DisplayOptionsHandler.SHOW_ALL;
}
else if (showCurrent != null) {
} else if (showCurrent != null) {
if (showCurrent.isSelected()) {
return displayOptionsHandler.SHOW_CURRENT;
}
@ -334,7 +379,7 @@ public class DetectionGroupTable extends UserDisplayComponentAdapter implements
private List<DataAnnotationType<?>> usedAnnotations;
private ArrayList<String> columnNames = new ArrayList<>();
private int nBaseColumns = 4;
PamSymbol symbol = new PamSymbol(PamSymbolType.SYMBOL_SQUARE,48,12,true,Color.BLACK,Color.BLUE);
PamSymbol symbol = new PamSymbol(PamSymbolType.SYMBOL_SQUARE, 48, 12, true, Color.BLACK, Color.BLUE);
private int firstRowToShow;
private int numRowsToShow;
@ -351,7 +396,9 @@ public class DetectionGroupTable extends UserDisplayComponentAdapter implements
return columnNames.size();
}
/* (non-Javadoc)
/*
* (non-Javadoc)
*
* @see javax.swing.table.AbstractTableModel#getColumnName(int)
*/
@Override
@ -361,37 +408,47 @@ public class DetectionGroupTable extends UserDisplayComponentAdapter implements
@Override
public int getRowCount() {
// System.out.println("getRowCount()");
if (getViewOption() == DisplayOptionsHandler.SHOW_ALL) {
firstRowToShow = 0;
return numRowsToShow = detectionGroupDataBlock.getUnitsCount();
}
else {
// work through datablock and work out the first and n indexes to show.
firstRowToShow = -1;
int lastRowToShow = -1;
int i = 0;
synchronized (detectionGroupDataBlock.getSynchLock()) {
ListIterator it = detectionGroupDataBlock.getListIterator(0);
while (it.hasNext()) {
DetectionGroupDataUnit nextData = (DetectionGroupDataUnit) it.next();
if (nextData.getSubDetectionsCount() > 0) {
if (firstRowToShow < 0) {
firstRowToShow = i;
}
lastRowToShow = i+1;
}
i++;
}
}
return lastRowToShow - firstRowToShow;
// System.out.println("getRowCount()");
if (dataCopy == null) {
return 0;
}
return dataCopy.size();
// if (getViewOption() == DisplayOptionsHandler.SHOW_ALL) {
// firstRowToShow = 0;
// return numRowsToShow = dataCopy.size();
//// return numRowsToShow = detectionGroupDataBlock.getUnitsCount();
// }
// else {
// // work through datablock and work out the first and n indexes to show.
// firstRowToShow = -1;
// int lastRowToShow = -1;
// int i = 0;
// synchronized (detectionGroupDataBlock.getSynchLock()) {
// ListIterator it = detectionGroupDataBlock.getListIterator(0);
// while (it.hasNext()) {
// DetectionGroupDataUnit nextData = (DetectionGroupDataUnit) it.next();
// if (nextData.getSubDetectionsCount() > 0) {
// if (firstRowToShow < 0) {
// firstRowToShow = i;
// }
// lastRowToShow = i+1;
// }
// i++;
// }
// }
// return lastRowToShow - firstRowToShow;
// }
}
@Override
public Object getValueAt(int iRow, int iCol) {
if (dataCopy == null) {
return null;
}
try {
DetectionGroupDataUnit dgdu = (DetectionGroupDataUnit) detectionGroupDataBlock.getDataUnit(iRow+firstRowToShow, PamDataBlock.REFERENCE_ABSOLUTE);
// DetectionGroupDataUnit dgdu = (DetectionGroupDataUnit) detectionGroupDataBlock.getDataUnit(iRow+firstRowToShow, PamDataBlock.REFERENCE_ABSOLUTE);
DetectionGroupDataUnit dgdu = dataCopy.get(iRow);
if (dgdu == null) {
return null;
}
@ -403,15 +460,14 @@ public class DetectionGroupTable extends UserDisplayComponentAdapter implements
return symbol;
case 1:
if (dgdu.getUpdateCount() > 0) {
return "*"+dgdu.getUpdateCount();
}
else {
return "*" + dgdu.getUpdateCount();
} else {
return null;
}
case 2:
// if (iRow == 0) {
// System.out.println("getValueAt(0,0)");
// }
// if (iRow == 0) {
// System.out.println("getValueAt(0,0)");
// }
return dgdu.getUID();
case 3:
return PamCalendar.formatDateTime(dgdu.getTimeMilliseconds());
@ -432,8 +488,7 @@ public class DetectionGroupTable extends UserDisplayComponentAdapter implements
}
}
catch (Exception e) {
} catch (Exception e) {
return null;
}
return null;
@ -447,7 +502,9 @@ public class DetectionGroupTable extends UserDisplayComponentAdapter implements
return super.getColumnClass(col);
}
/* (non-Javadoc)
/*
* (non-Javadoc)
*
* @see javax.swing.table.AbstractTableModel#fireTableStructureChanged()
*/
@Override
@ -463,25 +520,25 @@ public class DetectionGroupTable extends UserDisplayComponentAdapter implements
// count columns in each annotation ...
annotationHandler = detectionGroupProcess.getAnnotationHandler();
usedAnnotations = annotationHandler.getUsedAnnotationTypes();
for (DataAnnotationType annotation:usedAnnotations) {
for (DataAnnotationType annotation : usedAnnotations) {
columnNames.add(annotation.getAnnotationName());
}
super.fireTableStructureChanged();
}
/**
* Attempt to set column widths.
* Attempt to set column widths.
*
* @param colIndex
* @return relative column widths.
*/
public int getRelativeWidth(int colIndex) {
switch(colIndex) {
switch (colIndex) {
case 0:
return 1;
case 1:
return 1;
case 2:
case 2:
return 5;
case 3:
return 5;
@ -491,7 +548,9 @@ public class DetectionGroupTable extends UserDisplayComponentAdapter implements
}
}
/* (non-Javadoc)
/*
* (non-Javadoc)
*
* @see userDisplay.UserDisplayComponentAdapter#setUniqueName(java.lang.String)
*/
@Override
@ -500,6 +559,4 @@ public class DetectionGroupTable extends UserDisplayComponentAdapter implements
super.setUniqueName(uniqueName);
}
}

14
src/difar/DifarProcess.java
View File

@ -316,11 +316,19 @@ public class DifarProcess extends PamProcess {
sP = difarControl.getDifarParameters().findSpeciesParams(difarDataUnit);
}
difarDataUnit.setDisplaySampleRate(sP.sampleRate);
if (!sP.useMarkedBandsForSpectrogramClips){
double[] frequency = {sP.processFreqMin, sP.processFreqMax};
difarDataUnit.setFrequency(frequency);
if (difarDataUnit.triggerName.equals(difarControl.getUnitName())) { // User detection
if (!sP.useMarkedBandsForSpectrogramClips ){
double[] frequency = {sP.processFreqMin, sP.processFreqMax};
difarDataUnit.setFrequency(frequency);
}
} else { //Check whether to override auto detection freq limits with DIFAR limits
if (!sP.useDetectionLimitsForTriggeredDetections ){ // Auto-detection
double[] frequency = {sP.processFreqMin, sP.processFreqMax};
difarDataUnit.setFrequency(frequency);
}
}
demuxDataUnit(difarDataUnit, demuxWorker, startTime);
calculateDifarGram(difarDataUnit, demuxWorker, startTime);

5
src/rawDeepLearningClassifier/dlClassification/DLClassifyProcess.java
View File

@ -107,7 +107,8 @@ public class DLClassifyProcess extends PamInstantProcess {
addOutputDataBlock(dlDetectionDataBlock);
dlDetectionDataBlock.setNaturalLifetimeMillis(600*1000); //keep this data for a while.
dlDetectionDataBlock.addDataAnnotationType(dlAnnotationType);
//ClipGeneration allows processing of detections by DIFAR module (and possibly others)
dlDetectionDataBlock.setCanClipGenerate(true);
//add custom graphics
PamDetectionOverlayGraphics overlayGraphics = new DLGraphics(dlModelResultDataBlock);
overlayGraphics.setDetectionData(true);
@ -483,7 +484,7 @@ public class DLClassifyProcess extends PamInstantProcess {
DataUnitBaseData basicData = groupDataBuffer.get(0).getBasicData().clone();
basicData.setMillisecondDuration(1000.*rawdata[0].length/this.sampleRate);
basicData.setSampleDuration((long) (groupDataBuffer.size()*dlControl.getDLParams().sampleHop));
basicData.setSampleDuration((long) (groupDataBuffer.size()*dlControl.getDLParams().rawSampleSize));
// System.out.println("Model result: " + modelResult.size());
DLDetection dlDetection = new DLDetection(basicData, rawdata);