Documenting tof branch merge conflicts

[ashgillman]

ML_norm.cxx

Chosen strategy: Keep the functions

[ashgillman]

ProjDataInfoCylindricalNoArcCorr.cxx

Chosen strategy: It seems ToF adds some extra swapping for rings and detectors. Respect this, while allowing updated to_0)2pi stuff:

[ashgillman]

Scanner.cxx

Related to #181, 8b648897ff2a22157cf54cbac0d7fdde82c801ab

@KrisThielemans not confident on this one, but it seems just to keep the master version?

[KrisThielemans]

MLnorm.cxx Chosen strategy: Keep the functions

incorrect. set_fan_data has been superseded by set_fan_data_add_gaps and similar with make_fan_data_remove_gaps. The modification is at the moment just the check if is_tof_data(), then call error

[KrisThielemans]

ProjDataInfoCylindricalNoArcCorr.cxx Chosen strategy: It seems ToF adds some extra swapping for rings and detectors. Respect this, while allowing updated to_0)2pi stuff

Agreed. let's do that in this merge (and the get_psi_offset() of course). I don't think we want any extra swapping, but we don't want the merge to affect the actual working of the TOF code.

[KrisThielemans]

Scanner.cxx not confident on this one, but it seems just to keep the master version?

There certainly shouldn't be any changes in list_all_names and get_names_of_predefined_scanners w.r.t. master.

[KrisThielemans]

Anything else?

[ashgillman]

MLnorm.cxx Chosen strategy: Keep the functions

incorrect. set_fan_data has been superseded by set_fan_data_add_gaps and similar with make_fan_data_remove_gaps. The modification is at the moment just the check if is_tof_data(), then call error

Removed

[ashgillman]

Bin.h

Resolution: Keep both

[ashgillman]

Bin.inl

Resolution: We're happy to not have a constructor for time_frame? Just add time_frame(1) to each

[ashgillman]

Scanner.h

Resolution: Just looks more complicated because of whitespace chages. Need to add max_num_of_timing_poss, size_timing_pos, timing_resolution to master. Unfortunately, the order chosen means no more default values are possible for energy parameters - is this okay?

[ashgillman]

ProjDataInfoCylindrical.h

Resolution: Keep both

[KrisThielemans]

Scanner.h Resolution: Just looks more complicated because of whitespace chages. Need to add max_num_of_timing_poss, size_timing_pos, timing_resolution to master. Unfortunately, the order chosen means no more default values are possible for energy parameters - is this okay?

can't spot the difference. Can you do a comparison without white-space and show that?

The Scanner constructor etc is a mess. Too many parameters!

[KrisThielemans]

Obsolete