optimize

pub/src/expr.cpp

@@ -581,8 +581,6 @@ void CTree::tree_val( CTOut *ret, const CContext *ctx ) const
                 CContext cvctx(*ctx);
                 vector<double> tt;
                 cvctx.fargs = &tt;
-                for ( uint i=0; i<n; ++i )
-                    ret->vd[i] = 0;
                 // Convolute theory with resolution.
                 if( conv_step ){
                     // Accelerated version with equidistant grids 
@@ -592,12 +590,16 @@ void CTree::tree_val( CTOut *ret, const CContext *ctx ) const
                         tt[ii] = (*(ctx->fargs))[0] - sv->x[0] - shift +
                             (ii-(nv-1))*conv_step;
                     arg[0]->tree_val( &r, &cvctx );
-                    for ( uint iv=0; iv<nv; ++iv )
-                        for ( uint i=0; i<n; ++i )
-                            ret->vd[i] += r.to_d(nv-1+i-iv) * sv->y[iv] *
-                                conv_step / conv_norm;
+                    for ( uint i=0; i<n; ++i ){
+                        ret->vd[i] = 0;
+                        for ( uint iv=0; iv<nv; ++iv )
+                            ret->vd[i] += r.to_d(nv-1+i-iv) * sv->y[iv];
+                        ret->vd[i] *= conv_step / conv_norm;
+                    }
                 } else {
                     // Simplest version: non-equidistant x_out and x_res.
+                    for ( uint i=0; i<n; ++i )
+                        ret->vd[i] = 0;
                     tt.resize(n);
                     for ( uint iv=0; iv<nv; ++iv ) {
                         double dx;