Author: gegorbet Date: 2019-05-03 19:53:00 +0000 (Fri, 03 May 2019) New Revision: 2755 Modified: trunk/programs/us_fit_meniscus/us_fit_meniscus.cpp Log: fix in fit_meniscus to find noises to delete for type 2DSA-FM-IT Modified: trunk/programs/us_fit_meniscus/us_fit_meniscus.cpp =================================================================== --- trunk/programs/us_fit_meniscus/us_fit_meniscus.cpp 2019-05-02 20:59:20 UTC (rev 2754) +++ trunk/programs/us_fit_meniscus/us_fit_meniscus.cpp 2019-05-03 19:53:00 UTC (rev 2755) @@ -2199,6 +2199,7 @@ rmodIDs << mID; rmodFnams << fname; rmodDescs << mDesc; +//DbgLv(1) << "RmvMod: jj" << jj << "mID" << mID << "mDesc" << mDesc; if ( modDesc.isEmpty() ) { @@ -2208,10 +2209,13 @@ noises_in_edit( modDesc, nieDescs, nieIDs, nieFnams ); } - tiDesc = QString( mDesc ).replace( ".model", ".ti_noise" ); - riDesc = QString( mDesc ).replace( ".model", ".ri_noise" ); + tiDesc = QString( mDesc ).replace( ".model", ".ti_noise" ) + .replace( "2DSA-FM-IT", "2DSA-FM" ); + riDesc = QString( mDesc ).replace( ".model", ".ri_noise" ) + .replace( "2DSA-FM-IT", "2DSA-FM" ); itix = nieDescs.indexOf( tiDesc ); irix = nieDescs.indexOf( riDesc ); +//DbgLv(1) << "RmvMod: itix irix" << itix << irix; if ( itix >= 0 ) { // There is a TI noise to remove @@ -2366,6 +2370,11 @@ msetBase.section( ".", -1, -1 ) .section( "_", 0, 0 ).mid( 1 ); DbgLv(1) << "NIE: msetBase" << msetBase; + if ( msetBase.contains( "2DSA-FM-IT" ) ) + { + msetBase = msetBase.replace( "2DSA-FM-IT", "2DSA-FM" ); +DbgLv(1) << "NIE: msetBase" << msetBase; + } QStringList query; QString fname; QString noiID;