diff --git a/Rapport2wavs.py b/Rapport2wavs.py index 6b0340d47ac65e2c3aa4a60b58013ad97fe94f82..6239431be8678004707105a1fbab9032a06302d9 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 e5d353a46d5b85adae1e8dfb3610e770ec3cce97..d6ca689381f8ffd4d8e2842834a8330df8c9e0f9 100755 Binary files a/RapportInfo2txt and b/RapportInfo2txt differ diff --git a/RapportInfo2txt.c b/RapportInfo2txt.c index e2817e31c703ce678a700d7db410d9f3f956a94d..97e58f74f8626b82a625741181c7b7d89bc8472a 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