18 changes: 9 additions & 9 deletions src/plugins/dataobject/crossspectrum/crossspectrum.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -217,9 +217,9 @@ bool CrossSpectrumSource::algorithm() {
/* Fill the frequency and zero the xps */
df = SR/( 2.0*double( xps_len-1 ) );
for ( i=0; i<xps_len; ++i ) {
outputVectorFrequency->value()[i] = double( i ) * df;
outputVectorReal->value()[i] = 0.0;
outputVectorImaginary->value()[i] = 0.0;
outputVectorFrequency->raw_V_ptr()[i] = double( i ) * df;
outputVectorReal->raw_V_ptr()[i] = 0.0;
outputVectorImaginary->raw_V_ptr()[i] = 0.0;
}

/* allocate input arrays */
Expand Down Expand Up @@ -269,21 +269,21 @@ bool CrossSpectrumSource::algorithm() {
rdft(ALen, 1, b);

/* sum each bin into psd[] */
outputVectorReal->value()[0] += ( a[0]*b[0] );
outputVectorReal->value()[xps_len-1] += ( a[1]*b[1] );
outputVectorReal->raw_V_ptr()[0] += ( a[0]*b[0] );
outputVectorReal->raw_V_ptr()[xps_len-1] += ( a[1]*b[1] );
for (i_samp=1; i_samp<xps_len-1; ++i_samp) {
outputVectorReal->value()[i_samp]+= ( a[i_samp*2] * b[i_samp*2] -
outputVectorReal->raw_V_ptr()[i_samp]+= ( a[i_samp*2] * b[i_samp*2] -
a[i_samp*2+1] * b[i_samp*2+1] );
outputVectorImaginary->value()[i_samp]+= ( -a[i_samp*2] * b[i_samp*2+1] +
outputVectorImaginary->raw_V_ptr()[i_samp]+= ( -a[i_samp*2] * b[i_samp*2+1] +
a[i_samp*2+1] * b[i_samp*2] );
}// (a+ci)(b+di)* = ab+cd +i(-ad + cb)
}

/* renormalize */
norm_factor = 1.0/((double(SR)*double(xps_len))*double(n_subsets));
for ( i=0; i<xps_len; ++i ) {
outputVectorReal->value()[i]*=norm_factor;
outputVectorImaginary->value()[i]*=norm_factor;
outputVectorReal->raw_V_ptr()[i]*=norm_factor;
outputVectorImaginary->raw_V_ptr()[i]*=norm_factor;
}

delete[] b;
Expand Down
2 changes: 1 addition & 1 deletion src/plugins/dataobject/genericfilter/genericfilter.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -224,7 +224,7 @@ bool GenericFilterSource::algorithm() {
theFilter.Reset();

double const *v_in = inputVector->noNanValue();
double *v_out = outputVector->value();
double *v_out = outputVector->raw_V_ptr();
for (int i=0; i<length; i++) {
in = v_in[i];
theFilter.NextTimeStep();
Expand Down
8 changes: 4 additions & 4 deletions src/plugins/dataobject/interpolations/interpolations.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -37,15 +37,15 @@ bool interpolate(Kst::VectorPtr xVector,
if (iLengthInterp > 0) {
if (yOutVector->length() != iLengthInterp) {
yOutVector->resize(iLengthInterp, true);
pResult[0] = (double*)realloc( yOutVector->value(), iLengthInterp * sizeof( double ) );
pResult[0] = (double*)realloc( yOutVector->raw_V_ptr(), iLengthInterp * sizeof( double ) );
} else {
pResult[0] = yOutVector->value();
pResult[0] = yOutVector->raw_V_ptr();
}

if (pResult[0] != NULL) {

for (int i = 0; i < iLengthInterp; ++i) {
yOutVector->value()[i] = pResult[0][i];
yOutVector->raw_V_ptr()[i] = pResult[0][i];
}

pInterp = gsl_interp_alloc( pType, iLengthData );
Expand All @@ -60,7 +60,7 @@ bool interpolate(Kst::VectorPtr xVector,
if (pSpline != NULL) {
if (!gsl_spline_init( pSpline, xVector->noNanValue(), yVector->noNanValue(), iLengthData )) {
double const *xV1 = x1Vector->noNanValue();
double *yVout = yOutVector->value();
double *yVout = yOutVector->raw_V_ptr();
for( int i=0; i<iLengthInterp; i++) {
yVout[i] = gsl_spline_eval( pSpline, xV1[i], pAccel );
}
Expand Down
4 changes: 2 additions & 2 deletions src/plugins/dataobject/linefit/linefit.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -174,8 +174,8 @@ bool LineFitSource::algorithm() {

double const * vX_in = inputVectorX->noNanValue();
double const * vY_in = inputVectorY->noNanValue();
double* vX_out = outputVectorX->value();
double* vY_out = outputVectorY->value();
double* vX_out = outputVectorX->raw_V_ptr();
double* vY_out = outputVectorY->raw_V_ptr();

if (inputVectorY->length() == 1) {
vX_out[0] = vX_in[0];
Expand Down
8 changes: 4 additions & 4 deletions src/plugins/dataobject/lockin/lockin.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -253,10 +253,10 @@ bool LockInSource::algorithm() {
normRefVector->resize(iLength, false);
lockinResult->resize(iLength, false);

double* pdInput = inputVector->value();
double* pdRef = refVector->value();
double* pdNormRef = normRefVector->value();
double* pdResult = lockinResult->value();
double const * pdInput = inputVector->value();
double const * pdRef = refVector->value();
double * pdNormRef = normRefVector->raw_V_ptr();
double * pdResult = lockinResult->raw_V_ptr();

/* to remove initial settling, evaluate the result separately in forward and backward direction */
BesselHP1<double> f_filt_d(0.15/f_samp);
Expand Down
4 changes: 2 additions & 2 deletions src/plugins/dataobject/noiseaddition/noiseaddition.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -155,14 +155,14 @@ bool NoiseAdditionSource::algorithm() {
int iLength = inputVector->length();

outputVector->resize(iLength, false);
pResult[0] = outputVector->value();
pResult[0] = outputVector->raw_V_ptr();

pGeneratorType = gsl_rng_default;
pRandomNumberGenerator = gsl_rng_alloc( pGeneratorType );
if (pRandomNumberGenerator != NULL) {
if (pResult[0] != NULL) {
for (int i=0; i<iLength; i++) {
outputVector->value()[i] = inputVector->value()[i] + gsl_ran_gaussian( pRandomNumberGenerator, inputScalar->value() );
outputVector->raw_V_ptr()[i] = inputVector->value()[i] + gsl_ran_gaussian( pRandomNumberGenerator, inputScalar->value() );
}

iRetVal = true;
Expand Down
16 changes: 8 additions & 8 deletions src/plugins/dataobject/periodogram/periodogram.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -210,18 +210,18 @@ bool PeriodogramSource::algorithm() {
lSizeWork = lFreq * 2;

outputVectorFrequency->resize(lSizeWork, true);
pResult[0] = outputVectorFrequency->value();
pResult[0] = outputVectorFrequency->raw_V_ptr();

outputVectorPeriodogram->resize(lSizeWork, true);
pResult[1] = outputVectorPeriodogram->value();
pResult[1] = outputVectorPeriodogram->raw_V_ptr();

if (pResult[0] != NULL && pResult[1] != NULL) {

for (int i = 0; i < outputVectorFrequency->length(); ++i) {
outputVectorFrequency->value()[i] = pResult[0][i];
outputVectorFrequency->raw_V_ptr()[i] = pResult[0][i];
}
for (int i = 0; i < outputVectorPeriodogram->length(); ++i) {
outputVectorPeriodogram->value()[i] = pResult[1][i];
outputVectorPeriodogram->raw_V_ptr()[i] = pResult[1][i];
}

if (lSizeIn > 100) {
Expand All @@ -231,8 +231,8 @@ bool PeriodogramSource::algorithm() {
inputVectorTime->length(),
inputScalarOversampling->value(),
inputScalarANFF->value(),
(double*)&(outputVectorFrequency->value()[-1]),
(double*)&(outputVectorPeriodogram->value()[-1]),
(double*)&(outputVectorFrequency->raw_V_ptr()[-1]),
(double*)&(outputVectorPeriodogram->raw_V_ptr()[-1]),
lSizeWork,
&lSizeOut,
&lMax,
Expand All @@ -246,8 +246,8 @@ bool PeriodogramSource::algorithm() {
inputVectorTime->length(),
inputScalarOversampling->value(),
inputScalarANFF->value(),
(double*)&(outputVectorFrequency->value()[-1]),
(double*)&(outputVectorPeriodogram->value()[-1]),
(double*)&(outputVectorFrequency->raw_V_ptr()[-1]),
(double*)&(outputVectorPeriodogram->raw_V_ptr()[-1]),
lSizeWork,
&lSizeOut,
&lMax,
Expand Down
16 changes: 8 additions & 8 deletions src/plugins/dataobject/phase/phase.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -199,33 +199,33 @@ bool PhaseSource::algorithm() {
iLength = inputVectorTime->length();

outputVectorPhase->resize(iLength, true);
pResult[0] = outputVectorPhase->value();
pResult[0] = outputVectorPhase->raw_V_ptr();

outputVectorDataOut->resize(iLength, true);
pResult[1] = outputVectorDataOut->value();
pResult[1] = outputVectorDataOut->raw_V_ptr();

if (pResult[0] != NULL && pResult[1] != NULL) {
for (int i = 0; i < outputVectorPhase->length(); ++i) {
outputVectorPhase->value()[i] = pResult[0][i];
outputVectorPhase->raw_V_ptr()[i] = pResult[0][i];
}
for (int i = 0; i < outputVectorDataOut->length(); ++i) {
outputVectorDataOut->value()[i] = pResult[1][i];
outputVectorDataOut->raw_V_ptr()[i] = pResult[1][i];
}

/*
determine the outputVectorPhase...
*/
for (int i=0; i<iLength; i++) {
outputVectorPhase->value()[i] = fmod( ( inputVectorTime->value()[i] - dPhaseZero ) / dPhasePeriod, 1.0 );
outputVectorPhase->raw_V_ptr()[i] = fmod( ( inputVectorTime->raw_V_ptr()[i] - dPhaseZero ) / dPhasePeriod, 1.0 );
}

/*
sort by outputVectorPhase...
*/
memcpy( outputVectorDataOut->value(), inputVectorData->value(), iLength * sizeof( double ) );
memcpy( outputVectorDataOut->raw_V_ptr(), inputVectorData->value(), iLength * sizeof( double ) );
double* sort[2];
sort[0] = outputVectorPhase->value();
sort[1] = outputVectorDataOut->value();
sort[0] = outputVectorPhase->raw_V_ptr();
sort[1] = outputVectorDataOut->raw_V_ptr();
quicksort( sort, 0, iLength-1 );

bReturn = true;
Expand Down
8 changes: 4 additions & 4 deletions src/plugins/dataobject/shift/shift.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -180,11 +180,11 @@ bool ShiftSource::algorithm() {
if (delay >= 0) {
/* Pad beginning with zeros */
for (int i = 0; i < delay; i++) {
outputVector->value()[i] = NAN;
outputVector->raw_V_ptr()[i] = NAN;
}
/* Then, copy values with the right offset */
for (int i = delay; i < inputVector->length(); i++) {
outputVector->value()[i] = inputVector->value()[i-delay];
outputVector->raw_V_ptr()[i] = inputVector->raw_V_ptr()[i-delay];
}
}

Expand All @@ -193,11 +193,11 @@ bool ShiftSource::algorithm() {
delay = -delay; /* Easier to visualize :-) */
/* Copy values with the right offset */
for (int i = 0; i < inputVector->length()-delay; i++) {
outputVector->value()[i] = inputVector->value()[i+delay];
outputVector->raw_V_ptr()[i] = inputVector->raw_V_ptr()[i+delay];
}
/* Pad end with zeros */
for (int i = inputVector->length()-delay; i < inputVector->length(); i++) {
outputVector->value()[i] = NAN;
outputVector->raw_V_ptr()[i] = NAN;
}
}
return true;
Expand Down
8 changes: 4 additions & 4 deletions src/plugins/dataobject/syncbin/syncbin.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -239,10 +239,10 @@ bool SyncBinSource::algorithm() {
n_in = int( inputVectorX->length() );
const double *Xin = inputVectorX->value();
const double *Yin = inputVectorY->value();
Xout = outputVectorX->value();
Yout = outputVectorY->value();
Yerr = outputVectorYError->value();
N = outputVectorN->value();
Xout = outputVectorX->raw_V_ptr();
Yout = outputVectorY->raw_V_ptr();
Yerr = outputVectorYError->raw_V_ptr();
N = outputVectorN->raw_V_ptr();

// set/check XMax and XMin
if ( XMax <= XMin ) { // autobin
Expand Down
2 changes: 1 addition & 1 deletion src/plugins/filters/cumulativeaverage/cumulativeaverage.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -159,7 +159,7 @@ bool CumulativeAverageSource::algorithm() {
outputVector->resize(inputVector->length(), true);

double const *v_in = inputVector->noNanValue();
double *v_out = outputVector->value();
double *v_out = outputVector->raw_V_ptr();
v_out[0] = v_in[0]; // i = 1

for (int i = 1; i < inputVector->length(); ++i) {
Expand Down
2 changes: 1 addition & 1 deletion src/plugins/filters/cumulativesum/cumulativesum.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -171,7 +171,7 @@ bool CumulativeSumSource::algorithm() {
outputVector->resize(inputVector->length(), true);

double const *v_in = inputVector->noNanValue();
double *v_out = outputVector->value();
double *v_out = outputVector->raw_V_ptr();
double s_in = inputScalar->value();
int len = inputVector->length();

Expand Down
14 changes: 7 additions & 7 deletions src/plugins/filters/despike/filterdespike.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -222,11 +222,11 @@ bool FilterDespikeSource::algorithm() {
i=N-1;
}
for (int j=spike_start; j<=i; j++) {
outputVector->value()[j] = last_good;
outputVector->raw_V_ptr()[j] = last_good;
}
spike_start = -1;
}
last_good = outputVector->value()[i] = inputVector->value(i);
last_good = outputVector->raw_V_ptr()[i] = inputVector->value(i);
}
}
// do a 3 point difference where it is possible
Expand All @@ -245,11 +245,11 @@ bool FilterDespikeSource::algorithm() {
i=N-1;
}
for (int j=spike_start; j<=i; j++) {
outputVector->value()[j] = last_good;
outputVector->raw_V_ptr()[j] = last_good;
}
spike_start = -1;
} else {
last_good = outputVector->value()[i] = inputVector->value(i);
last_good = outputVector->raw_V_ptr()[i] = inputVector->value(i);
}
}
}
Expand All @@ -269,17 +269,17 @@ bool FilterDespikeSource::algorithm() {
i=N-1;
}
for (int j=spike_start; j<=i; j++) {
outputVector->value()[j] = last_good;
outputVector->raw_V_ptr()[j] = last_good;
}
spike_start = -1;
} else {
last_good = outputVector->value()[i] = inputVector->value(i);
last_good = outputVector->raw_V_ptr()[i] = inputVector->value(i);
}
}
}
if (spike_start>=0) {
for (int j=spike_start; j<N; j++) {
outputVector->value()[j] = last_good;
outputVector->raw_V_ptr()[j] = last_good;
}
}

Expand Down
4 changes: 2 additions & 2 deletions src/plugins/filters/differentiation/differentiation.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -171,11 +171,11 @@ bool DifferentiationSource::algorithm() {

int i = 0;
for (; i < inputVector->length()-1; i++) {
outputVector->value()[i] = (inputVector->value()[i+1] - inputVector->value()[i]) / inputScalar->value();
outputVector->raw_V_ptr()[i] = (inputVector->value()[i+1] - inputVector->value()[i]) / inputScalar->value();
}

// Repeat the last point to keep the vector length, even though it does not bring much additional info
outputVector->value()[i] = (inputVector->value()[i] - inputVector->value()[i-1]) / inputScalar->value();
outputVector->raw_V_ptr()[i] = (inputVector->value()[i] - inputVector->value()[i-1]) / inputScalar->value();
return true;
}

Expand Down
4 changes: 2 additions & 2 deletions src/plugins/filters/filters.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -149,8 +149,8 @@ bool kst_pass_filter(
//
iStatus = gsl_fft_halfcomplex_inverse( pPadded, 1, iLengthDataPadded, hc, work );
if( !iStatus ) {
memcpy( outVector->value(), pPadded, iLengthData * sizeof( double ) );
//memcpy( outVector->value(), pPadded, iLengthDataPadded * sizeof( double ) ); // DEBUG **********************
memcpy( outVector->raw_V_ptr(), pPadded, iLengthData * sizeof( double ) );
//memcpy( outVector->raw_V_ptr(), pPadded, iLengthDataPadded * sizeof( double ) ); // DEBUG **********************
bReturn = true;
}
gsl_fft_halfcomplex_wavetable_free( hc );
Expand Down
4 changes: 2 additions & 2 deletions src/plugins/filters/unwind/filterunwind.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -219,7 +219,7 @@ bool FilterUnwindSource::algorithm() {


last_x_in = inputVector->noNanValue(0);
outputVector->value()[0] = last_x_in;
outputVector->raw_V_ptr()[0] = last_x_in;

for (i=1; i<N; ++i) {
x = inputVector->noNanValue(i);
Expand All @@ -231,7 +231,7 @@ bool FilterUnwindSource::algorithm() {
} else if (last_x_in - x > step) {
wind += range;
}
outputVector->value()[i] = x + wind;
outputVector->raw_V_ptr()[i] = x + wind;
last_x_in = x;
}

Expand Down
4 changes: 2 additions & 2 deletions src/plugins/filters/window/filterwindow.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -198,9 +198,9 @@ bool FilterWindowSource::algorithm() {
for (i=0; i<N; ++i) {
x = inputVector->value(i);
if ((x>max) || (x<min)) { // out of range: Nannify
outputVector->value()[i] = NAN;
outputVector->raw_V_ptr()[i] = NAN;
} else {
outputVector->value()[i] = x;
outputVector->raw_V_ptr()[i] = x;
}
}

Expand Down
2 changes: 1 addition & 1 deletion src/plugins/fits/common.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ double interpolate(int iIndex, int iLengthDesired, const double* pArray, int iLe

void assign( Kst::VectorPtr targetVector, double* pResult[], int iIndex, int iLength ) {
for (int i = 0; i < iLength; i++) {
targetVector->value()[i] = pResult[iIndex][i];
targetVector->raw_V_ptr()[i] = pResult[iIndex][i];
}
}

Expand Down
12 changes: 6 additions & 6 deletions src/plugins/fits/gradient_unweighted/fitgradient_unweighted.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -203,14 +203,14 @@ bool FitGradientUnweightedSource::algorithm() {
for( i=0; i<iLength; ++i ) {
gsl_fit_mul_est( pInputs[XVALUES][i], c0, cov00, &y, &yErr );

outputVectorYFitted->value()[i] = y;
outputVectorYResiduals->value()[i] = pInputs[YVALUES][i] - y;
outputVectorYLo->value()[i] = y - yErr;
outputVectorYHi->value()[i] = y + yErr;
outputVectorYFitted->raw_V_ptr()[i] = y;
outputVectorYResiduals->raw_V_ptr()[i] = pInputs[YVALUES][i] - y;
outputVectorYLo->raw_V_ptr()[i] = y - yErr;
outputVectorYHi->raw_V_ptr()[i] = y + yErr;
}

outputVectorYParameters->value()[0] = c0;
outputVectorYCovariance->value()[0] = cov00;
outputVectorYParameters->raw_V_ptr()[0] = c0;
outputVectorYCovariance->raw_V_ptr()[0] = cov00;

outputScalar->setValue(dSumSq / ( (double)iLength - 2.0 ));

Expand Down
12 changes: 6 additions & 6 deletions src/plugins/fits/gradient_weighted/fitgradient_weighted.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -220,14 +220,14 @@ bool FitGradientWeightedSource::algorithm() {
for( i=0; i<iLength; ++i ) {
gsl_fit_mul_est( pInputs[XVALUES][i], c0, cov00, &y, &yErr );

outputVectorYFitted->value()[i] = y;
outputVectorYResiduals->value()[i] = pInputs[YVALUES][i] - y;
outputVectorYLo->value()[i] = y - yErr;
outputVectorYHi->value()[i] = y + yErr;
outputVectorYFitted->raw_V_ptr()[i] = y;
outputVectorYResiduals->raw_V_ptr()[i] = pInputs[YVALUES][i] - y;
outputVectorYLo->raw_V_ptr()[i] = y - yErr;
outputVectorYHi->raw_V_ptr()[i] = y + yErr;
}

outputVectorYParameters->value()[0] = c0;
outputVectorYCovariance->value()[0] = cov00;
outputVectorYParameters->raw_V_ptr()[0] = c0;
outputVectorYCovariance->raw_V_ptr()[0] = cov00;

outputScalar->setValue(dSumSq / ( (double)iLength - 2.0 ));

Expand Down
22 changes: 11 additions & 11 deletions src/plugins/fits/kneefrequency/fitkneefrequency.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -314,25 +314,25 @@ bool FitKneeFrequencySource::algorithm() {

// output fit data
for (i = 0; i < maxOneOverFIndex; ++i) {
outputVectorYFitted->value()[i] = b * pow(inputVectorX->value()[i],a) + ybar;
outputVectorYResiduals->value()[i] = inputVectorY->value()[i] - outputVectorYFitted->value()[i];
outputVectorYFitted->raw_V_ptr()[i] = b * pow(inputVectorX->value()[i],a) + ybar;
outputVectorYResiduals->raw_V_ptr()[i] = inputVectorY->value()[i] - outputVectorYFitted->raw_V_ptr()[i];
}

for (i = maxOneOverFIndex; i < minWhiteNoiseIndex; ++i) { // zeros for unfitted region.
outputVectorYFitted->value()[i] = 0;
outputVectorYResiduals->value()[i] = 0;
outputVectorYFitted->raw_V_ptr()[i] = 0;
outputVectorYResiduals->raw_V_ptr()[i] = 0;
}

for (i = minWhiteNoiseIndex; i < inArraysLength; ++i) {
outputVectorYFitted->value()[i] = ybar;
outputVectorYResiduals->value()[i] = outputVectorYFitted->value()[i] - ybar;
outputVectorYFitted->raw_V_ptr()[i] = ybar;
outputVectorYResiduals->raw_V_ptr()[i] = outputVectorYFitted->raw_V_ptr()[i] - ybar;
}

outputVectorYParameters->value()[0] = ybar;
outputVectorYParameters->value()[1] = ysigma;
outputVectorYParameters->value()[2] = b;
outputVectorYParameters->value()[3] = -a;
outputVectorYParameters->value()[4] = knee_freq;
outputVectorYParameters->raw_V_ptr()[0] = ybar;
outputVectorYParameters->raw_V_ptr()[1] = ysigma;
outputVectorYParameters->raw_V_ptr()[2] = b;
outputVectorYParameters->raw_V_ptr()[3] = -a;
outputVectorYParameters->raw_V_ptr()[4] = knee_freq;

return true;
}
Expand Down
8 changes: 4 additions & 4 deletions src/plugins/fits/linear.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -98,14 +98,14 @@ bool kstfit_linear_unweighted(
dY += gsl_matrix_get( pMatrixX, i, j ) *
gsl_vector_get( pVectorParameters, j );
}
vectorOutYFitted->value()[i] = dY;
vectorOutYResiduals->value()[i] = interpolate(i, iLength, yVector->noNanValue(), yVector->length()) - dY;
vectorOutYFitted->raw_V_ptr()[i] = dY;
vectorOutYResiduals->raw_V_ptr()[i] = interpolate(i, iLength, yVector->noNanValue(), yVector->length()) - dY;
}

for( i=0; i<iNumParams; i++ ) {
vectorOutYParameters->value()[i] = gsl_vector_get( pVectorParameters, i );
vectorOutYParameters->raw_V_ptr()[i] = gsl_vector_get( pVectorParameters, i );
for( j=0; j<iNumParams; j++ ) {
vectorOutYCovariance->value()[(i*iNumParams)+j] = gsl_matrix_get( pMatrixCovariance, i, j );
vectorOutYCovariance->raw_V_ptr()[(i*iNumParams)+j] = gsl_matrix_get( pMatrixCovariance, i, j );
}
}

Expand Down
18 changes: 9 additions & 9 deletions src/plugins/fits/linear_unweighted/fitlinear_unweighted.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -204,17 +204,17 @@ bool FitLinearUnweightedSource::algorithm() {
if( !gsl_fit_linear( pInputs[XVALUES], 1, pInputs[YVALUES], 1, iLength, &c0, &c1, &cov00, &cov01, &cov11, &dSumSq ) ) {
for( i=0; i<iLength; ++i ) {
gsl_fit_linear_est( pInputs[XVALUES][i], c0, c1, cov00, cov01, cov11, &y, &yErr );
outputVectorYFitted->value()[i] = y;
outputVectorYResiduals->value()[i] = pInputs[YVALUES][i] - y;
outputVectorYLo->value()[i] = y - yErr;
outputVectorYHi->value()[i] = y + yErr;
outputVectorYFitted->raw_V_ptr()[i] = y;
outputVectorYResiduals->raw_V_ptr()[i] = pInputs[YVALUES][i] - y;
outputVectorYLo->raw_V_ptr()[i] = y - yErr;
outputVectorYHi->raw_V_ptr()[i] = y + yErr;
}

outputVectorYParameters->value()[0] = c0;
outputVectorYParameters->value()[1] = c1;
outputVectorYCovariance->value()[0] = cov00;
outputVectorYCovariance->value()[1] = cov01;
outputVectorYCovariance->value()[2] = cov11;
outputVectorYParameters->raw_V_ptr()[0] = c0;
outputVectorYParameters->raw_V_ptr()[1] = c1;
outputVectorYCovariance->raw_V_ptr()[0] = cov00;
outputVectorYCovariance->raw_V_ptr()[1] = cov01;
outputVectorYCovariance->raw_V_ptr()[2] = cov11;

outputScalar->setValue(dSumSq / ( (double)iLength - 2.0 ));
bReturn = true;
Expand Down
8 changes: 4 additions & 4 deletions src/plugins/fits/linear_weighted.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -101,14 +101,14 @@ bool kstfit_linear_weighted(
dY += gsl_matrix_get( pMatrixX, i, j ) *
gsl_vector_get( pVectorParameters, j );
}
vectorOutYFitted->value()[i] = dY;
vectorOutYResiduals->value()[i] = interpolate(i, iLength, yVector->noNanValue(), yVector->length()) - dY;
vectorOutYFitted->raw_V_ptr()[i] = dY;
vectorOutYResiduals->raw_V_ptr()[i] = interpolate(i, iLength, yVector->noNanValue(), yVector->length()) - dY;
}

for( i=0; i<iNumParams; i++ ) {
vectorOutYParameters->value()[i] = gsl_vector_get( pVectorParameters, i );
vectorOutYParameters->raw_V_ptr()[i] = gsl_vector_get( pVectorParameters, i );
for( j=0; j<iNumParams; j++ ) {
vectorOutYCovariance->value()[(i*iNumParams)+j] = gsl_matrix_get( pMatrixCovariance, i, j );
vectorOutYCovariance->raw_V_ptr()[(i*iNumParams)+j] = gsl_matrix_get( pMatrixCovariance, i, j );
}
}

Expand Down
18 changes: 9 additions & 9 deletions src/plugins/fits/linear_weighted/fitlinear_weighted.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -221,17 +221,17 @@ bool FitLinearWeightedSource::algorithm() {
if( !gsl_fit_wlinear( pInputs[XVALUES], 1, pInputs[WEIGHTS], 1, pInputs[YVALUES], 1, iLength, &c0, &c1, &cov00, &cov01, &cov11, &dSumSq ) ) {
for( i=0; i<iLength; ++i ) {
gsl_fit_linear_est( pInputs[XVALUES][i], c0, c1, cov00, cov01, cov11, &y, &yErr );
outputVectorYFitted->value()[i] = y;
outputVectorYResiduals->value()[i] = pInputs[YVALUES][i] - y;
outputVectorYLo->value()[i] = y - yErr;
outputVectorYHi->value()[i] = y + yErr;
outputVectorYFitted->raw_V_ptr()[i] = y;
outputVectorYResiduals->raw_V_ptr()[i] = pInputs[YVALUES][i] - y;
outputVectorYLo->raw_V_ptr()[i] = y - yErr;
outputVectorYHi->raw_V_ptr()[i] = y + yErr;
}

outputVectorYParameters->value()[0] = c0;
outputVectorYParameters->value()[1] = c1;
outputVectorYCovariance->value()[0] = cov00;
outputVectorYCovariance->value()[1] = cov01;
outputVectorYCovariance->value()[2] = cov11;
outputVectorYParameters->raw_V_ptr()[0] = c0;
outputVectorYParameters->raw_V_ptr()[1] = c1;
outputVectorYCovariance->raw_V_ptr()[0] = cov00;
outputVectorYCovariance->raw_V_ptr()[1] = cov01;
outputVectorYCovariance->raw_V_ptr()[2] = cov11;

outputScalar->setValue(dSumSq / ( (double)iLength - 2.0 ));
bReturn = true;
Expand Down
8 changes: 4 additions & 4 deletions src/plugins/fits/non_linear.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -191,17 +191,17 @@ bool kstfit_nonlinear(
}

for( i=0; i<iLength; i++ ) {
vectorOutYFitted->value()[i] = function_calculate( pInputX[i], dXInitial );
vectorOutYResiduals->value()[i] = pInputY[i] - vectorOutYFitted->value()[i];
vectorOutYFitted->raw_V_ptr()[i] = function_calculate( pInputX[i], dXInitial );
vectorOutYResiduals->raw_V_ptr()[i] = pInputY[i] - vectorOutYFitted->raw_V_ptr()[i];
}

//
// fill in the parameter values and covariance matrix...
//
for( i=0; i<NUM_PARAMS; i++ ) {
vectorOutYParameters->value()[i] = gsl_vector_get( pSolver->x, i );
vectorOutYParameters->raw_V_ptr()[i] = gsl_vector_get( pSolver->x, i );
for( j=0; j<NUM_PARAMS; j++ ) {
vectorOutYCovariance->value()[(i*NUM_PARAMS)+j] = gsl_matrix_get( pMatrixCovariance, i, j );
vectorOutYCovariance->raw_V_ptr()[(i*NUM_PARAMS)+j] = gsl_matrix_get( pMatrixCovariance, i, j );
}
}

Expand Down
8 changes: 4 additions & 4 deletions src/plugins/fits/non_linear_weighted.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -207,17 +207,17 @@ bool kstfit_nonlinear_weighted(
}

for( i=0; i<iLength; i++ ) {
vectorOutYFitted->value()[i] = function_calculate( pInputs[XVALUES][i], dXInitial );
vectorOutYResiduals->value()[i] = pInputs[YVALUES][i] - vectorOutYFitted->value()[i];
vectorOutYFitted->raw_V_ptr()[i] = function_calculate( pInputs[XVALUES][i], dXInitial );
vectorOutYResiduals->raw_V_ptr()[i] = pInputs[YVALUES][i] - vectorOutYFitted->raw_V_ptr()[i];
}

//
// fill in the parameter values and covariance matrix...
//
for( i=0; i<NUM_PARAMS; i++ ) {
vectorOutYParameters->value()[i] = gsl_vector_get( pSolver->x, i );
vectorOutYParameters->raw_V_ptr()[i] = gsl_vector_get( pSolver->x, i );
for( j=0; j<NUM_PARAMS; j++ ) {
vectorOutYCovariance->value()[(i*NUM_PARAMS)+j] = gsl_matrix_get( pMatrixCovariance, i, j );
vectorOutYCovariance->raw_V_ptr()[(i*NUM_PARAMS)+j] = gsl_matrix_get( pMatrixCovariance, i, j );
}
}

Expand Down