| 39 |
|
} |
| 40 |
|
} |
| 41 |
|
|
| 42 |
– |
// retrieve eta array from simInfo if it exists |
| 43 |
– |
data = info->getProperty(ETAVALUE_ID); |
| 44 |
– |
if(data){ |
| 45 |
– |
etaValue = dynamic_cast<DoubleArrayData*>(data); |
| 42 |
|
|
| 43 |
< |
if(etaValue){ |
| 48 |
< |
etaArray = etaValue->getData(); |
| 43 |
> |
if( theInfo->useInitXSstate ){ |
| 44 |
|
|
| 45 |
< |
for(i = 0; i < 3; i++){ |
| 46 |
< |
for (j = 0; j < 3; j++){ |
| 47 |
< |
eta[i][j] = etaArray[3*i+j]; |
| 48 |
< |
oldEta[i][j] = eta[i][j]; |
| 49 |
< |
} |
| 45 |
> |
// retrieve eta array from simInfo if it exists |
| 46 |
> |
data = info->getProperty(ETAVALUE_ID); |
| 47 |
> |
if(data){ |
| 48 |
> |
etaValue = dynamic_cast<DoubleArrayData*>(data); |
| 49 |
> |
|
| 50 |
> |
if(etaValue){ |
| 51 |
> |
etaArray = etaValue->getData(); |
| 52 |
> |
|
| 53 |
> |
for(i = 0; i < 3; i++){ |
| 54 |
> |
for (j = 0; j < 3; j++){ |
| 55 |
> |
eta[i][j] = etaArray[3*i+j]; |
| 56 |
> |
oldEta[i][j] = eta[i][j]; |
| 57 |
> |
} |
| 58 |
> |
} |
| 59 |
|
} |
| 60 |
|
} |
| 61 |
|
} |
| 58 |
– |
|
| 62 |
|
} |
| 63 |
|
|
| 64 |
|
template<typename T> NPTxyz<T>::~NPTxyz() { |
| 308 |
|
const int BUFFERSIZE = 2000; // size of the read buffer |
| 309 |
|
char buffer[BUFFERSIZE]; |
| 310 |
|
|
| 311 |
< |
sprintf(buffer,"\t%lf\t%lf;", chi, integralOfChidt); |
| 311 |
> |
sprintf(buffer,"\t%G\t%G;", chi, integralOfChidt); |
| 312 |
|
parameters += buffer; |
| 313 |
|
|
| 314 |
|
for(int i = 0; i < 3; i++){ |
| 315 |
< |
sprintf(buffer,"\t%lf\t%lf\t%lf;", eta[3*i], eta[3*i+1], eta[3*i+2]); |
| 315 |
> |
sprintf(buffer,"\t%G\t%G\t%G;", eta[i][0], eta[i][1], eta[i][2]); |
| 316 |
|
parameters += buffer; |
| 317 |
|
} |
| 318 |
|
|
