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

Merge pull request #5 from PAMGuard/main

Browse Source 
Mere from main
This commit is contained in:
Douglas Gillespie 2022-06-24 12:31:51 +01:00 committed by GitHub
commit 847cff413d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 13 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
dependency-reduced-pom.xml
View File

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

2
pom.xml
View File

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

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.04";
static public final String version = "2.02.04a";
/**
* Release date
*/
static public final String date = "11 June 2022";
static public final String date = "23 June 2022";
// /**
// * Release type - Beta or Core

7
src/rocca/RoccaSidePanel.java
View File

@ -115,8 +115,11 @@ public class RoccaSidePanel extends PamObserverAdapter implements PamSidePanel
(roccaControl.roccaProcess,
roccaControl.roccaParameters.getChannelMap());
// this one probably OK to never delete ?
rsdb.setNaturalLifetimeMillis(Integer.MAX_VALUE);
/*
* this one probably OK to never delete ? Nope lots of stuff goes in
* here, so it seems it will eventually bring the system down.
*/
rsdb.setNaturalLifetimeMillis(roccaControl.getMaxDataKeepTime());
rdl = new RoccaDetectionLogger(this, rsdb);
rsdb.SetLogging(rdl);

2
src/simulatedAcquisition/SimProcess.java
View File

@ -304,7 +304,7 @@ public class SimProcess extends DaqSystem implements PamSettings {
/* simulate the noise, need to divide fs by 2 to only generate for 0 to Nyquist to get correct values out.
* that match the results of the noise band monitor modules.
*/
double dbNse = simParameters.backgroundNoise + 10*Math.log10(getSampleRate()/2);
double dbNse = simParameters.backgroundNoise + 10*Math.log10(getSampleRate()/2.);
nse = daqControl.getDaqProcess().dbMicropascalToSignal(i, dbNse);
generateNoise(channelData, nse);
// generateNoiseQuickly(channelData, nse, i);

3
src/simulatedAcquisition/sounds/SimSignals.java
View File

@ -27,6 +27,9 @@ public class SimSignals {
simSignalList.add(new ClickSound("Click", 3000, 3000, 2e-3, WINDOWTYPE.DECAY));
simSignalList.add(new ClickSound("Chirp", 3000, 6000, 0.1, WINDOWTYPE.TAPER10));
simSignalList.add(new ClickSound("Chirp", 3000, 8000, 0.5, WINDOWTYPE.TAPER10));
simSignalList.add(new ClickSound("Dolphin Click", 60000, 60000, 20.e-6, WINDOWTYPE.DECAY));
simSignalList.add(new ClickSound("Fin 20Hz", 20, 20, 0.5, WINDOWTYPE.HANN));
simSignalList.add(new ClickSound("Fin 40Hz", 40, 40, 0.5, WINDOWTYPE.HANN));
// simSignalList.add(new LinearChirp(simProcess.getSampleRate(), 3000, 6000, 0.1));
// simSignalList.add(new LinearChirp(simProcess.getSampleRate(), 3000, 8000, .5));
simSignalList.add(new RandomWhistles());