From 70e65c79831128a8ff48ed2f7b637b4cc0c1b8ae Mon Sep 17 00:00:00 2001
From: lamipaul <paulobest25@gmail.com>
Date: Mon, 13 Mar 2023 13:36:38 +0100
Subject: [PATCH] detection 1min
---
Rapport2wavs.py | 8 ++++----
RapportInfo2txt | Bin 16368 -> 16368 bytes
RapportInfo2txt.c | 4 ++--
3 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/Rapport2wavs.py b/Rapport2wavs.py
index 6b0340d..6239431 100644
--- a/Rapport2wavs.py
+++ b/Rapport2wavs.py
@@ -6,8 +6,8 @@ parser = argparse.ArgumentParser()
parser.add_argument('filename')
args = parser.parse_args()
-RORQUAL_HOPSIZE, RORQUAL_WINSIZE, RORQUAL_FE, RORQUAL_SAMPLEPERSAMPLE = 256, 4096, 4000, 25600
-CACHA_HOPSIZE, CACHA_WINSIZE, CACHA_FE, CACHA_SAMPLEPERSAMPLE = 256, 512, 64000, 12800
+RORQUAL_HOPSIZE, RORQUAL_WINSIZE, RORQUAL_FE, RORQUAL_SAMPLEPERSAMPLE, RORQUAL_LENSIG = 256, 4096, 4000, 25600, 60
+CACHA_HOPSIZE, CACHA_WINSIZE, CACHA_FE, CACHA_SAMPLEPERSAMPLE, CACHA_LENSIG = 256, 512, 64000, 12800, 60
CACHA_RAPPORT_FE, RORQUAL_RAPPORT_FE, RAPPORT_N_CHANNELS = 128_000, 128_00, 5
CACHA_NUM_DETEC, RORQUAL_NUM_DETEC = 10, 3
rorqual_predPos = lambda p: int(((p * RORQUAL_HOPSIZE + (RORQUAL_WINSIZE/2 + RORQUAL_HOPSIZE * 13) / 2) / RORQUAL_FE - 1) * RORQUAL_RAPPORT_FE)
@@ -20,7 +20,7 @@ for l in lines:
if l == ' rorqual predPeaks\n':
l = next(lines)
if ',' in l:
- sig = np.zeros((30 * RORQUAL_RAPPORT_FE, RAPPORT_N_CHANNELS), dtype='int16')
+ sig = np.zeros((RORQUAL_LENSIG * RORQUAL_RAPPORT_FE, RAPPORT_N_CHANNELS), dtype='int16')
peaks = np.array(l[:-2].split(',')).astype(int)
l = next(lines)
for p in peaks[:RORQUAL_NUM_DETEC]:
@@ -31,7 +31,7 @@ for l in lines:
if l == ' cacha predPeaks\n':
l = next(lines)
if ',' in l:
- sig = np.zeros((10 * CACHA_RAPPORT_FE, RAPPORT_N_CHANNELS), dtype='int16')
+ sig = np.zeros((CACHA_LENSIG * CACHA_RAPPORT_FE, RAPPORT_N_CHANNELS), dtype='int16')
peaks = np.array(l[:-2].split(',')).astype(int)
l = next(lines)
for p in peaks[:CACHA_NUM_DETEC]:
diff --git a/RapportInfo2txt b/RapportInfo2txt
index be9448a1b15a8fb4ace1ea1c416955ef833250a5..dfdba6569694eb98dc55308cfdf2d99c3c6269d6 100755
GIT binary patch
delta 243
zcmexR|Dk?E10z#M(dH(`Z;T?GzvMb%ef?ei6U@)8<5aHpyf5};a}V=sex)V(@(dom
ztp9Wv7(6<UzgYJ7|9}4Ntjb;t4E*~~@NZ`gjF=oLtjDArF}YLNQ^1Fvfx)9!q?LgI
zM6)JOek5$e)WbYkLBxdTfH+7@1Z3LN$q6DlOfun<`$P(OE+E8BCv%C0FnNVdP7rNk
z@?oF+L=;7v`eYR`9VP|$$w6WTJQqH*f~*1=S2+2cSQ3+i+h!wiJ1M3m`J0Oj&6t>8
TtlzxKSdE+MME>SWc5;jWe7;T}
delta 243
zcmexR|Dk?E10&Okpv_H;-xx(o>lc4nk#Iz!aK8WgW<}w3+|NGsZ0=!R&9C&rU!K9E
zm-U|x1A|BB@fXYf{{PRvoprY%0|Wp56a3p*r&>&o6xL%(x0u{1>?vTv$iU#yE7Hoq
z0HRr=CqELlVcO0(SwX~v=K(uNOax@w%gG5MI!p=Xllw#pcs?M+Ehlq{hA{P+O->MP
zVlrZ!{6y4*=LJGqda{a`4$}_3$w6WTJRcsjf~*1=S33EeSQ66>-OWbgc2Z0){5KaF
XnlUkHOxV22SdE*BBVh9-J2^%GW>HZv
diff --git a/RapportInfo2txt.c b/RapportInfo2txt.c
index ca1f568..44cacb6 100755
--- a/RapportInfo2txt.c
+++ b/RapportInfo2txt.c
@@ -8,7 +8,7 @@
#define NTOAS_MAX 200
#define RORQUAL_SAMPLE_RATE 4000
-#define RORQUAL_LENSIG RORQUAL_SAMPLE_RATE*30 // load 60sec
+#define RORQUAL_LENSIG RORQUAL_SAMPLE_RATE*60 // load 60sec
#define RORQUAL_WINSIZE 4096
#define RORQUAL_LENSPEC (RORQUAL_LENSIG - RORQUAL_WINSIZE)/RORQUAL_HOPSIZE
#define RORQUAL_HOPSIZE 256
@@ -18,7 +18,7 @@
#define RORQUAL_RAPPORT_SAMPLESPERSAMPLE 25600 // see cacha
#define CACHA_SAMPLE_RATE 64000
-#define CACHA_LENSIG CACHA_SAMPLE_RATE*10 // load 10sec
+#define CACHA_LENSIG CACHA_SAMPLE_RATE*60 // load 10sec
#define CACHA_WINSIZE 512
#define CACHA_LENSPEC (CACHA_LENSIG - CACHA_WINSIZE)/CACHA_HOPSIZE
#define CACHA_HOPSIZE 256
--
GitLab