bool haveData=false;
if (!fpSimData) return false;
do {
- if (haveData=(fCurrentTimeOffset>=0 &&
- fCurrentBunch>0 &&
- ++fCurrentTimeOffset<GetBunchSize())) {
+ if ((haveData=(fCurrentTimeOffset>=0 &&
+ fCurrentBunch>0 &&
+ ++fCurrentTimeOffset<GetBunchSize()))) {
break;
}
- if (haveData=(NextBunch() && GetBunchSize()>0)) {
+ if ((haveData=(NextBunch()) && GetBunchSize()>0)) {
fCurrentTimeOffset=0;
break;
}
if (fDirection==kBackwards) {
if (fCurrentBunch<0) {
// bunch count in channel end - 1
- if (haveData=(fpSimData->At(fChannelPositions[fCurrentPosition].fEnd-1))>0) {
+ if ((haveData=(fpSimData->At(fChannelPositions[fCurrentPosition].fEnd-1))>0)) {
// first bunch length at channel end - 2
fCurrentBunch=fChannelPositions[fCurrentPosition].fEnd-2;
}
} else if (fDirection==kForwards) {
if (fCurrentBunch<0) {
// bunch count in channel start + 1
- if (haveData=(fpSimData->At(fChannelPositions[fCurrentPosition].fPosition+1))>0) {
+ if ((haveData=(fpSimData->At(fChannelPositions[fCurrentPosition].fPosition+1))>0)) {
// first bunch length at channel start + 2
fCurrentBunch=fChannelPositions[fCurrentPosition].fPosition+2;
}