diff --git a/pub/src/curve.cpp b/pub/src/curve.cpp index 25c30eda653f12f4441541e4bf4d3c188cd8eff9..07fc9cbe2788ea5666e51988acbda3a1f2e3df09 100644 --- a/pub/src/curve.cpp +++ b/pub/src/curve.cpp @@ -170,9 +170,9 @@ vector<string> COlc::pInfo() const ret.push_back( "convolute with: " + strg(kconv) ); ret.push_back( "weight(ylog): " + strg(weight_y_log) ); // z's and parameters: - lin = "j "; + lin = "j "; for ( uint iz=0; iz<nZ(); iz++ ) { - snprintf( wrd, PINFO_WRD_SIZ, "z%i ", iz ); + snprintf( wrd, PINFO_WRD_SIZ, "z%i ", iz ); lin += wrd; } for ( uint ip=0; ip<nPar(); ip++ ) { @@ -183,7 +183,8 @@ vector<string> COlc::pInfo() const // z's and parameters per scan: for ( uint j=0; j<nScan(); j++ ) { lin = ""; - snprintf( wrd, PINFO_WRD_SIZ, "%-2i ", j ); + snprintf( wrd, PINFO_WRD_SIZ, "%-2i%c ", j, + ProtectedScans.contained(j) ? '/' : ' ' ); lin += wrd; for ( uint iz=0; iz<nZ(); iz++ ) { snprintf( wrd, PINFO_WRD_SIZ, "%-12.7g ", VC[j].z[iz] ); @@ -229,7 +230,7 @@ void NCurveFile::OprPar(string llabel) while( (f=fiter()) ) { uint k = fiter.SelNo(); if ( f->ProtectedScans.size() ) - cout << "note: some scans are protected\n"; + cout << "some scans are protected\n"; if( lref.num>=f->nPar() ) throw string( "invalid left-hand side: not that many parameters" ); f->lDoc.push_back( "o" + llabel + " " + expr); @@ -537,7 +538,7 @@ void NCurveFile::Fit( bool _allow_slow_conv ) throw string( "data file and curve file have " "different number of scans" ); if ( fc->ProtectedScans.size() ) - cout << "note: some scans are protected\n"; + cout << "some scans are protected\n"; string plist = "?"; string slist = "?"; fc->lDoc.push_back( "fitted parameters " + plist +