mirror of
https://github.com/saitohirga/WSJT-X.git
synced 2025-09-02 21:27:52 -04:00
When called with -B, make second-pass the same as it was before block detection was introduced. This will be obtained with the Normal decode setting in WSJT-X.
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@8496 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
This commit is contained in:
parent
f693ad4287
commit
e7077b4842
@ -717,8 +717,8 @@ int main(int argc, char *argv[])
|
|||||||
char timer_fname[200],hash_fname[200];
|
char timer_fname[200],hash_fname[200];
|
||||||
char uttime[5],date[7];
|
char uttime[5],date[7];
|
||||||
int c,delta,maxpts=65536,verbose=0,quickmode=0,more_candidates=0, stackdecoder=0;
|
int c,delta,maxpts=65536,verbose=0,quickmode=0,more_candidates=0, stackdecoder=0;
|
||||||
int writenoise=0,usehashtable=1,wspr_type=2, ipass, nblocksize=1;
|
int writenoise=0,usehashtable=1,wspr_type=2, ipass, nblocksize;
|
||||||
int writec2=0, npasses=2, subtraction=1, block_demod=1;
|
int writec2=0,maxdrift;
|
||||||
int shift1, lagmin, lagmax, lagstep, ifmin, ifmax, worth_a_try, not_decoded;
|
int shift1, lagmin, lagmax, lagstep, ifmin, ifmax, worth_a_try, not_decoded;
|
||||||
unsigned int nbits=81, stacksize=200000;
|
unsigned int nbits=81, stacksize=200000;
|
||||||
unsigned int npoints, metric, cycles, maxnp;
|
unsigned int npoints, metric, cycles, maxnp;
|
||||||
@ -762,7 +762,10 @@ int main(int argc, char *argv[])
|
|||||||
float minsync2=0.12; //Second sync limit
|
float minsync2=0.12; //Second sync limit
|
||||||
int iifac=8; //Step size in final DT peakup
|
int iifac=8; //Step size in final DT peakup
|
||||||
int symfac=50; //Soft-symbol normalizing factor
|
int symfac=50; //Soft-symbol normalizing factor
|
||||||
int maxdrift=4; //Maximum (+/-) drift
|
int block_demod=1; //Default is to use block demod on pass 2
|
||||||
|
int subtraction=1;
|
||||||
|
int npasses=2;
|
||||||
|
|
||||||
float minrms=52.0 * (symfac/64.0); //Final test for plausible decoding
|
float minrms=52.0 * (symfac/64.0); //Final test for plausible decoding
|
||||||
delta=60; //Fano threshold step
|
delta=60; //Fano threshold step
|
||||||
float bias=0.45; //Fano metric bias (used for both Fano and stack algorithms)
|
float bias=0.45; //Fano metric bias (used for both Fano and stack algorithms)
|
||||||
@ -948,9 +951,15 @@ int main(int argc, char *argv[])
|
|||||||
minsync2=0.12;
|
minsync2=0.12;
|
||||||
}
|
}
|
||||||
if(ipass == 1 ) {
|
if(ipass == 1 ) {
|
||||||
if(block_demod == 1) nblocksize=3; // try all blocksizes up to 3
|
if(block_demod == 1) {
|
||||||
maxdrift=0; // no drift for smaller frequency estimator variance
|
nblocksize=3; // try all blocksizes up to 3
|
||||||
minsync2=0.10;
|
maxdrift=0; // no drift for smaller frequency estimator variance
|
||||||
|
minsync2=0.10;
|
||||||
|
} else { // if called with -B, revert to "classic" wspr params
|
||||||
|
nblocksize=1;
|
||||||
|
maxdrift=4;
|
||||||
|
minsync2=0.12;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
ndecodes_pass=0; // still needed?
|
ndecodes_pass=0; // still needed?
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user