_storage_scheme -> _default_storage_scheme

[rijobro]

fixes #715.

@evgueni-ovtchinnikov how about this. Change _storage_scheme to _default_storage_scheme. If using the static method, return the default. However, if the object exists, return the corresponding type.

I've added the test, which fails with the old code, but passes with these changes:

    AcquisitionData.set_storage_scheme("memory")
    ad = AcquisitionData(raw_data_file)
    AcquisitionData.set_storage_scheme("file")
    test.check_if_equal("memory", ad.get_storage_scheme())

[KrisThielemans]

strategy seems ok to me, but is it necessary to change the C++ name (you don't on the python side)? One more thing that breaks backwards compatibility, for not so good reasons?

[rijobro]

I can leave the naming as it is if you'd like, but it seems confusing to me.

Keeping the old name makes it unclear as to whether you're returning the default scheme or the scheme for the current object.

I didn't change the naming on the python side because it handles both cases - if object is None, return default scheme, else return scheme for specific object.

Thinking about it, I should probably update the matlab side...

[KrisThielemans]

Keeping the old name makes it unclear as to whether you're returning the default scheme or the scheme for the current object.

I didn't change the naming on the python side because it handles both cases - if object is None, return default scheme, else return scheme for specific object.

I don't see the difference between C++ and Python in that respect. PETAcquisitionData::storage_scheme() has no object, so will return the default. acq_data.storage_scheme() will return the value for the object. That's what you do in Python as well:

SIRF/src/xSTIR/pSTIR/tests/tests_one.py

Line 45 in 7cde815

AcquisitionData.set_storage_scheme(scheme)

I agree that the default_storage_scheme() name might be better, but it does need some more changes in demos and UserGuide (ok, the latter will have to be updated in any case!).

In any case, I want to have the same names in Python/MATLAB/C++.

[KrisThielemans]

needs changes in UsersGuide and CHANGES. see also comment

[KrisThielemans]

I'd be amazed if this changes the default. In C++,Python you need PET.AcquisitionData.set_storage_scheme

[KrisThielemans]

@evgueni-ovtchinnikov is this PR still valid (I'm sure it'd need changes). If so, please assign to 3.1