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

V2.02.11e fix file start skip

Browse Source 
Skipping start of files was causing click detector to not find clicks. Changed code so first seconds are still sent, but with data set to 0, rather than not sending data since that was causing sample counts in different bits of PAMGuard to get out of synch.
This commit is contained in:
Douglas Gillespie 2024-06-19 15:29:28 +01:00
parent a8af4d32f4
commit 1d7a986621
4 changed files with 10 additions and 7 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.11d</version>
<version>2.02.11e</version>
<name>Pamguard</name>
<description>Pamguard using Maven to control dependencies</description>
<url>www.pamguard.org</url>

7
src/Acquisition/FileInputSystem.java
View File

@ -15,6 +15,7 @@ import java.io.FileNotFoundException;
import java.io.IOException;
import java.io.Serializable;
import java.text.DateFormat;
import java.util.Arrays;
import java.util.Calendar;
import java.util.List;
@ -1017,9 +1018,11 @@ public class FileInputSystem extends DaqSystem implements ActionListener, PamSe
newDataUnit = new RawDataUnit(ms, 1 << ichan, totalSamples, newSamples);
newDataUnit.setRawData(doubleData[ichan]);
if (1000*(readFileSamples/sampleRate)>=fileInputParameters.skipStartFileTime) {
newDataUnits.addNewData(newDataUnit);
if (1000*(readFileSamples/sampleRate)<fileInputParameters.skipStartFileTime) {
// zero the data. Skipping it causes all the timing to screw up
Arrays.fill(doubleData[ichan], 0.);
}
newDataUnits.addNewData(newDataUnit);
// GetOutputDataBlock().addPamData(pamDataUnit);
}

4
src/PamController/PamguardVersionInfo.java
View File

@ -31,12 +31,12 @@ 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.11d";
static public final String version = "2.02.11e";
/**
* Release date
*/
static public final String date = "30 May 2024";
static public final String date = "19 June 2024";
// /**
// * Release type - Beta or Core

4
src/clickDetector/ClickDetector.java
View File

@ -329,7 +329,7 @@ public class ClickDetector extends PamProcess {
offlineEventLogging.setSubLogging(getClickDataBlock().getOfflineClickLogging());
triggerBackgroundHandler = new TriggerBackgroundHandler(this);
clickBackgroundManager = new ClickBackgroundManager(this);
setProcessCheck(new BaseProcessCheck(this, RawDataUnit.class, 1, 0.0000001));
@ -1378,7 +1378,7 @@ public class ClickDetector extends PamProcess {
private boolean initialiseFilters;
private long clickStartSample, clickEndSample;
private double maxSignalExcess;
private int clickTriggers;