addresses issues in pr SyneRBI#390

.travis.yml

@@ -228,7 +228,9 @@ before_install:
  # Use Travis' currently checked-out SIRF commit ID to build.
  # Also no point re-downloading SIRF - just use local URL.
  # N.B.: don't put into build matrix to allow caching.
- - BUILD_FLAGS="$BUILD_FLAGS -DPYVER=$PYMVER -DSIRF_URL=$PWD -DSIRF_TAG=$TRAVIS_COMMIT"
+ #- BUILD_FLAGS="$BUILD_FLAGS -DPYVER=$PYMVER -DSIRF_URL=$PWD -DSIRF_TAG=$TRAVIS_COMMIT"
+ # Force TOF PR branch
+ - BUILD_FLAGS="$BUILD_FLAGS -DPYVER=$PYMVER -DSIRF_URL=https://github.com/ALEXJAZZ008008/SIRF.git -DSIRF_TAG=tof_clean"
  # get SuperBuild
  - cd ..
  - git clone https://github.com/CCPPETMR/SIRF-SuperBuild --recursive -b master

src/xSTIR/cSTIR/cstir.cpp

@@ -590,7 +590,7 @@ void* cSTIR_getAcquisitionDataDimensions(const void* ptr_acq, size_t ptr_dim)
 		SPTR_FROM_HANDLE(PETAcquisitionData, sptr_ad, ptr_acq);
 		dim[0] = sptr_ad->get_num_tangential_poss();
 		dim[1] = sptr_ad->get_num_views();
-		dim[2] = sptr_ad->get_num_sinograms();
+		dim[2] = sptr_ad->get_num_non_tof_sinograms();
 		dim[3] = sptr_ad->get_num_TOF_bins();
 		return (void*)new DataHandle;
 	}
@@ -1160,4 +1160,4 @@ extern "C"
 void* parameter(const void* ptr, const char* obj, const char* name)
 {
 	return cSTIR_parameter(ptr, obj, name);
-}
+}

src/xSTIR/cSTIR/include/sirf/STIR/stir_data_containers.h

@@ -241,7 +241,7 @@ namespace sirf {
 		}
 		int get_num_TOF_bins()
 		{
-			return 1;
+			return data()->get_num_tof_poss();
 		}
 		int get_max_segment_num() const
 		{