diff --git a/.appveyor.yml b/.appveyor.yml
index e1065e01e..a644a5202 100644
--- a/.appveyor.yml
+++ b/.appveyor.yml
@@ -30,6 +30,6 @@ build_script:
 
 test_script:
   - cd C:\projects\stir\build
-  - ctest -VV -C %CONFIGURATION%
+  - ctest --output-on-failure  -C %CONFIGURATION%
   - cd ..\recon_test_pack
   - run_tests --nointbp "C:\projects\stir\install\bin\"
diff --git a/documentation/release_5.0.htm b/documentation/release_5.0.htm
index 86e3613a9..3ed9befe6 100644
--- a/documentation/release_5.0.htm
+++ b/documentation/release_5.0.htm
@@ -15,6 +15,17 @@ <h2>Overall summary</h2>
 <p>
 <ul>
   <li>At least C++-11 is now required. We are not aware of any problems with more recent versions of C++.</li>
+  <li>Initial support for PET scanners with block detectors or even generic location of detectors (less tested feature), taking into account
+    appropriate geometry. This is currently kept independent of the cylindrical scanner modelling used normally, but this will be change
+    in a future version. See <a href="https://github.com/UCL/STIR/pull/577/">PR #577</a>. This work is described in<br />
+    P. Khateri, J. Fischer, W. Lustermann, C. Tsoumpas, and G. Dissertori,<br />
+    <cite>Implementation of cylindrical PET scanners with block detector geometry in STIR</cite>,<br />
+    EJNMMI Physics, vol. 6, no. 1, p. 15, Jul. 2019, doi: <a href=https://doi.org/10.1186/s40658-019-0248-9>10.1186/s40658-019-0248-9.</a><br />
+    V. Dao, E. Mikhaylova, M. L. Ahnen, J. Fischer , K. Thielemans, C. Tsoumpas,<br />
+    <cite>Image Reconstruction for PET Scanners With Polygonal Prism Geometry Using STIR</cite>, proc. IEEE MIC 2021<br />
+    This code was initially developed by Parisa Khateri and Michael Roethlisberger (ETH), and further improved and tested by Viet Dao (Leeds),
+    Daniel Deidda (NPL) and Kris Thielemans (UCL and ASC) with funding by the University of Leeds and <a href=https://www.positrigo.com/>Positrigo AG</a>.
+  </li>    
   <li>View Offset Support enabled for the PET scanners, contributed by Palak Wadhwa (Leeds Univ), allowing fixing rotation of reconstructed images, see <a href="https://github.com/UCL/STIR/pull/181">PR 181</a>.
     </li>
   <li>Maximum Likelihood estimation of normalisation factors now includes estimation of geometric factors in 3D, see <a href="https://github.com/UCL/STIR/pull/619">PR 619</a>.
@@ -80,9 +91,15 @@ <h3>Changes breaking backwards compatibility from a user-perspective</h3>
     STIR usages of these methods (OSSPS and SqrtHessianRowSum) have been updated to see no effective change in functionality.
     However, calling the Hessian vector product methods, via python etc., will result in a change in functionality as the sign of the output voxel values has changed.
 </li>
+
+<li> Python/MATLAB wrappers no longer have <code>ProjDataInfo::ProjDataInfoCTI</code>, use <code>ProjDataInfo::construct_proj_data_info</code> instead.
+  However, this now returns an object of the appropriate (derived) type as opposed to just
+  <code>ProjDataInfo</code>. This should be transparant, except apparently for testing equality of objects.
+</li>
 </ul>
 
 
+
 <h3>Bug fixes</h3>
 <ul>
 <li>
@@ -100,6 +117,20 @@ <h3>Bug fixes</h3>
 
 <h3>New functionality</h3>
 <ul>
+  <li>Capability to model block and generic PET detectors was added. This is currently limited to span=1, no view mashing and the ray-tracing
+    matrix (single LOR). It is enabled by specifying appropriate keywords in the Interfile header of the projection data.
+    <pre>
+      Scanner parameters:=
+      normal parameters...
+      Scanner geometry (BlocksOnCylindrical/Cylindrical/Generic)  := BlocksOnCylindrical
+      Distance between crystals in axial direction (cm)           := 0.22
+      Distance between crystals in transaxial direction (cm)      := 0.22
+      Distance between blocks in axial direction (cm)             := 0.22
+      Distance between blocks in transaxial direction (cm)        := 3.3
+      end scanner parameters:=
+    </pre>
+    Scatter and normalisation code are still pending changes.
+    </li>
   <li><a href=https://github.com/gschramm/parallelproj>Georg's Schramm parallelproj</a> is an
     implementation of the Joseph algorithm for projection. If it has been installed
     in your system, and you tell CMake where to find it (`parallelproj_DIR=/wherever/lib/cmake`), the STIR user is
@@ -278,7 +309,13 @@ <h3>Backward incompatibities</h3>
     <li>Poisson log-likelihood hierarchy has changed for gradient methods to now use <tt>actual_compute_subset_gradient_without_penalty</tt>
 	in the derived classes (which has an extra argument <tt>add_sensitivity</tt>). Therefore developers that created their own derived class will need to
 	adjust their class accordingly. The <tt>public</tt> class interface is identical though.
-    </li>    
+    </li>
+    <li><code>DetectorCoordinateMapFromfile</code> (used by SAFIR listmode files) has been renamed to <code>DetectorCoordinateMap</code> and moved from <tt>listmode</tt> to <tt>buildblock</tt>.</li>
+    <li><code>Scanner</code> now has a <code>set_up()</code> function. This needs to be called after
+      using any of the <code>set_*()</code> functions (except <code>set_params</code>). For the blocks/generic
+      scanners, this will fill in the detector maps etc.
+      You will get a run-time exception if you forgot to do this.
+    </li>
 </ul>
 
 <h3>New functionality</h3>
@@ -308,6 +345,8 @@ <h3>New functionality</h3>
 </li>
 <li><code>KeyParser::parameter_info()</code> now outputs vectorised keys as well
 </li>
+<li><code>DetectionPosition</code> now has all comparison operators.
+</li>
 <li><code>LOR</code> classes now no longer require phi at input to be between 0 and pi,
   nor psi to be between 0 and 2 pi. They will standardise the input automatically.
   </li>
diff --git a/examples/PET_simulation/generate_input_data.sh b/examples/PET_simulation/generate_input_data.sh
index ba3f5c4e8..9d792704e 100755
--- a/examples/PET_simulation/generate_input_data.sh
+++ b/examples/PET_simulation/generate_input_data.sh
@@ -40,6 +40,7 @@ echo "===  create template sinogram (DSTE in 3D with max ring diff 1 to save tim
 template_sino=my_DSTE_3D_rd1_template.hs
 cat > my_input.txt <<EOF
 Discovery STE
+
 1
 n
 
diff --git a/examples/SAFIR_genericScanner/.gitignore b/examples/SAFIR_genericScanner/.gitignore
new file mode 100644
index 000000000..8fd467b83
--- /dev/null
+++ b/examples/SAFIR_genericScanner/.gitignore
@@ -0,0 +1,4 @@
+test_generic_implementation*
+test_forward*
+test_*.*v
+sens_*.*v
\ No newline at end of file
diff --git a/examples/SAFIR_genericScanner/DualRingPrototype_crystal_map.txt b/examples/SAFIR_genericScanner/DualRingPrototype_crystal_map.txt
new file mode 100644
index 000000000..c48fdf54c
--- /dev/null
+++ b/examples/SAFIR_genericScanner/DualRingPrototype_crystal_map.txt
@@ -0,0 +1,2881 @@
+#ring	#detector	#layer	x	y	z
+0	0	0	15.65	70.5	-16.75
+0	1	0	13.45	70.5	-16.75
+0	2	0	11.25	70.5	-16.75
+0	3	0	9.05	70.5	-16.75
+0	4	0	6.85	70.5	-16.75
+0	5	0	4.65	70.5	-16.75
+0	6	0	2.45	70.5	-16.75
+0	7	0	-0.25	70.5	-16.75
+0	8	0	-2.45	70.5	-16.75
+0	9	0	-4.65	70.5	-16.75
+0	10	0	-6.85	70.5	-16.75
+0	11	0	-9.05	70.5	-16.75
+0	12	0	-11.25	70.5	-16.75
+0	13	0	-13.45	70.5	-16.75
+0	14	0	-15.65	70.5	-16.75
+0	15	0	-21.6967	68.8798	-16.75
+0	16	0	-23.602	67.7798	-16.75
+0	17	0	-25.5072	66.6798	-16.75
+0	18	0	-27.4125	65.5798	-16.75
+0	19	0	-29.3177	64.4798	-16.75
+0	20	0	-31.223	63.3798	-16.75
+0	21	0	-33.1282	62.2798	-16.75
+0	22	0	-35.4665	60.9298	-16.75
+0	23	0	-37.3718	59.8298	-16.75
+0	24	0	-39.277	58.7298	-16.75
+0	25	0	-41.1823	57.6298	-16.75
+0	26	0	-43.0875	56.5298	-16.75
+0	27	0	-44.9928	55.4298	-16.75
+0	28	0	-46.898	54.3298	-16.75
+0	29	0	-48.8033	53.2298	-16.75
+0	30	0	-53.2298	48.8033	-16.75
+0	31	0	-54.3298	46.898	-16.75
+0	32	0	-55.4298	44.9928	-16.75
+0	33	0	-56.5298	43.0875	-16.75
+0	34	0	-57.6298	41.1823	-16.75
+0	35	0	-58.7298	39.277	-16.75
+0	36	0	-59.8298	37.3718	-16.75
+0	37	0	-61.1798	35.0335	-16.75
+0	38	0	-62.2798	33.1282	-16.75
+0	39	0	-63.3798	31.223	-16.75
+0	40	0	-64.4798	29.3177	-16.75
+0	41	0	-65.5798	27.4125	-16.75
+0	42	0	-66.6798	25.5072	-16.75
+0	43	0	-67.7798	23.602	-16.75
+0	44	0	-68.8798	21.6967	-16.75
+0	45	0	-70.5	15.65	-16.75
+0	46	0	-70.5	13.45	-16.75
+0	47	0	-70.5	11.25	-16.75
+0	48	0	-70.5	9.05	-16.75
+0	49	0	-70.5	6.85	-16.75
+0	50	0	-70.5	4.65	-16.75
+0	51	0	-70.5	2.45	-16.75
+0	52	0	-70.5	-0.25	-16.75
+0	53	0	-70.5	-2.45	-16.75
+0	54	0	-70.5	-4.65	-16.75
+0	55	0	-70.5	-6.85	-16.75
+0	56	0	-70.5	-9.05	-16.75
+0	57	0	-70.5	-11.25	-16.75
+0	58	0	-70.5	-13.45	-16.75
+0	59	0	-70.5	-15.65	-16.75
+0	60	0	-68.8798	-21.6967	-16.75
+0	61	0	-67.7798	-23.602	-16.75
+0	62	0	-66.6798	-25.5072	-16.75
+0	63	0	-65.5798	-27.4125	-16.75
+0	64	0	-64.4798	-29.3177	-16.75
+0	65	0	-63.3798	-31.223	-16.75
+0	66	0	-62.2798	-33.1282	-16.75
+0	67	0	-60.9298	-35.4665	-16.75
+0	68	0	-59.8298	-37.3718	-16.75
+0	69	0	-58.7298	-39.277	-16.75
+0	70	0	-57.6298	-41.1823	-16.75
+0	71	0	-56.5298	-43.0875	-16.75
+0	72	0	-55.4298	-44.9928	-16.75
+0	73	0	-54.3298	-46.898	-16.75
+0	74	0	-53.2298	-48.8033	-16.75
+0	75	0	-48.8033	-53.2298	-16.75
+0	76	0	-46.898	-54.3298	-16.75
+0	77	0	-44.9928	-55.4298	-16.75
+0	78	0	-43.0875	-56.5298	-16.75
+0	79	0	-41.1823	-57.6298	-16.75
+0	80	0	-39.277	-58.7298	-16.75
+0	81	0	-37.3718	-59.8298	-16.75
+0	82	0	-35.0335	-61.1798	-16.75
+0	83	0	-33.1282	-62.2798	-16.75
+0	84	0	-31.223	-63.3798	-16.75
+0	85	0	-29.3177	-64.4798	-16.75
+0	86	0	-27.4125	-65.5798	-16.75
+0	87	0	-25.5072	-66.6798	-16.75
+0	88	0	-23.602	-67.7798	-16.75
+0	89	0	-21.6967	-68.8798	-16.75
+0	90	0	-15.65	-70.5	-16.75
+0	91	0	-13.45	-70.5	-16.75
+0	92	0	-11.25	-70.5	-16.75
+0	93	0	-9.05	-70.5	-16.75
+0	94	0	-6.85	-70.5	-16.75
+0	95	0	-4.65	-70.5	-16.75
+0	96	0	-2.45	-70.5	-16.75
+0	97	0	0.25	-70.5	-16.75
+0	98	0	2.45	-70.5	-16.75
+0	99	0	4.65	-70.5	-16.75
+0	100	0	6.85	-70.5	-16.75
+0	101	0	9.05	-70.5	-16.75
+0	102	0	11.25	-70.5	-16.75
+0	103	0	13.45	-70.5	-16.75
+0	104	0	15.65	-70.5	-16.75
+0	105	0	21.6967	-68.8798	-16.75
+0	106	0	23.602	-67.7798	-16.75
+0	107	0	25.5072	-66.6798	-16.75
+0	108	0	27.4125	-65.5798	-16.75
+0	109	0	29.3177	-64.4798	-16.75
+0	110	0	31.223	-63.3798	-16.75
+0	111	0	33.1282	-62.2798	-16.75
+0	112	0	35.4665	-60.9298	-16.75
+0	113	0	37.3718	-59.8298	-16.75
+0	114	0	39.277	-58.7298	-16.75
+0	115	0	41.1823	-57.6298	-16.75
+0	116	0	43.0875	-56.5298	-16.75
+0	117	0	44.9928	-55.4298	-16.75
+0	118	0	46.898	-54.3298	-16.75
+0	119	0	48.8033	-53.2298	-16.75
+0	120	0	53.2298	-48.8033	-16.75
+0	121	0	54.3298	-46.898	-16.75
+0	122	0	55.4298	-44.9928	-16.75
+0	123	0	56.5298	-43.0875	-16.75
+0	124	0	57.6298	-41.1823	-16.75
+0	125	0	58.7298	-39.277	-16.75
+0	126	0	59.8298	-37.3718	-16.75
+0	127	0	61.1798	-35.0335	-16.75
+0	128	0	62.2798	-33.1282	-16.75
+0	129	0	63.3798	-31.223	-16.75
+0	130	0	64.4798	-29.3177	-16.75
+0	131	0	65.5798	-27.4125	-16.75
+0	132	0	66.6798	-25.5072	-16.75
+0	133	0	67.7798	-23.602	-16.75
+0	134	0	68.8798	-21.6967	-16.75
+0	135	0	70.5	-15.65	-16.75
+0	136	0	70.5	-13.45	-16.75
+0	137	0	70.5	-11.25	-16.75
+0	138	0	70.5	-9.05	-16.75
+0	139	0	70.5	-6.85	-16.75
+0	140	0	70.5	-4.65	-16.75
+0	141	0	70.5	-2.45	-16.75
+0	142	0	70.5	0.25	-16.75
+0	143	0	70.5	2.45	-16.75
+0	144	0	70.5	4.65	-16.75
+0	145	0	70.5	6.85	-16.75
+0	146	0	70.5	9.05	-16.75
+0	147	0	70.5	11.25	-16.75
+0	148	0	70.5	13.45	-16.75
+0	149	0	70.5	15.65	-16.75
+0	150	0	68.8798	21.6967	-16.75
+0	151	0	67.7798	23.602	-16.75
+0	152	0	66.6798	25.5072	-16.75
+0	153	0	65.5798	27.4125	-16.75
+0	154	0	64.4798	29.3177	-16.75
+0	155	0	63.3798	31.223	-16.75
+0	156	0	62.2798	33.1282	-16.75
+0	157	0	60.9298	35.4665	-16.75
+0	158	0	59.8298	37.3718	-16.75
+0	159	0	58.7298	39.277	-16.75
+0	160	0	57.6298	41.1823	-16.75
+0	161	0	56.5298	43.0875	-16.75
+0	162	0	55.4298	44.9928	-16.75
+0	163	0	54.3298	46.898	-16.75
+0	164	0	53.2298	48.8033	-16.75
+0	165	0	48.8033	53.2298	-16.75
+0	166	0	46.898	54.3298	-16.75
+0	167	0	44.9928	55.4298	-16.75
+0	168	0	43.0875	56.5298	-16.75
+0	169	0	41.1823	57.6298	-16.75
+0	170	0	39.277	58.7298	-16.75
+0	171	0	37.3718	59.8298	-16.75
+0	172	0	35.0335	61.1798	-16.75
+0	173	0	33.1282	62.2798	-16.75
+0	174	0	31.223	63.3798	-16.75
+0	175	0	29.3177	64.4798	-16.75
+0	176	0	27.4125	65.5798	-16.75
+0	177	0	25.5072	66.6798	-16.75
+0	178	0	23.602	67.7798	-16.75
+0	179	0	21.6967	68.8798	-16.75
+1	0	0	15.65	70.5	-14.55
+1	1	0	13.45	70.5	-14.55
+1	2	0	11.25	70.5	-14.55
+1	3	0	9.05	70.5	-14.55
+1	4	0	6.85	70.5	-14.55
+1	5	0	4.65	70.5	-14.55
+1	6	0	2.45	70.5	-14.55
+1	7	0	-0.25	70.5	-14.55
+1	8	0	-2.45	70.5	-14.55
+1	9	0	-4.65	70.5	-14.55
+1	10	0	-6.85	70.5	-14.55
+1	11	0	-9.05	70.5	-14.55
+1	12	0	-11.25	70.5	-14.55
+1	13	0	-13.45	70.5	-14.55
+1	14	0	-15.65	70.5	-14.55
+1	15	0	-21.6967	68.8798	-14.55
+1	16	0	-23.602	67.7798	-14.55
+1	17	0	-25.5072	66.6798	-14.55
+1	18	0	-27.4125	65.5798	-14.55
+1	19	0	-29.3177	64.4798	-14.55
+1	20	0	-31.223	63.3798	-14.55
+1	21	0	-33.1282	62.2798	-14.55
+1	22	0	-35.4665	60.9298	-14.55
+1	23	0	-37.3718	59.8298	-14.55
+1	24	0	-39.277	58.7298	-14.55
+1	25	0	-41.1823	57.6298	-14.55
+1	26	0	-43.0875	56.5298	-14.55
+1	27	0	-44.9928	55.4298	-14.55
+1	28	0	-46.898	54.3298	-14.55
+1	29	0	-48.8033	53.2298	-14.55
+1	30	0	-53.2298	48.8033	-14.55
+1	31	0	-54.3298	46.898	-14.55
+1	32	0	-55.4298	44.9928	-14.55
+1	33	0	-56.5298	43.0875	-14.55
+1	34	0	-57.6298	41.1823	-14.55
+1	35	0	-58.7298	39.277	-14.55
+1	36	0	-59.8298	37.3718	-14.55
+1	37	0	-61.1798	35.0335	-14.55
+1	38	0	-62.2798	33.1282	-14.55
+1	39	0	-63.3798	31.223	-14.55
+1	40	0	-64.4798	29.3177	-14.55
+1	41	0	-65.5798	27.4125	-14.55
+1	42	0	-66.6798	25.5072	-14.55
+1	43	0	-67.7798	23.602	-14.55
+1	44	0	-68.8798	21.6967	-14.55
+1	45	0	-70.5	15.65	-14.55
+1	46	0	-70.5	13.45	-14.55
+1	47	0	-70.5	11.25	-14.55
+1	48	0	-70.5	9.05	-14.55
+1	49	0	-70.5	6.85	-14.55
+1	50	0	-70.5	4.65	-14.55
+1	51	0	-70.5	2.45	-14.55
+1	52	0	-70.5	-0.25	-14.55
+1	53	0	-70.5	-2.45	-14.55
+1	54	0	-70.5	-4.65	-14.55
+1	55	0	-70.5	-6.85	-14.55
+1	56	0	-70.5	-9.05	-14.55
+1	57	0	-70.5	-11.25	-14.55
+1	58	0	-70.5	-13.45	-14.55
+1	59	0	-70.5	-15.65	-14.55
+1	60	0	-68.8798	-21.6967	-14.55
+1	61	0	-67.7798	-23.602	-14.55
+1	62	0	-66.6798	-25.5072	-14.55
+1	63	0	-65.5798	-27.4125	-14.55
+1	64	0	-64.4798	-29.3177	-14.55
+1	65	0	-63.3798	-31.223	-14.55
+1	66	0	-62.2798	-33.1282	-14.55
+1	67	0	-60.9298	-35.4665	-14.55
+1	68	0	-59.8298	-37.3718	-14.55
+1	69	0	-58.7298	-39.277	-14.55
+1	70	0	-57.6298	-41.1823	-14.55
+1	71	0	-56.5298	-43.0875	-14.55
+1	72	0	-55.4298	-44.9928	-14.55
+1	73	0	-54.3298	-46.898	-14.55
+1	74	0	-53.2298	-48.8033	-14.55
+1	75	0	-48.8033	-53.2298	-14.55
+1	76	0	-46.898	-54.3298	-14.55
+1	77	0	-44.9928	-55.4298	-14.55
+1	78	0	-43.0875	-56.5298	-14.55
+1	79	0	-41.1823	-57.6298	-14.55
+1	80	0	-39.277	-58.7298	-14.55
+1	81	0	-37.3718	-59.8298	-14.55
+1	82	0	-35.0335	-61.1798	-14.55
+1	83	0	-33.1282	-62.2798	-14.55
+1	84	0	-31.223	-63.3798	-14.55
+1	85	0	-29.3177	-64.4798	-14.55
+1	86	0	-27.4125	-65.5798	-14.55
+1	87	0	-25.5072	-66.6798	-14.55
+1	88	0	-23.602	-67.7798	-14.55
+1	89	0	-21.6967	-68.8798	-14.55
+1	90	0	-15.65	-70.5	-14.55
+1	91	0	-13.45	-70.5	-14.55
+1	92	0	-11.25	-70.5	-14.55
+1	93	0	-9.05	-70.5	-14.55
+1	94	0	-6.85	-70.5	-14.55
+1	95	0	-4.65	-70.5	-14.55
+1	96	0	-2.45	-70.5	-14.55
+1	97	0	0.25	-70.5	-14.55
+1	98	0	2.45	-70.5	-14.55
+1	99	0	4.65	-70.5	-14.55
+1	100	0	6.85	-70.5	-14.55
+1	101	0	9.05	-70.5	-14.55
+1	102	0	11.25	-70.5	-14.55
+1	103	0	13.45	-70.5	-14.55
+1	104	0	15.65	-70.5	-14.55
+1	105	0	21.6967	-68.8798	-14.55
+1	106	0	23.602	-67.7798	-14.55
+1	107	0	25.5072	-66.6798	-14.55
+1	108	0	27.4125	-65.5798	-14.55
+1	109	0	29.3177	-64.4798	-14.55
+1	110	0	31.223	-63.3798	-14.55
+1	111	0	33.1282	-62.2798	-14.55
+1	112	0	35.4665	-60.9298	-14.55
+1	113	0	37.3718	-59.8298	-14.55
+1	114	0	39.277	-58.7298	-14.55
+1	115	0	41.1823	-57.6298	-14.55
+1	116	0	43.0875	-56.5298	-14.55
+1	117	0	44.9928	-55.4298	-14.55
+1	118	0	46.898	-54.3298	-14.55
+1	119	0	48.8033	-53.2298	-14.55
+1	120	0	53.2298	-48.8033	-14.55
+1	121	0	54.3298	-46.898	-14.55
+1	122	0	55.4298	-44.9928	-14.55
+1	123	0	56.5298	-43.0875	-14.55
+1	124	0	57.6298	-41.1823	-14.55
+1	125	0	58.7298	-39.277	-14.55
+1	126	0	59.8298	-37.3718	-14.55
+1	127	0	61.1798	-35.0335	-14.55
+1	128	0	62.2798	-33.1282	-14.55
+1	129	0	63.3798	-31.223	-14.55
+1	130	0	64.4798	-29.3177	-14.55
+1	131	0	65.5798	-27.4125	-14.55
+1	132	0	66.6798	-25.5072	-14.55
+1	133	0	67.7798	-23.602	-14.55
+1	134	0	68.8798	-21.6967	-14.55
+1	135	0	70.5	-15.65	-14.55
+1	136	0	70.5	-13.45	-14.55
+1	137	0	70.5	-11.25	-14.55
+1	138	0	70.5	-9.05	-14.55
+1	139	0	70.5	-6.85	-14.55
+1	140	0	70.5	-4.65	-14.55
+1	141	0	70.5	-2.45	-14.55
+1	142	0	70.5	0.25	-14.55
+1	143	0	70.5	2.45	-14.55
+1	144	0	70.5	4.65	-14.55
+1	145	0	70.5	6.85	-14.55
+1	146	0	70.5	9.05	-14.55
+1	147	0	70.5	11.25	-14.55
+1	148	0	70.5	13.45	-14.55
+1	149	0	70.5	15.65	-14.55
+1	150	0	68.8798	21.6967	-14.55
+1	151	0	67.7798	23.602	-14.55
+1	152	0	66.6798	25.5072	-14.55
+1	153	0	65.5798	27.4125	-14.55
+1	154	0	64.4798	29.3177	-14.55
+1	155	0	63.3798	31.223	-14.55
+1	156	0	62.2798	33.1282	-14.55
+1	157	0	60.9298	35.4665	-14.55
+1	158	0	59.8298	37.3718	-14.55
+1	159	0	58.7298	39.277	-14.55
+1	160	0	57.6298	41.1823	-14.55
+1	161	0	56.5298	43.0875	-14.55
+1	162	0	55.4298	44.9928	-14.55
+1	163	0	54.3298	46.898	-14.55
+1	164	0	53.2298	48.8033	-14.55
+1	165	0	48.8033	53.2298	-14.55
+1	166	0	46.898	54.3298	-14.55
+1	167	0	44.9928	55.4298	-14.55
+1	168	0	43.0875	56.5298	-14.55
+1	169	0	41.1823	57.6298	-14.55
+1	170	0	39.277	58.7298	-14.55
+1	171	0	37.3718	59.8298	-14.55
+1	172	0	35.0335	61.1798	-14.55
+1	173	0	33.1282	62.2798	-14.55
+1	174	0	31.223	63.3798	-14.55
+1	175	0	29.3177	64.4798	-14.55
+1	176	0	27.4125	65.5798	-14.55
+1	177	0	25.5072	66.6798	-14.55
+1	178	0	23.602	67.7798	-14.55
+1	179	0	21.6967	68.8798	-14.55
+2	0	0	15.65	70.5	-12.35
+2	1	0	13.45	70.5	-12.35
+2	2	0	11.25	70.5	-12.35
+2	3	0	9.05	70.5	-12.35
+2	4	0	6.85	70.5	-12.35
+2	5	0	4.65	70.5	-12.35
+2	6	0	2.45	70.5	-12.35
+2	7	0	-0.25	70.5	-12.35
+2	8	0	-2.45	70.5	-12.35
+2	9	0	-4.65	70.5	-12.35
+2	10	0	-6.85	70.5	-12.35
+2	11	0	-9.05	70.5	-12.35
+2	12	0	-11.25	70.5	-12.35
+2	13	0	-13.45	70.5	-12.35
+2	14	0	-15.65	70.5	-12.35
+2	15	0	-21.6967	68.8798	-12.35
+2	16	0	-23.602	67.7798	-12.35
+2	17	0	-25.5072	66.6798	-12.35
+2	18	0	-27.4125	65.5798	-12.35
+2	19	0	-29.3177	64.4798	-12.35
+2	20	0	-31.223	63.3798	-12.35
+2	21	0	-33.1282	62.2798	-12.35
+2	22	0	-35.4665	60.9298	-12.35
+2	23	0	-37.3718	59.8298	-12.35
+2	24	0	-39.277	58.7298	-12.35
+2	25	0	-41.1823	57.6298	-12.35
+2	26	0	-43.0875	56.5298	-12.35
+2	27	0	-44.9928	55.4298	-12.35
+2	28	0	-46.898	54.3298	-12.35
+2	29	0	-48.8033	53.2298	-12.35
+2	30	0	-53.2298	48.8033	-12.35
+2	31	0	-54.3298	46.898	-12.35
+2	32	0	-55.4298	44.9928	-12.35
+2	33	0	-56.5298	43.0875	-12.35
+2	34	0	-57.6298	41.1823	-12.35
+2	35	0	-58.7298	39.277	-12.35
+2	36	0	-59.8298	37.3718	-12.35
+2	37	0	-61.1798	35.0335	-12.35
+2	38	0	-62.2798	33.1282	-12.35
+2	39	0	-63.3798	31.223	-12.35
+2	40	0	-64.4798	29.3177	-12.35
+2	41	0	-65.5798	27.4125	-12.35
+2	42	0	-66.6798	25.5072	-12.35
+2	43	0	-67.7798	23.602	-12.35
+2	44	0	-68.8798	21.6967	-12.35
+2	45	0	-70.5	15.65	-12.35
+2	46	0	-70.5	13.45	-12.35
+2	47	0	-70.5	11.25	-12.35
+2	48	0	-70.5	9.05	-12.35
+2	49	0	-70.5	6.85	-12.35
+2	50	0	-70.5	4.65	-12.35
+2	51	0	-70.5	2.45	-12.35
+2	52	0	-70.5	-0.25	-12.35
+2	53	0	-70.5	-2.45	-12.35
+2	54	0	-70.5	-4.65	-12.35
+2	55	0	-70.5	-6.85	-12.35
+2	56	0	-70.5	-9.05	-12.35
+2	57	0	-70.5	-11.25	-12.35
+2	58	0	-70.5	-13.45	-12.35
+2	59	0	-70.5	-15.65	-12.35
+2	60	0	-68.8798	-21.6967	-12.35
+2	61	0	-67.7798	-23.602	-12.35
+2	62	0	-66.6798	-25.5072	-12.35
+2	63	0	-65.5798	-27.4125	-12.35
+2	64	0	-64.4798	-29.3177	-12.35
+2	65	0	-63.3798	-31.223	-12.35
+2	66	0	-62.2798	-33.1282	-12.35
+2	67	0	-60.9298	-35.4665	-12.35
+2	68	0	-59.8298	-37.3718	-12.35
+2	69	0	-58.7298	-39.277	-12.35
+2	70	0	-57.6298	-41.1823	-12.35
+2	71	0	-56.5298	-43.0875	-12.35
+2	72	0	-55.4298	-44.9928	-12.35
+2	73	0	-54.3298	-46.898	-12.35
+2	74	0	-53.2298	-48.8033	-12.35
+2	75	0	-48.8033	-53.2298	-12.35
+2	76	0	-46.898	-54.3298	-12.35
+2	77	0	-44.9928	-55.4298	-12.35
+2	78	0	-43.0875	-56.5298	-12.35
+2	79	0	-41.1823	-57.6298	-12.35
+2	80	0	-39.277	-58.7298	-12.35
+2	81	0	-37.3718	-59.8298	-12.35
+2	82	0	-35.0335	-61.1798	-12.35
+2	83	0	-33.1282	-62.2798	-12.35
+2	84	0	-31.223	-63.3798	-12.35
+2	85	0	-29.3177	-64.4798	-12.35
+2	86	0	-27.4125	-65.5798	-12.35
+2	87	0	-25.5072	-66.6798	-12.35
+2	88	0	-23.602	-67.7798	-12.35
+2	89	0	-21.6967	-68.8798	-12.35
+2	90	0	-15.65	-70.5	-12.35
+2	91	0	-13.45	-70.5	-12.35
+2	92	0	-11.25	-70.5	-12.35
+2	93	0	-9.05	-70.5	-12.35
+2	94	0	-6.85	-70.5	-12.35
+2	95	0	-4.65	-70.5	-12.35
+2	96	0	-2.45	-70.5	-12.35
+2	97	0	0.25	-70.5	-12.35
+2	98	0	2.45	-70.5	-12.35
+2	99	0	4.65	-70.5	-12.35
+2	100	0	6.85	-70.5	-12.35
+2	101	0	9.05	-70.5	-12.35
+2	102	0	11.25	-70.5	-12.35
+2	103	0	13.45	-70.5	-12.35
+2	104	0	15.65	-70.5	-12.35
+2	105	0	21.6967	-68.8798	-12.35
+2	106	0	23.602	-67.7798	-12.35
+2	107	0	25.5072	-66.6798	-12.35
+2	108	0	27.4125	-65.5798	-12.35
+2	109	0	29.3177	-64.4798	-12.35
+2	110	0	31.223	-63.3798	-12.35
+2	111	0	33.1282	-62.2798	-12.35
+2	112	0	35.4665	-60.9298	-12.35
+2	113	0	37.3718	-59.8298	-12.35
+2	114	0	39.277	-58.7298	-12.35
+2	115	0	41.1823	-57.6298	-12.35
+2	116	0	43.0875	-56.5298	-12.35
+2	117	0	44.9928	-55.4298	-12.35
+2	118	0	46.898	-54.3298	-12.35
+2	119	0	48.8033	-53.2298	-12.35
+2	120	0	53.2298	-48.8033	-12.35
+2	121	0	54.3298	-46.898	-12.35
+2	122	0	55.4298	-44.9928	-12.35
+2	123	0	56.5298	-43.0875	-12.35
+2	124	0	57.6298	-41.1823	-12.35
+2	125	0	58.7298	-39.277	-12.35
+2	126	0	59.8298	-37.3718	-12.35
+2	127	0	61.1798	-35.0335	-12.35
+2	128	0	62.2798	-33.1282	-12.35
+2	129	0	63.3798	-31.223	-12.35
+2	130	0	64.4798	-29.3177	-12.35
+2	131	0	65.5798	-27.4125	-12.35
+2	132	0	66.6798	-25.5072	-12.35
+2	133	0	67.7798	-23.602	-12.35
+2	134	0	68.8798	-21.6967	-12.35
+2	135	0	70.5	-15.65	-12.35
+2	136	0	70.5	-13.45	-12.35
+2	137	0	70.5	-11.25	-12.35
+2	138	0	70.5	-9.05	-12.35
+2	139	0	70.5	-6.85	-12.35
+2	140	0	70.5	-4.65	-12.35
+2	141	0	70.5	-2.45	-12.35
+2	142	0	70.5	0.25	-12.35
+2	143	0	70.5	2.45	-12.35
+2	144	0	70.5	4.65	-12.35
+2	145	0	70.5	6.85	-12.35
+2	146	0	70.5	9.05	-12.35
+2	147	0	70.5	11.25	-12.35
+2	148	0	70.5	13.45	-12.35
+2	149	0	70.5	15.65	-12.35
+2	150	0	68.8798	21.6967	-12.35
+2	151	0	67.7798	23.602	-12.35
+2	152	0	66.6798	25.5072	-12.35
+2	153	0	65.5798	27.4125	-12.35
+2	154	0	64.4798	29.3177	-12.35
+2	155	0	63.3798	31.223	-12.35
+2	156	0	62.2798	33.1282	-12.35
+2	157	0	60.9298	35.4665	-12.35
+2	158	0	59.8298	37.3718	-12.35
+2	159	0	58.7298	39.277	-12.35
+2	160	0	57.6298	41.1823	-12.35
+2	161	0	56.5298	43.0875	-12.35
+2	162	0	55.4298	44.9928	-12.35
+2	163	0	54.3298	46.898	-12.35
+2	164	0	53.2298	48.8033	-12.35
+2	165	0	48.8033	53.2298	-12.35
+2	166	0	46.898	54.3298	-12.35
+2	167	0	44.9928	55.4298	-12.35
+2	168	0	43.0875	56.5298	-12.35
+2	169	0	41.1823	57.6298	-12.35
+2	170	0	39.277	58.7298	-12.35
+2	171	0	37.3718	59.8298	-12.35
+2	172	0	35.0335	61.1798	-12.35
+2	173	0	33.1282	62.2798	-12.35
+2	174	0	31.223	63.3798	-12.35
+2	175	0	29.3177	64.4798	-12.35
+2	176	0	27.4125	65.5798	-12.35
+2	177	0	25.5072	66.6798	-12.35
+2	178	0	23.602	67.7798	-12.35
+2	179	0	21.6967	68.8798	-12.35
+3	0	0	15.65	70.5	-10.15
+3	1	0	13.45	70.5	-10.15
+3	2	0	11.25	70.5	-10.15
+3	3	0	9.05	70.5	-10.15
+3	4	0	6.85	70.5	-10.15
+3	5	0	4.65	70.5	-10.15
+3	6	0	2.45	70.5	-10.15
+3	7	0	-0.25	70.5	-10.15
+3	8	0	-2.45	70.5	-10.15
+3	9	0	-4.65	70.5	-10.15
+3	10	0	-6.85	70.5	-10.15
+3	11	0	-9.05	70.5	-10.15
+3	12	0	-11.25	70.5	-10.15
+3	13	0	-13.45	70.5	-10.15
+3	14	0	-15.65	70.5	-10.15
+3	15	0	-21.6967	68.8798	-10.15
+3	16	0	-23.602	67.7798	-10.15
+3	17	0	-25.5072	66.6798	-10.15
+3	18	0	-27.4125	65.5798	-10.15
+3	19	0	-29.3177	64.4798	-10.15
+3	20	0	-31.223	63.3798	-10.15
+3	21	0	-33.1282	62.2798	-10.15
+3	22	0	-35.4665	60.9298	-10.15
+3	23	0	-37.3718	59.8298	-10.15
+3	24	0	-39.277	58.7298	-10.15
+3	25	0	-41.1823	57.6298	-10.15
+3	26	0	-43.0875	56.5298	-10.15
+3	27	0	-44.9928	55.4298	-10.15
+3	28	0	-46.898	54.3298	-10.15
+3	29	0	-48.8033	53.2298	-10.15
+3	30	0	-53.2298	48.8033	-10.15
+3	31	0	-54.3298	46.898	-10.15
+3	32	0	-55.4298	44.9928	-10.15
+3	33	0	-56.5298	43.0875	-10.15
+3	34	0	-57.6298	41.1823	-10.15
+3	35	0	-58.7298	39.277	-10.15
+3	36	0	-59.8298	37.3718	-10.15
+3	37	0	-61.1798	35.0335	-10.15
+3	38	0	-62.2798	33.1282	-10.15
+3	39	0	-63.3798	31.223	-10.15
+3	40	0	-64.4798	29.3177	-10.15
+3	41	0	-65.5798	27.4125	-10.15
+3	42	0	-66.6798	25.5072	-10.15
+3	43	0	-67.7798	23.602	-10.15
+3	44	0	-68.8798	21.6967	-10.15
+3	45	0	-70.5	15.65	-10.15
+3	46	0	-70.5	13.45	-10.15
+3	47	0	-70.5	11.25	-10.15
+3	48	0	-70.5	9.05	-10.15
+3	49	0	-70.5	6.85	-10.15
+3	50	0	-70.5	4.65	-10.15
+3	51	0	-70.5	2.45	-10.15
+3	52	0	-70.5	-0.25	-10.15
+3	53	0	-70.5	-2.45	-10.15
+3	54	0	-70.5	-4.65	-10.15
+3	55	0	-70.5	-6.85	-10.15
+3	56	0	-70.5	-9.05	-10.15
+3	57	0	-70.5	-11.25	-10.15
+3	58	0	-70.5	-13.45	-10.15
+3	59	0	-70.5	-15.65	-10.15
+3	60	0	-68.8798	-21.6967	-10.15
+3	61	0	-67.7798	-23.602	-10.15
+3	62	0	-66.6798	-25.5072	-10.15
+3	63	0	-65.5798	-27.4125	-10.15
+3	64	0	-64.4798	-29.3177	-10.15
+3	65	0	-63.3798	-31.223	-10.15
+3	66	0	-62.2798	-33.1282	-10.15
+3	67	0	-60.9298	-35.4665	-10.15
+3	68	0	-59.8298	-37.3718	-10.15
+3	69	0	-58.7298	-39.277	-10.15
+3	70	0	-57.6298	-41.1823	-10.15
+3	71	0	-56.5298	-43.0875	-10.15
+3	72	0	-55.4298	-44.9928	-10.15
+3	73	0	-54.3298	-46.898	-10.15
+3	74	0	-53.2298	-48.8033	-10.15
+3	75	0	-48.8033	-53.2298	-10.15
+3	76	0	-46.898	-54.3298	-10.15
+3	77	0	-44.9928	-55.4298	-10.15
+3	78	0	-43.0875	-56.5298	-10.15
+3	79	0	-41.1823	-57.6298	-10.15
+3	80	0	-39.277	-58.7298	-10.15
+3	81	0	-37.3718	-59.8298	-10.15
+3	82	0	-35.0335	-61.1798	-10.15
+3	83	0	-33.1282	-62.2798	-10.15
+3	84	0	-31.223	-63.3798	-10.15
+3	85	0	-29.3177	-64.4798	-10.15
+3	86	0	-27.4125	-65.5798	-10.15
+3	87	0	-25.5072	-66.6798	-10.15
+3	88	0	-23.602	-67.7798	-10.15
+3	89	0	-21.6967	-68.8798	-10.15
+3	90	0	-15.65	-70.5	-10.15
+3	91	0	-13.45	-70.5	-10.15
+3	92	0	-11.25	-70.5	-10.15
+3	93	0	-9.05	-70.5	-10.15
+3	94	0	-6.85	-70.5	-10.15
+3	95	0	-4.65	-70.5	-10.15
+3	96	0	-2.45	-70.5	-10.15
+3	97	0	0.25	-70.5	-10.15
+3	98	0	2.45	-70.5	-10.15
+3	99	0	4.65	-70.5	-10.15
+3	100	0	6.85	-70.5	-10.15
+3	101	0	9.05	-70.5	-10.15
+3	102	0	11.25	-70.5	-10.15
+3	103	0	13.45	-70.5	-10.15
+3	104	0	15.65	-70.5	-10.15
+3	105	0	21.6967	-68.8798	-10.15
+3	106	0	23.602	-67.7798	-10.15
+3	107	0	25.5072	-66.6798	-10.15
+3	108	0	27.4125	-65.5798	-10.15
+3	109	0	29.3177	-64.4798	-10.15
+3	110	0	31.223	-63.3798	-10.15
+3	111	0	33.1282	-62.2798	-10.15
+3	112	0	35.4665	-60.9298	-10.15
+3	113	0	37.3718	-59.8298	-10.15
+3	114	0	39.277	-58.7298	-10.15
+3	115	0	41.1823	-57.6298	-10.15
+3	116	0	43.0875	-56.5298	-10.15
+3	117	0	44.9928	-55.4298	-10.15
+3	118	0	46.898	-54.3298	-10.15
+3	119	0	48.8033	-53.2298	-10.15
+3	120	0	53.2298	-48.8033	-10.15
+3	121	0	54.3298	-46.898	-10.15
+3	122	0	55.4298	-44.9928	-10.15
+3	123	0	56.5298	-43.0875	-10.15
+3	124	0	57.6298	-41.1823	-10.15
+3	125	0	58.7298	-39.277	-10.15
+3	126	0	59.8298	-37.3718	-10.15
+3	127	0	61.1798	-35.0335	-10.15
+3	128	0	62.2798	-33.1282	-10.15
+3	129	0	63.3798	-31.223	-10.15
+3	130	0	64.4798	-29.3177	-10.15
+3	131	0	65.5798	-27.4125	-10.15
+3	132	0	66.6798	-25.5072	-10.15
+3	133	0	67.7798	-23.602	-10.15
+3	134	0	68.8798	-21.6967	-10.15
+3	135	0	70.5	-15.65	-10.15
+3	136	0	70.5	-13.45	-10.15
+3	137	0	70.5	-11.25	-10.15
+3	138	0	70.5	-9.05	-10.15
+3	139	0	70.5	-6.85	-10.15
+3	140	0	70.5	-4.65	-10.15
+3	141	0	70.5	-2.45	-10.15
+3	142	0	70.5	0.25	-10.15
+3	143	0	70.5	2.45	-10.15
+3	144	0	70.5	4.65	-10.15
+3	145	0	70.5	6.85	-10.15
+3	146	0	70.5	9.05	-10.15
+3	147	0	70.5	11.25	-10.15
+3	148	0	70.5	13.45	-10.15
+3	149	0	70.5	15.65	-10.15
+3	150	0	68.8798	21.6967	-10.15
+3	151	0	67.7798	23.602	-10.15
+3	152	0	66.6798	25.5072	-10.15
+3	153	0	65.5798	27.4125	-10.15
+3	154	0	64.4798	29.3177	-10.15
+3	155	0	63.3798	31.223	-10.15
+3	156	0	62.2798	33.1282	-10.15
+3	157	0	60.9298	35.4665	-10.15
+3	158	0	59.8298	37.3718	-10.15
+3	159	0	58.7298	39.277	-10.15
+3	160	0	57.6298	41.1823	-10.15
+3	161	0	56.5298	43.0875	-10.15
+3	162	0	55.4298	44.9928	-10.15
+3	163	0	54.3298	46.898	-10.15
+3	164	0	53.2298	48.8033	-10.15
+3	165	0	48.8033	53.2298	-10.15
+3	166	0	46.898	54.3298	-10.15
+3	167	0	44.9928	55.4298	-10.15
+3	168	0	43.0875	56.5298	-10.15
+3	169	0	41.1823	57.6298	-10.15
+3	170	0	39.277	58.7298	-10.15
+3	171	0	37.3718	59.8298	-10.15
+3	172	0	35.0335	61.1798	-10.15
+3	173	0	33.1282	62.2798	-10.15
+3	174	0	31.223	63.3798	-10.15
+3	175	0	29.3177	64.4798	-10.15
+3	176	0	27.4125	65.5798	-10.15
+3	177	0	25.5072	66.6798	-10.15
+3	178	0	23.602	67.7798	-10.15
+3	179	0	21.6967	68.8798	-10.15
+4	0	0	15.65	70.5	-7.95
+4	1	0	13.45	70.5	-7.95
+4	2	0	11.25	70.5	-7.95
+4	3	0	9.05	70.5	-7.95
+4	4	0	6.85	70.5	-7.95
+4	5	0	4.65	70.5	-7.95
+4	6	0	2.45	70.5	-7.95
+4	7	0	-0.25	70.5	-7.95
+4	8	0	-2.45	70.5	-7.95
+4	9	0	-4.65	70.5	-7.95
+4	10	0	-6.85	70.5	-7.95
+4	11	0	-9.05	70.5	-7.95
+4	12	0	-11.25	70.5	-7.95
+4	13	0	-13.45	70.5	-7.95
+4	14	0	-15.65	70.5	-7.95
+4	15	0	-21.6967	68.8798	-7.95
+4	16	0	-23.602	67.7798	-7.95
+4	17	0	-25.5072	66.6798	-7.95
+4	18	0	-27.4125	65.5798	-7.95
+4	19	0	-29.3177	64.4798	-7.95
+4	20	0	-31.223	63.3798	-7.95
+4	21	0	-33.1282	62.2798	-7.95
+4	22	0	-35.4665	60.9298	-7.95
+4	23	0	-37.3718	59.8298	-7.95
+4	24	0	-39.277	58.7298	-7.95
+4	25	0	-41.1823	57.6298	-7.95
+4	26	0	-43.0875	56.5298	-7.95
+4	27	0	-44.9928	55.4298	-7.95
+4	28	0	-46.898	54.3298	-7.95
+4	29	0	-48.8033	53.2298	-7.95
+4	30	0	-53.2298	48.8033	-7.95
+4	31	0	-54.3298	46.898	-7.95
+4	32	0	-55.4298	44.9928	-7.95
+4	33	0	-56.5298	43.0875	-7.95
+4	34	0	-57.6298	41.1823	-7.95
+4	35	0	-58.7298	39.277	-7.95
+4	36	0	-59.8298	37.3718	-7.95
+4	37	0	-61.1798	35.0335	-7.95
+4	38	0	-62.2798	33.1282	-7.95
+4	39	0	-63.3798	31.223	-7.95
+4	40	0	-64.4798	29.3177	-7.95
+4	41	0	-65.5798	27.4125	-7.95
+4	42	0	-66.6798	25.5072	-7.95
+4	43	0	-67.7798	23.602	-7.95
+4	44	0	-68.8798	21.6967	-7.95
+4	45	0	-70.5	15.65	-7.95
+4	46	0	-70.5	13.45	-7.95
+4	47	0	-70.5	11.25	-7.95
+4	48	0	-70.5	9.05	-7.95
+4	49	0	-70.5	6.85	-7.95
+4	50	0	-70.5	4.65	-7.95
+4	51	0	-70.5	2.45	-7.95
+4	52	0	-70.5	-0.25	-7.95
+4	53	0	-70.5	-2.45	-7.95
+4	54	0	-70.5	-4.65	-7.95
+4	55	0	-70.5	-6.85	-7.95
+4	56	0	-70.5	-9.05	-7.95
+4	57	0	-70.5	-11.25	-7.95
+4	58	0	-70.5	-13.45	-7.95
+4	59	0	-70.5	-15.65	-7.95
+4	60	0	-68.8798	-21.6967	-7.95
+4	61	0	-67.7798	-23.602	-7.95
+4	62	0	-66.6798	-25.5072	-7.95
+4	63	0	-65.5798	-27.4125	-7.95
+4	64	0	-64.4798	-29.3177	-7.95
+4	65	0	-63.3798	-31.223	-7.95
+4	66	0	-62.2798	-33.1282	-7.95
+4	67	0	-60.9298	-35.4665	-7.95
+4	68	0	-59.8298	-37.3718	-7.95
+4	69	0	-58.7298	-39.277	-7.95
+4	70	0	-57.6298	-41.1823	-7.95
+4	71	0	-56.5298	-43.0875	-7.95
+4	72	0	-55.4298	-44.9928	-7.95
+4	73	0	-54.3298	-46.898	-7.95
+4	74	0	-53.2298	-48.8033	-7.95
+4	75	0	-48.8033	-53.2298	-7.95
+4	76	0	-46.898	-54.3298	-7.95
+4	77	0	-44.9928	-55.4298	-7.95
+4	78	0	-43.0875	-56.5298	-7.95
+4	79	0	-41.1823	-57.6298	-7.95
+4	80	0	-39.277	-58.7298	-7.95
+4	81	0	-37.3718	-59.8298	-7.95
+4	82	0	-35.0335	-61.1798	-7.95
+4	83	0	-33.1282	-62.2798	-7.95
+4	84	0	-31.223	-63.3798	-7.95
+4	85	0	-29.3177	-64.4798	-7.95
+4	86	0	-27.4125	-65.5798	-7.95
+4	87	0	-25.5072	-66.6798	-7.95
+4	88	0	-23.602	-67.7798	-7.95
+4	89	0	-21.6967	-68.8798	-7.95
+4	90	0	-15.65	-70.5	-7.95
+4	91	0	-13.45	-70.5	-7.95
+4	92	0	-11.25	-70.5	-7.95
+4	93	0	-9.05	-70.5	-7.95
+4	94	0	-6.85	-70.5	-7.95
+4	95	0	-4.65	-70.5	-7.95
+4	96	0	-2.45	-70.5	-7.95
+4	97	0	0.25	-70.5	-7.95
+4	98	0	2.45	-70.5	-7.95
+4	99	0	4.65	-70.5	-7.95
+4	100	0	6.85	-70.5	-7.95
+4	101	0	9.05	-70.5	-7.95
+4	102	0	11.25	-70.5	-7.95
+4	103	0	13.45	-70.5	-7.95
+4	104	0	15.65	-70.5	-7.95
+4	105	0	21.6967	-68.8798	-7.95
+4	106	0	23.602	-67.7798	-7.95
+4	107	0	25.5072	-66.6798	-7.95
+4	108	0	27.4125	-65.5798	-7.95
+4	109	0	29.3177	-64.4798	-7.95
+4	110	0	31.223	-63.3798	-7.95
+4	111	0	33.1282	-62.2798	-7.95
+4	112	0	35.4665	-60.9298	-7.95
+4	113	0	37.3718	-59.8298	-7.95
+4	114	0	39.277	-58.7298	-7.95
+4	115	0	41.1823	-57.6298	-7.95
+4	116	0	43.0875	-56.5298	-7.95
+4	117	0	44.9928	-55.4298	-7.95
+4	118	0	46.898	-54.3298	-7.95
+4	119	0	48.8033	-53.2298	-7.95
+4	120	0	53.2298	-48.8033	-7.95
+4	121	0	54.3298	-46.898	-7.95
+4	122	0	55.4298	-44.9928	-7.95
+4	123	0	56.5298	-43.0875	-7.95
+4	124	0	57.6298	-41.1823	-7.95
+4	125	0	58.7298	-39.277	-7.95
+4	126	0	59.8298	-37.3718	-7.95
+4	127	0	61.1798	-35.0335	-7.95
+4	128	0	62.2798	-33.1282	-7.95
+4	129	0	63.3798	-31.223	-7.95
+4	130	0	64.4798	-29.3177	-7.95
+4	131	0	65.5798	-27.4125	-7.95
+4	132	0	66.6798	-25.5072	-7.95
+4	133	0	67.7798	-23.602	-7.95
+4	134	0	68.8798	-21.6967	-7.95
+4	135	0	70.5	-15.65	-7.95
+4	136	0	70.5	-13.45	-7.95
+4	137	0	70.5	-11.25	-7.95
+4	138	0	70.5	-9.05	-7.95
+4	139	0	70.5	-6.85	-7.95
+4	140	0	70.5	-4.65	-7.95
+4	141	0	70.5	-2.45	-7.95
+4	142	0	70.5	0.25	-7.95
+4	143	0	70.5	2.45	-7.95
+4	144	0	70.5	4.65	-7.95
+4	145	0	70.5	6.85	-7.95
+4	146	0	70.5	9.05	-7.95
+4	147	0	70.5	11.25	-7.95
+4	148	0	70.5	13.45	-7.95
+4	149	0	70.5	15.65	-7.95
+4	150	0	68.8798	21.6967	-7.95
+4	151	0	67.7798	23.602	-7.95
+4	152	0	66.6798	25.5072	-7.95
+4	153	0	65.5798	27.4125	-7.95
+4	154	0	64.4798	29.3177	-7.95
+4	155	0	63.3798	31.223	-7.95
+4	156	0	62.2798	33.1282	-7.95
+4	157	0	60.9298	35.4665	-7.95
+4	158	0	59.8298	37.3718	-7.95
+4	159	0	58.7298	39.277	-7.95
+4	160	0	57.6298	41.1823	-7.95
+4	161	0	56.5298	43.0875	-7.95
+4	162	0	55.4298	44.9928	-7.95
+4	163	0	54.3298	46.898	-7.95
+4	164	0	53.2298	48.8033	-7.95
+4	165	0	48.8033	53.2298	-7.95
+4	166	0	46.898	54.3298	-7.95
+4	167	0	44.9928	55.4298	-7.95
+4	168	0	43.0875	56.5298	-7.95
+4	169	0	41.1823	57.6298	-7.95
+4	170	0	39.277	58.7298	-7.95
+4	171	0	37.3718	59.8298	-7.95
+4	172	0	35.0335	61.1798	-7.95
+4	173	0	33.1282	62.2798	-7.95
+4	174	0	31.223	63.3798	-7.95
+4	175	0	29.3177	64.4798	-7.95
+4	176	0	27.4125	65.5798	-7.95
+4	177	0	25.5072	66.6798	-7.95
+4	178	0	23.602	67.7798	-7.95
+4	179	0	21.6967	68.8798	-7.95
+5	0	0	15.65	70.5	-5.75
+5	1	0	13.45	70.5	-5.75
+5	2	0	11.25	70.5	-5.75
+5	3	0	9.05	70.5	-5.75
+5	4	0	6.85	70.5	-5.75
+5	5	0	4.65	70.5	-5.75
+5	6	0	2.45	70.5	-5.75
+5	7	0	-0.25	70.5	-5.75
+5	8	0	-2.45	70.5	-5.75
+5	9	0	-4.65	70.5	-5.75
+5	10	0	-6.85	70.5	-5.75
+5	11	0	-9.05	70.5	-5.75
+5	12	0	-11.25	70.5	-5.75
+5	13	0	-13.45	70.5	-5.75
+5	14	0	-15.65	70.5	-5.75
+5	15	0	-21.6967	68.8798	-5.75
+5	16	0	-23.602	67.7798	-5.75
+5	17	0	-25.5072	66.6798	-5.75
+5	18	0	-27.4125	65.5798	-5.75
+5	19	0	-29.3177	64.4798	-5.75
+5	20	0	-31.223	63.3798	-5.75
+5	21	0	-33.1282	62.2798	-5.75
+5	22	0	-35.4665	60.9298	-5.75
+5	23	0	-37.3718	59.8298	-5.75
+5	24	0	-39.277	58.7298	-5.75
+5	25	0	-41.1823	57.6298	-5.75
+5	26	0	-43.0875	56.5298	-5.75
+5	27	0	-44.9928	55.4298	-5.75
+5	28	0	-46.898	54.3298	-5.75
+5	29	0	-48.8033	53.2298	-5.75
+5	30	0	-53.2298	48.8033	-5.75
+5	31	0	-54.3298	46.898	-5.75
+5	32	0	-55.4298	44.9928	-5.75
+5	33	0	-56.5298	43.0875	-5.75
+5	34	0	-57.6298	41.1823	-5.75
+5	35	0	-58.7298	39.277	-5.75
+5	36	0	-59.8298	37.3718	-5.75
+5	37	0	-61.1798	35.0335	-5.75
+5	38	0	-62.2798	33.1282	-5.75
+5	39	0	-63.3798	31.223	-5.75
+5	40	0	-64.4798	29.3177	-5.75
+5	41	0	-65.5798	27.4125	-5.75
+5	42	0	-66.6798	25.5072	-5.75
+5	43	0	-67.7798	23.602	-5.75
+5	44	0	-68.8798	21.6967	-5.75
+5	45	0	-70.5	15.65	-5.75
+5	46	0	-70.5	13.45	-5.75
+5	47	0	-70.5	11.25	-5.75
+5	48	0	-70.5	9.05	-5.75
+5	49	0	-70.5	6.85	-5.75
+5	50	0	-70.5	4.65	-5.75
+5	51	0	-70.5	2.45	-5.75
+5	52	0	-70.5	-0.25	-5.75
+5	53	0	-70.5	-2.45	-5.75
+5	54	0	-70.5	-4.65	-5.75
+5	55	0	-70.5	-6.85	-5.75
+5	56	0	-70.5	-9.05	-5.75
+5	57	0	-70.5	-11.25	-5.75
+5	58	0	-70.5	-13.45	-5.75
+5	59	0	-70.5	-15.65	-5.75
+5	60	0	-68.8798	-21.6967	-5.75
+5	61	0	-67.7798	-23.602	-5.75
+5	62	0	-66.6798	-25.5072	-5.75
+5	63	0	-65.5798	-27.4125	-5.75
+5	64	0	-64.4798	-29.3177	-5.75
+5	65	0	-63.3798	-31.223	-5.75
+5	66	0	-62.2798	-33.1282	-5.75
+5	67	0	-60.9298	-35.4665	-5.75
+5	68	0	-59.8298	-37.3718	-5.75
+5	69	0	-58.7298	-39.277	-5.75
+5	70	0	-57.6298	-41.1823	-5.75
+5	71	0	-56.5298	-43.0875	-5.75
+5	72	0	-55.4298	-44.9928	-5.75
+5	73	0	-54.3298	-46.898	-5.75
+5	74	0	-53.2298	-48.8033	-5.75
+5	75	0	-48.8033	-53.2298	-5.75
+5	76	0	-46.898	-54.3298	-5.75
+5	77	0	-44.9928	-55.4298	-5.75
+5	78	0	-43.0875	-56.5298	-5.75
+5	79	0	-41.1823	-57.6298	-5.75
+5	80	0	-39.277	-58.7298	-5.75
+5	81	0	-37.3718	-59.8298	-5.75
+5	82	0	-35.0335	-61.1798	-5.75
+5	83	0	-33.1282	-62.2798	-5.75
+5	84	0	-31.223	-63.3798	-5.75
+5	85	0	-29.3177	-64.4798	-5.75
+5	86	0	-27.4125	-65.5798	-5.75
+5	87	0	-25.5072	-66.6798	-5.75
+5	88	0	-23.602	-67.7798	-5.75
+5	89	0	-21.6967	-68.8798	-5.75
+5	90	0	-15.65	-70.5	-5.75
+5	91	0	-13.45	-70.5	-5.75
+5	92	0	-11.25	-70.5	-5.75
+5	93	0	-9.05	-70.5	-5.75
+5	94	0	-6.85	-70.5	-5.75
+5	95	0	-4.65	-70.5	-5.75
+5	96	0	-2.45	-70.5	-5.75
+5	97	0	0.25	-70.5	-5.75
+5	98	0	2.45	-70.5	-5.75
+5	99	0	4.65	-70.5	-5.75
+5	100	0	6.85	-70.5	-5.75
+5	101	0	9.05	-70.5	-5.75
+5	102	0	11.25	-70.5	-5.75
+5	103	0	13.45	-70.5	-5.75
+5	104	0	15.65	-70.5	-5.75
+5	105	0	21.6967	-68.8798	-5.75
+5	106	0	23.602	-67.7798	-5.75
+5	107	0	25.5072	-66.6798	-5.75
+5	108	0	27.4125	-65.5798	-5.75
+5	109	0	29.3177	-64.4798	-5.75
+5	110	0	31.223	-63.3798	-5.75
+5	111	0	33.1282	-62.2798	-5.75
+5	112	0	35.4665	-60.9298	-5.75
+5	113	0	37.3718	-59.8298	-5.75
+5	114	0	39.277	-58.7298	-5.75
+5	115	0	41.1823	-57.6298	-5.75
+5	116	0	43.0875	-56.5298	-5.75
+5	117	0	44.9928	-55.4298	-5.75
+5	118	0	46.898	-54.3298	-5.75
+5	119	0	48.8033	-53.2298	-5.75
+5	120	0	53.2298	-48.8033	-5.75
+5	121	0	54.3298	-46.898	-5.75
+5	122	0	55.4298	-44.9928	-5.75
+5	123	0	56.5298	-43.0875	-5.75
+5	124	0	57.6298	-41.1823	-5.75
+5	125	0	58.7298	-39.277	-5.75
+5	126	0	59.8298	-37.3718	-5.75
+5	127	0	61.1798	-35.0335	-5.75
+5	128	0	62.2798	-33.1282	-5.75
+5	129	0	63.3798	-31.223	-5.75
+5	130	0	64.4798	-29.3177	-5.75
+5	131	0	65.5798	-27.4125	-5.75
+5	132	0	66.6798	-25.5072	-5.75
+5	133	0	67.7798	-23.602	-5.75
+5	134	0	68.8798	-21.6967	-5.75
+5	135	0	70.5	-15.65	-5.75
+5	136	0	70.5	-13.45	-5.75
+5	137	0	70.5	-11.25	-5.75
+5	138	0	70.5	-9.05	-5.75
+5	139	0	70.5	-6.85	-5.75
+5	140	0	70.5	-4.65	-5.75
+5	141	0	70.5	-2.45	-5.75
+5	142	0	70.5	0.25	-5.75
+5	143	0	70.5	2.45	-5.75
+5	144	0	70.5	4.65	-5.75
+5	145	0	70.5	6.85	-5.75
+5	146	0	70.5	9.05	-5.75
+5	147	0	70.5	11.25	-5.75
+5	148	0	70.5	13.45	-5.75
+5	149	0	70.5	15.65	-5.75
+5	150	0	68.8798	21.6967	-5.75
+5	151	0	67.7798	23.602	-5.75
+5	152	0	66.6798	25.5072	-5.75
+5	153	0	65.5798	27.4125	-5.75
+5	154	0	64.4798	29.3177	-5.75
+5	155	0	63.3798	31.223	-5.75
+5	156	0	62.2798	33.1282	-5.75
+5	157	0	60.9298	35.4665	-5.75
+5	158	0	59.8298	37.3718	-5.75
+5	159	0	58.7298	39.277	-5.75
+5	160	0	57.6298	41.1823	-5.75
+5	161	0	56.5298	43.0875	-5.75
+5	162	0	55.4298	44.9928	-5.75
+5	163	0	54.3298	46.898	-5.75
+5	164	0	53.2298	48.8033	-5.75
+5	165	0	48.8033	53.2298	-5.75
+5	166	0	46.898	54.3298	-5.75
+5	167	0	44.9928	55.4298	-5.75
+5	168	0	43.0875	56.5298	-5.75
+5	169	0	41.1823	57.6298	-5.75
+5	170	0	39.277	58.7298	-5.75
+5	171	0	37.3718	59.8298	-5.75
+5	172	0	35.0335	61.1798	-5.75
+5	173	0	33.1282	62.2798	-5.75
+5	174	0	31.223	63.3798	-5.75
+5	175	0	29.3177	64.4798	-5.75
+5	176	0	27.4125	65.5798	-5.75
+5	177	0	25.5072	66.6798	-5.75
+5	178	0	23.602	67.7798	-5.75
+5	179	0	21.6967	68.8798	-5.75
+6	0	0	15.65	70.5	-3.55
+6	1	0	13.45	70.5	-3.55
+6	2	0	11.25	70.5	-3.55
+6	3	0	9.05	70.5	-3.55
+6	4	0	6.85	70.5	-3.55
+6	5	0	4.65	70.5	-3.55
+6	6	0	2.45	70.5	-3.55
+6	7	0	-0.25	70.5	-3.55
+6	8	0	-2.45	70.5	-3.55
+6	9	0	-4.65	70.5	-3.55
+6	10	0	-6.85	70.5	-3.55
+6	11	0	-9.05	70.5	-3.55
+6	12	0	-11.25	70.5	-3.55
+6	13	0	-13.45	70.5	-3.55
+6	14	0	-15.65	70.5	-3.55
+6	15	0	-21.6967	68.8798	-3.55
+6	16	0	-23.602	67.7798	-3.55
+6	17	0	-25.5072	66.6798	-3.55
+6	18	0	-27.4125	65.5798	-3.55
+6	19	0	-29.3177	64.4798	-3.55
+6	20	0	-31.223	63.3798	-3.55
+6	21	0	-33.1282	62.2798	-3.55
+6	22	0	-35.4665	60.9298	-3.55
+6	23	0	-37.3718	59.8298	-3.55
+6	24	0	-39.277	58.7298	-3.55
+6	25	0	-41.1823	57.6298	-3.55
+6	26	0	-43.0875	56.5298	-3.55
+6	27	0	-44.9928	55.4298	-3.55
+6	28	0	-46.898	54.3298	-3.55
+6	29	0	-48.8033	53.2298	-3.55
+6	30	0	-53.2298	48.8033	-3.55
+6	31	0	-54.3298	46.898	-3.55
+6	32	0	-55.4298	44.9928	-3.55
+6	33	0	-56.5298	43.0875	-3.55
+6	34	0	-57.6298	41.1823	-3.55
+6	35	0	-58.7298	39.277	-3.55
+6	36	0	-59.8298	37.3718	-3.55
+6	37	0	-61.1798	35.0335	-3.55
+6	38	0	-62.2798	33.1282	-3.55
+6	39	0	-63.3798	31.223	-3.55
+6	40	0	-64.4798	29.3177	-3.55
+6	41	0	-65.5798	27.4125	-3.55
+6	42	0	-66.6798	25.5072	-3.55
+6	43	0	-67.7798	23.602	-3.55
+6	44	0	-68.8798	21.6967	-3.55
+6	45	0	-70.5	15.65	-3.55
+6	46	0	-70.5	13.45	-3.55
+6	47	0	-70.5	11.25	-3.55
+6	48	0	-70.5	9.05	-3.55
+6	49	0	-70.5	6.85	-3.55
+6	50	0	-70.5	4.65	-3.55
+6	51	0	-70.5	2.45	-3.55
+6	52	0	-70.5	-0.25	-3.55
+6	53	0	-70.5	-2.45	-3.55
+6	54	0	-70.5	-4.65	-3.55
+6	55	0	-70.5	-6.85	-3.55
+6	56	0	-70.5	-9.05	-3.55
+6	57	0	-70.5	-11.25	-3.55
+6	58	0	-70.5	-13.45	-3.55
+6	59	0	-70.5	-15.65	-3.55
+6	60	0	-68.8798	-21.6967	-3.55
+6	61	0	-67.7798	-23.602	-3.55
+6	62	0	-66.6798	-25.5072	-3.55
+6	63	0	-65.5798	-27.4125	-3.55
+6	64	0	-64.4798	-29.3177	-3.55
+6	65	0	-63.3798	-31.223	-3.55
+6	66	0	-62.2798	-33.1282	-3.55
+6	67	0	-60.9298	-35.4665	-3.55
+6	68	0	-59.8298	-37.3718	-3.55
+6	69	0	-58.7298	-39.277	-3.55
+6	70	0	-57.6298	-41.1823	-3.55
+6	71	0	-56.5298	-43.0875	-3.55
+6	72	0	-55.4298	-44.9928	-3.55
+6	73	0	-54.3298	-46.898	-3.55
+6	74	0	-53.2298	-48.8033	-3.55
+6	75	0	-48.8033	-53.2298	-3.55
+6	76	0	-46.898	-54.3298	-3.55
+6	77	0	-44.9928	-55.4298	-3.55
+6	78	0	-43.0875	-56.5298	-3.55
+6	79	0	-41.1823	-57.6298	-3.55
+6	80	0	-39.277	-58.7298	-3.55
+6	81	0	-37.3718	-59.8298	-3.55
+6	82	0	-35.0335	-61.1798	-3.55
+6	83	0	-33.1282	-62.2798	-3.55
+6	84	0	-31.223	-63.3798	-3.55
+6	85	0	-29.3177	-64.4798	-3.55
+6	86	0	-27.4125	-65.5798	-3.55
+6	87	0	-25.5072	-66.6798	-3.55
+6	88	0	-23.602	-67.7798	-3.55
+6	89	0	-21.6967	-68.8798	-3.55
+6	90	0	-15.65	-70.5	-3.55
+6	91	0	-13.45	-70.5	-3.55
+6	92	0	-11.25	-70.5	-3.55
+6	93	0	-9.05	-70.5	-3.55
+6	94	0	-6.85	-70.5	-3.55
+6	95	0	-4.65	-70.5	-3.55
+6	96	0	-2.45	-70.5	-3.55
+6	97	0	0.25	-70.5	-3.55
+6	98	0	2.45	-70.5	-3.55
+6	99	0	4.65	-70.5	-3.55
+6	100	0	6.85	-70.5	-3.55
+6	101	0	9.05	-70.5	-3.55
+6	102	0	11.25	-70.5	-3.55
+6	103	0	13.45	-70.5	-3.55
+6	104	0	15.65	-70.5	-3.55
+6	105	0	21.6967	-68.8798	-3.55
+6	106	0	23.602	-67.7798	-3.55
+6	107	0	25.5072	-66.6798	-3.55
+6	108	0	27.4125	-65.5798	-3.55
+6	109	0	29.3177	-64.4798	-3.55
+6	110	0	31.223	-63.3798	-3.55
+6	111	0	33.1282	-62.2798	-3.55
+6	112	0	35.4665	-60.9298	-3.55
+6	113	0	37.3718	-59.8298	-3.55
+6	114	0	39.277	-58.7298	-3.55
+6	115	0	41.1823	-57.6298	-3.55
+6	116	0	43.0875	-56.5298	-3.55
+6	117	0	44.9928	-55.4298	-3.55
+6	118	0	46.898	-54.3298	-3.55
+6	119	0	48.8033	-53.2298	-3.55
+6	120	0	53.2298	-48.8033	-3.55
+6	121	0	54.3298	-46.898	-3.55
+6	122	0	55.4298	-44.9928	-3.55
+6	123	0	56.5298	-43.0875	-3.55
+6	124	0	57.6298	-41.1823	-3.55
+6	125	0	58.7298	-39.277	-3.55
+6	126	0	59.8298	-37.3718	-3.55
+6	127	0	61.1798	-35.0335	-3.55
+6	128	0	62.2798	-33.1282	-3.55
+6	129	0	63.3798	-31.223	-3.55
+6	130	0	64.4798	-29.3177	-3.55
+6	131	0	65.5798	-27.4125	-3.55
+6	132	0	66.6798	-25.5072	-3.55
+6	133	0	67.7798	-23.602	-3.55
+6	134	0	68.8798	-21.6967	-3.55
+6	135	0	70.5	-15.65	-3.55
+6	136	0	70.5	-13.45	-3.55
+6	137	0	70.5	-11.25	-3.55
+6	138	0	70.5	-9.05	-3.55
+6	139	0	70.5	-6.85	-3.55
+6	140	0	70.5	-4.65	-3.55
+6	141	0	70.5	-2.45	-3.55
+6	142	0	70.5	0.25	-3.55
+6	143	0	70.5	2.45	-3.55
+6	144	0	70.5	4.65	-3.55
+6	145	0	70.5	6.85	-3.55
+6	146	0	70.5	9.05	-3.55
+6	147	0	70.5	11.25	-3.55
+6	148	0	70.5	13.45	-3.55
+6	149	0	70.5	15.65	-3.55
+6	150	0	68.8798	21.6967	-3.55
+6	151	0	67.7798	23.602	-3.55
+6	152	0	66.6798	25.5072	-3.55
+6	153	0	65.5798	27.4125	-3.55
+6	154	0	64.4798	29.3177	-3.55
+6	155	0	63.3798	31.223	-3.55
+6	156	0	62.2798	33.1282	-3.55
+6	157	0	60.9298	35.4665	-3.55
+6	158	0	59.8298	37.3718	-3.55
+6	159	0	58.7298	39.277	-3.55
+6	160	0	57.6298	41.1823	-3.55
+6	161	0	56.5298	43.0875	-3.55
+6	162	0	55.4298	44.9928	-3.55
+6	163	0	54.3298	46.898	-3.55
+6	164	0	53.2298	48.8033	-3.55
+6	165	0	48.8033	53.2298	-3.55
+6	166	0	46.898	54.3298	-3.55
+6	167	0	44.9928	55.4298	-3.55
+6	168	0	43.0875	56.5298	-3.55
+6	169	0	41.1823	57.6298	-3.55
+6	170	0	39.277	58.7298	-3.55
+6	171	0	37.3718	59.8298	-3.55
+6	172	0	35.0335	61.1798	-3.55
+6	173	0	33.1282	62.2798	-3.55
+6	174	0	31.223	63.3798	-3.55
+6	175	0	29.3177	64.4798	-3.55
+6	176	0	27.4125	65.5798	-3.55
+6	177	0	25.5072	66.6798	-3.55
+6	178	0	23.602	67.7798	-3.55
+6	179	0	21.6967	68.8798	-3.55
+7	0	0	15.65	70.5	-1.35
+7	1	0	13.45	70.5	-1.35
+7	2	0	11.25	70.5	-1.35
+7	3	0	9.05	70.5	-1.35
+7	4	0	6.85	70.5	-1.35
+7	5	0	4.65	70.5	-1.35
+7	6	0	2.45	70.5	-1.35
+7	7	0	-0.25	70.5	-1.35
+7	8	0	-2.45	70.5	-1.35
+7	9	0	-4.65	70.5	-1.35
+7	10	0	-6.85	70.5	-1.35
+7	11	0	-9.05	70.5	-1.35
+7	12	0	-11.25	70.5	-1.35
+7	13	0	-13.45	70.5	-1.35
+7	14	0	-15.65	70.5	-1.35
+7	15	0	-21.6967	68.8798	-1.35
+7	16	0	-23.602	67.7798	-1.35
+7	17	0	-25.5072	66.6798	-1.35
+7	18	0	-27.4125	65.5798	-1.35
+7	19	0	-29.3177	64.4798	-1.35
+7	20	0	-31.223	63.3798	-1.35
+7	21	0	-33.1282	62.2798	-1.35
+7	22	0	-35.4665	60.9298	-1.35
+7	23	0	-37.3718	59.8298	-1.35
+7	24	0	-39.277	58.7298	-1.35
+7	25	0	-41.1823	57.6298	-1.35
+7	26	0	-43.0875	56.5298	-1.35
+7	27	0	-44.9928	55.4298	-1.35
+7	28	0	-46.898	54.3298	-1.35
+7	29	0	-48.8033	53.2298	-1.35
+7	30	0	-53.2298	48.8033	-1.35
+7	31	0	-54.3298	46.898	-1.35
+7	32	0	-55.4298	44.9928	-1.35
+7	33	0	-56.5298	43.0875	-1.35
+7	34	0	-57.6298	41.1823	-1.35
+7	35	0	-58.7298	39.277	-1.35
+7	36	0	-59.8298	37.3718	-1.35
+7	37	0	-61.1798	35.0335	-1.35
+7	38	0	-62.2798	33.1282	-1.35
+7	39	0	-63.3798	31.223	-1.35
+7	40	0	-64.4798	29.3177	-1.35
+7	41	0	-65.5798	27.4125	-1.35
+7	42	0	-66.6798	25.5072	-1.35
+7	43	0	-67.7798	23.602	-1.35
+7	44	0	-68.8798	21.6967	-1.35
+7	45	0	-70.5	15.65	-1.35
+7	46	0	-70.5	13.45	-1.35
+7	47	0	-70.5	11.25	-1.35
+7	48	0	-70.5	9.05	-1.35
+7	49	0	-70.5	6.85	-1.35
+7	50	0	-70.5	4.65	-1.35
+7	51	0	-70.5	2.45	-1.35
+7	52	0	-70.5	-0.25	-1.35
+7	53	0	-70.5	-2.45	-1.35
+7	54	0	-70.5	-4.65	-1.35
+7	55	0	-70.5	-6.85	-1.35
+7	56	0	-70.5	-9.05	-1.35
+7	57	0	-70.5	-11.25	-1.35
+7	58	0	-70.5	-13.45	-1.35
+7	59	0	-70.5	-15.65	-1.35
+7	60	0	-68.8798	-21.6967	-1.35
+7	61	0	-67.7798	-23.602	-1.35
+7	62	0	-66.6798	-25.5072	-1.35
+7	63	0	-65.5798	-27.4125	-1.35
+7	64	0	-64.4798	-29.3177	-1.35
+7	65	0	-63.3798	-31.223	-1.35
+7	66	0	-62.2798	-33.1282	-1.35
+7	67	0	-60.9298	-35.4665	-1.35
+7	68	0	-59.8298	-37.3718	-1.35
+7	69	0	-58.7298	-39.277	-1.35
+7	70	0	-57.6298	-41.1823	-1.35
+7	71	0	-56.5298	-43.0875	-1.35
+7	72	0	-55.4298	-44.9928	-1.35
+7	73	0	-54.3298	-46.898	-1.35
+7	74	0	-53.2298	-48.8033	-1.35
+7	75	0	-48.8033	-53.2298	-1.35
+7	76	0	-46.898	-54.3298	-1.35
+7	77	0	-44.9928	-55.4298	-1.35
+7	78	0	-43.0875	-56.5298	-1.35
+7	79	0	-41.1823	-57.6298	-1.35
+7	80	0	-39.277	-58.7298	-1.35
+7	81	0	-37.3718	-59.8298	-1.35
+7	82	0	-35.0335	-61.1798	-1.35
+7	83	0	-33.1282	-62.2798	-1.35
+7	84	0	-31.223	-63.3798	-1.35
+7	85	0	-29.3177	-64.4798	-1.35
+7	86	0	-27.4125	-65.5798	-1.35
+7	87	0	-25.5072	-66.6798	-1.35
+7	88	0	-23.602	-67.7798	-1.35
+7	89	0	-21.6967	-68.8798	-1.35
+7	90	0	-15.65	-70.5	-1.35
+7	91	0	-13.45	-70.5	-1.35
+7	92	0	-11.25	-70.5	-1.35
+7	93	0	-9.05	-70.5	-1.35
+7	94	0	-6.85	-70.5	-1.35
+7	95	0	-4.65	-70.5	-1.35
+7	96	0	-2.45	-70.5	-1.35
+7	97	0	0.25	-70.5	-1.35
+7	98	0	2.45	-70.5	-1.35
+7	99	0	4.65	-70.5	-1.35
+7	100	0	6.85	-70.5	-1.35
+7	101	0	9.05	-70.5	-1.35
+7	102	0	11.25	-70.5	-1.35
+7	103	0	13.45	-70.5	-1.35
+7	104	0	15.65	-70.5	-1.35
+7	105	0	21.6967	-68.8798	-1.35
+7	106	0	23.602	-67.7798	-1.35
+7	107	0	25.5072	-66.6798	-1.35
+7	108	0	27.4125	-65.5798	-1.35
+7	109	0	29.3177	-64.4798	-1.35
+7	110	0	31.223	-63.3798	-1.35
+7	111	0	33.1282	-62.2798	-1.35
+7	112	0	35.4665	-60.9298	-1.35
+7	113	0	37.3718	-59.8298	-1.35
+7	114	0	39.277	-58.7298	-1.35
+7	115	0	41.1823	-57.6298	-1.35
+7	116	0	43.0875	-56.5298	-1.35
+7	117	0	44.9928	-55.4298	-1.35
+7	118	0	46.898	-54.3298	-1.35
+7	119	0	48.8033	-53.2298	-1.35
+7	120	0	53.2298	-48.8033	-1.35
+7	121	0	54.3298	-46.898	-1.35
+7	122	0	55.4298	-44.9928	-1.35
+7	123	0	56.5298	-43.0875	-1.35
+7	124	0	57.6298	-41.1823	-1.35
+7	125	0	58.7298	-39.277	-1.35
+7	126	0	59.8298	-37.3718	-1.35
+7	127	0	61.1798	-35.0335	-1.35
+7	128	0	62.2798	-33.1282	-1.35
+7	129	0	63.3798	-31.223	-1.35
+7	130	0	64.4798	-29.3177	-1.35
+7	131	0	65.5798	-27.4125	-1.35
+7	132	0	66.6798	-25.5072	-1.35
+7	133	0	67.7798	-23.602	-1.35
+7	134	0	68.8798	-21.6967	-1.35
+7	135	0	70.5	-15.65	-1.35
+7	136	0	70.5	-13.45	-1.35
+7	137	0	70.5	-11.25	-1.35
+7	138	0	70.5	-9.05	-1.35
+7	139	0	70.5	-6.85	-1.35
+7	140	0	70.5	-4.65	-1.35
+7	141	0	70.5	-2.45	-1.35
+7	142	0	70.5	0.25	-1.35
+7	143	0	70.5	2.45	-1.35
+7	144	0	70.5	4.65	-1.35
+7	145	0	70.5	6.85	-1.35
+7	146	0	70.5	9.05	-1.35
+7	147	0	70.5	11.25	-1.35
+7	148	0	70.5	13.45	-1.35
+7	149	0	70.5	15.65	-1.35
+7	150	0	68.8798	21.6967	-1.35
+7	151	0	67.7798	23.602	-1.35
+7	152	0	66.6798	25.5072	-1.35
+7	153	0	65.5798	27.4125	-1.35
+7	154	0	64.4798	29.3177	-1.35
+7	155	0	63.3798	31.223	-1.35
+7	156	0	62.2798	33.1282	-1.35
+7	157	0	60.9298	35.4665	-1.35
+7	158	0	59.8298	37.3718	-1.35
+7	159	0	58.7298	39.277	-1.35
+7	160	0	57.6298	41.1823	-1.35
+7	161	0	56.5298	43.0875	-1.35
+7	162	0	55.4298	44.9928	-1.35
+7	163	0	54.3298	46.898	-1.35
+7	164	0	53.2298	48.8033	-1.35
+7	165	0	48.8033	53.2298	-1.35
+7	166	0	46.898	54.3298	-1.35
+7	167	0	44.9928	55.4298	-1.35
+7	168	0	43.0875	56.5298	-1.35
+7	169	0	41.1823	57.6298	-1.35
+7	170	0	39.277	58.7298	-1.35
+7	171	0	37.3718	59.8298	-1.35
+7	172	0	35.0335	61.1798	-1.35
+7	173	0	33.1282	62.2798	-1.35
+7	174	0	31.223	63.3798	-1.35
+7	175	0	29.3177	64.4798	-1.35
+7	176	0	27.4125	65.5798	-1.35
+7	177	0	25.5072	66.6798	-1.35
+7	178	0	23.602	67.7798	-1.35
+7	179	0	21.6967	68.8798	-1.35
+8	0	0	15.65	70.5	1.35
+8	1	0	13.45	70.5	1.35
+8	2	0	11.25	70.5	1.35
+8	3	0	9.05	70.5	1.35
+8	4	0	6.85	70.5	1.35
+8	5	0	4.65	70.5	1.35
+8	6	0	2.45	70.5	1.35
+8	7	0	-0.25	70.5	1.35
+8	8	0	-2.45	70.5	1.35
+8	9	0	-4.65	70.5	1.35
+8	10	0	-6.85	70.5	1.35
+8	11	0	-9.05	70.5	1.35
+8	12	0	-11.25	70.5	1.35
+8	13	0	-13.45	70.5	1.35
+8	14	0	-15.65	70.5	1.35
+8	15	0	-21.6967	68.8798	1.35
+8	16	0	-23.602	67.7798	1.35
+8	17	0	-25.5072	66.6798	1.35
+8	18	0	-27.4125	65.5798	1.35
+8	19	0	-29.3177	64.4798	1.35
+8	20	0	-31.223	63.3798	1.35
+8	21	0	-33.1282	62.2798	1.35
+8	22	0	-35.4665	60.9298	1.35
+8	23	0	-37.3718	59.8298	1.35
+8	24	0	-39.277	58.7298	1.35
+8	25	0	-41.1823	57.6298	1.35
+8	26	0	-43.0875	56.5298	1.35
+8	27	0	-44.9928	55.4298	1.35
+8	28	0	-46.898	54.3298	1.35
+8	29	0	-48.8033	53.2298	1.35
+8	30	0	-53.2298	48.8033	1.35
+8	31	0	-54.3298	46.898	1.35
+8	32	0	-55.4298	44.9928	1.35
+8	33	0	-56.5298	43.0875	1.35
+8	34	0	-57.6298	41.1823	1.35
+8	35	0	-58.7298	39.277	1.35
+8	36	0	-59.8298	37.3718	1.35
+8	37	0	-61.1798	35.0335	1.35
+8	38	0	-62.2798	33.1282	1.35
+8	39	0	-63.3798	31.223	1.35
+8	40	0	-64.4798	29.3177	1.35
+8	41	0	-65.5798	27.4125	1.35
+8	42	0	-66.6798	25.5072	1.35
+8	43	0	-67.7798	23.602	1.35
+8	44	0	-68.8798	21.6967	1.35
+8	45	0	-70.5	15.65	1.35
+8	46	0	-70.5	13.45	1.35
+8	47	0	-70.5	11.25	1.35
+8	48	0	-70.5	9.05	1.35
+8	49	0	-70.5	6.85	1.35
+8	50	0	-70.5	4.65	1.35
+8	51	0	-70.5	2.45	1.35
+8	52	0	-70.5	-0.25	1.35
+8	53	0	-70.5	-2.45	1.35
+8	54	0	-70.5	-4.65	1.35
+8	55	0	-70.5	-6.85	1.35
+8	56	0	-70.5	-9.05	1.35
+8	57	0	-70.5	-11.25	1.35
+8	58	0	-70.5	-13.45	1.35
+8	59	0	-70.5	-15.65	1.35
+8	60	0	-68.8798	-21.6967	1.35
+8	61	0	-67.7798	-23.602	1.35
+8	62	0	-66.6798	-25.5072	1.35
+8	63	0	-65.5798	-27.4125	1.35
+8	64	0	-64.4798	-29.3177	1.35
+8	65	0	-63.3798	-31.223	1.35
+8	66	0	-62.2798	-33.1282	1.35
+8	67	0	-60.9298	-35.4665	1.35
+8	68	0	-59.8298	-37.3718	1.35
+8	69	0	-58.7298	-39.277	1.35
+8	70	0	-57.6298	-41.1823	1.35
+8	71	0	-56.5298	-43.0875	1.35
+8	72	0	-55.4298	-44.9928	1.35
+8	73	0	-54.3298	-46.898	1.35
+8	74	0	-53.2298	-48.8033	1.35
+8	75	0	-48.8033	-53.2298	1.35
+8	76	0	-46.898	-54.3298	1.35
+8	77	0	-44.9928	-55.4298	1.35
+8	78	0	-43.0875	-56.5298	1.35
+8	79	0	-41.1823	-57.6298	1.35
+8	80	0	-39.277	-58.7298	1.35
+8	81	0	-37.3718	-59.8298	1.35
+8	82	0	-35.0335	-61.1798	1.35
+8	83	0	-33.1282	-62.2798	1.35
+8	84	0	-31.223	-63.3798	1.35
+8	85	0	-29.3177	-64.4798	1.35
+8	86	0	-27.4125	-65.5798	1.35
+8	87	0	-25.5072	-66.6798	1.35
+8	88	0	-23.602	-67.7798	1.35
+8	89	0	-21.6967	-68.8798	1.35
+8	90	0	-15.65	-70.5	1.35
+8	91	0	-13.45	-70.5	1.35
+8	92	0	-11.25	-70.5	1.35
+8	93	0	-9.05	-70.5	1.35
+8	94	0	-6.85	-70.5	1.35
+8	95	0	-4.65	-70.5	1.35
+8	96	0	-2.45	-70.5	1.35
+8	97	0	0.25	-70.5	1.35
+8	98	0	2.45	-70.5	1.35
+8	99	0	4.65	-70.5	1.35
+8	100	0	6.85	-70.5	1.35
+8	101	0	9.05	-70.5	1.35
+8	102	0	11.25	-70.5	1.35
+8	103	0	13.45	-70.5	1.35
+8	104	0	15.65	-70.5	1.35
+8	105	0	21.6967	-68.8798	1.35
+8	106	0	23.602	-67.7798	1.35
+8	107	0	25.5072	-66.6798	1.35
+8	108	0	27.4125	-65.5798	1.35
+8	109	0	29.3177	-64.4798	1.35
+8	110	0	31.223	-63.3798	1.35
+8	111	0	33.1282	-62.2798	1.35
+8	112	0	35.4665	-60.9298	1.35
+8	113	0	37.3718	-59.8298	1.35
+8	114	0	39.277	-58.7298	1.35
+8	115	0	41.1823	-57.6298	1.35
+8	116	0	43.0875	-56.5298	1.35
+8	117	0	44.9928	-55.4298	1.35
+8	118	0	46.898	-54.3298	1.35
+8	119	0	48.8033	-53.2298	1.35
+8	120	0	53.2298	-48.8033	1.35
+8	121	0	54.3298	-46.898	1.35
+8	122	0	55.4298	-44.9928	1.35
+8	123	0	56.5298	-43.0875	1.35
+8	124	0	57.6298	-41.1823	1.35
+8	125	0	58.7298	-39.277	1.35
+8	126	0	59.8298	-37.3718	1.35
+8	127	0	61.1798	-35.0335	1.35
+8	128	0	62.2798	-33.1282	1.35
+8	129	0	63.3798	-31.223	1.35
+8	130	0	64.4798	-29.3177	1.35
+8	131	0	65.5798	-27.4125	1.35
+8	132	0	66.6798	-25.5072	1.35
+8	133	0	67.7798	-23.602	1.35
+8	134	0	68.8798	-21.6967	1.35
+8	135	0	70.5	-15.65	1.35
+8	136	0	70.5	-13.45	1.35
+8	137	0	70.5	-11.25	1.35
+8	138	0	70.5	-9.05	1.35
+8	139	0	70.5	-6.85	1.35
+8	140	0	70.5	-4.65	1.35
+8	141	0	70.5	-2.45	1.35
+8	142	0	70.5	0.25	1.35
+8	143	0	70.5	2.45	1.35
+8	144	0	70.5	4.65	1.35
+8	145	0	70.5	6.85	1.35
+8	146	0	70.5	9.05	1.35
+8	147	0	70.5	11.25	1.35
+8	148	0	70.5	13.45	1.35
+8	149	0	70.5	15.65	1.35
+8	150	0	68.8798	21.6967	1.35
+8	151	0	67.7798	23.602	1.35
+8	152	0	66.6798	25.5072	1.35
+8	153	0	65.5798	27.4125	1.35
+8	154	0	64.4798	29.3177	1.35
+8	155	0	63.3798	31.223	1.35
+8	156	0	62.2798	33.1282	1.35
+8	157	0	60.9298	35.4665	1.35
+8	158	0	59.8298	37.3718	1.35
+8	159	0	58.7298	39.277	1.35
+8	160	0	57.6298	41.1823	1.35
+8	161	0	56.5298	43.0875	1.35
+8	162	0	55.4298	44.9928	1.35
+8	163	0	54.3298	46.898	1.35
+8	164	0	53.2298	48.8033	1.35
+8	165	0	48.8033	53.2298	1.35
+8	166	0	46.898	54.3298	1.35
+8	167	0	44.9928	55.4298	1.35
+8	168	0	43.0875	56.5298	1.35
+8	169	0	41.1823	57.6298	1.35
+8	170	0	39.277	58.7298	1.35
+8	171	0	37.3718	59.8298	1.35
+8	172	0	35.0335	61.1798	1.35
+8	173	0	33.1282	62.2798	1.35
+8	174	0	31.223	63.3798	1.35
+8	175	0	29.3177	64.4798	1.35
+8	176	0	27.4125	65.5798	1.35
+8	177	0	25.5072	66.6798	1.35
+8	178	0	23.602	67.7798	1.35
+8	179	0	21.6967	68.8798	1.35
+9	0	0	15.65	70.5	3.55
+9	1	0	13.45	70.5	3.55
+9	2	0	11.25	70.5	3.55
+9	3	0	9.05	70.5	3.55
+9	4	0	6.85	70.5	3.55
+9	5	0	4.65	70.5	3.55
+9	6	0	2.45	70.5	3.55
+9	7	0	-0.25	70.5	3.55
+9	8	0	-2.45	70.5	3.55
+9	9	0	-4.65	70.5	3.55
+9	10	0	-6.85	70.5	3.55
+9	11	0	-9.05	70.5	3.55
+9	12	0	-11.25	70.5	3.55
+9	13	0	-13.45	70.5	3.55
+9	14	0	-15.65	70.5	3.55
+9	15	0	-21.6967	68.8798	3.55
+9	16	0	-23.602	67.7798	3.55
+9	17	0	-25.5072	66.6798	3.55
+9	18	0	-27.4125	65.5798	3.55
+9	19	0	-29.3177	64.4798	3.55
+9	20	0	-31.223	63.3798	3.55
+9	21	0	-33.1282	62.2798	3.55
+9	22	0	-35.4665	60.9298	3.55
+9	23	0	-37.3718	59.8298	3.55
+9	24	0	-39.277	58.7298	3.55
+9	25	0	-41.1823	57.6298	3.55
+9	26	0	-43.0875	56.5298	3.55
+9	27	0	-44.9928	55.4298	3.55
+9	28	0	-46.898	54.3298	3.55
+9	29	0	-48.8033	53.2298	3.55
+9	30	0	-53.2298	48.8033	3.55
+9	31	0	-54.3298	46.898	3.55
+9	32	0	-55.4298	44.9928	3.55
+9	33	0	-56.5298	43.0875	3.55
+9	34	0	-57.6298	41.1823	3.55
+9	35	0	-58.7298	39.277	3.55
+9	36	0	-59.8298	37.3718	3.55
+9	37	0	-61.1798	35.0335	3.55
+9	38	0	-62.2798	33.1282	3.55
+9	39	0	-63.3798	31.223	3.55
+9	40	0	-64.4798	29.3177	3.55
+9	41	0	-65.5798	27.4125	3.55
+9	42	0	-66.6798	25.5072	3.55
+9	43	0	-67.7798	23.602	3.55
+9	44	0	-68.8798	21.6967	3.55
+9	45	0	-70.5	15.65	3.55
+9	46	0	-70.5	13.45	3.55
+9	47	0	-70.5	11.25	3.55
+9	48	0	-70.5	9.05	3.55
+9	49	0	-70.5	6.85	3.55
+9	50	0	-70.5	4.65	3.55
+9	51	0	-70.5	2.45	3.55
+9	52	0	-70.5	-0.25	3.55
+9	53	0	-70.5	-2.45	3.55
+9	54	0	-70.5	-4.65	3.55
+9	55	0	-70.5	-6.85	3.55
+9	56	0	-70.5	-9.05	3.55
+9	57	0	-70.5	-11.25	3.55
+9	58	0	-70.5	-13.45	3.55
+9	59	0	-70.5	-15.65	3.55
+9	60	0	-68.8798	-21.6967	3.55
+9	61	0	-67.7798	-23.602	3.55
+9	62	0	-66.6798	-25.5072	3.55
+9	63	0	-65.5798	-27.4125	3.55
+9	64	0	-64.4798	-29.3177	3.55
+9	65	0	-63.3798	-31.223	3.55
+9	66	0	-62.2798	-33.1282	3.55
+9	67	0	-60.9298	-35.4665	3.55
+9	68	0	-59.8298	-37.3718	3.55
+9	69	0	-58.7298	-39.277	3.55
+9	70	0	-57.6298	-41.1823	3.55
+9	71	0	-56.5298	-43.0875	3.55
+9	72	0	-55.4298	-44.9928	3.55
+9	73	0	-54.3298	-46.898	3.55
+9	74	0	-53.2298	-48.8033	3.55
+9	75	0	-48.8033	-53.2298	3.55
+9	76	0	-46.898	-54.3298	3.55
+9	77	0	-44.9928	-55.4298	3.55
+9	78	0	-43.0875	-56.5298	3.55
+9	79	0	-41.1823	-57.6298	3.55
+9	80	0	-39.277	-58.7298	3.55
+9	81	0	-37.3718	-59.8298	3.55
+9	82	0	-35.0335	-61.1798	3.55
+9	83	0	-33.1282	-62.2798	3.55
+9	84	0	-31.223	-63.3798	3.55
+9	85	0	-29.3177	-64.4798	3.55
+9	86	0	-27.4125	-65.5798	3.55
+9	87	0	-25.5072	-66.6798	3.55
+9	88	0	-23.602	-67.7798	3.55
+9	89	0	-21.6967	-68.8798	3.55
+9	90	0	-15.65	-70.5	3.55
+9	91	0	-13.45	-70.5	3.55
+9	92	0	-11.25	-70.5	3.55
+9	93	0	-9.05	-70.5	3.55
+9	94	0	-6.85	-70.5	3.55
+9	95	0	-4.65	-70.5	3.55
+9	96	0	-2.45	-70.5	3.55
+9	97	0	0.25	-70.5	3.55
+9	98	0	2.45	-70.5	3.55
+9	99	0	4.65	-70.5	3.55
+9	100	0	6.85	-70.5	3.55
+9	101	0	9.05	-70.5	3.55
+9	102	0	11.25	-70.5	3.55
+9	103	0	13.45	-70.5	3.55
+9	104	0	15.65	-70.5	3.55
+9	105	0	21.6967	-68.8798	3.55
+9	106	0	23.602	-67.7798	3.55
+9	107	0	25.5072	-66.6798	3.55
+9	108	0	27.4125	-65.5798	3.55
+9	109	0	29.3177	-64.4798	3.55
+9	110	0	31.223	-63.3798	3.55
+9	111	0	33.1282	-62.2798	3.55
+9	112	0	35.4665	-60.9298	3.55
+9	113	0	37.3718	-59.8298	3.55
+9	114	0	39.277	-58.7298	3.55
+9	115	0	41.1823	-57.6298	3.55
+9	116	0	43.0875	-56.5298	3.55
+9	117	0	44.9928	-55.4298	3.55
+9	118	0	46.898	-54.3298	3.55
+9	119	0	48.8033	-53.2298	3.55
+9	120	0	53.2298	-48.8033	3.55
+9	121	0	54.3298	-46.898	3.55
+9	122	0	55.4298	-44.9928	3.55
+9	123	0	56.5298	-43.0875	3.55
+9	124	0	57.6298	-41.1823	3.55
+9	125	0	58.7298	-39.277	3.55
+9	126	0	59.8298	-37.3718	3.55
+9	127	0	61.1798	-35.0335	3.55
+9	128	0	62.2798	-33.1282	3.55
+9	129	0	63.3798	-31.223	3.55
+9	130	0	64.4798	-29.3177	3.55
+9	131	0	65.5798	-27.4125	3.55
+9	132	0	66.6798	-25.5072	3.55
+9	133	0	67.7798	-23.602	3.55
+9	134	0	68.8798	-21.6967	3.55
+9	135	0	70.5	-15.65	3.55
+9	136	0	70.5	-13.45	3.55
+9	137	0	70.5	-11.25	3.55
+9	138	0	70.5	-9.05	3.55
+9	139	0	70.5	-6.85	3.55
+9	140	0	70.5	-4.65	3.55
+9	141	0	70.5	-2.45	3.55
+9	142	0	70.5	0.25	3.55
+9	143	0	70.5	2.45	3.55
+9	144	0	70.5	4.65	3.55
+9	145	0	70.5	6.85	3.55
+9	146	0	70.5	9.05	3.55
+9	147	0	70.5	11.25	3.55
+9	148	0	70.5	13.45	3.55
+9	149	0	70.5	15.65	3.55
+9	150	0	68.8798	21.6967	3.55
+9	151	0	67.7798	23.602	3.55
+9	152	0	66.6798	25.5072	3.55
+9	153	0	65.5798	27.4125	3.55
+9	154	0	64.4798	29.3177	3.55
+9	155	0	63.3798	31.223	3.55
+9	156	0	62.2798	33.1282	3.55
+9	157	0	60.9298	35.4665	3.55
+9	158	0	59.8298	37.3718	3.55
+9	159	0	58.7298	39.277	3.55
+9	160	0	57.6298	41.1823	3.55
+9	161	0	56.5298	43.0875	3.55
+9	162	0	55.4298	44.9928	3.55
+9	163	0	54.3298	46.898	3.55
+9	164	0	53.2298	48.8033	3.55
+9	165	0	48.8033	53.2298	3.55
+9	166	0	46.898	54.3298	3.55
+9	167	0	44.9928	55.4298	3.55
+9	168	0	43.0875	56.5298	3.55
+9	169	0	41.1823	57.6298	3.55
+9	170	0	39.277	58.7298	3.55
+9	171	0	37.3718	59.8298	3.55
+9	172	0	35.0335	61.1798	3.55
+9	173	0	33.1282	62.2798	3.55
+9	174	0	31.223	63.3798	3.55
+9	175	0	29.3177	64.4798	3.55
+9	176	0	27.4125	65.5798	3.55
+9	177	0	25.5072	66.6798	3.55
+9	178	0	23.602	67.7798	3.55
+9	179	0	21.6967	68.8798	3.55
+10	0	0	15.65	70.5	5.75
+10	1	0	13.45	70.5	5.75
+10	2	0	11.25	70.5	5.75
+10	3	0	9.05	70.5	5.75
+10	4	0	6.85	70.5	5.75
+10	5	0	4.65	70.5	5.75
+10	6	0	2.45	70.5	5.75
+10	7	0	-0.25	70.5	5.75
+10	8	0	-2.45	70.5	5.75
+10	9	0	-4.65	70.5	5.75
+10	10	0	-6.85	70.5	5.75
+10	11	0	-9.05	70.5	5.75
+10	12	0	-11.25	70.5	5.75
+10	13	0	-13.45	70.5	5.75
+10	14	0	-15.65	70.5	5.75
+10	15	0	-21.6967	68.8798	5.75
+10	16	0	-23.602	67.7798	5.75
+10	17	0	-25.5072	66.6798	5.75
+10	18	0	-27.4125	65.5798	5.75
+10	19	0	-29.3177	64.4798	5.75
+10	20	0	-31.223	63.3798	5.75
+10	21	0	-33.1282	62.2798	5.75
+10	22	0	-35.4665	60.9298	5.75
+10	23	0	-37.3718	59.8298	5.75
+10	24	0	-39.277	58.7298	5.75
+10	25	0	-41.1823	57.6298	5.75
+10	26	0	-43.0875	56.5298	5.75
+10	27	0	-44.9928	55.4298	5.75
+10	28	0	-46.898	54.3298	5.75
+10	29	0	-48.8033	53.2298	5.75
+10	30	0	-53.2298	48.8033	5.75
+10	31	0	-54.3298	46.898	5.75
+10	32	0	-55.4298	44.9928	5.75
+10	33	0	-56.5298	43.0875	5.75
+10	34	0	-57.6298	41.1823	5.75
+10	35	0	-58.7298	39.277	5.75
+10	36	0	-59.8298	37.3718	5.75
+10	37	0	-61.1798	35.0335	5.75
+10	38	0	-62.2798	33.1282	5.75
+10	39	0	-63.3798	31.223	5.75
+10	40	0	-64.4798	29.3177	5.75
+10	41	0	-65.5798	27.4125	5.75
+10	42	0	-66.6798	25.5072	5.75
+10	43	0	-67.7798	23.602	5.75
+10	44	0	-68.8798	21.6967	5.75
+10	45	0	-70.5	15.65	5.75
+10	46	0	-70.5	13.45	5.75
+10	47	0	-70.5	11.25	5.75
+10	48	0	-70.5	9.05	5.75
+10	49	0	-70.5	6.85	5.75
+10	50	0	-70.5	4.65	5.75
+10	51	0	-70.5	2.45	5.75
+10	52	0	-70.5	-0.25	5.75
+10	53	0	-70.5	-2.45	5.75
+10	54	0	-70.5	-4.65	5.75
+10	55	0	-70.5	-6.85	5.75
+10	56	0	-70.5	-9.05	5.75
+10	57	0	-70.5	-11.25	5.75
+10	58	0	-70.5	-13.45	5.75
+10	59	0	-70.5	-15.65	5.75
+10	60	0	-68.8798	-21.6967	5.75
+10	61	0	-67.7798	-23.602	5.75
+10	62	0	-66.6798	-25.5072	5.75
+10	63	0	-65.5798	-27.4125	5.75
+10	64	0	-64.4798	-29.3177	5.75
+10	65	0	-63.3798	-31.223	5.75
+10	66	0	-62.2798	-33.1282	5.75
+10	67	0	-60.9298	-35.4665	5.75
+10	68	0	-59.8298	-37.3718	5.75
+10	69	0	-58.7298	-39.277	5.75
+10	70	0	-57.6298	-41.1823	5.75
+10	71	0	-56.5298	-43.0875	5.75
+10	72	0	-55.4298	-44.9928	5.75
+10	73	0	-54.3298	-46.898	5.75
+10	74	0	-53.2298	-48.8033	5.75
+10	75	0	-48.8033	-53.2298	5.75
+10	76	0	-46.898	-54.3298	5.75
+10	77	0	-44.9928	-55.4298	5.75
+10	78	0	-43.0875	-56.5298	5.75
+10	79	0	-41.1823	-57.6298	5.75
+10	80	0	-39.277	-58.7298	5.75
+10	81	0	-37.3718	-59.8298	5.75
+10	82	0	-35.0335	-61.1798	5.75
+10	83	0	-33.1282	-62.2798	5.75
+10	84	0	-31.223	-63.3798	5.75
+10	85	0	-29.3177	-64.4798	5.75
+10	86	0	-27.4125	-65.5798	5.75
+10	87	0	-25.5072	-66.6798	5.75
+10	88	0	-23.602	-67.7798	5.75
+10	89	0	-21.6967	-68.8798	5.75
+10	90	0	-15.65	-70.5	5.75
+10	91	0	-13.45	-70.5	5.75
+10	92	0	-11.25	-70.5	5.75
+10	93	0	-9.05	-70.5	5.75
+10	94	0	-6.85	-70.5	5.75
+10	95	0	-4.65	-70.5	5.75
+10	96	0	-2.45	-70.5	5.75
+10	97	0	0.25	-70.5	5.75
+10	98	0	2.45	-70.5	5.75
+10	99	0	4.65	-70.5	5.75
+10	100	0	6.85	-70.5	5.75
+10	101	0	9.05	-70.5	5.75
+10	102	0	11.25	-70.5	5.75
+10	103	0	13.45	-70.5	5.75
+10	104	0	15.65	-70.5	5.75
+10	105	0	21.6967	-68.8798	5.75
+10	106	0	23.602	-67.7798	5.75
+10	107	0	25.5072	-66.6798	5.75
+10	108	0	27.4125	-65.5798	5.75
+10	109	0	29.3177	-64.4798	5.75
+10	110	0	31.223	-63.3798	5.75
+10	111	0	33.1282	-62.2798	5.75
+10	112	0	35.4665	-60.9298	5.75
+10	113	0	37.3718	-59.8298	5.75
+10	114	0	39.277	-58.7298	5.75
+10	115	0	41.1823	-57.6298	5.75
+10	116	0	43.0875	-56.5298	5.75
+10	117	0	44.9928	-55.4298	5.75
+10	118	0	46.898	-54.3298	5.75
+10	119	0	48.8033	-53.2298	5.75
+10	120	0	53.2298	-48.8033	5.75
+10	121	0	54.3298	-46.898	5.75
+10	122	0	55.4298	-44.9928	5.75
+10	123	0	56.5298	-43.0875	5.75
+10	124	0	57.6298	-41.1823	5.75
+10	125	0	58.7298	-39.277	5.75
+10	126	0	59.8298	-37.3718	5.75
+10	127	0	61.1798	-35.0335	5.75
+10	128	0	62.2798	-33.1282	5.75
+10	129	0	63.3798	-31.223	5.75
+10	130	0	64.4798	-29.3177	5.75
+10	131	0	65.5798	-27.4125	5.75
+10	132	0	66.6798	-25.5072	5.75
+10	133	0	67.7798	-23.602	5.75
+10	134	0	68.8798	-21.6967	5.75
+10	135	0	70.5	-15.65	5.75
+10	136	0	70.5	-13.45	5.75
+10	137	0	70.5	-11.25	5.75
+10	138	0	70.5	-9.05	5.75
+10	139	0	70.5	-6.85	5.75
+10	140	0	70.5	-4.65	5.75
+10	141	0	70.5	-2.45	5.75
+10	142	0	70.5	0.25	5.75
+10	143	0	70.5	2.45	5.75
+10	144	0	70.5	4.65	5.75
+10	145	0	70.5	6.85	5.75
+10	146	0	70.5	9.05	5.75
+10	147	0	70.5	11.25	5.75
+10	148	0	70.5	13.45	5.75
+10	149	0	70.5	15.65	5.75
+10	150	0	68.8798	21.6967	5.75
+10	151	0	67.7798	23.602	5.75
+10	152	0	66.6798	25.5072	5.75
+10	153	0	65.5798	27.4125	5.75
+10	154	0	64.4798	29.3177	5.75
+10	155	0	63.3798	31.223	5.75
+10	156	0	62.2798	33.1282	5.75
+10	157	0	60.9298	35.4665	5.75
+10	158	0	59.8298	37.3718	5.75
+10	159	0	58.7298	39.277	5.75
+10	160	0	57.6298	41.1823	5.75
+10	161	0	56.5298	43.0875	5.75
+10	162	0	55.4298	44.9928	5.75
+10	163	0	54.3298	46.898	5.75
+10	164	0	53.2298	48.8033	5.75
+10	165	0	48.8033	53.2298	5.75
+10	166	0	46.898	54.3298	5.75
+10	167	0	44.9928	55.4298	5.75
+10	168	0	43.0875	56.5298	5.75
+10	169	0	41.1823	57.6298	5.75
+10	170	0	39.277	58.7298	5.75
+10	171	0	37.3718	59.8298	5.75
+10	172	0	35.0335	61.1798	5.75
+10	173	0	33.1282	62.2798	5.75
+10	174	0	31.223	63.3798	5.75
+10	175	0	29.3177	64.4798	5.75
+10	176	0	27.4125	65.5798	5.75
+10	177	0	25.5072	66.6798	5.75
+10	178	0	23.602	67.7798	5.75
+10	179	0	21.6967	68.8798	5.75
+11	0	0	15.65	70.5	7.95
+11	1	0	13.45	70.5	7.95
+11	2	0	11.25	70.5	7.95
+11	3	0	9.05	70.5	7.95
+11	4	0	6.85	70.5	7.95
+11	5	0	4.65	70.5	7.95
+11	6	0	2.45	70.5	7.95
+11	7	0	-0.25	70.5	7.95
+11	8	0	-2.45	70.5	7.95
+11	9	0	-4.65	70.5	7.95
+11	10	0	-6.85	70.5	7.95
+11	11	0	-9.05	70.5	7.95
+11	12	0	-11.25	70.5	7.95
+11	13	0	-13.45	70.5	7.95
+11	14	0	-15.65	70.5	7.95
+11	15	0	-21.6967	68.8798	7.95
+11	16	0	-23.602	67.7798	7.95
+11	17	0	-25.5072	66.6798	7.95
+11	18	0	-27.4125	65.5798	7.95
+11	19	0	-29.3177	64.4798	7.95
+11	20	0	-31.223	63.3798	7.95
+11	21	0	-33.1282	62.2798	7.95
+11	22	0	-35.4665	60.9298	7.95
+11	23	0	-37.3718	59.8298	7.95
+11	24	0	-39.277	58.7298	7.95
+11	25	0	-41.1823	57.6298	7.95
+11	26	0	-43.0875	56.5298	7.95
+11	27	0	-44.9928	55.4298	7.95
+11	28	0	-46.898	54.3298	7.95
+11	29	0	-48.8033	53.2298	7.95
+11	30	0	-53.2298	48.8033	7.95
+11	31	0	-54.3298	46.898	7.95
+11	32	0	-55.4298	44.9928	7.95
+11	33	0	-56.5298	43.0875	7.95
+11	34	0	-57.6298	41.1823	7.95
+11	35	0	-58.7298	39.277	7.95
+11	36	0	-59.8298	37.3718	7.95
+11	37	0	-61.1798	35.0335	7.95
+11	38	0	-62.2798	33.1282	7.95
+11	39	0	-63.3798	31.223	7.95
+11	40	0	-64.4798	29.3177	7.95
+11	41	0	-65.5798	27.4125	7.95
+11	42	0	-66.6798	25.5072	7.95
+11	43	0	-67.7798	23.602	7.95
+11	44	0	-68.8798	21.6967	7.95
+11	45	0	-70.5	15.65	7.95
+11	46	0	-70.5	13.45	7.95
+11	47	0	-70.5	11.25	7.95
+11	48	0	-70.5	9.05	7.95
+11	49	0	-70.5	6.85	7.95
+11	50	0	-70.5	4.65	7.95
+11	51	0	-70.5	2.45	7.95
+11	52	0	-70.5	-0.25	7.95
+11	53	0	-70.5	-2.45	7.95
+11	54	0	-70.5	-4.65	7.95
+11	55	0	-70.5	-6.85	7.95
+11	56	0	-70.5	-9.05	7.95
+11	57	0	-70.5	-11.25	7.95
+11	58	0	-70.5	-13.45	7.95
+11	59	0	-70.5	-15.65	7.95
+11	60	0	-68.8798	-21.6967	7.95
+11	61	0	-67.7798	-23.602	7.95
+11	62	0	-66.6798	-25.5072	7.95
+11	63	0	-65.5798	-27.4125	7.95
+11	64	0	-64.4798	-29.3177	7.95
+11	65	0	-63.3798	-31.223	7.95
+11	66	0	-62.2798	-33.1282	7.95
+11	67	0	-60.9298	-35.4665	7.95
+11	68	0	-59.8298	-37.3718	7.95
+11	69	0	-58.7298	-39.277	7.95
+11	70	0	-57.6298	-41.1823	7.95
+11	71	0	-56.5298	-43.0875	7.95
+11	72	0	-55.4298	-44.9928	7.95
+11	73	0	-54.3298	-46.898	7.95
+11	74	0	-53.2298	-48.8033	7.95
+11	75	0	-48.8033	-53.2298	7.95
+11	76	0	-46.898	-54.3298	7.95
+11	77	0	-44.9928	-55.4298	7.95
+11	78	0	-43.0875	-56.5298	7.95
+11	79	0	-41.1823	-57.6298	7.95
+11	80	0	-39.277	-58.7298	7.95
+11	81	0	-37.3718	-59.8298	7.95
+11	82	0	-35.0335	-61.1798	7.95
+11	83	0	-33.1282	-62.2798	7.95
+11	84	0	-31.223	-63.3798	7.95
+11	85	0	-29.3177	-64.4798	7.95
+11	86	0	-27.4125	-65.5798	7.95
+11	87	0	-25.5072	-66.6798	7.95
+11	88	0	-23.602	-67.7798	7.95
+11	89	0	-21.6967	-68.8798	7.95
+11	90	0	-15.65	-70.5	7.95
+11	91	0	-13.45	-70.5	7.95
+11	92	0	-11.25	-70.5	7.95
+11	93	0	-9.05	-70.5	7.95
+11	94	0	-6.85	-70.5	7.95
+11	95	0	-4.65	-70.5	7.95
+11	96	0	-2.45	-70.5	7.95
+11	97	0	0.25	-70.5	7.95
+11	98	0	2.45	-70.5	7.95
+11	99	0	4.65	-70.5	7.95
+11	100	0	6.85	-70.5	7.95
+11	101	0	9.05	-70.5	7.95
+11	102	0	11.25	-70.5	7.95
+11	103	0	13.45	-70.5	7.95
+11	104	0	15.65	-70.5	7.95
+11	105	0	21.6967	-68.8798	7.95
+11	106	0	23.602	-67.7798	7.95
+11	107	0	25.5072	-66.6798	7.95
+11	108	0	27.4125	-65.5798	7.95
+11	109	0	29.3177	-64.4798	7.95
+11	110	0	31.223	-63.3798	7.95
+11	111	0	33.1282	-62.2798	7.95
+11	112	0	35.4665	-60.9298	7.95
+11	113	0	37.3718	-59.8298	7.95
+11	114	0	39.277	-58.7298	7.95
+11	115	0	41.1823	-57.6298	7.95
+11	116	0	43.0875	-56.5298	7.95
+11	117	0	44.9928	-55.4298	7.95
+11	118	0	46.898	-54.3298	7.95
+11	119	0	48.8033	-53.2298	7.95
+11	120	0	53.2298	-48.8033	7.95
+11	121	0	54.3298	-46.898	7.95
+11	122	0	55.4298	-44.9928	7.95
+11	123	0	56.5298	-43.0875	7.95
+11	124	0	57.6298	-41.1823	7.95
+11	125	0	58.7298	-39.277	7.95
+11	126	0	59.8298	-37.3718	7.95
+11	127	0	61.1798	-35.0335	7.95
+11	128	0	62.2798	-33.1282	7.95
+11	129	0	63.3798	-31.223	7.95
+11	130	0	64.4798	-29.3177	7.95
+11	131	0	65.5798	-27.4125	7.95
+11	132	0	66.6798	-25.5072	7.95
+11	133	0	67.7798	-23.602	7.95
+11	134	0	68.8798	-21.6967	7.95
+11	135	0	70.5	-15.65	7.95
+11	136	0	70.5	-13.45	7.95
+11	137	0	70.5	-11.25	7.95
+11	138	0	70.5	-9.05	7.95
+11	139	0	70.5	-6.85	7.95
+11	140	0	70.5	-4.65	7.95
+11	141	0	70.5	-2.45	7.95
+11	142	0	70.5	0.25	7.95
+11	143	0	70.5	2.45	7.95
+11	144	0	70.5	4.65	7.95
+11	145	0	70.5	6.85	7.95
+11	146	0	70.5	9.05	7.95
+11	147	0	70.5	11.25	7.95
+11	148	0	70.5	13.45	7.95
+11	149	0	70.5	15.65	7.95
+11	150	0	68.8798	21.6967	7.95
+11	151	0	67.7798	23.602	7.95
+11	152	0	66.6798	25.5072	7.95
+11	153	0	65.5798	27.4125	7.95
+11	154	0	64.4798	29.3177	7.95
+11	155	0	63.3798	31.223	7.95
+11	156	0	62.2798	33.1282	7.95
+11	157	0	60.9298	35.4665	7.95
+11	158	0	59.8298	37.3718	7.95
+11	159	0	58.7298	39.277	7.95
+11	160	0	57.6298	41.1823	7.95
+11	161	0	56.5298	43.0875	7.95
+11	162	0	55.4298	44.9928	7.95
+11	163	0	54.3298	46.898	7.95
+11	164	0	53.2298	48.8033	7.95
+11	165	0	48.8033	53.2298	7.95
+11	166	0	46.898	54.3298	7.95
+11	167	0	44.9928	55.4298	7.95
+11	168	0	43.0875	56.5298	7.95
+11	169	0	41.1823	57.6298	7.95
+11	170	0	39.277	58.7298	7.95
+11	171	0	37.3718	59.8298	7.95
+11	172	0	35.0335	61.1798	7.95
+11	173	0	33.1282	62.2798	7.95
+11	174	0	31.223	63.3798	7.95
+11	175	0	29.3177	64.4798	7.95
+11	176	0	27.4125	65.5798	7.95
+11	177	0	25.5072	66.6798	7.95
+11	178	0	23.602	67.7798	7.95
+11	179	0	21.6967	68.8798	7.95
+12	0	0	15.65	70.5	10.15
+12	1	0	13.45	70.5	10.15
+12	2	0	11.25	70.5	10.15
+12	3	0	9.05	70.5	10.15
+12	4	0	6.85	70.5	10.15
+12	5	0	4.65	70.5	10.15
+12	6	0	2.45	70.5	10.15
+12	7	0	-0.25	70.5	10.15
+12	8	0	-2.45	70.5	10.15
+12	9	0	-4.65	70.5	10.15
+12	10	0	-6.85	70.5	10.15
+12	11	0	-9.05	70.5	10.15
+12	12	0	-11.25	70.5	10.15
+12	13	0	-13.45	70.5	10.15
+12	14	0	-15.65	70.5	10.15
+12	15	0	-21.6967	68.8798	10.15
+12	16	0	-23.602	67.7798	10.15
+12	17	0	-25.5072	66.6798	10.15
+12	18	0	-27.4125	65.5798	10.15
+12	19	0	-29.3177	64.4798	10.15
+12	20	0	-31.223	63.3798	10.15
+12	21	0	-33.1282	62.2798	10.15
+12	22	0	-35.4665	60.9298	10.15
+12	23	0	-37.3718	59.8298	10.15
+12	24	0	-39.277	58.7298	10.15
+12	25	0	-41.1823	57.6298	10.15
+12	26	0	-43.0875	56.5298	10.15
+12	27	0	-44.9928	55.4298	10.15
+12	28	0	-46.898	54.3298	10.15
+12	29	0	-48.8033	53.2298	10.15
+12	30	0	-53.2298	48.8033	10.15
+12	31	0	-54.3298	46.898	10.15
+12	32	0	-55.4298	44.9928	10.15
+12	33	0	-56.5298	43.0875	10.15
+12	34	0	-57.6298	41.1823	10.15
+12	35	0	-58.7298	39.277	10.15
+12	36	0	-59.8298	37.3718	10.15
+12	37	0	-61.1798	35.0335	10.15
+12	38	0	-62.2798	33.1282	10.15
+12	39	0	-63.3798	31.223	10.15
+12	40	0	-64.4798	29.3177	10.15
+12	41	0	-65.5798	27.4125	10.15
+12	42	0	-66.6798	25.5072	10.15
+12	43	0	-67.7798	23.602	10.15
+12	44	0	-68.8798	21.6967	10.15
+12	45	0	-70.5	15.65	10.15
+12	46	0	-70.5	13.45	10.15
+12	47	0	-70.5	11.25	10.15
+12	48	0	-70.5	9.05	10.15
+12	49	0	-70.5	6.85	10.15
+12	50	0	-70.5	4.65	10.15
+12	51	0	-70.5	2.45	10.15
+12	52	0	-70.5	-0.25	10.15
+12	53	0	-70.5	-2.45	10.15
+12	54	0	-70.5	-4.65	10.15
+12	55	0	-70.5	-6.85	10.15
+12	56	0	-70.5	-9.05	10.15
+12	57	0	-70.5	-11.25	10.15
+12	58	0	-70.5	-13.45	10.15
+12	59	0	-70.5	-15.65	10.15
+12	60	0	-68.8798	-21.6967	10.15
+12	61	0	-67.7798	-23.602	10.15
+12	62	0	-66.6798	-25.5072	10.15
+12	63	0	-65.5798	-27.4125	10.15
+12	64	0	-64.4798	-29.3177	10.15
+12	65	0	-63.3798	-31.223	10.15
+12	66	0	-62.2798	-33.1282	10.15
+12	67	0	-60.9298	-35.4665	10.15
+12	68	0	-59.8298	-37.3718	10.15
+12	69	0	-58.7298	-39.277	10.15
+12	70	0	-57.6298	-41.1823	10.15
+12	71	0	-56.5298	-43.0875	10.15
+12	72	0	-55.4298	-44.9928	10.15
+12	73	0	-54.3298	-46.898	10.15
+12	74	0	-53.2298	-48.8033	10.15
+12	75	0	-48.8033	-53.2298	10.15
+12	76	0	-46.898	-54.3298	10.15
+12	77	0	-44.9928	-55.4298	10.15
+12	78	0	-43.0875	-56.5298	10.15
+12	79	0	-41.1823	-57.6298	10.15
+12	80	0	-39.277	-58.7298	10.15
+12	81	0	-37.3718	-59.8298	10.15
+12	82	0	-35.0335	-61.1798	10.15
+12	83	0	-33.1282	-62.2798	10.15
+12	84	0	-31.223	-63.3798	10.15
+12	85	0	-29.3177	-64.4798	10.15
+12	86	0	-27.4125	-65.5798	10.15
+12	87	0	-25.5072	-66.6798	10.15
+12	88	0	-23.602	-67.7798	10.15
+12	89	0	-21.6967	-68.8798	10.15
+12	90	0	-15.65	-70.5	10.15
+12	91	0	-13.45	-70.5	10.15
+12	92	0	-11.25	-70.5	10.15
+12	93	0	-9.05	-70.5	10.15
+12	94	0	-6.85	-70.5	10.15
+12	95	0	-4.65	-70.5	10.15
+12	96	0	-2.45	-70.5	10.15
+12	97	0	0.25	-70.5	10.15
+12	98	0	2.45	-70.5	10.15
+12	99	0	4.65	-70.5	10.15
+12	100	0	6.85	-70.5	10.15
+12	101	0	9.05	-70.5	10.15
+12	102	0	11.25	-70.5	10.15
+12	103	0	13.45	-70.5	10.15
+12	104	0	15.65	-70.5	10.15
+12	105	0	21.6967	-68.8798	10.15
+12	106	0	23.602	-67.7798	10.15
+12	107	0	25.5072	-66.6798	10.15
+12	108	0	27.4125	-65.5798	10.15
+12	109	0	29.3177	-64.4798	10.15
+12	110	0	31.223	-63.3798	10.15
+12	111	0	33.1282	-62.2798	10.15
+12	112	0	35.4665	-60.9298	10.15
+12	113	0	37.3718	-59.8298	10.15
+12	114	0	39.277	-58.7298	10.15
+12	115	0	41.1823	-57.6298	10.15
+12	116	0	43.0875	-56.5298	10.15
+12	117	0	44.9928	-55.4298	10.15
+12	118	0	46.898	-54.3298	10.15
+12	119	0	48.8033	-53.2298	10.15
+12	120	0	53.2298	-48.8033	10.15
+12	121	0	54.3298	-46.898	10.15
+12	122	0	55.4298	-44.9928	10.15
+12	123	0	56.5298	-43.0875	10.15
+12	124	0	57.6298	-41.1823	10.15
+12	125	0	58.7298	-39.277	10.15
+12	126	0	59.8298	-37.3718	10.15
+12	127	0	61.1798	-35.0335	10.15
+12	128	0	62.2798	-33.1282	10.15
+12	129	0	63.3798	-31.223	10.15
+12	130	0	64.4798	-29.3177	10.15
+12	131	0	65.5798	-27.4125	10.15
+12	132	0	66.6798	-25.5072	10.15
+12	133	0	67.7798	-23.602	10.15
+12	134	0	68.8798	-21.6967	10.15
+12	135	0	70.5	-15.65	10.15
+12	136	0	70.5	-13.45	10.15
+12	137	0	70.5	-11.25	10.15
+12	138	0	70.5	-9.05	10.15
+12	139	0	70.5	-6.85	10.15
+12	140	0	70.5	-4.65	10.15
+12	141	0	70.5	-2.45	10.15
+12	142	0	70.5	0.25	10.15
+12	143	0	70.5	2.45	10.15
+12	144	0	70.5	4.65	10.15
+12	145	0	70.5	6.85	10.15
+12	146	0	70.5	9.05	10.15
+12	147	0	70.5	11.25	10.15
+12	148	0	70.5	13.45	10.15
+12	149	0	70.5	15.65	10.15
+12	150	0	68.8798	21.6967	10.15
+12	151	0	67.7798	23.602	10.15
+12	152	0	66.6798	25.5072	10.15
+12	153	0	65.5798	27.4125	10.15
+12	154	0	64.4798	29.3177	10.15
+12	155	0	63.3798	31.223	10.15
+12	156	0	62.2798	33.1282	10.15
+12	157	0	60.9298	35.4665	10.15
+12	158	0	59.8298	37.3718	10.15
+12	159	0	58.7298	39.277	10.15
+12	160	0	57.6298	41.1823	10.15
+12	161	0	56.5298	43.0875	10.15
+12	162	0	55.4298	44.9928	10.15
+12	163	0	54.3298	46.898	10.15
+12	164	0	53.2298	48.8033	10.15
+12	165	0	48.8033	53.2298	10.15
+12	166	0	46.898	54.3298	10.15
+12	167	0	44.9928	55.4298	10.15
+12	168	0	43.0875	56.5298	10.15
+12	169	0	41.1823	57.6298	10.15
+12	170	0	39.277	58.7298	10.15
+12	171	0	37.3718	59.8298	10.15
+12	172	0	35.0335	61.1798	10.15
+12	173	0	33.1282	62.2798	10.15
+12	174	0	31.223	63.3798	10.15
+12	175	0	29.3177	64.4798	10.15
+12	176	0	27.4125	65.5798	10.15
+12	177	0	25.5072	66.6798	10.15
+12	178	0	23.602	67.7798	10.15
+12	179	0	21.6967	68.8798	10.15
+13	0	0	15.65	70.5	12.35
+13	1	0	13.45	70.5	12.35
+13	2	0	11.25	70.5	12.35
+13	3	0	9.05	70.5	12.35
+13	4	0	6.85	70.5	12.35
+13	5	0	4.65	70.5	12.35
+13	6	0	2.45	70.5	12.35
+13	7	0	-0.25	70.5	12.35
+13	8	0	-2.45	70.5	12.35
+13	9	0	-4.65	70.5	12.35
+13	10	0	-6.85	70.5	12.35
+13	11	0	-9.05	70.5	12.35
+13	12	0	-11.25	70.5	12.35
+13	13	0	-13.45	70.5	12.35
+13	14	0	-15.65	70.5	12.35
+13	15	0	-21.6967	68.8798	12.35
+13	16	0	-23.602	67.7798	12.35
+13	17	0	-25.5072	66.6798	12.35
+13	18	0	-27.4125	65.5798	12.35
+13	19	0	-29.3177	64.4798	12.35
+13	20	0	-31.223	63.3798	12.35
+13	21	0	-33.1282	62.2798	12.35
+13	22	0	-35.4665	60.9298	12.35
+13	23	0	-37.3718	59.8298	12.35
+13	24	0	-39.277	58.7298	12.35
+13	25	0	-41.1823	57.6298	12.35
+13	26	0	-43.0875	56.5298	12.35
+13	27	0	-44.9928	55.4298	12.35
+13	28	0	-46.898	54.3298	12.35
+13	29	0	-48.8033	53.2298	12.35
+13	30	0	-53.2298	48.8033	12.35
+13	31	0	-54.3298	46.898	12.35
+13	32	0	-55.4298	44.9928	12.35
+13	33	0	-56.5298	43.0875	12.35
+13	34	0	-57.6298	41.1823	12.35
+13	35	0	-58.7298	39.277	12.35
+13	36	0	-59.8298	37.3718	12.35
+13	37	0	-61.1798	35.0335	12.35
+13	38	0	-62.2798	33.1282	12.35
+13	39	0	-63.3798	31.223	12.35
+13	40	0	-64.4798	29.3177	12.35
+13	41	0	-65.5798	27.4125	12.35
+13	42	0	-66.6798	25.5072	12.35
+13	43	0	-67.7798	23.602	12.35
+13	44	0	-68.8798	21.6967	12.35
+13	45	0	-70.5	15.65	12.35
+13	46	0	-70.5	13.45	12.35
+13	47	0	-70.5	11.25	12.35
+13	48	0	-70.5	9.05	12.35
+13	49	0	-70.5	6.85	12.35
+13	50	0	-70.5	4.65	12.35
+13	51	0	-70.5	2.45	12.35
+13	52	0	-70.5	-0.25	12.35
+13	53	0	-70.5	-2.45	12.35
+13	54	0	-70.5	-4.65	12.35
+13	55	0	-70.5	-6.85	12.35
+13	56	0	-70.5	-9.05	12.35
+13	57	0	-70.5	-11.25	12.35
+13	58	0	-70.5	-13.45	12.35
+13	59	0	-70.5	-15.65	12.35
+13	60	0	-68.8798	-21.6967	12.35
+13	61	0	-67.7798	-23.602	12.35
+13	62	0	-66.6798	-25.5072	12.35
+13	63	0	-65.5798	-27.4125	12.35
+13	64	0	-64.4798	-29.3177	12.35
+13	65	0	-63.3798	-31.223	12.35
+13	66	0	-62.2798	-33.1282	12.35
+13	67	0	-60.9298	-35.4665	12.35
+13	68	0	-59.8298	-37.3718	12.35
+13	69	0	-58.7298	-39.277	12.35
+13	70	0	-57.6298	-41.1823	12.35
+13	71	0	-56.5298	-43.0875	12.35
+13	72	0	-55.4298	-44.9928	12.35
+13	73	0	-54.3298	-46.898	12.35
+13	74	0	-53.2298	-48.8033	12.35
+13	75	0	-48.8033	-53.2298	12.35
+13	76	0	-46.898	-54.3298	12.35
+13	77	0	-44.9928	-55.4298	12.35
+13	78	0	-43.0875	-56.5298	12.35
+13	79	0	-41.1823	-57.6298	12.35
+13	80	0	-39.277	-58.7298	12.35
+13	81	0	-37.3718	-59.8298	12.35
+13	82	0	-35.0335	-61.1798	12.35
+13	83	0	-33.1282	-62.2798	12.35
+13	84	0	-31.223	-63.3798	12.35
+13	85	0	-29.3177	-64.4798	12.35
+13	86	0	-27.4125	-65.5798	12.35
+13	87	0	-25.5072	-66.6798	12.35
+13	88	0	-23.602	-67.7798	12.35
+13	89	0	-21.6967	-68.8798	12.35
+13	90	0	-15.65	-70.5	12.35
+13	91	0	-13.45	-70.5	12.35
+13	92	0	-11.25	-70.5	12.35
+13	93	0	-9.05	-70.5	12.35
+13	94	0	-6.85	-70.5	12.35
+13	95	0	-4.65	-70.5	12.35
+13	96	0	-2.45	-70.5	12.35
+13	97	0	0.25	-70.5	12.35
+13	98	0	2.45	-70.5	12.35
+13	99	0	4.65	-70.5	12.35
+13	100	0	6.85	-70.5	12.35
+13	101	0	9.05	-70.5	12.35
+13	102	0	11.25	-70.5	12.35
+13	103	0	13.45	-70.5	12.35
+13	104	0	15.65	-70.5	12.35
+13	105	0	21.6967	-68.8798	12.35
+13	106	0	23.602	-67.7798	12.35
+13	107	0	25.5072	-66.6798	12.35
+13	108	0	27.4125	-65.5798	12.35
+13	109	0	29.3177	-64.4798	12.35
+13	110	0	31.223	-63.3798	12.35
+13	111	0	33.1282	-62.2798	12.35
+13	112	0	35.4665	-60.9298	12.35
+13	113	0	37.3718	-59.8298	12.35
+13	114	0	39.277	-58.7298	12.35
+13	115	0	41.1823	-57.6298	12.35
+13	116	0	43.0875	-56.5298	12.35
+13	117	0	44.9928	-55.4298	12.35
+13	118	0	46.898	-54.3298	12.35
+13	119	0	48.8033	-53.2298	12.35
+13	120	0	53.2298	-48.8033	12.35
+13	121	0	54.3298	-46.898	12.35
+13	122	0	55.4298	-44.9928	12.35
+13	123	0	56.5298	-43.0875	12.35
+13	124	0	57.6298	-41.1823	12.35
+13	125	0	58.7298	-39.277	12.35
+13	126	0	59.8298	-37.3718	12.35
+13	127	0	61.1798	-35.0335	12.35
+13	128	0	62.2798	-33.1282	12.35
+13	129	0	63.3798	-31.223	12.35
+13	130	0	64.4798	-29.3177	12.35
+13	131	0	65.5798	-27.4125	12.35
+13	132	0	66.6798	-25.5072	12.35
+13	133	0	67.7798	-23.602	12.35
+13	134	0	68.8798	-21.6967	12.35
+13	135	0	70.5	-15.65	12.35
+13	136	0	70.5	-13.45	12.35
+13	137	0	70.5	-11.25	12.35
+13	138	0	70.5	-9.05	12.35
+13	139	0	70.5	-6.85	12.35
+13	140	0	70.5	-4.65	12.35
+13	141	0	70.5	-2.45	12.35
+13	142	0	70.5	0.25	12.35
+13	143	0	70.5	2.45	12.35
+13	144	0	70.5	4.65	12.35
+13	145	0	70.5	6.85	12.35
+13	146	0	70.5	9.05	12.35
+13	147	0	70.5	11.25	12.35
+13	148	0	70.5	13.45	12.35
+13	149	0	70.5	15.65	12.35
+13	150	0	68.8798	21.6967	12.35
+13	151	0	67.7798	23.602	12.35
+13	152	0	66.6798	25.5072	12.35
+13	153	0	65.5798	27.4125	12.35
+13	154	0	64.4798	29.3177	12.35
+13	155	0	63.3798	31.223	12.35
+13	156	0	62.2798	33.1282	12.35
+13	157	0	60.9298	35.4665	12.35
+13	158	0	59.8298	37.3718	12.35
+13	159	0	58.7298	39.277	12.35
+13	160	0	57.6298	41.1823	12.35
+13	161	0	56.5298	43.0875	12.35
+13	162	0	55.4298	44.9928	12.35
+13	163	0	54.3298	46.898	12.35
+13	164	0	53.2298	48.8033	12.35
+13	165	0	48.8033	53.2298	12.35
+13	166	0	46.898	54.3298	12.35
+13	167	0	44.9928	55.4298	12.35
+13	168	0	43.0875	56.5298	12.35
+13	169	0	41.1823	57.6298	12.35
+13	170	0	39.277	58.7298	12.35
+13	171	0	37.3718	59.8298	12.35
+13	172	0	35.0335	61.1798	12.35
+13	173	0	33.1282	62.2798	12.35
+13	174	0	31.223	63.3798	12.35
+13	175	0	29.3177	64.4798	12.35
+13	176	0	27.4125	65.5798	12.35
+13	177	0	25.5072	66.6798	12.35
+13	178	0	23.602	67.7798	12.35
+13	179	0	21.6967	68.8798	12.35
+14	0	0	15.65	70.5	14.55
+14	1	0	13.45	70.5	14.55
+14	2	0	11.25	70.5	14.55
+14	3	0	9.05	70.5	14.55
+14	4	0	6.85	70.5	14.55
+14	5	0	4.65	70.5	14.55
+14	6	0	2.45	70.5	14.55
+14	7	0	-0.25	70.5	14.55
+14	8	0	-2.45	70.5	14.55
+14	9	0	-4.65	70.5	14.55
+14	10	0	-6.85	70.5	14.55
+14	11	0	-9.05	70.5	14.55
+14	12	0	-11.25	70.5	14.55
+14	13	0	-13.45	70.5	14.55
+14	14	0	-15.65	70.5	14.55
+14	15	0	-21.6967	68.8798	14.55
+14	16	0	-23.602	67.7798	14.55
+14	17	0	-25.5072	66.6798	14.55
+14	18	0	-27.4125	65.5798	14.55
+14	19	0	-29.3177	64.4798	14.55
+14	20	0	-31.223	63.3798	14.55
+14	21	0	-33.1282	62.2798	14.55
+14	22	0	-35.4665	60.9298	14.55
+14	23	0	-37.3718	59.8298	14.55
+14	24	0	-39.277	58.7298	14.55
+14	25	0	-41.1823	57.6298	14.55
+14	26	0	-43.0875	56.5298	14.55
+14	27	0	-44.9928	55.4298	14.55
+14	28	0	-46.898	54.3298	14.55
+14	29	0	-48.8033	53.2298	14.55
+14	30	0	-53.2298	48.8033	14.55
+14	31	0	-54.3298	46.898	14.55
+14	32	0	-55.4298	44.9928	14.55
+14	33	0	-56.5298	43.0875	14.55
+14	34	0	-57.6298	41.1823	14.55
+14	35	0	-58.7298	39.277	14.55
+14	36	0	-59.8298	37.3718	14.55
+14	37	0	-61.1798	35.0335	14.55
+14	38	0	-62.2798	33.1282	14.55
+14	39	0	-63.3798	31.223	14.55
+14	40	0	-64.4798	29.3177	14.55
+14	41	0	-65.5798	27.4125	14.55
+14	42	0	-66.6798	25.5072	14.55
+14	43	0	-67.7798	23.602	14.55
+14	44	0	-68.8798	21.6967	14.55
+14	45	0	-70.5	15.65	14.55
+14	46	0	-70.5	13.45	14.55
+14	47	0	-70.5	11.25	14.55
+14	48	0	-70.5	9.05	14.55
+14	49	0	-70.5	6.85	14.55
+14	50	0	-70.5	4.65	14.55
+14	51	0	-70.5	2.45	14.55
+14	52	0	-70.5	-0.25	14.55
+14	53	0	-70.5	-2.45	14.55
+14	54	0	-70.5	-4.65	14.55
+14	55	0	-70.5	-6.85	14.55
+14	56	0	-70.5	-9.05	14.55
+14	57	0	-70.5	-11.25	14.55
+14	58	0	-70.5	-13.45	14.55
+14	59	0	-70.5	-15.65	14.55
+14	60	0	-68.8798	-21.6967	14.55
+14	61	0	-67.7798	-23.602	14.55
+14	62	0	-66.6798	-25.5072	14.55
+14	63	0	-65.5798	-27.4125	14.55
+14	64	0	-64.4798	-29.3177	14.55
+14	65	0	-63.3798	-31.223	14.55
+14	66	0	-62.2798	-33.1282	14.55
+14	67	0	-60.9298	-35.4665	14.55
+14	68	0	-59.8298	-37.3718	14.55
+14	69	0	-58.7298	-39.277	14.55
+14	70	0	-57.6298	-41.1823	14.55
+14	71	0	-56.5298	-43.0875	14.55
+14	72	0	-55.4298	-44.9928	14.55
+14	73	0	-54.3298	-46.898	14.55
+14	74	0	-53.2298	-48.8033	14.55
+14	75	0	-48.8033	-53.2298	14.55
+14	76	0	-46.898	-54.3298	14.55
+14	77	0	-44.9928	-55.4298	14.55
+14	78	0	-43.0875	-56.5298	14.55
+14	79	0	-41.1823	-57.6298	14.55
+14	80	0	-39.277	-58.7298	14.55
+14	81	0	-37.3718	-59.8298	14.55
+14	82	0	-35.0335	-61.1798	14.55
+14	83	0	-33.1282	-62.2798	14.55
+14	84	0	-31.223	-63.3798	14.55
+14	85	0	-29.3177	-64.4798	14.55
+14	86	0	-27.4125	-65.5798	14.55
+14	87	0	-25.5072	-66.6798	14.55
+14	88	0	-23.602	-67.7798	14.55
+14	89	0	-21.6967	-68.8798	14.55
+14	90	0	-15.65	-70.5	14.55
+14	91	0	-13.45	-70.5	14.55
+14	92	0	-11.25	-70.5	14.55
+14	93	0	-9.05	-70.5	14.55
+14	94	0	-6.85	-70.5	14.55
+14	95	0	-4.65	-70.5	14.55
+14	96	0	-2.45	-70.5	14.55
+14	97	0	0.25	-70.5	14.55
+14	98	0	2.45	-70.5	14.55
+14	99	0	4.65	-70.5	14.55
+14	100	0	6.85	-70.5	14.55
+14	101	0	9.05	-70.5	14.55
+14	102	0	11.25	-70.5	14.55
+14	103	0	13.45	-70.5	14.55
+14	104	0	15.65	-70.5	14.55
+14	105	0	21.6967	-68.8798	14.55
+14	106	0	23.602	-67.7798	14.55
+14	107	0	25.5072	-66.6798	14.55
+14	108	0	27.4125	-65.5798	14.55
+14	109	0	29.3177	-64.4798	14.55
+14	110	0	31.223	-63.3798	14.55
+14	111	0	33.1282	-62.2798	14.55
+14	112	0	35.4665	-60.9298	14.55
+14	113	0	37.3718	-59.8298	14.55
+14	114	0	39.277	-58.7298	14.55
+14	115	0	41.1823	-57.6298	14.55
+14	116	0	43.0875	-56.5298	14.55
+14	117	0	44.9928	-55.4298	14.55
+14	118	0	46.898	-54.3298	14.55
+14	119	0	48.8033	-53.2298	14.55
+14	120	0	53.2298	-48.8033	14.55
+14	121	0	54.3298	-46.898	14.55
+14	122	0	55.4298	-44.9928	14.55
+14	123	0	56.5298	-43.0875	14.55
+14	124	0	57.6298	-41.1823	14.55
+14	125	0	58.7298	-39.277	14.55
+14	126	0	59.8298	-37.3718	14.55
+14	127	0	61.1798	-35.0335	14.55
+14	128	0	62.2798	-33.1282	14.55
+14	129	0	63.3798	-31.223	14.55
+14	130	0	64.4798	-29.3177	14.55
+14	131	0	65.5798	-27.4125	14.55
+14	132	0	66.6798	-25.5072	14.55
+14	133	0	67.7798	-23.602	14.55
+14	134	0	68.8798	-21.6967	14.55
+14	135	0	70.5	-15.65	14.55
+14	136	0	70.5	-13.45	14.55
+14	137	0	70.5	-11.25	14.55
+14	138	0	70.5	-9.05	14.55
+14	139	0	70.5	-6.85	14.55
+14	140	0	70.5	-4.65	14.55
+14	141	0	70.5	-2.45	14.55
+14	142	0	70.5	0.25	14.55
+14	143	0	70.5	2.45	14.55
+14	144	0	70.5	4.65	14.55
+14	145	0	70.5	6.85	14.55
+14	146	0	70.5	9.05	14.55
+14	147	0	70.5	11.25	14.55
+14	148	0	70.5	13.45	14.55
+14	149	0	70.5	15.65	14.55
+14	150	0	68.8798	21.6967	14.55
+14	151	0	67.7798	23.602	14.55
+14	152	0	66.6798	25.5072	14.55
+14	153	0	65.5798	27.4125	14.55
+14	154	0	64.4798	29.3177	14.55
+14	155	0	63.3798	31.223	14.55
+14	156	0	62.2798	33.1282	14.55
+14	157	0	60.9298	35.4665	14.55
+14	158	0	59.8298	37.3718	14.55
+14	159	0	58.7298	39.277	14.55
+14	160	0	57.6298	41.1823	14.55
+14	161	0	56.5298	43.0875	14.55
+14	162	0	55.4298	44.9928	14.55
+14	163	0	54.3298	46.898	14.55
+14	164	0	53.2298	48.8033	14.55
+14	165	0	48.8033	53.2298	14.55
+14	166	0	46.898	54.3298	14.55
+14	167	0	44.9928	55.4298	14.55
+14	168	0	43.0875	56.5298	14.55
+14	169	0	41.1823	57.6298	14.55
+14	170	0	39.277	58.7298	14.55
+14	171	0	37.3718	59.8298	14.55
+14	172	0	35.0335	61.1798	14.55
+14	173	0	33.1282	62.2798	14.55
+14	174	0	31.223	63.3798	14.55
+14	175	0	29.3177	64.4798	14.55
+14	176	0	27.4125	65.5798	14.55
+14	177	0	25.5072	66.6798	14.55
+14	178	0	23.602	67.7798	14.55
+14	179	0	21.6967	68.8798	14.55
+15	0	0	15.65	70.5	16.75
+15	1	0	13.45	70.5	16.75
+15	2	0	11.25	70.5	16.75
+15	3	0	9.05	70.5	16.75
+15	4	0	6.85	70.5	16.75
+15	5	0	4.65	70.5	16.75
+15	6	0	2.45	70.5	16.75
+15	7	0	-0.25	70.5	16.75
+15	8	0	-2.45	70.5	16.75
+15	9	0	-4.65	70.5	16.75
+15	10	0	-6.85	70.5	16.75
+15	11	0	-9.05	70.5	16.75
+15	12	0	-11.25	70.5	16.75
+15	13	0	-13.45	70.5	16.75
+15	14	0	-15.65	70.5	16.75
+15	15	0	-21.6967	68.8798	16.75
+15	16	0	-23.602	67.7798	16.75
+15	17	0	-25.5072	66.6798	16.75
+15	18	0	-27.4125	65.5798	16.75
+15	19	0	-29.3177	64.4798	16.75
+15	20	0	-31.223	63.3798	16.75
+15	21	0	-33.1282	62.2798	16.75
+15	22	0	-35.4665	60.9298	16.75
+15	23	0	-37.3718	59.8298	16.75
+15	24	0	-39.277	58.7298	16.75
+15	25	0	-41.1823	57.6298	16.75
+15	26	0	-43.0875	56.5298	16.75
+15	27	0	-44.9928	55.4298	16.75
+15	28	0	-46.898	54.3298	16.75
+15	29	0	-48.8033	53.2298	16.75
+15	30	0	-53.2298	48.8033	16.75
+15	31	0	-54.3298	46.898	16.75
+15	32	0	-55.4298	44.9928	16.75
+15	33	0	-56.5298	43.0875	16.75
+15	34	0	-57.6298	41.1823	16.75
+15	35	0	-58.7298	39.277	16.75
+15	36	0	-59.8298	37.3718	16.75
+15	37	0	-61.1798	35.0335	16.75
+15	38	0	-62.2798	33.1282	16.75
+15	39	0	-63.3798	31.223	16.75
+15	40	0	-64.4798	29.3177	16.75
+15	41	0	-65.5798	27.4125	16.75
+15	42	0	-66.6798	25.5072	16.75
+15	43	0	-67.7798	23.602	16.75
+15	44	0	-68.8798	21.6967	16.75
+15	45	0	-70.5	15.65	16.75
+15	46	0	-70.5	13.45	16.75
+15	47	0	-70.5	11.25	16.75
+15	48	0	-70.5	9.05	16.75
+15	49	0	-70.5	6.85	16.75
+15	50	0	-70.5	4.65	16.75
+15	51	0	-70.5	2.45	16.75
+15	52	0	-70.5	-0.25	16.75
+15	53	0	-70.5	-2.45	16.75
+15	54	0	-70.5	-4.65	16.75
+15	55	0	-70.5	-6.85	16.75
+15	56	0	-70.5	-9.05	16.75
+15	57	0	-70.5	-11.25	16.75
+15	58	0	-70.5	-13.45	16.75
+15	59	0	-70.5	-15.65	16.75
+15	60	0	-68.8798	-21.6967	16.75
+15	61	0	-67.7798	-23.602	16.75
+15	62	0	-66.6798	-25.5072	16.75
+15	63	0	-65.5798	-27.4125	16.75
+15	64	0	-64.4798	-29.3177	16.75
+15	65	0	-63.3798	-31.223	16.75
+15	66	0	-62.2798	-33.1282	16.75
+15	67	0	-60.9298	-35.4665	16.75
+15	68	0	-59.8298	-37.3718	16.75
+15	69	0	-58.7298	-39.277	16.75
+15	70	0	-57.6298	-41.1823	16.75
+15	71	0	-56.5298	-43.0875	16.75
+15	72	0	-55.4298	-44.9928	16.75
+15	73	0	-54.3298	-46.898	16.75
+15	74	0	-53.2298	-48.8033	16.75
+15	75	0	-48.8033	-53.2298	16.75
+15	76	0	-46.898	-54.3298	16.75
+15	77	0	-44.9928	-55.4298	16.75
+15	78	0	-43.0875	-56.5298	16.75
+15	79	0	-41.1823	-57.6298	16.75
+15	80	0	-39.277	-58.7298	16.75
+15	81	0	-37.3718	-59.8298	16.75
+15	82	0	-35.0335	-61.1798	16.75
+15	83	0	-33.1282	-62.2798	16.75
+15	84	0	-31.223	-63.3798	16.75
+15	85	0	-29.3177	-64.4798	16.75
+15	86	0	-27.4125	-65.5798	16.75
+15	87	0	-25.5072	-66.6798	16.75
+15	88	0	-23.602	-67.7798	16.75
+15	89	0	-21.6967	-68.8798	16.75
+15	90	0	-15.65	-70.5	16.75
+15	91	0	-13.45	-70.5	16.75
+15	92	0	-11.25	-70.5	16.75
+15	93	0	-9.05	-70.5	16.75
+15	94	0	-6.85	-70.5	16.75
+15	95	0	-4.65	-70.5	16.75
+15	96	0	-2.45	-70.5	16.75
+15	97	0	0.25	-70.5	16.75
+15	98	0	2.45	-70.5	16.75
+15	99	0	4.65	-70.5	16.75
+15	100	0	6.85	-70.5	16.75
+15	101	0	9.05	-70.5	16.75
+15	102	0	11.25	-70.5	16.75
+15	103	0	13.45	-70.5	16.75
+15	104	0	15.65	-70.5	16.75
+15	105	0	21.6967	-68.8798	16.75
+15	106	0	23.602	-67.7798	16.75
+15	107	0	25.5072	-66.6798	16.75
+15	108	0	27.4125	-65.5798	16.75
+15	109	0	29.3177	-64.4798	16.75
+15	110	0	31.223	-63.3798	16.75
+15	111	0	33.1282	-62.2798	16.75
+15	112	0	35.4665	-60.9298	16.75
+15	113	0	37.3718	-59.8298	16.75
+15	114	0	39.277	-58.7298	16.75
+15	115	0	41.1823	-57.6298	16.75
+15	116	0	43.0875	-56.5298	16.75
+15	117	0	44.9928	-55.4298	16.75
+15	118	0	46.898	-54.3298	16.75
+15	119	0	48.8033	-53.2298	16.75
+15	120	0	53.2298	-48.8033	16.75
+15	121	0	54.3298	-46.898	16.75
+15	122	0	55.4298	-44.9928	16.75
+15	123	0	56.5298	-43.0875	16.75
+15	124	0	57.6298	-41.1823	16.75
+15	125	0	58.7298	-39.277	16.75
+15	126	0	59.8298	-37.3718	16.75
+15	127	0	61.1798	-35.0335	16.75
+15	128	0	62.2798	-33.1282	16.75
+15	129	0	63.3798	-31.223	16.75
+15	130	0	64.4798	-29.3177	16.75
+15	131	0	65.5798	-27.4125	16.75
+15	132	0	66.6798	-25.5072	16.75
+15	133	0	67.7798	-23.602	16.75
+15	134	0	68.8798	-21.6967	16.75
+15	135	0	70.5	-15.65	16.75
+15	136	0	70.5	-13.45	16.75
+15	137	0	70.5	-11.25	16.75
+15	138	0	70.5	-9.05	16.75
+15	139	0	70.5	-6.85	16.75
+15	140	0	70.5	-4.65	16.75
+15	141	0	70.5	-2.45	16.75
+15	142	0	70.5	0.25	16.75
+15	143	0	70.5	2.45	16.75
+15	144	0	70.5	4.65	16.75
+15	145	0	70.5	6.85	16.75
+15	146	0	70.5	9.05	16.75
+15	147	0	70.5	11.25	16.75
+15	148	0	70.5	13.45	16.75
+15	149	0	70.5	15.65	16.75
+15	150	0	68.8798	21.6967	16.75
+15	151	0	67.7798	23.602	16.75
+15	152	0	66.6798	25.5072	16.75
+15	153	0	65.5798	27.4125	16.75
+15	154	0	64.4798	29.3177	16.75
+15	155	0	63.3798	31.223	16.75
+15	156	0	62.2798	33.1282	16.75
+15	157	0	60.9298	35.4665	16.75
+15	158	0	59.8298	37.3718	16.75
+15	159	0	58.7298	39.277	16.75
+15	160	0	57.6298	41.1823	16.75
+15	161	0	56.5298	43.0875	16.75
+15	162	0	55.4298	44.9928	16.75
+15	163	0	54.3298	46.898	16.75
+15	164	0	53.2298	48.8033	16.75
+15	165	0	48.8033	53.2298	16.75
+15	166	0	46.898	54.3298	16.75
+15	167	0	44.9928	55.4298	16.75
+15	168	0	43.0875	56.5298	16.75
+15	169	0	41.1823	57.6298	16.75
+15	170	0	39.277	58.7298	16.75
+15	171	0	37.3718	59.8298	16.75
+15	172	0	35.0335	61.1798	16.75
+15	173	0	33.1282	62.2798	16.75
+15	174	0	31.223	63.3798	16.75
+15	175	0	29.3177	64.4798	16.75
+15	176	0	27.4125	65.5798	16.75
+15	177	0	25.5072	66.6798	16.75
+15	178	0	23.602	67.7798	16.75
+15	179	0	21.6967	68.8798	16.75
diff --git a/examples/SAFIR_genericScanner/OSMAPOSL_QuadraticPrior.par b/examples/SAFIR_genericScanner/OSMAPOSL_QuadraticPrior.par
new file mode 100644
index 000000000..d9148d989
--- /dev/null
+++ b/examples/SAFIR_genericScanner/OSMAPOSL_QuadraticPrior.par
@@ -0,0 +1,91 @@
+OSMAPOSLParameters :=
+; example file for using a quadratic prior (with One Step Late and subsets)
+
+objective function type:= PoissonLogLikelihoodWithLinearModelForMeanAndProjData
+PoissonLogLikelihoodWithLinearModelForMeanAndProjData Parameters:=
+
+input file :=  test_generic_implementation_f1g1d0b0.hs
+	       
+; next keywords can be used to specify image size, but will be removed
+; they are ignored when using an initial image
+zoom := 1
+; use --1 for default sizes that cover the whole field of view
+;XY output image size (in pixels) := 61
+
+; if disabled, defaults to maximum segment number in the file
+maximum absolute segment number to process := 1
+; see User's Guide to see when you need this
+zero end planes of segment 0:= 1
+
+recompute sensitivity := 1
+use subset sensitivities:=1 ; recommended
+; optional filename to store/read the sensitivity image
+; (if use subset sensitivity is off)
+
+; optional filename to store/read the subsensitivities
+; use %d where you want the subset-number (a la printf)
+subset sensitivity filenames:= sens_%d.hv
+
+; if the next parameter is disabled,
+; the sensitivity will be computed
+sensitivity filename:= sens.hv
+; specify additive projection data to handle randoms or so
+; see User's Guide for more info
+additive sinogram := 0
+
+
+; here comes the prior stuff
+
+prior type := quadratic
+  Quadratic Prior Parameters:=
+  penalisation factor := 5
+  ; next defaults to 0, set to 1 for 2D inverse Euclidean weights, 0 for 3D
+  only 2D:= 0
+  ; next can be used to set weights explicitly. Needs to be a 3D array (of floats).
+  ; value of only_2D is ignored
+  ; following example uses 2D 'nearest neighbour' penalty
+  ; weights:={{{0,1,0},{1,0,1},{0,1,0}}}
+  ; use next parameter to specify an image with penalisation factors (a la Fessler)
+  ; see class documentation for more info
+  ; kappa filename:=
+  ; use next parameter to get gradient images at every subiteration
+  ; see class documentation
+  gradient filename prefix:=
+  END Quadratic Prior Parameters:=
+
+projector pair type := Matrix
+  Projector Pair Using Matrix Parameters :=
+  Matrix type := Ray Tracing
+  Ray tracing matrix parameters :=
+   ; use multiple (almost) parallel LORs for every bin in the sinogram
+   ; to avoid discretisation artefacts
+   number of rays in tangential direction to trace for each bin:=5
+   ; you could disable some symmetries if you have enough memory
+   ; this would for instance allow you to increase the number of subsets
+   do_symmetry_90degrees_min_phi:=0
+   do_symmetry_180degrees_min_phi:=0
+   do_symmetry_swap_segment:=0
+   do_symmetry_swap_s:=0
+   do_symmetry_shift_z:= 0
+   disable caching:= 1
+  End Ray tracing matrix parameters :=
+  End Projector Pair Using Matrix Parameters :=
+
+
+end PoissonLogLikelihoodWithLinearModelForMeanAndProjData Parameters:=
+
+;initial estimate:=
+; enable this when you read an initial estimate with negative data
+enforce initial positivity condition:=1
+
+output filename prefix := test_OSMAPOSL
+number of subsets:= 6 
+number of subiterations:= 6
+save estimates at subiteration intervals:= 3
+
+; enable this for multiplicative form of OSMAPOSL (see User's Guide)
+;MAP model := multiplicative
+
+post-filter type := None
+
+END :=
diff --git a/examples/SAFIR_genericScanner/README.txt b/examples/SAFIR_genericScanner/README.txt
new file mode 100644
index 000000000..adb1e078d
--- /dev/null
+++ b/examples/SAFIR_genericScanner/README.txt
@@ -0,0 +1,45 @@
+The PET scanner prototype of the SAFIR project has a high requirement for 
+precision. Therefore the simplification of projecting all detectors on a cylinder 
+(cylindric geometry) for the reconstruction instead of the real scanner form of 
+a dodecagon leads to a not sufficient spatial resolution. The block geometry 
+projects the detectors on a polygon, but the modules have the restriction of 
+consisting of equally sized blocks. The newest design of SAFIR does not fulfill 
+this condition. Therefore a third geometry (generic geometry) was implemented.
+It computes the position of the detectors used for the reconstruction based on 
+an external text file and hence is not dependent on the design of the detector.
+It requires the availability of the coordinates in an external file and that the
+rings consist of an constant number of detectors.
+
+The files in this directory are to test the new 'generic' implementation, to
+understand the changes and as model for later usage. 
+
+The bash script 'test.sh' runs the methods 'lm_to_projdata', 'backproject', 
+'forward_project' and 'OSMAPOSL' to test the functionality with the new scanner 
+geometry. It shows as well how the different parameter files are used. In the 
+next sections the different files and methods are explained more precisely.
+
+The first method call 'lm_to_projdata lm_to_projdata.par' turns the listmode 
+data in the file 'coincidencesLM.clm.safir' to projdata (a.k.a. sinogram data). 
+The parameter file contains the input SAFIR parameter file 
+'listmode_input_SAFIR.par' which specifies the above mentioned data file, the 
+crystal map file and the projdata file template 'muppet.hs'.
+The 'lm_to_projdata.par' parameter file contains as well the projdata file 
+template and the output file name. More infos about the other entries can be 
+found in the online documentation of STIR and another example file can be found 
+in 'example/samples/lm_to_projdata.par'.
+
+The projdata template file can be created with the utility 
+'create_projdata_template'. The new entries for this implementation are 'Name of 
+crystal map' which defines the name of the file which contains all coordinates 
+of the detectors like the example file 'DualRingPrototype_crystal_map.txt' and 
+it contains as well the new 'Scanner geometry' option 'Generic'. The 'crystal map'
+file should be in the same folder as the template file. For the other entries 
+please check the online documentation.
+
+'forward_project' and 'backproject' are the utilities that convert the sinogram 
+ data into an image and vice versa.
+ 
+The OSMAPOSL method is an iterative algorithm to get an image from the 
+sinogram data. It uses a parameter file as defined in the STIR user guide or 
+online documentation. There is as well another example file in 
+'example/samples'.
diff --git a/examples/SAFIR_genericScanner/coincidencesLM.clm.safir b/examples/SAFIR_genericScanner/coincidencesLM.clm.safir
new file mode 100644
index 000000000..521143db0
Binary files /dev/null and b/examples/SAFIR_genericScanner/coincidencesLM.clm.safir differ
diff --git a/examples/SAFIR_genericScanner/listmode_input_SAFIR.par b/examples/SAFIR_genericScanner/listmode_input_SAFIR.par
new file mode 100644
index 000000000..5fd11a2fc
--- /dev/null
+++ b/examples/SAFIR_genericScanner/listmode_input_SAFIR.par
@@ -0,0 +1,4 @@
+CListModeDataSAFIR Parameters:=
+        listmode data filename:= coincidencesLM.clm.safir
+        template projection data filename:= muppet.hs
+END CListModeDataSAFIR Parameters:=
diff --git a/examples/SAFIR_genericScanner/lm_to_projdata.par b/examples/SAFIR_genericScanner/lm_to_projdata.par
new file mode 100644
index 000000000..cefede0fe
--- /dev/null
+++ b/examples/SAFIR_genericScanner/lm_to_projdata.par
@@ -0,0 +1,41 @@
+lm_to_projdata Parameters:=
+
+  input file := listmode_input_SAFIR.par
+  output filename prefix := test_generic_implementation
+
+  ; parameters that determine the sizes etc of the output
+
+    template_projdata := muppet.hs
+    ; the next can be used to use a smaller number of segments than given
+    ; in the template
+    maximum absolute segment number to process := -1
+
+  ; parameters for saying which events will be stored
+
+    ; time frames (see TimeFrameDefinitions doc for format)
+    ; frame_definition file := frames.fdef
+    ; or a total number of events (if  larger than 0, frame definitions will be ignored)
+    ; note that this normally counts the total of prompts-delayeds (see below)
+    num_events_to_store := 100000000
+
+  ; parameters relating to prompts and delayeds
+
+    ; with the default values, prompts will be added and delayed subtracted
+    ; to give the usual estimate of the trues.
+
+    ; store the prompts (value should be 1 or 0)
+    store prompts := 1  ;default
+    ; what to do if it's a delayed event
+    store delayeds := 0  ;default
+
+  ; miscellaneous parameters
+
+    ; list each event on stdout and do not store any files (use only for testing!)
+    ; has to be 0 or 1
+    List event coordinates := 0
+
+    ; if you're short of RAM (i.e. a single projdata does not fit into memory),
+    ; you can use this to process the list mode data in multiple passes.
+    num_segments_in_memory := -1
+
+End :=
diff --git a/examples/SAFIR_genericScanner/muppet.hs b/examples/SAFIR_genericScanner/muppet.hs
new file mode 100644
index 000000000..9a59a5766
--- /dev/null
+++ b/examples/SAFIR_genericScanner/muppet.hs
@@ -0,0 +1,54 @@
+!INTERFILE  :=
+!imaging modality := PT
+name of data file := muppet.s
+originating system := double_ring_prototype
+!version of keys := STIR3.0
+!GENERAL DATA :=
+!GENERAL IMAGE DATA :=
+!type of data := PET
+imagedata byte order := LITTLEENDIAN
+!PET STUDY (General) :=
+!PET data type := Emission
+applied corrections := {None}
+!number format := float
+!number of bytes per pixel := 4
+number of dimensions := 4
+matrix axis label [4] := segment
+!matrix size [4] := 31
+matrix axis label [3] := view
+!matrix size [3] := 90
+matrix axis label [2] := axial coordinate
+!matrix size [2] := { 1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,15,14,13,12,11,10,9,8,7,6,5,4,3,2,1}
+matrix axis label [1] := tangential coordinate
+!matrix size [1] := 160
+minimum ring difference per segment := { -15,-14,-13,-12,-11,-10,-9,-8,-7,-6,-5,-4,-3,-2,-1,0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15}
+maximum ring difference per segment := { -15,-14,-13,-12,-11,-10,-9,-8,-7,-6,-5,-4,-3,-2,-1,0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15}
+Scanner parameters:= 
+Scanner type := double_ring_prototype
+Number of rings                          := 16
+Number of detectors per ring             := 180
+Inner ring diameter (cm)                 := 12.8
+Average depth of interaction (cm)        := 0.65
+Distance between rings (cm)      	 := 0.22
+Default bin size (cm)                    := 0.22
+View offset (degrees)                    := 0
+Maximum number of non-arc-corrected bins := 160
+Default number of arc-corrected bins     := 160
+Number of blocks per bucket in transaxial direction         := 2
+Number of blocks per bucket in axial direction              := 1
+Number of crystals per block in axial direction             := 8
+Number of crystals per block in transaxial direction        := 8
+Number of detector layers                                   := 1
+Number of crystals per singles unit in axial direction      := 1
+Number of crystals per singles unit in transaxial direction := 1
+Name of crystal map                                         := DualRingPrototype_crystal_map.txt
+Scanner orientation (X or Y)                                := Y
+Scanner geometry (BlocksOnCylindrical/Cylindrical/Generic)  := Generic
+Distance between crystals in axial direction (cm)           := 0.22
+Distance between crystals in transaxial direction (cm)      := 0.22
+Distance between blocks in axial direction (cm)             := 1.81
+Distance between blocks in transaxial direction (cm)        := 1.81
+end scanner parameters:=
+effective central bin size (cm) := 0.134942
+number of time frames := 1
+!END OF INTERFILE :=
diff --git a/examples/SAFIR_genericScanner/muppet.s b/examples/SAFIR_genericScanner/muppet.s
new file mode 100644
index 000000000..e69de29bb
diff --git a/examples/SAFIR_genericScanner/template_image.hv b/examples/SAFIR_genericScanner/template_image.hv
new file mode 100644
index 000000000..922254f3d
--- /dev/null
+++ b/examples/SAFIR_genericScanner/template_image.hv
@@ -0,0 +1,26 @@
+!INTERFILE  :=
+name of data file := template_image.v
+!GENERAL DATA :=
+!GENERAL IMAGE DATA :=
+!type of data := PET
+imagedata byte order := LITTLEENDIAN
+!PET STUDY (General) :=
+!PET data type := Image
+process status := Reconstructed
+!number format := float
+!number of bytes per pixel := 4
+number of dimensions := 3
+matrix axis label [1] := x
+!matrix size [1] := 65
+scaling factor (mm/pixel) [1] := 2.2
+matrix axis label [2] := y
+!matrix size [2] := 65
+scaling factor (mm/pixel) [2] := 2.2
+matrix axis label [3] := z
+!matrix size [3] := 31
+scaling factor (mm/pixel) [3] := 1.1
+first pixel offset (mm) [1] := -70.4
+first pixel offset (mm) [2] := -70.4
+first pixel offset (mm) [3] := 0
+number of time frames := 1
+!END OF INTERFILE :=
diff --git a/examples/SAFIR_genericScanner/template_image.v b/examples/SAFIR_genericScanner/template_image.v
new file mode 100644
index 000000000..fd15d1093
Binary files /dev/null and b/examples/SAFIR_genericScanner/template_image.v differ
diff --git a/examples/SAFIR_genericScanner/test.sh b/examples/SAFIR_genericScanner/test.sh
new file mode 100755
index 000000000..517bb6cbf
--- /dev/null
+++ b/examples/SAFIR_genericScanner/test.sh
@@ -0,0 +1,26 @@
+#!/bin/bash
+
+
+lm_path=
+project_path=
+OSMAPOSL_path=
+
+# If you have built the STIR installation locally and do not have the methods 
+# in your PATH variable, then uncomment the path variables and adapt the path 
+# to your build folder 
+#build_path=/home/<pathtobuild>/src
+#lm_path=${build_path}/listmode_utilities/
+#project_path=${build_path}/utilities/
+#OSMAPOSL_path=${build_path}/iterative/OSMAPOSL/
+
+# Creates a projdata file (.hs, .s) out of listmode data 
+${lm_path}lm_to_projdata lm_to_projdata.par &&\
+
+# Creates an image out of the projdata
+${project_path}back_project test_back test_generic_implementation_f1g1d0b0.hs template_image.hv &&\
+
+# Creates projdata out of an image
+${project_path}forward_project test_forward test_back.hv muppet.hs &&\
+
+# Use the iterative algorithm OSMAPOSL to get an image out of the projdata
+${OSMAPOSL_path}OSMAPOSL OSMAPOSL_QuadraticPrior.par
diff --git a/examples/python/plot_scanner_LORs.py b/examples/python/plot_scanner_LORs.py
new file mode 100644
index 000000000..31ab67d6e
--- /dev/null
+++ b/examples/python/plot_scanner_LORs.py
@@ -0,0 +1,229 @@
+# Demo of how to use STIR from python to plot line of responses of a blocksOnCylindrical scanner in different 2D 
+# orientation and in 3Ds. The plots show the coordinate system used in STIR with labels L for left, R for right, 
+# P for posterior, A for anterior, H for Head and F for feet. This is easily modifiable for Cylindrical scanner. 
+# To run in "normal" Python, you would type the following in the command line
+#  execfile('plot_scanner_LORs.py')
+# In ipython, you can use
+#  %run plot_scanner_LORs.py
+
+# Copyright 2021 University College London
+# Copyright 2021 National Phyisical Laboratory
+
+# Author Daniel Deidda
+# Author Kris Thielemans
+
+# This file is part of STIR.
+#
+# SPDX-License-Identifier: Apache-2.0
+#
+# See STIR/LICENSE.txt for details
+
+
+#%% imports
+
+import stir
+import stirextra
+import pylab
+import numpy
+import math
+import os
+import matplotlib.pyplot as plt
+from mpl_toolkits.mplot3d import Axes3D
+import matplotlib.cm as cm
+#%% definition of useful objects and variables
+
+scanner=stir.Scanner_get_scanner_from_name('SAFIRDualRingPrototype')
+scanner.set_num_transaxial_blocks_per_bucket(1)
+scanner.set_intrinsic_azimuthal_tilt(0)
+# scanner.set_num_axial_crystals_per_block(1)
+# scanner.set_axial_block_spacing(scanner.get_axial_crystal_spacing()*scanner.get_num_axial_crystals_per_block());
+# scanner.set_num_rings(1)
+scanner.set_scanner_geometry("BlocksOnCylindrical")
+# scanner.set_up();
+
+Nr=scanner.get_num_rings()
+Nv=scanner.get_max_num_views()
+NaBl=scanner.get_num_axial_blocks()
+NtBu=scanner.get_num_transaxial_blocks()/scanner.get_num_transaxial_blocks_per_bucket()
+aBl_s=scanner.get_axial_block_spacing()
+tBl_s=scanner.get_transaxial_block_spacing()
+tC_s=scanner.get_transaxial_crystal_spacing()
+r=scanner.get_effective_ring_radius()
+
+NtCpBl=scanner.get_num_transaxial_crystals_per_block()
+NtBlpBu=scanner.get_num_transaxial_blocks_per_bucket()
+NaCpBl=scanner.get_num_axial_crystals_per_block()
+NaBlpBu=scanner.get_num_axial_blocks_per_bucket()
+NCpR=scanner.get_num_detectors_per_ring()
+
+min_r_diff=stir.IntVectorWithOffset((2*Nr-1))
+max_r_diff=stir.IntVectorWithOffset((2*Nr-1))
+num_ax_pps=stir.IntVectorWithOffset((2*Nr-1))
+
+csi=math.pi/NtBu
+tBl_gap=tBl_s-NtCpBl*tC_s
+csi_minus_csiGaps=csi-(csi/tBl_s*2)*(tC_s/2+tBl_gap)
+rmax =r/math.cos(csi_minus_csiGaps)
+
+scanner.set_intrinsic_azimuthal_tilt(-csi_minus_csiGaps) #if you want to play with the orientation of the blocks
+scanner.set_up()
+#%% Create projection data info for Blocks on Cylindrical
+for i in range(0,2*Nr-1,1 ):
+    min_r_diff[i]=-Nr+1+i
+    max_r_diff[i]=-Nr+1+i
+    if i<Nr:
+        num_ax_pps[i]=Nr+min_r_diff[i]
+    else:
+        num_ax_pps[i]=Nr-min_r_diff[i]
+    # print(num_ax_pps[i])
+
+
+proj_data_info_blocks=stir.ProjDataInfoBlocksOnCylindricalNoArcCorr(scanner, num_ax_pps, min_r_diff, max_r_diff, scanner.get_max_num_views(), scanner.get_max_num_non_arccorrected_bins())
+
+
+#%% Plot 2D XY LORs for segment, axial position and tangential position =0
+b1=stir.FloatCartesianCoordinate3D;
+b2=stir.FloatCartesianCoordinate3D;
+lor=stir.FloatLORInAxialAndNoArcCorrSinogramCoordinates;
+
+fig=plt.figure()
+ax=plt.axes()
+plt.xlim([-rmax, rmax])
+plt.ylim([-rmax, rmax])
+ax.set_xlabel('X ')
+ax.set_ylabel('Y ')
+
+color_v = iter(cm.tab20(numpy.linspace(0, 10, NCpR)))
+c=next(color_v)
+tB_num2=-1
+
+for v in range(0, Nv, 5):
+    tB_nim_i, tB_num_f=divmod(v/NtCpBl,1)
+    tB_num=int(tB_nim_i)
+    bin=stir.Bin(0,v,0,0)
+
+    if tB_num>tB_num2:
+        c=next(color_v)
+
+    tB_num2=tB_num
+    b1=proj_data_info_blocks.find_cartesian_coordinate_of_detection_1(bin)
+    b2=proj_data_info_blocks.find_cartesian_coordinate_of_detection_2(bin)
+    
+    plt.plot((b1.x(), b2.x()),(b1.y(), b2.y()),color=c)
+    plt.plot(b1.x(),b1.y(),'o',color=c, label="Block %s - det %s" % (tB_num, v))
+
+    # Shrink current axis %
+    box = ax.get_position()
+    ax.set_position([box.x0-box.y0*0.04, box.y0+box.y0*0.01, box.width, box.height])
+    ax.set_aspect('equal', 'box')
+    plt.legend(loc='best',bbox_to_anchor=(1., 1.),fancybox=True)
+    # plt.show()  #if debugging we can se how the LORs are order
+plt.gca().invert_yaxis()
+plt.text(-65,65,"PL")
+plt.text(65,65,"PR")
+plt.text(-65,-65,"AL")
+plt.text(65,-65,"AR")
+plt.savefig('2D-2BlocksPerBuckets-ObliqueAt0degrees-XY-LOR.png', format='png', dpi=300)
+plt.show()    
+plt.close();
+
+# # %% the following is an example when using LOR coordinates
+# fig=plt.figure(figsize=(12, 12))
+# ax=plt.axes()
+# plt.xlim([-rmax, rmax])
+# plt.ylim([-rmax, rmax])
+# ax.set_xlabel('X ')
+# ax.set_ylabel('Y ')
+
+# for v in range(0, Nv, 5):
+#     bin=stir.Bin(0,v,0,0)
+#     lor=proj_data_info_blocks.get_lor(bin)
+#     phi=lor.phi();
+#     r=lor.radius()
+#     plt.plot((r*math.sin(phi), r*math.sin(phi+math.pi)),(-r*math.cos(phi), -r*math.cos(phi+math.pi)))
+#     plt.show()
+# plt.gca().invert_yaxis()
+# plt.show()    
+# plt.savefig('2D-XY-LOR-cyl.png', format='png', dpi=300)
+
+# plt.close()
+
+#%% Plot 2D ZY LORs 
+ax=plt.axes()
+plt.xlim([0, NaBl*aBl_s])
+plt.ylim([-rmax, rmax])
+ax.set_xlabel('Z ')
+ax.set_ylabel('Y ')
+
+color_a = iter(cm.tab20(numpy.linspace(0, 1, Nr)))
+c=next(color_a)
+aB_num2=-1
+
+for a in range(0,(Nr), 1):
+    aB_nim_i, aB_num_f=divmod(a/NaCpBl,1)
+    aB_num=int(aB_nim_i)
+    bin=stir.Bin(0,v,0,0)
+
+    if aB_num>aB_num2:
+        c=next(color_a)
+
+    aB_num2=aB_num
+    bin=stir.Bin((Nr-1),0,a,0)
+    b1=proj_data_info_blocks.find_cartesian_coordinate_of_detection_1(bin)
+    b2=proj_data_info_blocks.find_cartesian_coordinate_of_detection_2(bin)
+    
+    plt.plot((b1.z(), b2.z()),(b1.y(), b2.y()),color=c)
+    plt.plot(b1.z(),b1.y(),'o',color=c, label="Block %s - ring %s" % (aB_num, a))
+
+    # Shrink current axis 
+    box = ax.get_position()
+    ax.set_position([box.x0-box.x0*0.01, box.y0+box.y0*0.01, box.width * .985, box.height])
+    plt.legend(loc='best',bbox_to_anchor=(1., 1.),fancybox=True)
+
+    # plt.show()
+plt.gca().invert_yaxis()
+plt.text(0.2,69,"PH")
+plt.text(0.2,-65,"AH")
+plt.text(34,69,"PF")
+plt.text(34,-65,"AF")
+plt.savefig('2D-YZ-LOR.png', format='png', dpi=300)
+plt.show()
+plt.close()
+
+
+#%% Plot 3D  LORs 
+ax=plt.axes(projection='3d')
+ax.set_xlim([-rmax, rmax])
+ax.set_ylim([-rmax, rmax])
+ax.set_zlim([0, NaBl*aBl_s])
+ax.set_xlabel('X ')
+ax.set_ylabel('Y ')
+ax.set_zlabel('Z ')
+color_a = iter(cm.tab20(numpy.linspace(0, 1, Nr)))
+c=next(color_a)
+aB_num2=-1
+
+for a in range(0,(Nr), 4):
+    for v in range(0, Nv, 30):
+        # aB_nim_i, aB_num_f=divmod(a/NaCpBl,1)
+        # aB_num=int(aB_nim_i)
+        bin=stir.Bin((Nr-1),v,a,0)
+        
+        # if aB_num>aB_num2:
+        c=next(color_a)
+            
+        # aB_num2=aB_num
+        b1=proj_data_info_blocks.find_cartesian_coordinate_of_detection_1(bin)
+        b2=proj_data_info_blocks.find_cartesian_coordinate_of_detection_2(bin)
+        plt.plot((b1.x(), b2.x()),(b1.y(), b2.y()),(b1.z(), b2.z()),color=c)
+        ax.scatter3D(b1.x(),b1.y(),b1.z(),'o',color=c, label="ring %s - detector %s" % (a, v))
+
+        # Shrink current axis by 1.5%
+        box = ax.get_position()
+        ax.set_position([box.x0-box.x0*0.12, box.y0+box.y0*0.01, box.width * .985, box.height])
+        
+        plt.legend(loc='best',bbox_to_anchor=(1., 1.),fancybox=True)
+        # plt.show()
+plt.gca().invert_yaxis()
+plt.savefig('3dLOR.png', format='png', dpi=300)
+plt.show()
\ No newline at end of file
diff --git a/recon_test_pack/run_test_simulate_and_recon.sh b/recon_test_pack/run_test_simulate_and_recon.sh
index ec2f8b7b1..d955c5814 100755
--- a/recon_test_pack/run_test_simulate_and_recon.sh
+++ b/recon_test_pack/run_test_simulate_and_recon.sh
@@ -70,6 +70,7 @@ LC_ALL=C
 export LC_ALL
 
 ./simulate_PET_data_for_tests.sh
+
 if [ $? -ne 0 ]; then
   echo "Error running simulation"
   exit 1
diff --git a/recon_test_pack/run_test_simulate_and_recon_with_motion.sh b/recon_test_pack/run_test_simulate_and_recon_with_motion.sh
index e6f925e1f..61fda5434 100755
--- a/recon_test_pack/run_test_simulate_and_recon_with_motion.sh
+++ b/recon_test_pack/run_test_simulate_and_recon_with_motion.sh
@@ -117,6 +117,7 @@ echo "===  create template sinogram (DSTE in 3D with max ring diff 2 to save tim
 template_sino=my_DSTE_3D_rd2_template.hs
 cat > my_input.txt <<EOF
 Discovery STE
+
 1
 n
 
diff --git a/recon_test_pack/run_test_zoom_image.sh b/recon_test_pack/run_test_zoom_image.sh
index 3c21ba61e..ceb528be6 100755
--- a/recon_test_pack/run_test_zoom_image.sh
+++ b/recon_test_pack/run_test_zoom_image.sh
@@ -147,6 +147,7 @@ echo "===  create template sinogram (DSTE in 3D with max ring diff 2 to save tim
 template_sino=my_DSTE_3D_rd2_template.hs
 cat > my_input.txt <<EOF
 Discovery STE
+
 1
 n
 
diff --git a/recon_test_pack/simulate_PET_data_for_tests.sh b/recon_test_pack/simulate_PET_data_for_tests.sh
index be365f651..6c0d759f1 100755
--- a/recon_test_pack/simulate_PET_data_for_tests.sh
+++ b/recon_test_pack/simulate_PET_data_for_tests.sh
@@ -76,6 +76,7 @@ echo "===  create template sinogram (DSTE in 3D with max ring diff 2 to save tim
 template_sino=my_DSTE_3D_rd2_template.hs
 cat > my_input.txt <<EOF
 Discovery STE
+
 1
 n
 
diff --git a/src/IO/InterfileHeader.cxx b/src/IO/InterfileHeader.cxx
index 6e3d6b59d..94925dd08 100644
--- a/src/IO/InterfileHeader.cxx
+++ b/src/IO/InterfileHeader.cxx
@@ -3,6 +3,7 @@
     Copyright (C) 2000 - 2009-04-30, Hammersmith Imanet Ltd
     Copyright (C) 2011-07-01 - 2012, Kris Thielemans
     Copyright (C) 2013, 2016, 2018, 2020 University College London
+    Copyright 2017 ETH Zurich, Institute of Particle Physics and Astrophysics
     This file is part of STIR.
 
     SPDX-License-Identifier: Apache-2.0 AND License-ref-PARAPET-license
@@ -17,6 +18,7 @@
   \author Kris Thielemans
   \author PARAPET project
   \author Richard Brown
+  \author Parisa Khateri
 */
 
 #include "stir/IO/InterfileHeader.h"
@@ -30,6 +32,8 @@
 #include "stir/info.h"
 #include <numeric>
 #include <functional>
+#include "stir/ProjDataInfoBlocksOnCylindricalNoArcCorr.h"
+#include "stir/ProjDataInfoGenericNoArcCorr.h"
 
 #ifndef STIR_NO_NAMESPACES
 using std::binary_function;
@@ -614,6 +618,36 @@ InterfilePDFSHeader::InterfilePDFSHeader()
   add_key("Reference energy (in keV)",
           &reference_energy);
 
+  // new keys for block geometry
+  scanner_orientation = "X";
+  add_key("Scanner orientation (X or Y)",
+          KeyArgument::ASCII, &scanner_orientation);
+
+  scanner_geometry = "Cylindrical";
+  add_key("Scanner geometry (BlocksOnCylindrical/Cylindrical/Generic)",
+          KeyArgument::ASCII, &scanner_geometry);
+
+  axial_distance_between_crystals_in_cm = -0.1;
+  add_key("distance between crystals in axial direction (cm)",
+          &axial_distance_between_crystals_in_cm);
+
+  transaxial_distance_between_crystals_in_cm = -0.1;
+  add_key("distance between crystals in transaxial direction (cm)",
+          &transaxial_distance_between_crystals_in_cm);
+
+  axial_distance_between_blocks_in_cm = -0.1;
+  add_key("distance between blocks in axial direction (cm)",
+          &axial_distance_between_blocks_in_cm);
+
+  transaxial_distance_between_blocks_in_cm = -0.1;
+  add_key("distance between blocks in transaxial direction (cm)",
+        &transaxial_distance_between_blocks_in_cm);
+  // end of new keys for block geometry
+  //new keys for generic geometry
+  crystal_map = "";
+  add_key("Name of crystal map", &crystal_map);
+  //end of new keys for generic geometry
+
   ignore_key("end scanner parameters");
   
   effective_central_bin_size_in_cm = -1;
@@ -1104,7 +1138,18 @@ bool InterfilePDFSHeader::post_processing()
         energy_resolution = guessed_scanner_ptr->get_energy_resolution();
     if (reference_energy < 0)
         reference_energy = guessed_scanner_ptr->get_reference_energy();
-    
+  
+    // new variables for block geometry
+    if (axial_distance_between_crystals_in_cm < 0)
+      axial_distance_between_crystals_in_cm = guessed_scanner_ptr->get_transaxial_crystal_spacing()/10;
+    if (transaxial_distance_between_crystals_in_cm < 0)
+      transaxial_distance_between_crystals_in_cm = guessed_scanner_ptr->get_transaxial_crystal_spacing()/10;
+    if (axial_distance_between_blocks_in_cm < 0)
+      axial_distance_between_blocks_in_cm = guessed_scanner_ptr->get_axial_block_spacing()/10;
+    if (transaxial_distance_between_blocks_in_cm < 0)
+      transaxial_distance_between_blocks_in_cm = guessed_scanner_ptr->get_transaxial_block_spacing()/10;
+    // end of new variables for block geometry
+
     // consistency check with values of the guessed_scanner_ptr we guessed above
 
     if (num_rings != guessed_scanner_ptr->get_num_rings())
@@ -1240,6 +1285,37 @@ bool InterfilePDFSHeader::post_processing()
 //    mismatch_between_header_and_guess = true;
       }
     }
+    
+    // new variables for block geometry
+    if (fabs(axial_distance_between_crystals_in_cm
+              -guessed_scanner_ptr->get_axial_crystal_spacing()/10) > .001)
+      {
+  warning("Interfile warning: 'distance between crystals in axial direction (cm)' (%f) is expected to be %f.\n",
+       axial_distance_between_crystals_in_cm, guessed_scanner_ptr->get_axial_crystal_spacing()/10);
+       mismatch_between_header_and_guess = true;
+      }
+    if (fabs(transaxial_distance_between_crystals_in_cm
+              -guessed_scanner_ptr->get_transaxial_crystal_spacing()/10) > .001)
+      {
+  warning("Interfile warning: 'distance between crystals in transaxial direction (cm)' (%f) is expected to be %f.\n",
+       transaxial_distance_between_crystals_in_cm, guessed_scanner_ptr->get_transaxial_crystal_spacing()/10);
+       mismatch_between_header_and_guess = true;
+      }
+    if (fabs(axial_distance_between_blocks_in_cm
+              -guessed_scanner_ptr->get_axial_block_spacing()/10) > .001)
+      {
+  warning("Interfile warning: 'distance between crystals in axial direction (cm)' (%f) is expected to be %f.\n",
+       axial_distance_between_blocks_in_cm, guessed_scanner_ptr->get_axial_block_spacing()/10);
+       mismatch_between_header_and_guess = true;
+      }
+  if (fabs(transaxial_distance_between_blocks_in_cm
+            -guessed_scanner_ptr->get_transaxial_block_spacing()/10) > .001)
+     {
+  warning("Interfile warning: 'distance between crystals in axial direction (cm)' (%f) is expected to be %f.\n",
+    transaxial_distance_between_blocks_in_cm, guessed_scanner_ptr->get_transaxial_block_spacing()/10);
+    mismatch_between_header_and_guess = true;
+     }
+   // end of new variables for block geometry
 
     // end of checks. If they failed, we ignore the guess
     if (mismatch_between_header_and_guess)
@@ -1278,7 +1354,16 @@ bool InterfilePDFSHeader::post_processing()
       warning("Interfile warning: 'axial crystals per singles unit' invalid.\n");
     if (num_transaxial_crystals_per_singles_unit <= 0)
       warning("Interfile warning: 'transaxial crystals per singles unit' invalid.\n");
-
+    // new variables for block geometry
+    if (axial_distance_between_crystals_in_cm <= 0)
+      warning("Interfile warning: 'distance between crystals in axial direction (cm)' invalid.\n");
+    if (transaxial_distance_between_crystals_in_cm <= 0)
+      warning("Interfile warning: 'distance between crystals in transaxial direction (cm)' invalid.\n");
+    if (axial_distance_between_blocks_in_cm <= 0)
+      warning("Interfile warning: 'distance between blocks in axial direction (cm)' invalid.\n");
+    if (transaxial_distance_between_blocks_in_cm <= 0)
+      warning("Interfile warning: 'distance between blocks in transaxial direction (cm)' invalid.\n");
+    // end of new variables for block geometry
   }
 
   // finally, we construct a new scanner object with
@@ -1303,7 +1388,15 @@ bool InterfilePDFSHeader::post_processing()
                 num_transaxial_crystals_per_singles_unit,
                 num_detector_layers,
                 energy_resolution,
-                reference_energy));
+                reference_energy,
+                scanner_orientation,
+                scanner_geometry,
+                static_cast<float>(axial_distance_between_crystals_in_cm*10.),
+                static_cast<float>(transaxial_distance_between_crystals_in_cm*10.),
+                static_cast<float>(axial_distance_between_blocks_in_cm*10.),
+                static_cast<float>(transaxial_distance_between_blocks_in_cm*10.),
+                crystal_map
+                ));
 
   bool is_consistent =
     scanner_ptr_from_file->check_consistency() == Succeeded::yes;
@@ -1321,7 +1414,8 @@ bool InterfilePDFSHeader::post_processing()
   
   
    
-  
+    if (scanner_geometry == "Cylindrical")
+      {
   if (is_arccorrected)
     {
       if (effective_central_bin_size_in_cm <= 0)
@@ -1364,7 +1458,48 @@ bool InterfilePDFSHeader::post_processing()
 		  data_info_sptr->get_sampling_in_s(Bin(0,0,0,0))/10.);
 	}
     }
-  //cerr << data_info_ptr->parameter_info() << endl;
+      }
+    else if(scanner_geometry == "BlocksOnCylindrical")// if block geometry
+      {
+        data_info_sptr.reset(
+          new ProjDataInfoBlocksOnCylindricalNoArcCorr (
+                  scanner_ptr_from_file,
+                  sorted_num_rings_per_segment,
+                  sorted_min_ring_diff,
+                  sorted_max_ring_diff,
+                  num_views,num_bins));
+        if (effective_central_bin_size_in_cm>0 &&
+          fabs(effective_central_bin_size_in_cm -
+              data_info_sptr->get_sampling_in_s(Bin(0,0,0,0))/10.)>.01)
+        {
+      warning("Interfile warning: inconsistent effective_central_bin_size_in_cm\n"
+        "Value in header is %g while I expect %g from the inner ring radius etc\n"
+        "Ignoring value in header",
+        effective_central_bin_size_in_cm,
+        data_info_sptr->get_sampling_in_s(Bin(0,0,0,0))/10.);
+        }    
+      }
+      else  // if generic geometry
+        {
+            data_info_sptr.reset(
+        new ProjDataInfoGenericNoArcCorr (
+                      scanner_ptr_from_file,
+                      sorted_num_rings_per_segment,
+                      sorted_min_ring_diff,
+                      sorted_max_ring_diff,
+                      num_views,num_bins));
+            if (effective_central_bin_size_in_cm>0 &&
+                    fabs(effective_central_bin_size_in_cm -
+                    data_info_sptr->get_sampling_in_s(Bin(0,0,0,0))/10.)>.01)
+            {
+                warning("Interfile warning: inconsistent effective_central_bin_size_in_cm\n"
+                "Value in header is %g while I expect %g from the inner ring radius etc\n"
+                "Ignoring value in header",
+                effective_central_bin_size_in_cm,
+                data_info_sptr->get_sampling_in_s(Bin(0,0,0,0))/10.);
+            }
+        }
+  //cerr << data_info_sptr->parameter_info() << endl;
   
   // Set the bed position
   data_info_sptr->set_bed_position_horizontal(bed_position_horizontal);
diff --git a/src/IO/interfile.cxx b/src/IO/interfile.cxx
index f0cd4c8de..2dbe67b2f 100644
--- a/src/IO/interfile.cxx
+++ b/src/IO/interfile.cxx
@@ -2,6 +2,7 @@
     Copyright (C) 2000 PARAPET partners
     Copyright (C) 2000- 2011, Hammersmith Imanet Ltd
     Copyright (C) 2013, 2018, University College London
+    Copyright 2017 ETH Zurich, Institute of Particle Physics and Astrophysics
     This file is part of STIR.
 
     SPDX-License-Identifier: Apache-2.0 AND License-ref-PARAPET-license
@@ -18,6 +19,7 @@
   \author Sanida Mustafovic
   \author PARAPET project
   \author Richard Brown
+  \author Parisa Khateri
 */
 //   Pretty horrible implementations at the moment...
 
@@ -51,6 +53,9 @@
 #include <boost/format.hpp>
 #include <fstream>
 #include <algorithm>
+#include "stir/ProjDataInfoBlocksOnCylindricalNoArcCorr.h"
+#include "stir/ProjDataInfoGenericNoArcCorr.h"
+
 
 #ifndef STIR_NO_NAMESPACES
 using std::cerr;
@@ -1410,7 +1415,93 @@ write_basic_interfile_PDFS_header(const string& header_file_name,
      } // end of cylindrical scanner
   else
     {
-      // TODO something here
+      // !author Parisa Khateri
+      const shared_ptr<const ProjDataInfoBlocksOnCylindrical> proj_data_info_sptr =
+        dynamic_pointer_cast<const ProjDataInfoBlocksOnCylindrical>(pdfs.get_proj_data_info_sptr());
+        
+      if (proj_data_info_sptr!=NULL)
+      {
+        // BlocksOncylindrical scanners
+        output_header << "minimum ring difference per segment := ";
+            {
+        std::vector<int>::const_iterator seg = segment_sequence.begin();
+        output_header << "{ " << proj_data_info_sptr->get_min_ring_difference(*seg);
+        for (seg++; seg != segment_sequence.end(); seg++)
+          output_header << "," <<proj_data_info_sptr->get_min_ring_difference(*seg);
+        output_header << "}\n";
+            }
+
+        output_header << "maximum ring difference per segment := ";
+            {
+        std::vector<int>::const_iterator seg = segment_sequence.begin();
+        output_header << "{ " <<proj_data_info_sptr->get_max_ring_difference(*seg);
+        for (seg++; seg != segment_sequence.end(); seg++)
+          output_header << "," <<proj_data_info_sptr->get_max_ring_difference(*seg);
+        output_header << "}\n";
+            }
+
+        const Scanner& scanner = *proj_data_info_sptr->get_scanner_ptr();
+#if 0 // KT commented out. currently no get_ring_radius() anymore
+        if (fabs(proj_data_info_sptr->get_ring_radius()-
+        scanner.get_effective_ring_radius()) > .1)
+      warning("write_basic_interfile_PDFS_header: inconsistent effective ring radius:\n"
+         "\tproj_data_info has %g, scanner has %g.\n"
+         "\tThis really should not happen and signifies a bug.\n"
+         "\tYou will have a problem reading this data back in.",
+         proj_data_info_sptr->get_ring_radius(),
+         scanner.get_effective_ring_radius());
+#endif
+          if (fabs(proj_data_info_sptr->get_ring_spacing()-
+        scanner.get_ring_spacing()) > .1)
+       warning("write_basic_interfile_PDFS_header: inconsistent ring spacing:\n"
+         "\tproj_data_info has %g, scanner has %g.\n"
+         "\tThis really should not happen and signifies a bug.\n"
+         "\tYou will have a problem reading this data back in.",
+         proj_data_info_sptr->get_ring_spacing(),
+         scanner.get_ring_spacing());
+
+          output_header << scanner.parameter_info();
+
+          output_header << "effective central bin size (cm) := "
+              << proj_data_info_sptr->get_sampling_in_s(Bin(0,0,0,0))/10. << endl;
+
+      }// end of BlocksOnCylindrical scanner
+      else  // generic scanner
+      {
+        const shared_ptr<const ProjDataInfoGeneric> proj_data_info_sptr =
+          dynamic_pointer_cast<const ProjDataInfoGeneric>(pdfs.get_proj_data_info_sptr());
+
+          if (proj_data_info_sptr!=NULL)
+          {
+              output_header << "minimum ring difference per segment := ";
+              {
+                  std::vector<int>::const_iterator seg = segment_sequence.begin();
+                  output_header << "{ " << proj_data_info_sptr->get_min_ring_difference(*seg);
+              	  for (seg++; seg != segment_sequence.end(); seg++)
+                    output_header << "," <<proj_data_info_sptr->get_min_ring_difference(*seg);
+              	  output_header << "}\n";
+              }
+
+              output_header << "maximum ring difference per segment := ";
+              {
+              	 std::vector<int>::const_iterator seg = segment_sequence.begin();
+              	 output_header << "{ " <<proj_data_info_sptr->get_max_ring_difference(*seg);
+              	 for (seg++; seg != segment_sequence.end(); seg++)
+              	   output_header << "," <<proj_data_info_sptr->get_max_ring_difference(*seg);
+              	 output_header << "}\n";
+              }
+
+              const Scanner& scanner = *proj_data_info_sptr->get_scanner_ptr();
+
+              output_header << scanner.parameter_info();
+
+              output_header << "effective central bin size (cm) := "
+              		     << proj_data_info_sptr->get_sampling_in_s(Bin(0,0,0,0))/10. << endl;
+
+            } // end generic scanner
+            
+          else error("write_basic_interfile_PDFS_header: Error casting the projdata to one of its geometries: Cylindrical/BlocksOnCylindrical/Genreic");
+        }  
     }
 
 
diff --git a/src/buildblock/CMakeLists.txt b/src/buildblock/CMakeLists.txt
index 2a5196748..0e4e647f9 100644
--- a/src/buildblock/CMakeLists.txt
+++ b/src/buildblock/CMakeLists.txt
@@ -88,6 +88,12 @@ set(${dir_LIB_SOURCES}
         GeneralisedPoissonNoiseGenerator.cxx
         FilePath.cxx
         date_time_functions.cxx
+        DetectorCoordinateMap.cxx
+       GeometryBlocksOnCylindrical.cxx
+        ProjDataInfoBlocksOnCylindricalNoArcCorr.cxx
+        ProjDataInfoGeneric.cxx
+        ProjDataInfoGenericNoArcCorr.cxx
+        date_time_functions.cxx
 )
 if (HAVE_HDF5)
  list(APPEND ${dir_LIB_SOURCES}
diff --git a/src/buildblock/DetectorCoordinateMap.cxx b/src/buildblock/DetectorCoordinateMap.cxx
new file mode 100644
index 000000000..cf8e5daab
--- /dev/null
+++ b/src/buildblock/DetectorCoordinateMap.cxx
@@ -0,0 +1,209 @@
+/* 
+	Copyright 2015, 2017 ETH Zurich, Institute of Particle Physics
+    Copyright (C) 2021 University College London
+    This file is part of STIR.
+
+    SPDX-License-Identifier: Apache-2.0
+
+    See STIR/LICENSE.txt for details
+*/
+/*!
+
+  \file
+  \ingroup buildblock
+  \brief Implementation of class stir::DetectorCoordinateMap
+
+  \author Jannis Fischer
+  \author Parisa Khateri
+  \author Michael Roethlisberger
+  \author Kris Thielemans
+*/
+
+#include "stir/error.h"
+#include "stir/DetectorCoordinateMap.h"
+#include "stir/modulo.h"
+#include "stir/Succeeded.h"
+
+START_NAMESPACE_STIR
+	
+DetectorCoordinateMap::det_pos_to_coord_type DetectorCoordinateMap::read_detectormap_from_file_help( const std::string& filename )
+{
+	std::ifstream myfile(filename.c_str());
+	if( !myfile ) 
+	{
+		error("Error opening file '" + filename + "'");
+	}
+
+    det_pos_to_coord_type coord_map;
+	std::string line;
+	while( std::getline( myfile, line))
+	{
+		if( line.size() && line[0] == '#' ) continue;
+		bool has_layer_index = false;
+		stir::CartesianCoordinate3D<float> coord;
+		stir::DetectionPosition<> detpos;
+		std::vector<std::string> col;
+		boost::split(col, line, boost::is_any_of("\t,"));
+		if( !col.size() ) break;
+		else if( col.size() == 5 ) has_layer_index = false;
+		else if( col.size() == 6 ) has_layer_index = true;
+		coord[1] = static_cast<float>(atof(col[4+has_layer_index].c_str() ));
+		coord[2] = static_cast<float>(atof(col[3+has_layer_index].c_str() ));
+		coord[3] = static_cast<float>(atof(col[2+has_layer_index].c_str() ));
+		
+		if( !has_layer_index ) detpos.radial_coord() = 0;
+		else detpos.radial_coord() = atoi(col[2].c_str());
+		detpos.axial_coord() = atoi(col[0].c_str());
+		detpos.tangential_coord() = atoi(col[1].c_str());
+
+		coord_map[detpos] = coord;
+	}
+	return coord_map;
+}
+
+
+void DetectorCoordinateMap::set_detector_map( const DetectorCoordinateMap::det_pos_to_coord_type& coord_map )
+{
+    // The detector crystal coordinates are saved in coord_map the following way:
+    // (detector#, ring#, 1)[(x,y,z)]
+    // the detector# and ring# are determined outside of STIR (later given in input)
+    // In order to fulfill the STIR convention we have to give the coordinates  
+    // detector# and ring# defined by ourself so that the start (0,0) goes to the 
+    // coordinate with the smallest z and smallest y and the detector# is  
+    // counterclockwise rising.
+    // To achieve this, we assign each coordinate the value 'coord_sorter' which
+    // is the assigned value of the criteria mentioned above. With it we sort the 
+    // coordinates and fill the to maps 'input_index_to_det_pos' and 
+    // 'det_pos_to_coord'.
+    std::vector<double> coords_to_be_sorted;
+    boost::unordered_map<double, stir::DetectionPosition<> > map_for_sorting_coordinates;
+    coords_to_be_sorted.reserve(coord_map.size());
+
+    unsigned min_tangential_coord = 1000000U;
+    unsigned min_axial_coord = 1000000U;
+    unsigned min_radial_coord = 1000000U;
+    num_tangential_coords = 0U;
+    num_axial_coords = 0U;
+    num_radial_coords = 0U;
+    for(auto it : coord_map)
+    {
+        double coord_sorter = it.second[1] * 100 + from_min_pi_plus_pi_to_0_2pi(std::atan2(it.second[3], -it.second[2]));
+        coords_to_be_sorted.push_back(coord_sorter);
+        map_for_sorting_coordinates[coord_sorter] = it.first;
+
+        const auto detpos = it.first;
+        if (num_tangential_coords <= detpos.tangential_coord())
+          num_tangential_coords = detpos.tangential_coord()+1;
+        if (min_tangential_coord > detpos.tangential_coord())
+          min_tangential_coord = detpos.tangential_coord();
+        if (num_axial_coords <= detpos.axial_coord())
+          num_axial_coords = detpos.axial_coord()+1;
+        if (min_axial_coord > detpos.axial_coord())
+          min_axial_coord = detpos.axial_coord();
+        if (num_radial_coords <= detpos.radial_coord())
+          num_radial_coords = detpos.radial_coord()+1;
+        if (min_radial_coord > detpos.radial_coord())
+          min_radial_coord = detpos.radial_coord(); 
+    }
+
+    if ((min_tangential_coord != 0) || (min_axial_coord != 0) || (min_radial_coord != 0))
+      error("DetectorCoordinateMap::set_detector_map: minimum indices have to be zero.");
+    if ((num_tangential_coords * num_axial_coords * num_radial_coords) != coord_map.size())
+        error("DetectorCoordinateMap::set_detector_map: maximum indices inconsistent with a regular 3D array.\n"
+              "Sizes derived from indices: tangential " + std::to_string(num_tangential_coords) +
+              ", axial " +std::to_string(num_axial_coords) + ", radial " + std::to_string(num_radial_coords) +
+              "\nOveral  size: " + std::to_string(coord_map.size()));
+
+//    std::sort(coords_to_be_sorted.begin(), coords_to_be_sorted.end());
+    stir::DetectionPosition<> detpos(0,0,0);
+    for(std::vector<double>::iterator it = coords_to_be_sorted.begin(); it != coords_to_be_sorted.end();++it)
+      {
+#if 0
+        input_index_to_det_pos[map_for_sorting_coordinates[*it]] = detpos;
+        auto cart_coord = coord_map.at(map_for_sorting_coordinates[*it]);
+#else
+        input_index_to_det_pos[detpos] = detpos;
+        auto cart_coord = coord_map.at(detpos);
+#endif
+        // rounding cart_coord to 3 and 2 decimal points then filling maps
+        cart_coord.z() = (round(cart_coord.z()*1000.0F))/1000.0F;
+        cart_coord.y() = (round(cart_coord.y()*1000.0F))/1000.0F;
+        cart_coord.x() = (round(cart_coord.x()*1000.0F))/1000.0F;
+	det_pos_to_coord[detpos] = cart_coord;
+        detection_position_map_given_cartesian_coord_keys_3_decimal[cart_coord] = detpos; //used to find bin from listmode data
+        cart_coord.z() = (round(cart_coord.z()*100.0F))/100.0F;
+        cart_coord.y() = (round(cart_coord.y()*100.0F))/100.0F;
+        cart_coord.x() = (round(cart_coord.x()*100.0F))/100.0F;
+        detection_position_map_given_cartesian_coord_keys_2_decimal[cart_coord] = detpos;
+
+        ++detpos.tangential_coord();
+        if (detpos.tangential_coord() == num_tangential_coords)
+          {
+            ++detpos.axial_coord();
+            detpos.tangential_coord() = 0;
+            if (detpos.axial_coord() == num_axial_coords)
+              {
+                ++detpos.radial_coord();
+                detpos.axial_coord() = 0;
+              }
+          }
+      }
+}
+
+// creates maps to convert between stir and 3d coordinates
+void DetectorCoordinateMap::read_detectormap_from_file( const std::string& filename )
+{
+  det_pos_to_coord_type coord_map =
+  read_detectormap_from_file_help(filename);
+  set_detector_map(coord_map);
+}
+
+Succeeded
+DetectorCoordinateMap::
+find_detection_position_given_cartesian_coordinate(DetectionPosition<>& det_pos,
+                                                   const CartesianCoordinate3D<float>& cart_coord) const
+{
+  /*! first round the cartesian coordinates, it might happen that the cart_coord
+   is not precisely pointing to the center of the crystal and
+   then the det_pos cannot be found using the map
+  */
+  //rounding cart_coord to 3 decimal place and find det_pos
+  CartesianCoordinate3D<float> rounded_cart_coord;
+  rounded_cart_coord.z() = round(cart_coord.z()*1000.0F)/1000.0F;
+  rounded_cart_coord.y() = round(cart_coord.y()*1000.0F)/1000.0F;
+  rounded_cart_coord.x() = round(cart_coord.x()*1000.0F)/1000.0F;
+	if (detection_position_map_given_cartesian_coord_keys_3_decimal.count(rounded_cart_coord))
+	{
+          det_pos =	detection_position_map_given_cartesian_coord_keys_3_decimal.at(rounded_cart_coord);
+          return Succeeded::yes;
+	}
+	else
+	{
+          //rounding cart_coord to 2 decimal place and find det_pos
+		rounded_cart_coord.z() = round(cart_coord.z()*100.0F)/100.0F;
+		rounded_cart_coord.y() = round(cart_coord.y()*100.0f)/100.0F;
+		rounded_cart_coord.x() = round(cart_coord.x()*100.0F)/100.0F;
+		if (detection_position_map_given_cartesian_coord_keys_2_decimal.count(rounded_cart_coord))
+		{
+                  det_pos =	detection_position_map_given_cartesian_coord_keys_2_decimal.at(rounded_cart_coord);
+                  return Succeeded::yes;
+		}
+		else
+		{
+			rounded_cart_coord.z() = round(cart_coord.z()*10.0F)/10.0F;
+			rounded_cart_coord.y() = round(cart_coord.y()*10.0f)/10.0F;
+			rounded_cart_coord.x() = round(cart_coord.x()*10.0F)/10.0F;
+			if (detection_position_map_given_cartesian_coord_keys_2_decimal.count(rounded_cart_coord))
+			{
+                  det_pos =	detection_position_map_given_cartesian_coord_keys_2_decimal.at(rounded_cart_coord);
+                  return Succeeded::yes;
+			}else{
+				warning("cartesian coordinate (x, y, z)=(%f, %f, %f) does not exist in the inner map",
+							cart_coord.x(), cart_coord.y(), cart_coord.z());
+				return Succeeded::no;
+			}
+		}
+	}
+}
+
+END_NAMESPACE_STIR
diff --git a/src/buildblock/GeometryBlocksOnCylindrical.cxx b/src/buildblock/GeometryBlocksOnCylindrical.cxx
new file mode 100755
index 000000000..455992fe6
--- /dev/null
+++ b/src/buildblock/GeometryBlocksOnCylindrical.cxx
@@ -0,0 +1,157 @@
+
+/*
+Copyright 2017 ETH Zurich, Institute of Particle Physics and Astrophysics
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+	http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+/*!
+  \file
+  \ingroup projdata
+
+  \brief  Non-inline implementations of stir::GeometryBlocksOnCylindrical
+
+  \author Parisa Khateri
+
+*/
+
+#include "stir/DetectionPosition.h"
+#include "stir/CartesianCoordinate3D.h"
+#include "stir/Scanner.h"
+#include "stir/shared_ptr.h"
+#include "stir/GeometryBlocksOnCylindrical.h"
+#include <string>
+#include <cmath>
+#include "stir/Array.h"
+#include "stir/make_array.h"
+#include "stir/numerics/MatrixFunction.h"
+#include <map>
+#include <iostream>
+#include <fstream>
+#include <iomanip>
+
+START_NAMESPACE_STIR
+
+GeometryBlocksOnCylindrical::
+GeometryBlocksOnCylindrical(const Scanner& scanner)
+{
+  build_crystal_maps(scanner);
+}
+
+stir::Array<2, float>
+GeometryBlocksOnCylindrical::
+get_rotation_matrix(float alpha) const
+{
+  return stir::make_array(
+                          stir::make_1d_array(1.F,0.F,0.F),
+                          stir::make_1d_array(0.F, std::cos(alpha), std::sin(alpha)),
+                          stir::make_1d_array(0.F, -1*std::sin(alpha), std::cos(alpha))
+                          );
+}
+
+void
+GeometryBlocksOnCylindrical::
+build_crystal_maps(const Scanner& scanner)
+{
+	// local variables to describe scanner
+	int num_axial_crystals_per_block = scanner.get_num_axial_crystals_per_block();
+	int num_transaxial_crystals_per_block = scanner.get_num_transaxial_crystals_per_block();
+	int num_axial_blocks = scanner.get_num_axial_blocks();
+	int num_transaxial_blocks_per_bucket = scanner.get_num_transaxial_blocks_per_bucket();
+	int num_axial_blocks_per_bucket = scanner.get_num_axial_blocks_per_bucket();
+	int num_transaxial_buckets = scanner.get_num_transaxial_blocks()/num_transaxial_blocks_per_bucket;
+	int num_axial_buckets = scanner.get_num_axial_blocks()/num_axial_blocks_per_bucket;
+	int num_detectors_per_ring = scanner.get_num_detectors_per_ring();
+	float axial_block_spacing = scanner.get_axial_block_spacing();
+	float transaxial_block_spacing = scanner.get_transaxial_block_spacing();
+	float axial_crystal_spacing = scanner.get_axial_crystal_spacing();
+	float transaxial_crystal_spacing = scanner.get_transaxial_crystal_spacing();
+	std::string scanner_orientation = scanner.get_scanner_orientation();
+
+	det_pos_to_coord_type cartesian_coord_map_given_detection_position_keys;
+	// check for the scanner orientation
+	/*Building starts from a bucket perpendicular to y axis, from its first crystal.
+		see start_x*/
+
+		//calculate start_point to build the map.
+
+//    estimate the angle covered by half bucket, csi
+    float csi=_PI/num_transaxial_buckets;
+    float trans_blocks_gap=transaxial_block_spacing-num_transaxial_crystals_per_block*transaxial_crystal_spacing;
+    float ax_blocks_gap=axial_block_spacing-num_axial_crystals_per_block*axial_crystal_spacing;
+    float csi_minus_csiGaps=csi-(csi/transaxial_block_spacing*2)*
+            (transaxial_crystal_spacing/2+trans_blocks_gap);
+//    distance between the center of the scannner and the first crystal in the bucket, r=Reffective/cos(csi)
+    float r=scanner.get_effective_ring_radius()/cos(csi_minus_csiGaps);
+    
+	float start_z = -(axial_block_spacing*(num_axial_blocks_per_bucket)*num_axial_buckets
+                       -axial_crystal_spacing - ax_blocks_gap
+                       *(num_axial_blocks_per_bucket*num_axial_buckets-1))/2;
+	float start_y = -1*scanner.get_effective_ring_radius();
+	float start_x = -1*r*sin(csi_minus_csiGaps);//(
+//								((num_transaxial_blocks_per_bucket-1)/2.)*transaxial_block_spacing
+//							+ ((num_transaxial_crystals_per_block-1)/2.)*transaxial_crystal_spacing
+//											); //the first crystal in the bucket
+    
+	stir::CartesianCoordinate3D<float> start_point(start_z, start_y, start_x);
+
+	for (int ax_bucket_num=0; ax_bucket_num<num_axial_buckets; ++ax_bucket_num)
+		for (int ax_block_num=0; ax_block_num<num_axial_blocks; ++ax_block_num)
+			for (int ax_crys_num=0; ax_crys_num<num_axial_crystals_per_block; ++ax_crys_num)
+				for (int trans_bucket_num=0; trans_bucket_num<num_transaxial_buckets; ++trans_bucket_num)
+					for (int trans_block_num=0; trans_block_num<num_transaxial_blocks_per_bucket; ++trans_block_num)
+						for (int trans_crys_num=0; trans_crys_num<num_transaxial_crystals_per_block; ++trans_crys_num)
+	{
+		// calculate detection position for a given detector
+		// note: in STIR convention, crystal(0,0,0) corresponds to card_coord(z=0,y=-r,x=0)
+		int tangential_coord;
+			tangential_coord = trans_bucket_num*num_transaxial_blocks_per_bucket*num_transaxial_crystals_per_block
+														+ trans_block_num*num_transaxial_crystals_per_block
+														+ trans_crys_num;
+		
+		if (tangential_coord<0)
+					tangential_coord += num_detectors_per_ring;
+
+		int axial_coord = ax_bucket_num*num_axial_blocks_per_bucket*num_axial_crystals_per_block
+														+ ax_block_num*num_axial_crystals_per_block 
+														+ ax_crys_num;
+		int radial_coord = 0;
+		stir::DetectionPosition<> det_pos(tangential_coord, axial_coord, radial_coord);
+
+		//calculate cartesian coordinate for a given detector
+		stir::CartesianCoordinate3D<float> transformation_matrix(
+									ax_block_num*axial_block_spacing + ax_crys_num*axial_crystal_spacing,
+									0.,
+									trans_block_num*transaxial_block_spacing + trans_crys_num*transaxial_crystal_spacing);
+		float alpha = scanner.get_intrinsic_azimuthal_tilt()+
+                trans_bucket_num*(2*_PI)/num_transaxial_buckets+csi_minus_csiGaps;
+
+		stir::Array<2, float> rotation_matrix = get_rotation_matrix(alpha);
+		// to match index range of CartesianCoordinate3D, which is 1 to 3
+		rotation_matrix.set_min_index(1);
+		rotation_matrix[1].set_min_index(1);
+		rotation_matrix[2].set_min_index(1);
+		rotation_matrix[3].set_min_index(1);
+
+		stir::CartesianCoordinate3D<float> transformed_coord =
+								start_point + transformation_matrix;
+		stir::CartesianCoordinate3D<float> cart_coord =
+								stir::matrix_multiply(rotation_matrix, transformed_coord);
+
+		cartesian_coord_map_given_detection_position_keys[det_pos] = cart_coord;
+	}
+        set_detector_map(cartesian_coord_map_given_detection_position_keys);
+}
+
+
+END_NAMESPACE_STIR
diff --git a/src/buildblock/ProjDataInfo.cxx b/src/buildblock/ProjDataInfo.cxx
index 0e06cf54e..c2c9f0cd6 100644
--- a/src/buildblock/ProjDataInfo.cxx
+++ b/src/buildblock/ProjDataInfo.cxx
@@ -25,6 +25,8 @@
 #include "stir/ProjDataInfo.h"
 #include "stir/ProjDataInfoCylindricalArcCorr.h"
 #include "stir/ProjDataInfoCylindricalNoArcCorr.h"
+#include "stir/ProjDataInfoBlocksOnCylindricalNoArcCorr.h"
+#include "stir/ProjDataInfoGenericNoArcCorr.h"
 #include "stir/Scanner.h"
 #include "stir/Viewgram.h"
 #include "stir/Sinogram.h"
@@ -67,7 +69,7 @@ float
 ProjDataInfo::get_sampling_in_t(const Bin& bin) const
 {
   return
-    (get_t(Bin(bin.segment_num(), bin.view_num(), bin.axial_pos_num()+1,bin.tangential_pos_num())) -
+    abs(get_t(Bin(bin.segment_num(), bin.view_num(), bin.axial_pos_num()+1,bin.tangential_pos_num())) -
      get_t(Bin(bin.segment_num(), bin.view_num(), bin.axial_pos_num()-1,bin.tangential_pos_num()))
      )/2;
 }
@@ -76,7 +78,7 @@ float
 ProjDataInfo::get_sampling_in_m(const Bin& bin) const
 {
   return
-    (get_m(Bin(bin.segment_num(), bin.view_num(), bin.axial_pos_num()+1,bin.tangential_pos_num())) -
+    abs(get_m(Bin(bin.segment_num(), bin.view_num(), bin.axial_pos_num()+1,bin.tangential_pos_num())) -
      get_m(Bin(bin.segment_num(), bin.view_num(), bin.axial_pos_num()-1,bin.tangential_pos_num()))
      )/2;
 }
@@ -86,7 +88,7 @@ float
 ProjDataInfo::get_sampling_in_s(const Bin& bin) const
 {
   return
-    (get_s(Bin(bin.segment_num(), bin.view_num(), bin.axial_pos_num(),bin.tangential_pos_num()+1)) -
+    abs(get_s(Bin(bin.segment_num(), bin.view_num(), bin.axial_pos_num(),bin.tangential_pos_num()+1)) -
      get_s(Bin(bin.segment_num(), bin.view_num(), bin.axial_pos_num(),bin.tangential_pos_num()-1))
      )/2;
 }
@@ -413,22 +415,34 @@ ProjDataInfo::ProjDataInfoCTI(const shared_ptr<Scanner>& scanner,
   
   const float bin_size = scanner->get_default_bin_size();
   
-  
-  if (arc_corrected)
+  if (scanner->get_scanner_geometry() == "BlocksOnCylindrical")
+    return
+      new ProjDataInfoBlocksOnCylindricalNoArcCorr(scanner,
+                                   num_axial_pos_per_segment,
+                                   min_ring_difference,
+                                   max_ring_difference,
+                                   num_views,num_tangential_poss);
+  else if (scanner->get_scanner_geometry() == "Generic")
+    return
+      new ProjDataInfoGenericNoArcCorr(scanner,
+                                   num_axial_pos_per_segment,
+                                   min_ring_difference,
+                                   max_ring_difference,
+                                   num_views,num_tangential_poss);
+  else if (scanner->get_scanner_geometry() == "Cylindrical" && arc_corrected)
     return
     new ProjDataInfoCylindricalArcCorr(scanner,bin_size,
                                        num_axial_pos_per_segment,
-                                       min_ring_difference, 
+                                       min_ring_difference,
                                        max_ring_difference,
                                        num_views,num_tangential_poss);
   else
     return
     new ProjDataInfoCylindricalNoArcCorr(scanner,
-                                       num_axial_pos_per_segment,
-                                       min_ring_difference, 
-                                       max_ring_difference,
-                                       num_views,num_tangential_poss);
-
+                                   num_axial_pos_per_segment,
+                                   min_ring_difference,
+                                   max_ring_difference,
+                                   num_views,num_tangential_poss);
 }
 
 unique_ptr<ProjDataInfo>
diff --git a/src/buildblock/ProjDataInfoBlocksOnCylindricalNoArcCorr.cxx b/src/buildblock/ProjDataInfoBlocksOnCylindricalNoArcCorr.cxx
new file mode 100644
index 000000000..d5393a476
--- /dev/null
+++ b/src/buildblock/ProjDataInfoBlocksOnCylindricalNoArcCorr.cxx
@@ -0,0 +1,181 @@
+
+/*
+    Copyright (C) 2000- 2007-10-08, Hammersmith Imanet Ltd
+    Copyright (C) 2011-07-01 - 2011, Kris Thielemans
+    Copyright (C) 2017, ETH Zurich, Institute of Particle Physics and Astrophysics
+    Copyright (C) 2018, University College London
+    Copyright (C) 2018, University of Leeds
+    This file is part of STIR.
+
+    SPDX-License-Identifier: Apache-2.0
+    See STIR/LICENSE.txt for details
+*/
+
+/*!
+  \file
+  \ingroup projdata
+
+  \brief  Non-inline implementations of
+  stir::ProjDataInfoBlocksOnCylindricalNoArcCorr
+
+  \author Kris Thielemans
+  \author Palak Wadhwa
+  \author Parisa Khateri
+
+*/
+
+#include "stir/ProjDataInfoBlocksOnCylindricalNoArcCorr.h"
+#include "stir/Bin.h"
+#include "stir/LORCoordinates.h"
+#include "stir/round.h"
+#include "stir/DetectionPosition.h"
+#include <iostream>
+#include <fstream>
+
+#ifdef BOOST_NO_STRINGSTREAM
+#include <strstream.h>
+#else
+#include <sstream>
+#endif
+
+#ifndef STIR_NO_NAMESPACES
+using std::endl;
+using std::ends;
+#endif
+
+START_NAMESPACE_STIR
+ProjDataInfoBlocksOnCylindricalNoArcCorr::
+ProjDataInfoBlocksOnCylindricalNoArcCorr()
+{}
+
+ProjDataInfoBlocksOnCylindricalNoArcCorr::
+ProjDataInfoBlocksOnCylindricalNoArcCorr(const shared_ptr<Scanner> scanner_ptr,
+                                 const  VectorWithOffset<int>& num_axial_pos_per_segment,
+                                 const  VectorWithOffset<int>& min_ring_diff_v,
+                                 const  VectorWithOffset<int>& max_ring_diff_v,
+                                 const int num_views,const int num_tangential_poss)
+: ProjDataInfoGenericNoArcCorr(scanner_ptr,
+                          num_axial_pos_per_segment,
+                          min_ring_diff_v, max_ring_diff_v,
+                          num_views, num_tangential_poss)
+{
+  if (is_null_ptr(scanner_ptr))
+    error("ProjDataInfoBlocksOnCylindricalNoArcCorr needs to be initialised with a non-empty Scanner");
+  if (scanner_ptr->get_scanner_geometry() != "BlocksOnCylindrical")
+    error("ProjDataInfoBlocksOnCylindricalNoArcCorr needs to be initialised with a Scanner with appropriate geometry");
+}
+
+
+
+ProjDataInfo*
+ProjDataInfoBlocksOnCylindricalNoArcCorr::clone() const
+{
+  return static_cast<ProjDataInfo*>(new ProjDataInfoBlocksOnCylindricalNoArcCorr(*this));
+}
+
+bool
+ProjDataInfoBlocksOnCylindricalNoArcCorr::
+operator==(const self_type& that) const
+{
+  if (!base_type::blindly_equals(&that))
+    return false;
+  // TODOBLOCKS check crystal_map
+  return
+    true;
+}
+
+bool
+ProjDataInfoBlocksOnCylindricalNoArcCorr::
+blindly_equals(const root_type * const that_ptr) const
+{
+  assert(dynamic_cast<const self_type * const>(that_ptr) != 0);
+  return
+    this->operator==(static_cast<const self_type&>(*that_ptr));
+}
+
+std::string
+ProjDataInfoBlocksOnCylindricalNoArcCorr::parameter_info()  const
+{
+
+ #ifdef BOOST_NO_STRINGSTREAM
+  // dangerous for out-of-range, but 'old-style' ostrstream seems to need this
+  char str[50000];
+  ostrstream s(str, 50000);
+ #else
+  std::ostringstream s;
+ #endif
+  s << "ProjDataInfoBlocksOnCylindricalNoArcCorr := \n";
+  s << base_type::parameter_info();
+  s << "End :=\n";
+  return s.str();
+}
+
+//!warning Use crystal map
+Succeeded
+ProjDataInfoBlocksOnCylindricalNoArcCorr::
+find_scanner_coordinates_given_cartesian_coordinates(int& det1, int& det2, int& ring1, int& ring2,
+					             const CartesianCoordinate3D<float>& c1,
+						     	 const CartesianCoordinate3D<float>& c2) const
+{
+
+  DetectionPosition<> det_pos1;
+  DetectionPosition<> det_pos2;
+  if (get_scanner_ptr()->find_detection_position_given_cartesian_coordinate(det_pos1, c1-this->z_shift)==Succeeded::no ||
+      get_scanner_ptr()->find_detection_position_given_cartesian_coordinate(det_pos2, c2-this->z_shift)==Succeeded::no)
+  {
+    return Succeeded::no;
+  }
+
+  det1 = det_pos1.tangential_coord();
+  det2 = det_pos2.tangential_coord();
+  ring1 = det_pos1.axial_coord();
+  ring2 = det_pos2.axial_coord();
+
+  assert(det1 >=0 && det1<get_scanner_ptr()->get_num_detectors_per_ring());
+  assert(det2 >=0 && det2<get_scanner_ptr()->get_num_detectors_per_ring());
+
+  return
+    (ring1 >=0 && ring1<get_scanner_ptr()->get_num_rings() &&
+     ring2 >=0 && ring2<get_scanner_ptr()->get_num_rings() &&
+     det1!=det2)
+     ? Succeeded::yes : Succeeded::no;
+}
+
+void
+ProjDataInfoBlocksOnCylindricalNoArcCorr::
+find_bin_given_cartesian_coordinates_of_detection(Bin& bin,
+						  const CartesianCoordinate3D<float>& coord_1,
+						  const CartesianCoordinate3D<float>& coord_2) const
+{
+  int det_num_a;
+  int det_num_b;
+  int ring_a;
+  int ring_b;
+
+  // given two CartesianCoordinates find the intersection
+  if (find_scanner_coordinates_given_cartesian_coordinates(det_num_a,det_num_b,
+							   ring_a, ring_b,
+							   coord_1,
+							   coord_2) ==
+      Succeeded::no)
+  {
+    bin.set_bin_value(-1);
+    return;
+  }
+
+  // check rings are in valid range
+  // this should have been done by find_scanner_coordinates_given_cartesian_coordinates
+  assert(!(ring_a<0 ||
+	   ring_a>=get_scanner_ptr()->get_num_rings() ||
+	   ring_b<0 ||
+	   ring_b>=get_scanner_ptr()->get_num_rings()));
+
+  if (get_bin_for_det_pair(bin,
+			   det_num_a, ring_a,
+			   det_num_b, ring_b) == Succeeded::no ||
+      bin.tangential_pos_num() < get_min_tangential_pos_num() ||
+      bin.tangential_pos_num() > get_max_tangential_pos_num())
+    bin.set_bin_value(-1);
+}
+
+END_NAMESPACE_STIR
diff --git a/src/buildblock/ProjDataInfoGeneric.cxx b/src/buildblock/ProjDataInfoGeneric.cxx
new file mode 100755
index 000000000..e97c76ec8
--- /dev/null
+++ b/src/buildblock/ProjDataInfoGeneric.cxx
@@ -0,0 +1,146 @@
+/*
+    Copyright (C) 2000 PARAPET partners
+    Copyright (C) 2000 - 2009-10-18 Hammersmith Imanet Ltd
+    Copyright (C) 2011, Kris Thielemans
+    Copyright (C) 2017 ETH Zurich, Institute of Particle Physics and Astrophysics
+    Copyright (C) 2013, 2018, 2021, University College London
+
+    This file is part of STIR.
+
+    SPDX-License-Identifier: Apache-2.0 AND License-ref-PARAPET-license
+
+    See STIR/LICENSE.txt for details
+*/
+
+/*!
+
+  \file
+  \ingroup projdata
+
+  \brief Non-inline implementations of stir::ProjDataInfoGeneric
+
+  \author Kris Thielemans
+  \author Sanida Mustafovic
+  \author PARAPET project
+  \author Parisa Khateri
+  \author Michael Roethlisberger
+*/
+
+
+#include "stir/ProjDataInfoGeneric.h"
+#include "stir/LORCoordinates.h"
+#include <algorithm>
+#ifdef BOOST_NO_STRINGSTREAM
+#include <strstream.h>
+#else
+#include <sstream>
+#endif
+
+#include "stir/round.h"
+#include <math.h>
+
+#ifndef STIR_NO_NAMESPACES
+using std::min_element;
+using std::max_element;
+using std::min;
+using std::max;
+using std::swap;
+using std::endl;
+#endif
+
+START_NAMESPACE_STIR
+
+ProjDataInfoGeneric::
+ProjDataInfoGeneric()
+{}
+
+
+ProjDataInfoGeneric::
+ProjDataInfoGeneric(const shared_ptr<Scanner>& scanner_ptr,
+                        const VectorWithOffset<int>& num_axial_pos_per_segment,
+                        const VectorWithOffset<int>& min_ring_diff_v,
+                        const VectorWithOffset<int>& max_ring_diff_v,
+                        const int num_views,const int num_tangential_poss)
+  :ProjDataInfoCylindrical(scanner_ptr,num_axial_pos_per_segment,
+                           min_ring_diff_v, max_ring_diff_v, num_views,num_tangential_poss)
+{
+}
+
+#if 0
+/*! Default implementation checks common variables. Needs to be overloaded.
+ */
+bool
+ProjDataInfoGeneric::
+blindly_equals(const root_type * const that) const
+{
+  if (!base_type::blindly_equals(that))
+    return false;
+
+  const self_type& proj_data_info = static_cast<const self_type&>(*that);
+  return
+    true;
+}
+#endif
+
+void
+ProjDataInfoGeneric::
+set_num_views(const int new_num_views)
+{
+  if (new_num_views != get_num_views())
+    error("ProjDataInfoGeneric::set_num_views not supported");
+}
+#if 0 // TODOBLOCK
+void
+ProjDataInfoGeneric::
+set_ring_spacing(float ring_spacing_v)
+{
+  ring_diff_arrays_computed = false;
+  ring_spacing = ring_spacing_v;
+}
+#endif
+
+//! warning Find lor from cartesian coordinates of detector pair
+void
+ProjDataInfoGeneric::
+get_LOR(LORInAxialAndNoArcCorrSinogramCoordinates<float>& lor,
+	const Bin& bin) const
+{
+	CartesianCoordinate3D<float> _p1;
+	CartesianCoordinate3D<float> _p2;
+	find_cartesian_coordinates_of_detection(_p1, _p2, bin);
+    
+    _p1.z()-=z_shift.z();
+    _p2.z()-=z_shift.z();
+    
+	LORAs2Points<float> lor_as_2_points(_p1, _p2);
+	const double R = sqrt(max(square(_p1.x())+square(_p1.y()), square(_p2.x())+square(_p2.y())));
+    
+    lor_as_2_points.change_representation(lor, R);
+}
+
+std::string
+ProjDataInfoGeneric::parameter_info()  const
+{
+
+#ifdef BOOST_NO_STRINGSTREAM
+  // dangerous for out-of-range, but 'old-style' ostrstream seems to need this
+  char str[30000];
+  ostrstream s(str, 30000);
+#else
+  std::ostringstream s;
+#endif
+  s << ProjDataInfo::parameter_info();
+  // TODOBLOCK Cylindrical has the following which doesn't make sense for Generic, so repeat code
+  //s << "Azimuthal angle increment (deg):   " << get_azimuthal_angle_sampling()*180/_PI << '\n';
+  //s << "Azimuthal angle extent (deg):      " << fabs(get_azimuthal_angle_sampling())*get_num_views()*180/_PI << '\n';
+
+  s << "ring differences per segment: \n";
+  for (int segment_num=get_min_segment_num(); segment_num<=get_max_segment_num(); ++segment_num)
+  {
+    s << '(' << get_min_ring_difference(segment_num)  << ',' << get_max_ring_difference(segment_num) <<')';
+  }
+  s << std::endl;
+  return s.str();
+}
+
+END_NAMESPACE_STIR
diff --git a/src/buildblock/ProjDataInfoGenericNoArcCorr.cxx b/src/buildblock/ProjDataInfoGenericNoArcCorr.cxx
new file mode 100644
index 000000000..bff19f716
--- /dev/null
+++ b/src/buildblock/ProjDataInfoGenericNoArcCorr.cxx
@@ -0,0 +1,435 @@
+/*
+    Copyright (C) 2000- 2007-10-08, Hammersmith Imanet Ltd
+    Copyright (C) 2011-07-01 - 2011, Kris Thielemans
+    Copyright (C) 2017 ETH Zurich, Institute of Particle Physics and Astrophysics
+    Copyright (C) 2018, University College London
+    Copyright (C) 2018, University of Leeds
+    This file is part of STIR.
+
+    SPDX-License-Identifier: Apache-2.0
+    See STIR/LICENSE.txt for details
+*/
+
+/*!
+
+  \file
+  \ingroup projdata
+
+  \brief Implementation of non-inline functions of class stir::ProjDataInfoGenericNoArcCorr
+  
+  \author Kris Thielemans
+  \author Palak Wadhwa
+  \author Parisa Khateri
+  \author Michael Roethlisberger
+*/
+
+#include "stir/ProjDataInfoGenericNoArcCorr.h"
+#include "stir/Bin.h"
+#include "stir/LORCoordinates.h"
+#include "stir/round.h"
+#include "stir/DetectionPosition.h"
+#include "stir/is_null_ptr.h"
+#include <iostream>
+#include <fstream>
+
+#ifdef BOOST_NO_STRINGSTREAM
+#include <strstream.h>
+#else
+#include <sstream>
+#endif
+
+#include <boost/static_assert.hpp>
+
+#ifndef STIR_NO_NAMESPACES
+using std::endl;
+using std::ends;
+#endif
+
+START_NAMESPACE_STIR
+ProjDataInfoGenericNoArcCorr::
+ProjDataInfoGenericNoArcCorr()
+{}
+
+ProjDataInfoGenericNoArcCorr::
+ProjDataInfoGenericNoArcCorr(const shared_ptr<Scanner> scanner_ptr,
+                                 const  VectorWithOffset<int>& num_axial_pos_per_segment,
+                                 const  VectorWithOffset<int>& min_ring_diff_v,
+                                 const  VectorWithOffset<int>& max_ring_diff_v,
+                                 const int num_views,const int num_tangential_poss)
+: ProjDataInfoGeneric(scanner_ptr,
+                          num_axial_pos_per_segment,
+                          min_ring_diff_v, max_ring_diff_v,
+                          num_views, num_tangential_poss)
+{
+  assert(!is_null_ptr(scanner_ptr));
+  uncompressed_view_tangpos_to_det1det2_initialised = false;
+  det1det2_to_uncompressed_view_tangpos_initialised = false;
+  
+  CartesianCoordinate3D< float> b1,b2;
+  Bin bin;
+  bin.segment_num() = 0;
+  bin.axial_pos_num() = 0;
+  bin.view_num() = 0;
+  bin.tangential_pos_num() = 0;
+// setting shift_z to 0 before it is actually estimated. Otherwise the next function will use it
+  this->z_shift.z()=0;
+  find_cartesian_coordinates_of_detection(b1,b2,bin);
+  float shift=b1.z();
+
+  this->z_shift.z()=shift;
+  this->z_shift.y()=0;
+  this->z_shift.x()=0;
+}
+
+
+
+
+ProjDataInfo*
+ProjDataInfoGenericNoArcCorr::clone() const
+{
+  return static_cast<ProjDataInfo*>(new ProjDataInfoGenericNoArcCorr(*this));
+}
+
+bool
+ProjDataInfoGenericNoArcCorr::
+operator==(const self_type& that) const
+{
+  if (!base_type::blindly_equals(&that))
+    return false;
+  return true;
+}
+
+bool
+ProjDataInfoGenericNoArcCorr::
+blindly_equals(const root_type * const that_ptr) const
+{
+  assert(dynamic_cast<const self_type * const>(that_ptr) != 0);
+  return
+    this->operator==(static_cast<const self_type&>(*that_ptr));
+}
+
+std::string
+ProjDataInfoGenericNoArcCorr::parameter_info()  const
+{
+
+ #ifdef BOOST_NO_STRINGSTREAM
+  // dangerous for out-of-range, but 'old-style' ostrstream seems to need this
+  char str[50000];
+  ostrstream s(str, 50000);
+ #else
+  std::ostringstream s;
+ #endif
+  s << "ProjDataInfoGenericNoArcCorr := \n";
+  s << ProjDataInfoGeneric::parameter_info();
+  s << "End :=\n";
+  return s.str();
+}
+
+/*
+   TODO make compile time assert
+
+   Warning:
+   this code makes use of an implementation dependent feature:
+   bit shifting negative ints to the right.
+    -1 >> 1 should be -1
+    -2 >> 1 should be -1
+   This is ok on SUNs (gcc, but probably SUNs cc as well), Parsytec (gcc),
+   Pentium (gcc, VC++) and probably every other system which uses
+   the 2-complement convention.
+
+   Update: compile time assert is implemented.
+*/
+
+/*!
+  Go from sinograms to detectors.
+
+  Because sinograms are not arc-corrected, tang_pos_num corresponds
+  to an angle as well. Before interleaving we have that
+  \verbatim
+  det_angle_1 = LOR_angle + bin_angle
+  det_angle_2 = LOR_angle + (Pi - bin_angle)
+  \endverbatim
+  (Hint: understand this first at LOR_angle=0, then realise that
+  other LOR_angles follow just by rotation)
+
+  Code gets slightly intricate because:
+  - angles have to be defined modulo 2 Pi (so num_detectors)
+  - interleaving
+*/
+
+//! build look-up table for get_view_tangential_pos_num_for_det_num_pair()
+void
+ProjDataInfoGenericNoArcCorr::
+initialise_uncompressed_view_tangpos_to_det1det2() const
+{
+  BOOST_STATIC_ASSERT(-1 >> 1 == -1);
+  BOOST_STATIC_ASSERT(-2 >> 1 == -1);
+
+  const int num_detectors =
+    get_scanner_ptr()->get_num_detectors_per_ring();
+  assert(num_detectors%2 == 0);
+
+  const int min_tang_pos_num = -(num_detectors/2)+1;
+  const int max_tang_pos_num = -(num_detectors/2)+num_detectors;
+
+  if (this->get_min_tangential_pos_num() < min_tang_pos_num ||
+      this->get_max_tangential_pos_num() > max_tang_pos_num)
+    {
+      error("The tangential_pos range (%d to %d) for this projection data is too large.\n"
+	    "Maximum supported range is from %d to %d",
+	    this->get_min_tangential_pos_num(), this->get_max_tangential_pos_num(),
+	    min_tang_pos_num, max_tang_pos_num);
+    }
+
+  uncompressed_view_tangpos_to_det1det2.grow(0,num_detectors/2-1);
+  for (int v_num=0; v_num<=num_detectors/2-1; ++v_num)
+  {
+    uncompressed_view_tangpos_to_det1det2[v_num].grow(min_tang_pos_num, max_tang_pos_num);
+
+    for (int tp_num=min_tang_pos_num; tp_num<=max_tang_pos_num; ++tp_num)
+    {
+      /*
+         adapted from CTI code
+         Note for implementation: avoid using % with negative numbers
+         so add num_detectors before doing modulo num_detectors)
+        */
+      uncompressed_view_tangpos_to_det1det2[v_num][tp_num].det1_num =
+        (v_num + (tp_num >> 1) + num_detectors) % num_detectors;
+      uncompressed_view_tangpos_to_det1det2[v_num][tp_num].det2_num =
+        (v_num - ( (tp_num + 1) >> 1 ) + num_detectors/2) % num_detectors;
+    }
+  }
+  uncompressed_view_tangpos_to_det1det2_initialised = true;
+}
+
+void
+ProjDataInfoGenericNoArcCorr::
+initialise_det1det2_to_uncompressed_view_tangpos() const
+{
+  BOOST_STATIC_ASSERT(-1 >> 1 == -1);
+  BOOST_STATIC_ASSERT(-2 >> 1 == -1);
+
+  const int num_detectors =
+    get_scanner_ptr()->get_num_detectors_per_ring();
+
+  if (num_detectors%2 != 0)
+    {
+      error("Number of detectors per ring should be even but is %d", num_detectors);
+    }
+  if (this->get_min_view_num() != 0)
+    {
+      error("Minimum view number should currently be zero to be able to use get_view_tangential_pos_num_for_det_num_pair()");
+    }
+
+
+  //const int min_tang_pos_num = -(num_detectors/2);
+  //const int max_tang_pos_num = -(num_detectors/2)+num_detectors;
+  const int max_num_views = num_detectors/2;
+
+  det1det2_to_uncompressed_view_tangpos.grow(0,num_detectors-1);
+  for (int det1_num=0; det1_num<num_detectors; ++det1_num)
+  {
+    det1det2_to_uncompressed_view_tangpos[det1_num].grow(0, num_detectors-1);
+
+    for (int det2_num=0; det2_num<num_detectors; ++det2_num)
+    {
+      if (det1_num == det2_num)
+	  continue;
+      /*
+       This somewhat obscure formula was obtained by inverting the code for
+       get_det_num_pair_for_view_tangential_pos_num()
+       This can be simplified (especially all the branching later on), but
+       as we execute this code only occasionally, it's probably not worth it.
+      */
+      int swap_detectors;
+      /*
+      Note for implementation: avoid using % with negative numbers
+      so add num_detectors before doing modulo num_detectors
+      */
+      int tang_pos_num = (det1_num - det2_num +  3*num_detectors/2) % num_detectors;
+      int view_num = (det1_num - (tang_pos_num >> 1) +  num_detectors) % num_detectors;
+
+      /* Now adjust ranges for view_num, tang_pos_num.
+      The next lines go only wrong in the singular (and irrelevant) case
+      det_num1 == det_num2 (when tang_pos_num == num_detectors - tang_pos_num)
+
+        We use the combinations of the following 'symmetries' of
+        (tang_pos_num, view_num) == (tang_pos_num+2*num_views, view_num + num_views)
+        == (-tang_pos_num, view_num + num_views)
+        Using the latter interchanges det_num1 and det_num2, and this leaves
+        the LOR the same in the 2D case. However, in 3D this interchanges the rings
+        as well. So, we keep track of this in swap_detectors, and return its final
+        value.
+      */
+      if (view_num <  max_num_views)
+      {
+        if (tang_pos_num >=  max_num_views)
+        {
+          tang_pos_num = num_detectors - tang_pos_num;
+          swap_detectors = 1;
+        }
+        else
+        {
+          swap_detectors = 0;
+        }
+      }
+      else
+      {
+        view_num -= max_num_views;
+        if (tang_pos_num >=  max_num_views)
+        {
+          tang_pos_num -= num_detectors;
+          swap_detectors = 0;
+        }
+        else
+        {
+          tang_pos_num *= -1;
+          swap_detectors = 1;
+        }
+      }
+
+      det1det2_to_uncompressed_view_tangpos[det1_num][det2_num].view_num = view_num;
+      det1det2_to_uncompressed_view_tangpos[det1_num][det2_num].tang_pos_num = tang_pos_num;
+      det1det2_to_uncompressed_view_tangpos[det1_num][det2_num].swap_detectors = swap_detectors==0;
+    }
+  }
+  det1det2_to_uncompressed_view_tangpos_initialised = true;
+}
+
+unsigned int
+ProjDataInfoGenericNoArcCorr::
+get_num_det_pos_pairs_for_bin(const Bin& bin) const
+{
+  return
+    get_num_ring_pairs_for_segment_axial_pos_num(bin.segment_num(),
+						 bin.axial_pos_num())*
+    get_view_mashing_factor();
+}
+
+void
+ProjDataInfoGenericNoArcCorr::
+get_all_det_pos_pairs_for_bin(std::vector<DetectionPositionPair<> >& dps,
+			      const Bin& bin) const
+{
+  this->initialise_uncompressed_view_tangpos_to_det1det2_if_not_done_yet();
+
+  dps.resize(get_num_det_pos_pairs_for_bin(bin));
+
+  const ProjDataInfoGeneric::RingNumPairs& ring_pairs =
+    get_all_ring_pairs_for_segment_axial_pos_num(bin.segment_num(),
+						 bin.axial_pos_num());
+  // not sure how to handle mashing with non-zero view offset...
+  assert(get_min_view_num()==0);
+
+  unsigned int current_dp_num=0;
+  for (int uncompressed_view_num=bin.view_num()*get_view_mashing_factor();
+       uncompressed_view_num<(bin.view_num()+1)*get_view_mashing_factor();
+       ++uncompressed_view_num)
+    {
+      const int det1_num =
+	uncompressed_view_tangpos_to_det1det2[uncompressed_view_num][bin.tangential_pos_num()].det1_num;
+      const int det2_num =
+	uncompressed_view_tangpos_to_det1det2[uncompressed_view_num][bin.tangential_pos_num()].det2_num;
+      for (ProjDataInfoGeneric::RingNumPairs::const_iterator rings_iter = ring_pairs.begin();
+	   rings_iter != ring_pairs.end();
+	   ++rings_iter)
+	{
+	  assert(current_dp_num < get_num_det_pos_pairs_for_bin(bin));
+	  dps[current_dp_num].pos1().tangential_coord() = det1_num;
+	  dps[current_dp_num].pos1().axial_coord() = rings_iter->first;
+	  dps[current_dp_num].pos2().tangential_coord() = det2_num;
+	  dps[current_dp_num].pos2().axial_coord() = rings_iter->second;
+	  ++current_dp_num;
+	}
+    }
+  assert(current_dp_num == get_num_det_pos_pairs_for_bin(bin));
+}
+
+void
+ProjDataInfoGenericNoArcCorr::
+find_cartesian_coordinates_of_detection(
+					CartesianCoordinate3D<float>& coord_1,
+					CartesianCoordinate3D<float>& coord_2,
+					const Bin& bin) const
+{
+ // find detectors
+  int det_num_a;
+  int det_num_b;
+  int ring_a;
+  int ring_b;
+  get_det_pair_for_bin(det_num_a, ring_a,
+                       det_num_b, ring_b, bin);
+
+  // find corresponding cartesian coordinates
+  find_cartesian_coordinates_given_scanner_coordinates(coord_1,coord_2,
+    ring_a,ring_b,det_num_a,det_num_b);
+  return;
+}
+
+void
+ProjDataInfoGenericNoArcCorr::
+find_cartesian_coordinates_given_scanner_coordinates(CartesianCoordinate3D<float>& coord_1,
+				 CartesianCoordinate3D<float>& coord_2,
+				 const int Ring_A,const int Ring_B,
+				 const int det1, const int det2) const
+{
+  assert(0<=det1);
+  assert(det1<get_scanner_ptr()->get_num_detectors_per_ring());
+  assert(0<=det2);
+  assert(det2<get_scanner_ptr()->get_num_detectors_per_ring());
+
+	DetectionPosition<> det_pos1;
+	DetectionPosition<> det_pos2;
+  det_pos1.tangential_coord() = det1;
+  det_pos2.tangential_coord() = det2;
+  det_pos1.axial_coord() = Ring_A;
+  det_pos2.axial_coord() = Ring_B;
+
+  coord_1 = get_scanner_ptr()->get_coordinate_for_det_pos(det_pos1);
+  coord_2 = get_scanner_ptr()->get_coordinate_for_det_pos(det_pos2);
+  coord_1.z() += z_shift.z();
+  coord_2.z() += z_shift.z();
+}
+
+
+Bin
+ProjDataInfoGenericNoArcCorr::
+get_bin(const LOR<float>& lor) const
+{
+	Bin bin;
+
+  const LORAs2Points<float> & lor_as_2points = dynamic_cast<const LORAs2Points<float> &>(lor);
+
+	CartesianCoordinate3D<float> _p1 = lor_as_2points.p1();
+	CartesianCoordinate3D<float> _p2 = lor_as_2points.p2();
+
+	DetectionPosition<> det_pos1;
+	DetectionPosition<> det_pos2;
+
+  if (get_scanner_ptr()->find_detection_position_given_cartesian_coordinate(det_pos1, _p1)==Succeeded::no ||
+      get_scanner_ptr()->find_detection_position_given_cartesian_coordinate(det_pos2, _p2)==Succeeded::no)
+  {
+    bin.set_bin_value(-1);
+    return bin;
+  }
+
+  DetectionPositionPair<> det_pos_pair;
+	det_pos_pair.pos1() = det_pos1;
+	det_pos_pair.pos2() = det_pos2;
+
+	if (get_bin_for_det_pos_pair(bin, det_pos_pair) == Succeeded::yes &&
+		  bin.tangential_pos_num() >= get_min_tangential_pos_num() &&
+		  bin.tangential_pos_num() <= get_max_tangential_pos_num())
+	{
+	  bin.set_bin_value(1);
+	  return bin;
+	}
+	else
+	{
+		bin.set_bin_value(-1);
+		return bin;
+	}
+}
+
+
+END_NAMESPACE_STIR
diff --git a/src/buildblock/Scanner.cxx b/src/buildblock/Scanner.cxx
index 50de207b8..6f9f51782 100644
--- a/src/buildblock/Scanner.cxx
+++ b/src/buildblock/Scanner.cxx
@@ -3,6 +3,7 @@
     Copyright (C) 2000 - 2010-07-21, Hammersmith Imanet Ltd
     Copyright (C) 2011, Kris Thielemans
     Copyright (C) 2010-2013, King's College London
+    Copyright 2017 ETH Zurich, Institute of Particle Physics and Astrophysics
     Copyright (C) 2013-2016,2019-2021 University College London
     Copyright (C) 2017-2018, University of Leeds
     This file is part of STIR.
@@ -26,6 +27,7 @@
   \author Palak Wadhwa
   \author Ottavia Bertolli
   \author PARAPET project
+  \author Parisa Khateri
 */
 
 #include "stir/Scanner.h"
@@ -33,6 +35,8 @@
 #include "stir/Succeeded.h"
 #include "stir/interfile_keyword_functions.h"
 #include "stir/info.h"
+#include "stir/DetectorCoordinateMap.h"
+#include "stir/GeometryBlocksOnCylindrical.h"
 #include <iostream>
 #include <algorithm>
 #ifdef BOOST_NO_STRINGSTREAM
@@ -68,6 +72,7 @@ static list<string>
 
   
 Scanner::Scanner(Type scanner_type)
+  : _already_setup(false)
 {
 
   // set_params parameters:
@@ -516,7 +521,37 @@ break;
                0, 0, 0, 0, 0, 0, 0);
  
     break;
-    
+
+  case SAFIRDualRingPrototype: 
+  set_params(SAFIRDualRingPrototype, string_list("SAFIRDualRingPrototype"), 
+             16, //num_rings_v
+             150, //max_num_non_arccorrected_bins_v,
+             150, //default_num_arccorrected_bins_v,
+             180, //num_detectors_per_ring_v    
+             64.05, //  inner_ring_radius_v
+             5, //average_depth_of_interaction_v
+             2.2, //ring_spacing_v
+             1.1, //bin_size_v
+             0, //intrinsic_tilt_v
+             2, //num_axial_blocks_per_bucket_v
+             1, //num_transaxial_blocks_per_bucket_v
+             8, //num_axial_crystals_per_block_v
+             15, //num_transaxial_crystals_per_block_v
+             1, //num_axial_crystals_per_singles_unit_v
+             1, //num_transaxial_crystals_per_singles_unit_v
+             1, //num_detector_layers_v
+             -1, //energy_resolution_v
+             -1, //reference_energy_v
+             "", //scanner_orientation_v
+             "", //scanner_geometry_v
+             2.2, //axial_crystal_spacing_v
+             2.2, //transaxial_crystal_spacing_v
+             18.1, //axial_block_spacing_v
+             33.6, //transaxial_block_spacing_v
+             ""//crystal_map_file_name_v
+            );  
+  break;
+  
   case User_defined_scanner: // zlong, 08-04-2004, Userdefined support
 
     set_params(User_defined_scanner, string_list("Userdefined"), 
@@ -552,7 +587,15 @@ Scanner::Scanner(Type type_v, const list<string>& list_of_names_v,
                  int num_transaxial_crystals_per_singles_unit_v,
                  int num_detector_layers_v,
                  float energy_resolution_v,
-                 float reference_energy_v)
+                 float reference_energy_v,
+                 const string& scanner_orientation_v,
+                 const string& scanner_geometry_v,
+                 float axial_crystal_spacing_v,
+                 float transaxial_crystal_spacing_v,
+                 float axial_block_spacing_v,
+                 float transaxial_block_spacing_v,
+                 const std::string& crystal_map_file_name_v)
+: _already_setup(false)
 {
   set_params(type_v, list_of_names_v, num_rings_v,
              max_num_non_arccorrected_bins_v,
@@ -567,7 +610,14 @@ Scanner::Scanner(Type type_v, const list<string>& list_of_names_v,
              num_transaxial_crystals_per_singles_unit_v,
              num_detector_layers_v,
              energy_resolution_v,
-             reference_energy_v);
+             reference_energy_v,
+             scanner_orientation_v,
+             scanner_geometry_v,
+             axial_crystal_spacing_v,
+             transaxial_crystal_spacing_v,
+             axial_block_spacing_v,
+             transaxial_block_spacing_v,
+             crystal_map_file_name_v);
 }
 
 
@@ -584,7 +634,15 @@ Scanner::Scanner(Type type_v, const string& name,
                  int num_transaxial_crystals_per_singles_unit_v,
                  int num_detector_layers_v,
                  float energy_resolution_v,
-                 float reference_energy_v) 
+                 float reference_energy_v,
+                 const string& scanner_orientation_v,
+                 const string& scanner_geometry_v,
+                 float axial_crystal_spacing_v,
+                 float transaxial_crystal_spacing_v,
+                 float axial_block_spacing_v,
+                 float transaxial_block_spacing_v,
+                 const std::string& crystal_map_file_name_v)
+  : _already_setup(false)
 {
   set_params(type_v, string_list(name), num_rings_v,
              max_num_non_arccorrected_bins_v,
@@ -599,7 +657,14 @@ Scanner::Scanner(Type type_v, const string& name,
              num_transaxial_crystals_per_singles_unit_v,
              num_detector_layers_v,
              energy_resolution_v,
-             reference_energy_v);
+             reference_energy_v,
+             scanner_orientation_v,
+             scanner_geometry_v,
+             axial_crystal_spacing_v,
+             transaxial_crystal_spacing_v,
+             axial_block_spacing_v,
+             transaxial_block_spacing_v,
+             crystal_map_file_name_v);
 }
 
 
@@ -624,7 +689,14 @@ set_params(Type type_v,const list<string>& list_of_names_v,
            int num_transaxial_crystals_per_singles_unit_v,
            int num_detector_layers_v,
            float energy_resolution_v,
-           float reference_energy_v)
+           float reference_energy_v,
+           const string& scanner_orientation_v,
+           const string& scanner_geometry_v,
+           float axial_crystal_spacing_v,
+           float transaxial_crystal_spacing_v,
+           float axial_block_spacing_v,
+           float transaxial_block_spacing_v,
+           const std::string& crystal_map_file_name_v)
 {
   set_params(type_v, list_of_names_v, num_rings_v,
              max_num_non_arccorrected_bins_v,
@@ -639,7 +711,14 @@ set_params(Type type_v,const list<string>& list_of_names_v,
              num_transaxial_crystals_per_singles_unit_v,
 	     num_detector_layers_v,
              energy_resolution_v,
-             reference_energy_v);
+             reference_energy_v,
+             scanner_orientation_v,
+             scanner_geometry_v,
+             axial_crystal_spacing_v,
+             transaxial_crystal_spacing_v,
+             axial_block_spacing_v,
+             transaxial_block_spacing_v,
+             crystal_map_file_name_v);
 }
 
 
@@ -660,7 +739,14 @@ set_params(Type type_v,const list<string>& list_of_names_v,
            int num_transaxial_crystals_per_singles_unit_v,
            int num_detector_layers_v,
            float energy_resolution_v,
-           float reference_energy_v)
+           float reference_energy_v,
+           const string& scanner_orientation_v,
+           const string& scanner_geometry_v,
+           float axial_crystal_spacing_v,
+           float transaxial_crystal_spacing_v,
+           float axial_block_spacing_v,
+           float transaxial_block_spacing_v,
+           const std::string& crystal_map_file_name_v)
 {
   type = type_v;
   list_of_names = list_of_names_v;  
@@ -686,7 +772,73 @@ set_params(Type type_v,const list<string>& list_of_names_v,
       reference_energy = 511.f;
   else
       reference_energy = reference_energy_v;
+  
+  scanner_orientation = scanner_orientation_v;
+  
+  axial_crystal_spacing = axial_crystal_spacing_v;
+  transaxial_crystal_spacing = transaxial_crystal_spacing_v;
+  axial_block_spacing = axial_block_spacing_v;
+  transaxial_block_spacing = transaxial_block_spacing_v;
+  
+  crystal_map_file_name = crystal_map_file_name_v;
+
+  if (scanner_geometry_v == "")
+    set_scanner_geometry("Cylindrical");
+  else
+    set_scanner_geometry(scanner_geometry_v);
+
+  set_up();
+}
 
+void Scanner::set_scanner_geometry(const std::string& new_scanner_geometry)
+{
+  scanner_geometry = new_scanner_geometry;
+   _already_setup = false;
+}
+
+void Scanner::set_up()
+{
+  if (scanner_geometry == "Generic")
+    {
+      if (!this->detector_map_sptr){
+          if (crystal_map_file_name == "")          
+        error("Scanner: scanner_geometry=Generic needs a crystal map");
+      
+      read_detectormap_from_file(crystal_map_file_name);
+      }
+    }
+  else
+    {
+      if (crystal_map_file_name != "")
+        error("Scanner: use scanner_geometry=Generic when specifying a crystal map");
+      if (scanner_geometry == "BlocksOnCylindrical")
+        this->detector_map_sptr.reset(new GeometryBlocksOnCylindrical(*this));
+      else
+        {
+          this->detector_map_sptr = 0;
+          if (scanner_geometry != "Cylindrical")
+            error("Scanner::scanner_geometry needs to be one of Cylindrical, BlocksOnCylindrical, Generic");
+        }
+    }
+  _already_setup = true;
+}
+
+void
+Scanner::
+set_detector_map( const DetectorCoordinateMap::det_pos_to_coord_type& coord_map )
+{
+  this->detector_map_sptr.reset(new DetectorCoordinateMap(coord_map));
+  if ((unsigned)num_detectors_per_ring != detector_map_sptr->get_num_tangential_coords() ||
+      (unsigned)num_rings != detector_map_sptr->get_num_axial_coords() ||
+      (unsigned)num_detector_layers != detector_map_sptr->get_num_radial_coords())
+      error("Scanner:set_detector_map: inconsistent number of detectors");
+}
+
+void
+Scanner::
+read_detectormap_from_file( const std::string& filename )
+{
+  this->detector_map_sptr.reset(new DetectorCoordinateMap(filename));
 }
 
 /*! \todo The current list is bound to be incomplete. would be better to stick it in set_params().
@@ -760,7 +912,8 @@ check_consistency() const
 	const int dets_per_ring =
 	  get_num_transaxial_blocks() *
 	  get_num_transaxial_crystals_per_block();
-	if ( dets_per_ring != get_num_detectors_per_ring())
+    // exclusion of generic as 'get_num_transaxial_crystals_per_block()' is sometimes false for asymmetric detectors and not important for generic
+	if ( dets_per_ring != get_num_detectors_per_ring() && scanner_orientation != "Generic")
 	  { 
 	    warning("Scanner %s: inconsistent transaxial block info",
 		    this->get_name().c_str()); 
@@ -778,7 +931,8 @@ check_consistency() const
 	const int blocks_per_ring =
 	  get_num_transaxial_buckets() *
 	  get_num_transaxial_blocks_per_bucket();
-	if ( blocks_per_ring != get_num_transaxial_blocks())
+    // exclusion of generic as 'get_num_transaxial_blocks_per_bucket()' is sometimes false for asymmetric detectors and not important for generic
+	if ( blocks_per_ring != get_num_transaxial_blocks() && scanner_orientation != "Generic")
 	  { 
 	    warning("Scanner %s: inconsistent transaxial block/bucket info",
 		    this->get_name().c_str()); 
@@ -796,7 +950,9 @@ check_consistency() const
 	const int dets_axial =
 	  get_num_axial_blocks() *
 	  get_num_axial_crystals_per_block();
-	if ( dets_axial != (get_num_rings() + get_num_virtual_axial_crystals_per_block()))
+
+	// exclusion of generic as 'get_num_axial_crystals_per_block()' is sometimes false for asymmetric detectors and not important for generic
+  if ( dets_axial != (get_num_rings() + get_num_virtual_axial_crystals_per_block())  && scanner_orientation != "Generic")
 	  { 
 	    warning("Scanner %s: inconsistent axial block info: %d vs %d",
 		    this->get_name().c_str(),
@@ -815,7 +971,8 @@ check_consistency() const
 	const int blocks_axial =
 	  get_num_axial_buckets() *
 	  get_num_axial_blocks_per_bucket();
-	if ( blocks_axial != get_num_axial_blocks())
+    // exclusion of generic as 'get_num_axial_blocks_per_bucket()' is sometimes false for asymmetric detectors and not important for generic
+	if ( blocks_axial != get_num_axial_blocks() && scanner_orientation != "Generic")
 	  { 
 	    warning("Scanner %s: inconsistent axial block/bucket info",
 		    this->get_name().c_str()); 
@@ -872,6 +1029,54 @@ check_consistency() const
 	  }
       }
   }
+  
+  if (get_scanner_geometry() == "BlocksOnCylindrical")
+  {//! Check consistency of axial and transaxial spacing for block geometry
+      if (get_axial_crystal_spacing()*get_num_axial_crystals_per_block() > get_axial_block_spacing())
+      {
+         warning("Scanner %s: inconsistent axial spacing:\n"
+              "\taxial_crystal_spacing %f muliplied by num_axial_crystals_per_block %d should fit into axial_block_spacing %f",
+                 this->get_name().c_str(),
+           get_axial_crystal_spacing(), get_num_axial_crystals_per_block(), get_axial_block_spacing());
+         return Succeeded::no;
+        }
+        if (get_transaxial_crystal_spacing()*get_num_transaxial_crystals_per_block() > get_transaxial_block_spacing())
+        {
+          warning("Scanner %s: inconsistent transaxial spacing:\n"
+                "\ttransaxial_crystal_spacing %f muliplied by num_transaxial_crystals_per_block %d should fit into transaxial_block_spacing %f",
+              this->get_name().c_str(),
+              get_transaxial_crystal_spacing(), get_num_transaxial_crystals_per_block(), get_transaxial_block_spacing());
+          return Succeeded::no;
+        }
+  
+        if (get_transaxial_block_spacing()*get_num_transaxial_blocks_per_bucket()
+            < round (2*inner_ring_radius*tan(_PI/get_num_transaxial_blocks()/get_num_transaxial_blocks_per_bucket())*1000.0)/1000.0)
+      {
+         warning("Scanner %s: inconsistent transaxial spacing:\n"
+              "\ttransaxial_block_spacing %f muliplied by num_transaxial_blocks_per_bucket %d should fit into a polygon that encircles a cylinder with inner_ring_radius %f",
+                 this->get_name().c_str(),
+                 get_transaxial_block_spacing(), get_num_transaxial_blocks_per_bucket(), get_inner_ring_radius());
+         return Succeeded::no;
+      }
+    else if (get_scanner_geometry() == "Generic")
+    { //! Check if the crystal map is correct and given
+      if (get_crystal_map_file_name() == "")
+      {
+        warning("No crystal map is provided. The scanner geometry Generic needs it! Please provide one.");
+        return Succeeded::no;
+      }
+      else
+      {
+        std::ifstream crystal_map(get_crystal_map_file_name());
+        if( !crystal_map)
+        {
+          warning("No correct crystal map provided. Please check the file name.");
+          return Succeeded::no;
+        }
+      }
+    }
+  
+  }
 
   return Succeeded::yes;
 }
@@ -907,6 +1112,10 @@ if (!close_enough(energy_resolution, scanner.energy_resolution) &&
       close_enough(ring_spacing, scanner.ring_spacing) &&
       close_enough(bin_size,scanner.bin_size) &&
       close_enough(intrinsic_tilt,scanner.intrinsic_tilt) &&
+      close_enough(axial_crystal_spacing, scanner.axial_crystal_spacing) &&
+      close_enough(transaxial_crystal_spacing, scanner.transaxial_crystal_spacing) &&
+      close_enough(axial_block_spacing, scanner.axial_block_spacing) &&
+      close_enough(transaxial_block_spacing, scanner.transaxial_block_spacing) &&
       (num_transaxial_blocks_per_bucket == scanner.num_transaxial_blocks_per_bucket) &&
       (num_axial_blocks_per_bucket == scanner.num_axial_blocks_per_bucket) &&
       (num_axial_crystals_per_block == scanner.num_axial_crystals_per_block) &&
@@ -980,6 +1189,33 @@ Scanner::parameter_info() const
     << "Number of crystals per singles unit in transaxial direction := "
     << get_num_transaxial_crystals_per_singles_unit() << '\n';
   
+  //block and generic geometry description
+  if (crystal_map_file_name != "")
+    s << "Name of crystal map                                         := "
+      << get_crystal_map_file_name() << '\n';
+  if (get_scanner_geometry() != "")
+  {
+    s << "Scanner geometry (BlocksOnCylindrical/Cylindrical/Generic)  := "
+      <<get_scanner_geometry() << '\n';
+  }
+  if (get_scanner_orientation() != "")
+  {
+    s << "Scanner orientation (X or Y)                                := "
+      <<get_scanner_orientation() << '\n';
+  }
+  if (get_axial_crystal_spacing() >=0)
+    s << "Distance between crystals in axial direction (cm)           := "
+      << get_axial_crystal_spacing()/10 << '\n';
+  if (get_transaxial_crystal_spacing() >=0)
+    s << "Distance between crystals in transaxial direction (cm)      := "
+      << get_transaxial_crystal_spacing()/10 << '\n';
+  if (get_axial_block_spacing() >=0)
+    s << "Distance between blocks in axial direction (cm)             := "
+      << get_axial_block_spacing()/10 << '\n';
+  if (get_transaxial_block_spacing() >=0)
+    s << "Distance between blocks in transaxial direction (cm)        := "
+      << get_transaxial_block_spacing()/10 << '\n';
+
   s << "end scanner parameters:=\n";
 
   return s.str();
@@ -1031,9 +1267,24 @@ Scanner* Scanner::ask_parameters()
   // old scanners. This should stay here as a transitional step.
   if (scanner_ptr->type != Unknown_scanner && scanner_ptr->type != User_defined_scanner)
     {
-      info("Two new options are available: (a) Energy Resolution and (b) Reference energy (in keV)."
-           "They are used in Scatter Simulation. In case, you need them, please set them"
-           "manually in your file.");
+      info("more options are available for the scanner: \n(a) Energy Resolution :=\n(b) Reference energy (in keV)\t:="
+        "\n(c) Scanner geometry ( BlocksOnCylindrical / Cylindrical / Generic ) \n(d) Scanner orientation (X or Y)\t:="
+        "\n\n(a) and (b) are used in Scatter Simulation. \n (c) is used to choose more precise models of the scanner. "
+        "\n(d) is used in BlocksOnCylindrical Geometry to build the proper crystal map."
+        "\nIn case, you need them, set them manually in your interfile header before 'end scanner parameters:='.");
+      
+      //This is needed for finding effective central bin size, because it is different for different geometries.
+      const string ScannerGeometry =
+        ask_string("Enter the scanner geometry ( BlocksOnCylindrical / Cylindrical / Generic ) :", "Cylindrical");
+
+      if (ScannerGeometry == "Generic")
+      {
+        string CrystalMapFileName = ask_string("Enter the name of the crystal map: ", "");
+        scanner_ptr->set_crystal_map_file_name(CrystalMapFileName);
+      }
+  
+      // will also read detector-map from file
+      scanner_ptr->set_scanner_geometry(ScannerGeometry);
 
       return scanner_ptr;
     }
@@ -1071,9 +1322,9 @@ Scanner* Scanner::ask_parameters()
       int AxialBlocksPerBucket = 
 	ask_num("Enter number of axial blocks per bucket: ",0,10,6);
       int AxialCrystalsPerBlock = 
-	ask_num("Enter number of axial crystals per block: ",0,12,8);
+	ask_num("Enter number of axial crystals per block: ",0,16,8);
       int TransaxialCrystalsPerBlock = 
-	ask_num("Enter number of transaxial crystals per block: ",0,12,8);
+	ask_num("Enter number of transaxial crystals per block: ",0,16,8);
       int AxialCrstalsPerSinglesUnit = 
         ask_num("Enter number of axial crystals per singles unit: ", 0, NoRings, 1);
       int TransaxialCrystalsPerSinglesUnit = 
@@ -1087,10 +1338,30 @@ Scanner* Scanner::ask_parameters()
 
       int num_detector_layers =
     ask_num("Enter number of detector layers per block: ",1,100,1);
+           
+      const string ScannerOrientation =
+  ask_string("Enter the scanner orientation, i.e. which axis passes through two opposite blocks ('X' or 'Y')", "Y");
+      const string ScannerGeometry =
+  ask_string("Enter the scanner geometry ( BlocksOnCylindrical / Cylindrical / Generic ) :", "Cylindrical");
+      
+      float AxialCrystalSpacing=      
+  ask_num("Enter crystal spacing in axial direction (in mm): ",0.F,30.F,6.75F);
+      float TransaxialCrystalSpacing=
+  ask_num("Enter crystal spacing in transaxial direction (in mm): ",0.F,30.F,6.75F);
+      float AxialBlockSpacing=
+  ask_num("Enter block spacing in axial direction (in mm): ",0.F,360.F,54.F);
+      float TransaxialBlockSpacing=
+  ask_num("Enter block spacing in transaxial direction (in mm): ",0.F,360.F,54.F);
+  
+  string crystal_map_file_name = "";
+  if (ScannerGeometry == "Generic") {
+      crystal_map_file_name =
+        ask_string("Enter the name of the crystal map: ", "");
+  }
+  
       Type type = User_defined_scanner;
   
-      if (EnergyResolution > -1 && ReferenceEnergy > -1)
-        scanner_ptr =
+      scanner_ptr =
             new Scanner(type, string_list(name),
                         num_detectors_per_ring,  NoRings,
                         NoBins, NoBins,
@@ -1101,18 +1372,14 @@ Scanner* Scanner::ask_parameters()
                         AxialCrstalsPerSinglesUnit, TransaxialCrystalsPerSinglesUnit,
                         num_detector_layers,
                         EnergyResolution,
-                        ReferenceEnergy );
-      else
-       scanner_ptr =
-            new Scanner(type, string_list(name),
-                        num_detectors_per_ring,  NoRings,
-                        NoBins, NoBins,
-                        InnerRingRadius, AverageDepthOfInteraction,
-                        RingSpacing, BinSize,intrTilt*float(_PI)/180,
-                        AxialBlocksPerBucket,TransBlocksPerBucket,
-                        AxialCrystalsPerBlock,TransaxialCrystalsPerBlock,
-                        AxialCrstalsPerSinglesUnit, TransaxialCrystalsPerSinglesUnit,
-                        num_detector_layers);
+                        ReferenceEnergy,
+                        ScannerOrientation,
+                        ScannerGeometry,
+                        TransaxialCrystalSpacing,
+                        AxialCrystalSpacing,
+                        AxialBlockSpacing,
+                        TransaxialBlockSpacing,
+                        crystal_map_file_name);
   
       if (scanner_ptr->check_consistency()==Succeeded::yes ||
 	  !ask("Ask questions again?",true))
diff --git a/src/buildblock/VoxelsOnCartesianGrid.cxx b/src/buildblock/VoxelsOnCartesianGrid.cxx
index 626f4b3d3..abd94574d 100644
--- a/src/buildblock/VoxelsOnCartesianGrid.cxx
+++ b/src/buildblock/VoxelsOnCartesianGrid.cxx
@@ -4,6 +4,7 @@
     Copyright (C) 2000 PARAPET partners
     Copyright (C) 2000- 2012, Hammersmith Imanet Ltd
     Copyright (C) 2018- 2019, University College London
+    Copyright 2017 ETH Zurich, Institute of Particle Physics and Astrophysics
 
     SPDX-License-Identifier: Apache-2.0 AND License-ref-PARAPET-license
 
@@ -17,6 +18,7 @@
   \author Sanida Mustafovic 
   \author Kris Thielemans (with help from Alexey Zverovich)
   \author PARAPET project
+  \author Parisa Khateri
 
 
 */
@@ -37,6 +39,9 @@
 #include <math.h>
 #include <memory>
 #include "stir/unique_ptr.h"
+#include "stir/ProjDataInfoBlocksOnCylindricalNoArcCorr.h"
+#include "stir/ProjDataInfoGenericNoArcCorr.h"
+
 #ifndef STIR_NO_NAMESPACES
 using std::ifstream;
 using std::max;
@@ -79,6 +84,50 @@ static void find_sampling_and_z_size(
         ? proj_data_info_cyl_ptr->get_num_axial_poss(0)
         : 2*proj_data_info_cyl_ptr->get_num_axial_poss(0) - 1;
   }
+  else if (const ProjDataInfoBlocksOnCylindrical*
+        proj_data_info_blk_ptr =
+        dynamic_cast<const ProjDataInfoBlocksOnCylindrical*>(proj_data_info_ptr))
+  {
+    // the case of BlocksOnCylindrical data
+
+    z_sampling = proj_data_info_blk_ptr->get_ring_spacing()/2;
+
+    // for 'span>1' case, we take z_size = number of sinograms in segment 0
+    // for 'span==1' case, we take 2*num_rings-1
+
+    // first check if we have segment 0
+    assert(proj_data_info_blk_ptr->get_min_segment_num() <= 0);
+    assert(proj_data_info_blk_ptr->get_max_segment_num() >= 0);
+
+    if (z_size<0)
+      z_size =
+        proj_data_info_blk_ptr->get_max_ring_difference(0) >
+        proj_data_info_blk_ptr->get_min_ring_difference(0)
+        ? proj_data_info_blk_ptr->get_num_axial_poss(0)
+        : 2*proj_data_info_blk_ptr->get_num_axial_poss(0) - 1;
+  }
+  else if (const ProjDataInfoGeneric*
+        proj_data_info_gen_ptr =
+        dynamic_cast<const ProjDataInfoGeneric*>(proj_data_info_ptr))
+    {
+      // the case of Generic data
+
+      z_sampling = proj_data_info_gen_ptr->get_ring_spacing()/2;
+
+      // for 'span>1' case, we take z_size = number of sinograms in segment 0
+      // for 'span==1' case, we take 2*num_rings-1
+
+      // first check if we have segment 0
+      assert(proj_data_info_gen_ptr->get_min_segment_num() <= 0);
+      assert(proj_data_info_gen_ptr->get_max_segment_num() >= 0);
+
+      if (z_size<0)
+        z_size =
+          proj_data_info_gen_ptr->get_max_ring_difference(0) >
+          proj_data_info_gen_ptr->get_min_ring_difference(0)
+          ? proj_data_info_gen_ptr->get_num_axial_poss(0)
+          : 2*proj_data_info_gen_ptr->get_num_axial_poss(0) - 1;
+    }
   else
   {
     // this is any other weird projection data. We just check sampling of segment 0
@@ -238,10 +287,16 @@ construct_from_projdata_info(const shared_ptr < const ExamInfo > & exam_info_spt
 
   if (sizes.x()==-1 || sizes.y()==-1)
     {
+      std::vector<float> radii;
+      for (int view=0; view<proj_data_info.get_max_view_num(); view++){
+          radii.push_back(abs(max(proj_data_info.get_s(Bin(0,view,0,proj_data_info.get_max_tangential_pos_num())),
+                        -proj_data_info.get_s(Bin(0,view,0,proj_data_info.get_min_tangential_pos_num())))));
+      }
+      
       // default it to cover full FOV by taking image_size>=2*FOVradius_in_pixs+1
       const float FOVradius_in_mm = 
-        max(proj_data_info.get_s(Bin(0,0,0,proj_data_info.get_max_tangential_pos_num())),
-            -proj_data_info.get_s(Bin(0,0,0,proj_data_info.get_min_tangential_pos_num())));
+              *std::max_element(radii.begin(), radii.end());
+        
       if (sizes.x()==-1)
         x_size_used = 2*static_cast<int>(ceil(FOVradius_in_mm / get_voxel_size().x())) + 1;
       if (sizes.y()==-1)
diff --git a/src/include/stir/DetectionPosition.h b/src/include/stir/DetectionPosition.h
index dfb01df12..a4bb7f8ff 100644
--- a/src/include/stir/DetectionPosition.h
+++ b/src/include/stir/DetectionPosition.h
@@ -18,6 +18,7 @@
 #define __stir_DetectionPosition_H__
 
 #include "stir/common.h"
+#include <boost/operators.hpp>
 
 START_NAMESPACE_STIR
 /*!   \ingroup projdata
@@ -54,7 +55,9 @@ START_NAMESPACE_STIR
  The class is templated to allow for systems with continuous detection.
 */
 template <typename coordT = unsigned int>
-class DetectionPosition
+  class DetectionPosition:
+  boost::partially_ordered<DetectionPosition<coordT>,  // have operator>, <= etc for free
+  boost::equality_comparable<DetectionPosition<coordT> > > // have operator!= for free
 {
 public: 
   inline explicit
@@ -71,7 +74,7 @@ class DetectionPosition
   //! \name comparison operators
   //@{
   inline bool operator==(const DetectionPosition&) const;
-  inline bool operator!=(const DetectionPosition&) const;
+  inline bool operator<(const DetectionPosition&) const;
   //@}
 private :
   coordT  tangential;  
diff --git a/src/include/stir/DetectionPosition.inl b/src/include/stir/DetectionPosition.inl
index 158b8d7cd..4e6826271 100644
--- a/src/include/stir/DetectionPosition.inl
+++ b/src/include/stir/DetectionPosition.inl
@@ -9,6 +9,7 @@
 */
 /*
     Copyright (C) 2002- 2009, Hammersmith Imanet Ltd
+    Copyright (C) 2021, University College London
     This file is part of STIR.
 
     SPDX-License-Identifier: Apache-2.0
@@ -78,8 +79,14 @@ operator==(const DetectionPosition& d) const
 template <typename coordT>
 bool
 DetectionPosition<coordT>::
-operator!=(const DetectionPosition& d) const
-{ return !(*this==d); }
+operator<(const DetectionPosition& d) const
+{
+  return
+    (tangential < d.tangential) ||
+    ((tangential == d.tangential) && 
+     ((axial < d.axial) ||
+      ((axial == d.axial) && (radial < d.radial))));
+}
 
 END_NAMESPACE_STIR
 
diff --git a/src/include/stir/DetectorCoordinateMap.h b/src/include/stir/DetectorCoordinateMap.h
new file mode 100644
index 000000000..72cf3acee
--- /dev/null
+++ b/src/include/stir/DetectorCoordinateMap.h
@@ -0,0 +1,141 @@
+/*
+	Copyright 2015, 2017 ETH Zurich, Institute of Particle Physics
+	Copyright 2020 Positrigo AG, Zurich
+    Copyright (C) 2021 University College London
+    This file is part of STIR.
+
+    SPDX-License-Identifier: Apache-2.0
+
+    See STIR/LICENSE.txt for details
+ */
+
+/*!
+
+  \file
+  \ingroup buildblock
+  \brief Declaration of class stir::DetectorCoordinateMap
+
+  \author Jannis Fischer
+  \author Parisa Khateri
+  \author Kris Thielemans
+*/
+
+#include <fstream>
+#include <string>
+#include <vector>
+#include <random>
+#include <map>
+#include <boost/algorithm/string.hpp>
+#include <boost/unordered_map.hpp>
+
+#include "stir/CartesianCoordinate3D.h"
+#include "stir/DetectionPosition.h"
+
+#ifndef __stir_DetectorCoordinateMap_H__
+#define __stir_DetectorCoordinateMap_H__
+
+START_NAMESPACE_STIR
+
+class Succeeded;
+
+/*! Class providing map functionality to convert detector indices to spatial coordinates. 
+	Map files can have 5 or 6 tab- or comma-separated columns. Lines beginning with '#' are ignored. The layer column is optional
+	\par Format:
+	ring,detector,(layer,)x,y,z
+	An empty line will terminate the reading at that line.
+
+    Optionally LOR end-points can be randomly displaced using a Gaussian distribution with standard deviation \sigma (in mm).
+*/
+class DetectorCoordinateMap
+{
+	struct ihash
+	    : std::unary_function<stir::DetectionPosition<> , std::size_t>
+	{
+	    std::size_t operator()(stir::DetectionPosition<>  const& detpos) const
+	    {
+		    std::size_t seed = 0;
+		    boost::hash_combine(seed, detpos.axial_coord());
+		    boost::hash_combine(seed, detpos.radial_coord());
+		    boost::hash_combine(seed, detpos.tangential_coord());
+		    return seed;
+	    }
+	};
+public:
+    typedef boost::unordered_map<stir::DetectionPosition<>, stir::CartesianCoordinate3D<float>, ihash> det_pos_to_coord_type;
+    typedef boost::unordered_map<stir::DetectionPosition<>, stir::DetectionPosition<>, ihash> unordered_to_ordered_det_pos_type;
+
+	//! Constructor calls read_detectormap_from_file( filename ).
+	DetectorCoordinateMap(const std::string& filename, double sigma = 0.0) :
+		sigma(sigma),
+		distribution(0.0, sigma)
+		{ read_detectormap_from_file( filename ); }
+	//! Constructor calls set_detector_map(coord_map).
+	DetectorCoordinateMap(const det_pos_to_coord_type& coord_map, double sigma = 0.0) :
+		sigma(sigma),
+		distribution(0.0, sigma)
+		{ set_detector_map( coord_map ); }
+
+	//! Reads map from file and stores it.
+	void read_detectormap_from_file( const std::string& filename );
+	//! stores the map
+	/*! applies sorting to standard STIR order */
+    void set_detector_map( const det_pos_to_coord_type& coord_map );
+
+	stir::DetectionPosition<> get_det_pos_for_index(const stir::DetectionPosition<>& index) const
+	{
+		return input_index_to_det_pos.at(index);
+    }
+	//! Returns a cartesian coordinate given a detection position.
+	stir::CartesianCoordinate3D<float> get_coordinate_for_det_pos( const stir::DetectionPosition<>& det_pos ) const
+	{ 
+		auto coord = det_pos_to_coord.at(det_pos);
+		coord.x() += static_cast<float>(distribution(generator));
+		coord.y() += static_cast<float>(distribution(generator));
+		coord.z() += static_cast<float>(distribution(generator));
+		return coord;
+	}
+	//! Returns a cartesian coordinate given an (unsorted) index.
+	stir::CartesianCoordinate3D<float> get_coordinate_for_index( const stir::DetectionPosition<>& index ) const
+	{
+		return get_coordinate_for_det_pos(get_det_pos_for_index(index));
+	}
+
+        Succeeded
+          find_detection_position_given_cartesian_coordinate(DetectionPosition<>& det_pos,
+                                                             const CartesianCoordinate3D<float>& cart_coord) const;
+
+        unsigned get_num_tangential_coords() const
+	{ return num_tangential_coords; }
+	unsigned get_num_axial_coords() const
+	{ return num_axial_coords; }
+	unsigned get_num_radial_coords() const
+	{ return num_radial_coords; }
+
+protected:
+
+ DetectorCoordinateMap(double sigma = 0.0) :
+        sigma(sigma),
+        distribution(0.0, sigma)
+  {}
+private:
+  unsigned num_tangential_coords;
+  unsigned num_axial_coords;
+  unsigned num_radial_coords;
+  unordered_to_ordered_det_pos_type input_index_to_det_pos;
+  det_pos_to_coord_type det_pos_to_coord;
+  std::map<stir::CartesianCoordinate3D<float>,
+    stir::DetectionPosition<>> detection_position_map_given_cartesian_coord_keys_3_decimal;
+  std::map<stir::CartesianCoordinate3D<float>,
+    stir::DetectionPosition<>> detection_position_map_given_cartesian_coord_keys_2_decimal;
+
+  const double sigma;
+  mutable std::default_random_engine generator;
+  mutable std::normal_distribution<double> distribution;
+
+  static det_pos_to_coord_type
+    read_detectormap_from_file_help( const std::string& crystal_map_name );
+
+};
+
+END_NAMESPACE_STIR
+#endif
diff --git a/src/include/stir/GeometryBlocksOnCylindrical.h b/src/include/stir/GeometryBlocksOnCylindrical.h
new file mode 100644
index 000000000..a14f5cea5
--- /dev/null
+++ b/src/include/stir/GeometryBlocksOnCylindrical.h
@@ -0,0 +1,66 @@
+
+/*
+Copyright 2017 ETH Zurich, Institute of Particle Physics and Astrophysics
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+	http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+/*!
+  \file
+  \ingroup projdata
+
+  \brief Declaration of class stir::GeometryBlocksOnCylindrical
+
+  \author Parisa Khateri
+
+*/
+#ifndef __stir_GeometryBlocksOnCylindrical_H__
+#define __stir_GeometryBlocksOnCylindrical_H__
+
+#include "stir/DetectorCoordinateMap.h"
+#include "stir/Array.h"
+
+START_NAMESPACE_STIR
+
+/*!
+  \ingroup projdata
+	\brief A helper class to build the crystal map based on scanner info.
+
+	\This class builds two maps between cartesian coordinates (z, y, x)
+	\ and the corresponding detection position (tangential_num, axial_num, radial_num) for each crystal.
+	\The crystal map, then, is used in ProjDataInfoBlocksOnCylindrical, ProjDataInfoBlocksOnCylindricalNoArcCorr, and CListRecordSAFIR
+
+	\The center of first ring is the center of coordinates.
+	\Distances are from center to center of crystals.
+
+*/
+
+class GeometryBlocksOnCylindrical: public DetectorCoordinateMap
+{
+
+
+public:
+
+	GeometryBlocksOnCylindrical(const Scanner &scanner);
+
+private:
+	//! Get rotation matrix for a given angle around z axis
+	stir::Array<2, float> get_rotation_matrix(float alpha) const;
+
+	//! Build crystal map in cartesian coordinate
+	void build_crystal_maps(const Scanner& scanner);
+};
+
+END_NAMESPACE_STIR
+
+#endif
diff --git a/src/include/stir/IO/InterfileHeader.h b/src/include/stir/IO/InterfileHeader.h
index da1a8f660..f15e3c1a2 100644
--- a/src/include/stir/IO/InterfileHeader.h
+++ b/src/include/stir/IO/InterfileHeader.h
@@ -1,6 +1,7 @@
 /*
     Copyright (C) 2002-2007, Hammersmith Imanet Ltd
     Copyright (C) 2013, 2016, 2018, 2020 University College London
+    Copyright 2017 ETH Zurich, Institute of Particle Physics and Astrophysics
     This file is part of STIR.
 
     SPDX-License-Identifier: Apache-2.0 AND License-ref-PARAPET-license
@@ -17,6 +18,7 @@
   \author Sanida Mustafovic
   \author PARAPET project
   \author Richard Brown
+  \author Parisa Khateri
 
   See http://stir.sourceforge.net for a description of the full
   proposal for Interfile headers for 3D PET.
@@ -284,6 +286,21 @@ class InterfilePDFSHeader : public InterfileHeader
   float energy_resolution;
   //! Reference energy.
   float reference_energy;
+  
+  //! \name new variables for block geometry
+  //@{
+  std::string scanner_orientation;
+  std::string scanner_geometry;
+  float axial_distance_between_crystals_in_cm;
+  float transaxial_distance_between_crystals_in_cm;
+  float axial_distance_between_blocks_in_cm;
+  float transaxial_distance_between_blocks_in_cm;
+  //@}
+  
+  //! \name new variables for generic geometry
+  //@{
+  std::string crystal_map;
+  //@}
   // end scanner parameters
 
   double effective_central_bin_size_in_cm;
diff --git a/src/include/stir/IO/SAFIRCListmodeInputFileFormat.h b/src/include/stir/IO/SAFIRCListmodeInputFileFormat.h
index b4755ce90..f9909cd94 100644
--- a/src/include/stir/IO/SAFIRCListmodeInputFileFormat.h
+++ b/src/include/stir/IO/SAFIRCListmodeInputFileFormat.h
@@ -48,20 +48,24 @@
 
 START_NAMESPACE_STIR
 
-/*! Class for reading SAFIR coincidence listmode data.
+/*! \brief Class for reading SAFIR coincidence listmode data.
 
 It reads a parameter file, which refers to 
-  - crystal map containing the mapping between detector index triple and cartesian coordinates of the crystal surfaces (see DetectorCoordinateMapFromFile)
+  - optional crystal map containing the mapping between detector index triple and cartesian coordinates of the crystal surfaces (see DetectorCoordinateMap)
   - the binary data file with the coincidence listmode data in SAFIR format (see CListModeDataSAFIR)
-  - a template projection data file, which is used to generate the virtual cylindrical scanner
+  - a template projection data file, which defines the scanner
+
+  If the map is not defined, the scanner detectors will be used. Otherwise, the nearest LOR of the scanner will be selected for each event.
 
   An example of such a parameter file would be
   \code
 	CListModeDataSAFIR Parameters:=
 		listmode data filename:= listmode_input.clm.safir
-		; the following two examples are also default to the key parser
-		crystal map filename:= crystal_map_front.txt 
-		template projection data filename:= safir_20.hs
+		template projection data filename:= <projdata-filename>
+        ; optional map specifying the actual location of the crystals
+		crystal map filename:= crystal_map.txt 
+		; optional random displacement of the LOR end-points in mm (only used of a map is present)
+        LOR randomization (Gaussian) sigma:=0
 	END CListModeDataSAFIR Parameters:=
   \endcode
 
@@ -144,8 +148,8 @@ class SAFIRCListmodeInputFileFormat : public InputFileFormat<ListModeData>, publ
 
 	void set_defaults() {
 		base_type::set_defaults();
-		crystal_map_filename = "crystal_map_front.txt";
-		template_proj_data_filename = "safir_20.hs";
+		crystal_map_filename = "";
+		template_proj_data_filename = "";
 		lor_randomization_sigma = 0.0;
 	}
 
@@ -161,7 +165,6 @@ class SAFIRCListmodeInputFileFormat : public InputFileFormat<ListModeData>, publ
 
 	bool post_processing() {
 		if( !file_exists(listmode_filename) ) return true;
-		else if( !file_exists(crystal_map_filename) ) return true; 
 		else if( !file_exists(template_proj_data_filename) ) return true;
 		else {
 			did_parsing = true;
diff --git a/src/include/stir/LORCoordinates.h b/src/include/stir/LORCoordinates.h
index c768ef5bc..bd2760edf 100644
--- a/src/include/stir/LORCoordinates.h
+++ b/src/include/stir/LORCoordinates.h
@@ -9,12 +9,14 @@
   \brief defines various classes for specifying a line in 3 dimensions
   \warning This is all preliminary and likely to change.
   \author Kris Thielemans
+  \author Parisa Khateri
 
 
 */
 /*
     Copyright (C) 2004 - 2009-06-22, Hammersmith Imanet Ltd
     Copyright (C) 2011-07-01 - 2013, Kris Thielemans
+    Copyright 2017 ETH Zurich, Institute of Particle Physics and Astrophysics
     This file is part of STIR.
 
     SPDX-License-Identifier: Apache-2.0
@@ -300,6 +302,11 @@ class LORAs2Points : public LOR<coordT>
     Succeeded
     get_intersections_with_cylinder(LORAs2Points<coordT>&,
 				    const double radius) const;
+ 
+ //! Calculate intersections with block. Used in: ProjDataInfoBlocksOnCylindrical::get_LOR
+  Succeeded
+  change_representation_for_block(LORInAxialAndNoArcCorrSinogramCoordinates<coordT>&,
+          const double radius) const;
 
  private:
   CartesianCoordinate3D<coordT> _p1;
@@ -426,6 +433,10 @@ class LORInAxialAndNoArcCorrSinogramCoordinates
   : public LOR<coordT>, private LORCylindricalCoordinates_z_and_radius<coordT>
 {
  private:
+#ifdef SWIG
+  // SWIG needs this typedef to be public
+ public:
+#endif
   typedef LORInAxialAndNoArcCorrSinogramCoordinates<coordT> self_type;
   typedef LORCylindricalCoordinates_z_and_radius<coordT> private_base_type;
 
diff --git a/src/include/stir/LORCoordinates.inl b/src/include/stir/LORCoordinates.inl
index 29c370d05..d787d8b3a 100644
--- a/src/include/stir/LORCoordinates.inl
+++ b/src/include/stir/LORCoordinates.inl
@@ -7,11 +7,12 @@
   \brief Implementations for LORCoordinates.h
   \warning This is all preliminary and likely to change.
   \author Kris Thielemans
-
+  \author Parisa Khateri
 
 */
 /*
     Copyright (C) 2004- 2013, Hammersmith Imanet Ltd
+    Copyright 2017 ETH Zurich, Institute of Particle Physics and Astrophysics
     Copyright (C) 2018, University College London
     This file is part of STIR.
 
@@ -446,6 +447,40 @@ get_intersections_with_cylinder(LORAs2Points<coordT>& lor,
   return find_LOR_intersections_with_cylinder(lor, *this, radius);
 }
 
+template <class coordT>
+Succeeded
+LORAs2Points<coordT>::
+change_representation_for_block(LORInAxialAndNoArcCorrSinogramCoordinates<coordT>& lor,
+                              const double radius) const
+{
+  const CartesianCoordinate3D<coordT>& c1 = this->p1();
+  const CartesianCoordinate3D<coordT>& c2 = this->p2();
+
+  //To check if LOR is inside the detector
+  const CartesianCoordinate3D<coordT> d = c2 - c1;
+  const double dxy2 = (square(d.x())+square(d.y()));
+  const double argsqrt=
+      (square(radius)*dxy2-square(d.x()*c1.y()-d.y()*c1.x()));
+
+  LORInCylinderCoordinates<coordT> cyl_coords;
+  cyl_coords.reset(static_cast<float>(radius));
+
+  cyl_coords.p1().psi() =
+    from_min_pi_plus_pi_to_0_2pi(static_cast<coordT>(atan2(c1.x(),-c1.y())));
+  cyl_coords.p2().psi() =
+    from_min_pi_plus_pi_to_0_2pi(static_cast<coordT>(atan2(c2.x(),-c2.y())));
+  cyl_coords.p1().z() =
+    static_cast<coordT>(c1.z());
+  cyl_coords.p2().z() =
+    static_cast<coordT>(c2.z());
+  lor = cyl_coords;
+
+  if (argsqrt<=0)
+    return Succeeded::no; // LOR is outside detector radius
+  else
+    return Succeeded::yes;
+}
+
 #define DEFINE_LOR_GET_FUNCTIONS(TYPE)                                       \
 template <class coordT>							     \
 Succeeded					     \
diff --git a/src/include/stir/ProjDataInfoBlocksOnCylindrical.h b/src/include/stir/ProjDataInfoBlocksOnCylindrical.h
new file mode 100644
index 000000000..1183bbf40
--- /dev/null
+++ b/src/include/stir/ProjDataInfoBlocksOnCylindrical.h
@@ -0,0 +1,35 @@
+
+/*
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+	http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+/*!
+  \file
+  \ingroup projdata
+
+  \brief Declaration of class stir::ProjDataInfoBlocksOnCylindrical
+
+*/
+#ifndef __stir_ProjDataInfoBlocksOnCylindrical_H__
+#define __stir_ProjDataInfoBlocksOnCylindrical_H__
+
+
+#include "stir/ProjDataInfoGeneric.h"
+
+START_NAMESPACE_STIR
+
+using ProjDataInfoBlocksOnCylindrical = ProjDataInfoGeneric;
+
+END_NAMESPACE_STIR
+#endif
diff --git a/src/include/stir/ProjDataInfoBlocksOnCylindricalNoArcCorr.h b/src/include/stir/ProjDataInfoBlocksOnCylindricalNoArcCorr.h
new file mode 100644
index 000000000..5d5ef419a
--- /dev/null
+++ b/src/include/stir/ProjDataInfoBlocksOnCylindricalNoArcCorr.h
@@ -0,0 +1,120 @@
+
+/*
+    Copyright (C) 2000- 2011-06-24, Hammersmith Imanet Ltd
+    Copyright (C) 2011-07-01 - 2011, Kris Thielemans
+    Copyright (C) 2017, ETH Zurich, Institute of Particle Physics and Astrophysics
+    This file is part of STIR.
+
+    SPDX-License-Identifier: Apache-2.0
+
+    See STIR/LICENSE.txt for details
+*/
+
+/*!
+  \file
+  \ingroup projdata
+
+  \brief Declaration of class stir::ProjDataInfoBlocksOnCylindricalNoArcCorr
+
+  \author Kris Thielemans
+  \author Parisa Khateri
+
+*/
+#ifndef __stir_ProjDataInfoBlocksOnCylindricalNoArcCorr_H__
+#define __stir_ProjDataInfoBlocksOnCylindricalNoArcCorr_H__
+
+
+#include "stir/ProjDataInfoGenericNoArcCorr.h"
+#include "stir/ProjDataInfoBlocksOnCylindrical.h"
+#include "stir/GeometryBlocksOnCylindrical.h"
+#include "stir/DetectionPositionPair.h"
+#include "stir/VectorWithOffset.h"
+#include "stir/CartesianCoordinate3D.h"
+
+START_NAMESPACE_STIR
+
+class Succeeded;
+/*!
+  \ingroup projdata
+  \brief Projection data info for data from a scanner with discrete dtectors organised by blocks
+
+  This class also contains some functions specific for (static) full-ring PET
+  scanners. In this case, it is assumed that for 'raw' data (i.e. no mashing)
+  sinogram space is 'interleaved': 2 adjacent LOR_angles are
+  merged to 1 'view', while the corresponding bins are
+  interleaved:
+
+  \verbatim
+     before interleaving               after interleaving
+     a00     a01     a02 ...      view 0: a00 a10 a01 a11  ...
+         a10     a11     ...
+     a20     a21     a22 ...      view 1: a20 a30 a21 a31 ...
+         a30     a31     ...
+	 \endverbatim
+  This (standard) interleaving is done because for 'odd' LOR_angles there
+  is no LOR which goes through the origin.
+
+
+  \par Interchanging the 2 detectors
+
+  When the ring difference = 0 (i.e. a 2D - or direct - sinogram),
+  interchanging the 2 detectors does not change the LOR. This is why
+  (in 2D) one gets away with a full sinogram size of
+  num_views * 2 * num_views, where the size of 'detector-space' is
+  twice as large.
+  However, in 3D, interchanging the detectors, also interchanges the
+  rings. One has 2 options:
+  - have 1 sinogram with twice as many views, together with the rings
+    as 'unordered pair' (i.e. ring_difference is always >0)
+  - have 2 sinograms of the same size as in 2D, together with the rings
+    as 'ordered pair' (i.e. ring_difference can be positive and negative).
+  In STIR, we use the second convention.
+
+  */
+class ProjDataInfoBlocksOnCylindricalNoArcCorr : public ProjDataInfoGenericNoArcCorr
+{
+private:
+  typedef ProjDataInfoGenericNoArcCorr base_type;
+#ifdef SWIG
+  // SWIG needs this typedef to be public
+ public:
+#endif
+  typedef ProjDataInfoBlocksOnCylindricalNoArcCorr self_type;
+
+public:
+  //! Default constructor (leaves object in ill-defined state)
+  ProjDataInfoBlocksOnCylindricalNoArcCorr();
+
+  //! Constructor which gets geometry from the scanner
+  ProjDataInfoBlocksOnCylindricalNoArcCorr(const shared_ptr<Scanner> scanner_ptr,
+    const  VectorWithOffset<int>& num_axial_pos_per_segment,
+    const  VectorWithOffset<int>& min_ring_diff_v,
+    const  VectorWithOffset<int>& max_ring_diff_v,
+    const int num_views,const int num_tangential_poss);
+
+  ProjDataInfo* clone() const;
+
+  bool operator==(const self_type&) const;
+
+  virtual std::string parameter_info() const;
+
+  //! \name set of obsolete functions to go between bins<->LORs (will disappear!)
+  //@{
+  Succeeded find_scanner_coordinates_given_cartesian_coordinates(int& det1, int& det2, int& ring1, int& ring2,
+					             const CartesianCoordinate3D<float>& c1,
+						     const CartesianCoordinate3D<float>& c2) const;
+
+  void find_bin_given_cartesian_coordinates_of_detection(Bin& bin,
+						  const CartesianCoordinate3D<float>& coord_1,
+						  const CartesianCoordinate3D<float>& coord_2) const;
+  //@}
+
+private:
+
+  virtual bool blindly_equals(const root_type * const) const;
+
+};
+
+END_NAMESPACE_STIR
+
+#endif
diff --git a/src/include/stir/ProjDataInfoBlocksOnCylindricalNoArcCorr.inl b/src/include/stir/ProjDataInfoBlocksOnCylindricalNoArcCorr.inl
new file mode 100644
index 000000000..c58678d47
--- /dev/null
+++ b/src/include/stir/ProjDataInfoBlocksOnCylindricalNoArcCorr.inl
@@ -0,0 +1,33 @@
+
+/*
+    Copyright (C) 2000- 2005, Hammersmith Imanet Ltd
+    Copyright (C) 2017, ETH Zurich, Institute of Particle Physics and Astrophysics
+    Copyright (C) 2021, University of Leeds
+    This file is part of STIR.
+
+    SPDX-License-Identifier: Apache-2.0
+
+    See STIR/LICENSE.txt for details
+*/
+
+/*!
+  \file
+  \ingroup projdata
+
+  \brief Implementation of inline functions of class
+	stir::ProjDataInfoBlocksOnCylindricalNoArcCorr
+
+  \author Kris Thielemans
+  \author Parisa Khateri
+  \author Viet Ahn Dao
+
+*/
+#include "stir/Bin.h"
+#include "stir/Succeeded.h"
+#include "stir/LORCoordinates.h"
+#include <math.h>
+
+START_NAMESPACE_STIR
+
+
+END_NAMESPACE_STIR
diff --git a/src/include/stir/ProjDataInfoCylindrical.h b/src/include/stir/ProjDataInfoCylindrical.h
index 73c1c0d97..b43656151 100644
--- a/src/include/stir/ProjDataInfoCylindrical.h
+++ b/src/include/stir/ProjDataInfoCylindrical.h
@@ -122,7 +122,11 @@ class ProjDataInfoCylindrical: public ProjDataInfo
    (i.e. no axial compression), while it is half the 
    ring spacing for spanned data.
   */
-  inline float get_axial_sampling(int segment_num) const;
+  virtual inline float get_axial_sampling(int segment_num) const;
+  //! Return if axial sampling makes sense
+  /*! could be \c false for block/generic cases */
+  virtual inline bool axial_sampling_is_uniform() const
+  { return true; }
   
   //! Get average ring difference for the given segment
   inline float get_average_ring_difference(int segment_num) const;
diff --git a/src/include/stir/ProjDataInfoGeneric.h b/src/include/stir/ProjDataInfoGeneric.h
new file mode 100644
index 000000000..275c14630
--- /dev/null
+++ b/src/include/stir/ProjDataInfoGeneric.h
@@ -0,0 +1,130 @@
+/*
+    Copyright (C) 2011, University College London
+    Copyright 2017 ETH Zurich, Institute of Particle Physics and Astrophysics
+    This file is part of STIR.
+
+    SPDX-License-Identifier: Apache-2.0
+
+    See STIR/LICENSE.txt for details
+*/
+/*!
+
+  \file
+  \ingroup projdata
+  \brief Declaration of class stir::ProjDataInfoGeneric
+  
+  \author Parisa Khateri
+  \author Michael Roethlisberger
+  \author Kris Thielemans
+*/
+#ifndef __stir_ProjDataInfoGeneric_H__
+#define __stir_ProjDataInfoGeneric_H__
+
+
+#include "stir/ProjDataInfoCylindrical.h"
+
+START_NAMESPACE_STIR
+
+class Succeeded;
+template <typename coordT> class CartesianCoordinate3D;
+
+/*!
+  \ingroup projdata
+  \brief projection data info for data corresponding to
+  'Generic' sampling.
+
+  This isn't completely generic as it assumes that there is "axial" (or "ring")
+  coordinate and a "transaxial" (or "crystal"). However, their spacing can
+  be arbitrary.
+
+  Currently this class is derived from ProjDataInfoCylindrical. Arguably it
+  should be the other way around. However, this would break backwards
+  compatibility dramatically, and break other pull-requests in progress.
+  We will leave this for later. At present, we just \c delete some member functions
+  that do not make sense in the Generic case. There are a few ones left which might
+  be removed in future, but are currently still used.
+
+  \todo change hierarchy order, i.e. derive from ProjDataInfoCylindrical from ProjDataInfoGeneric.
+*/
+
+class ProjDataInfoGeneric: public ProjDataInfoCylindrical
+{
+private:
+  typedef ProjDataInfo base_type;
+  typedef ProjDataInfoGeneric self_type;
+
+public:
+  //! Type used by get_all_ring_pairs_for_segment_axial_pos_num()
+  typedef std::vector<std::pair<int, int> > RingNumPairs;
+
+  //! Constructors
+  ProjDataInfoGeneric();
+  //! Constructor given all the necessary information
+  /*! The min and max ring difference in each segment are passed
+  as VectorWithOffsets. All three vectors have to have index ranges
+  from min_segment_num to max_segment_num.
+
+  \warning Most of this library assumes that segment 0 corresponds
+  to an average ring difference of 0.
+  */
+  ProjDataInfoGeneric(const shared_ptr<Scanner>& scanner_ptr,
+    const VectorWithOffset<int>& num_axial_poss_per_segment, //index ranges from min_segment_num to max_segment_num
+    const VectorWithOffset<int>& min_ring_diff,
+    const VectorWithOffset<int>& max_ring_diff,
+    const int num_views,const int num_tangential_poss);
+
+  inline virtual float get_tantheta(const Bin&) const;
+
+  inline float get_phi(const Bin&) const;
+
+  inline float get_t(const Bin&) const;
+
+  //! Return z-coordinate of the middle of the LOR
+  /*!
+  The 0 of the z-axis is chosen in the middle of the scanner.
+  */
+  inline float get_m(const Bin&) const;
+
+  virtual void
+    get_LOR(LORInAxialAndNoArcCorrSinogramCoordinates<float>& lor, const Bin& bin) const;
+
+  void set_azimuthal_angle_offset(const float angle) = delete;
+  void set_azimuthal_angle_sampling(const float angle) = delete;
+
+  //! set new number of views (currently calls error() unless nothing changes)
+  virtual void
+    set_num_views(const int new_num_views);
+
+  float get_azimuthal_angle_sampling() const = delete;
+  float get_azimuthal_angle_offset() const = delete;
+  float get_ring_radius() const = delete;
+  void set_ring_radii_for_all_views(const VectorWithOffset<float>& new_ring_radius) = delete;
+  VectorWithOffset<float> get_ring_radii_for_all_views() const = delete;
+
+  //! return an average ring-spacing (from Scanner)
+  //TODOBLOCK what does this mean in a generic case?
+  inline float get_ring_spacing() const;
+
+  virtual inline float get_sampling_in_t(const Bin&) const;
+  virtual inline float get_sampling_in_m(const Bin&) const;
+
+  inline float get_axial_sampling(int segment_num) const override;
+  inline bool axial_sampling_is_uniform() const override;
+
+  virtual std::string parameter_info() const;
+
+private:
+  //! to be used in get LOR
+  virtual void find_cartesian_coordinates_of_detection(CartesianCoordinate3D<float>& coord_1,
+  													   CartesianCoordinate3D<float>& coord_2,
+													   const Bin& bin) const = 0;
+protected:
+  CartesianCoordinate3D<float> z_shift;
+};
+
+
+END_NAMESPACE_STIR
+
+#include "stir/ProjDataInfoGeneric.inl"
+
+#endif
diff --git a/src/include/stir/ProjDataInfoGeneric.inl b/src/include/stir/ProjDataInfoGeneric.inl
new file mode 100644
index 000000000..20ae2cf21
--- /dev/null
+++ b/src/include/stir/ProjDataInfoGeneric.inl
@@ -0,0 +1,126 @@
+/*
+    Copyright (C) 2000 PARAPET partners
+    Copyright (C) 2000-2003, Hammersmith Imanet Ltd
+    Copyright (C) 2013, University College London
+    Copyright (C) 2013, Institute for Bioengineering of Catalonia
+    Copyright (C) 2017, ETH Zurich, Institute of Particle Physics and Astrophysics
+    Copyright (C) 2018, 2021 University of Leeds
+
+    This file is part of STIR.
+
+    SPDX-License-Identifier: Apache-2.0 AND License-ref-PARAPET-license
+
+    See STIR/LICENSE.txt for details
+*/
+
+/*!
+
+  \file
+  \ingroup projdata
+
+  \brief Implementation of inline functions of class stir::ProjDataInfoGeneric
+	
+  \author Sanida Mustafovic
+  \author Kris Thielemans
+  \author Palak Wadhwa
+  \author Berta Marti Fuster
+  \author PARAPET project
+  \author Parisa Khateri
+  \author Michael Roethlisberger
+  \author Viet Ahn Dao
+*/
+
+// for sqrt
+#include <math.h>
+#include "stir/Bin.h"
+#include "stir/Succeeded.h"
+#include "stir/LORCoordinates.h"
+#include "stir/is_null_ptr.h"
+#include <algorithm>
+#include "stir/CartesianCoordinate3D.h"
+
+START_NAMESPACE_STIR
+
+
+//! find phi from correspoding lor
+float
+ProjDataInfoGeneric::get_phi(const Bin& bin)const
+{
+	LORInAxialAndNoArcCorrSinogramCoordinates<float> lor;
+	get_LOR(lor, bin);
+	if (bin.view_num()==0 && lor.phi()>0.1)
+		return static_cast<float>(lor.phi()-_PI);
+	return lor.phi();
+}
+
+/*! warning In generic geometry m is calculated directly from lor while in
+	cylindrical geometry m is calculated using m_offset and axial_sampling
+*/
+float
+ProjDataInfoGeneric::get_m(const Bin& bin) const
+{
+	LORInAxialAndNoArcCorrSinogramCoordinates<float> lor;
+	get_LOR(lor, bin);
+	return (static_cast<float>(lor.z1() + lor.z2()))/2.F;
+}
+
+float
+ProjDataInfoGeneric::get_t(const Bin& bin) const
+{
+  return
+    get_m(bin)*get_costheta(bin);
+}
+
+/*
+	theta is copolar angle of normal to projection plane with z axis, i.e. copolar angle of lor with z axis.
+	tan (theta) = dz/sqrt(dx2+dy2)
+	cylindrical geometry:
+		delta_z = delta_ring * ring spacing
+	generic geometry:
+		delta_z is calculated from lor
+*/
+float
+ProjDataInfoGeneric::get_tantheta(const Bin& bin) const
+{
+  CartesianCoordinate3D<float> _p1;
+  CartesianCoordinate3D<float> _p2;
+  find_cartesian_coordinates_of_detection(_p1, _p2, bin);
+  CartesianCoordinate3D<float> p2_minus_p1 = _p2 - _p1;
+  return p2_minus_p1.z() / (sqrt(square(p2_minus_p1.x())+square(p2_minus_p1.y()))); 
+}
+
+float
+ProjDataInfoGeneric::get_sampling_in_m(const Bin& bin) const
+{
+  // TODOBLOCK
+  return get_scanner_ptr()->get_ring_spacing()/2; // TODO currently restricted to span=1 get_num_axial_poss_per_ring_inc(segment_num);
+  //return get_axial_sampling(bin.segment_num());
+}
+
+float
+ProjDataInfoGeneric::get_sampling_in_t(const Bin& bin) const
+{
+  // TODOBLOCK
+  return get_scanner_ptr()->get_ring_spacing()/2*get_costheta(bin); // TODO currently restricted to span=1 get_num_axial_poss_per_ring_inc(segment_num);
+  //return get_axial_sampling(bin.segment_num())*get_costheta(bin);
+}
+
+float
+ProjDataInfoGeneric::get_axial_sampling(int segment_num) const
+{
+  // TODOBLOCK should check sampling
+  return get_ring_spacing()/2; // TODO currently restricted to span=1 get_num_axial_poss_per_ring_inc(segment_num);
+}
+
+bool ProjDataInfoGeneric::axial_sampling_is_uniform() const
+{
+  // TODOBLOCK should check sampling
+  return true;
+}
+
+float
+ProjDataInfoGeneric::get_ring_spacing() const
+{ return get_scanner_ptr()->get_ring_spacing();}
+
+
+END_NAMESPACE_STIR
diff --git a/src/include/stir/ProjDataInfoGenericNoArcCorr.h b/src/include/stir/ProjDataInfoGenericNoArcCorr.h
new file mode 100644
index 000000000..621413f01
--- /dev/null
+++ b/src/include/stir/ProjDataInfoGenericNoArcCorr.h
@@ -0,0 +1,278 @@
+/*
+    Copyright (C) 2000- 2011-06-24, Hammersmith Imanet Ltd
+    Copyright (C) 2011-07-01 - 2011, Kris Thielemans
+    Copyright (C) 2017, ETH Zurich, Institute of Particle Physics and Astrophysics
+    This file is part of STIR.
+
+    SPDX-License-Identifier: Apache-2.0
+
+    See STIR/LICENSE.txt for details
+*/
+
+/*!
+  \file
+  \ingroup projdata
+
+  \brief Declaration of class stir::ProjDataInfoGenericNoArcCorr
+  
+  \author Kris Thielemans
+  \author Parisa Khateri
+  \author Michael Roethlisberger
+*/
+#ifndef __stir_ProjDataInfoGenericNoArcCorr_H__
+#define __stir_ProjDataInfoGenericNoArcCorr_H__
+
+
+#include "stir/ProjDataInfoGeneric.h"
+#include "stir/GeometryBlocksOnCylindrical.h"
+#include "stir/DetectionPositionPair.h"
+#include "stir/VectorWithOffset.h"
+#include "stir/CartesianCoordinate3D.h"
+
+START_NAMESPACE_STIR
+
+class Succeeded;
+/*!
+  \ingroup projdata
+  \brief Projection data info for data for a scanner with discrete detectors
+
+  This class also contains some functions specific for (static) full-ring PET
+  scanners. In this case, it is assumed that for 'raw' data (i.e. no mashing)
+  sinogram space is 'interleaved': 2 adjacent LOR_angles are
+  merged to 1 'view', while the corresponding bins are
+  interleaved:
+
+  \verbatim
+     before interleaving               after interleaving
+     a00     a01     a02 ...      view 0: a00 a10 a01 a11  ...
+         a10     a11     ...
+     a20     a21     a22 ...      view 1: a20 a30 a21 a31 ...
+         a30     a31     ...
+	 \endverbatim
+  This (standard) interleaving is done because for 'odd' LOR_angles there
+  is no LOR which goes through the origin.
+
+
+  \par Interchanging the 2 detectors
+
+  When the ring difference = 0 (i.e. a 2D - or direct - sinogram),
+  interchanging the 2 detectors does not change the LOR. This is why
+  (in 2D) one gets away with a full sinogram size of
+  num_views * 2 * num_views, where the size of 'detector-space' is
+  twice as large.
+  However, in 3D, interchanging the detectors, also interchanges the
+  rings. One has 2 options:
+  - have 1 sinogram with twice as many views, together with the rings
+    as 'unordered pair' (i.e. ring_difference is always >0)
+  - have 2 sinograms of the same size as in 2D, together with the rings
+    as 'ordered pair' (i.e. ring_difference can be positive and negative).
+  In STIR, we use the second convention.
+  */
+class ProjDataInfoGenericNoArcCorr : public ProjDataInfoGeneric
+{
+private:
+  typedef ProjDataInfoGeneric base_type;
+#ifdef SWIG
+  // SWIG needs this typedef to be public
+ public:
+#endif
+  typedef ProjDataInfoGenericNoArcCorr self_type;
+
+public:
+  //! Default constructor (leaves object in ill-defined state)
+  ProjDataInfoGenericNoArcCorr();
+
+  //! Constructor which gets geometry from the scanner
+   ProjDataInfoGenericNoArcCorr(const shared_ptr<Scanner> scanner_ptr,
+    const  VectorWithOffset<int>& num_axial_pos_per_segment,
+    const  VectorWithOffset<int>& min_ring_diff_v,
+    const  VectorWithOffset<int>& max_ring_diff_v,
+    const int num_views,const int num_tangential_poss);
+
+  ProjDataInfo* clone() const;
+
+  bool operator==(const self_type&) const;
+
+  //! Gets s coordinate in mm
+  /*! \warning
+    This does \c not take the 'interleaving' into account which is
+    customarily applied to raw PET data.
+  */
+  inline virtual float get_s(const Bin&) const;
+
+  virtual std::string parameter_info() const;
+
+  //! \name Functions that convert between bins and detection positions
+  //@{
+  //! This gets view_num and tang_pos_num for a particular detector pair
+  /*! This function makes only sense if the scanner is a full-ring scanner
+      with discrete detectors and there is no rotation or wobble.
+
+      \arg view runs currently from 0 to num_views-1
+
+      \arg tang_pos_num is centred around 0, where 0 corresponds
+      to opposing detectors. The maximum range of tangential positions for any
+      scanner is -(num_detectors)/2<tang_pos_num<=-(num_detectors)/2+num_detectors,
+      but this range is never used (as the 'last' tang_pos_num would be a LOR
+      between two adjacent detectors).
+
+      \arg det_num1, \a det_num2 run from 0 to num_detectors-1
+
+      \return \c true if the detector pair is stored in a positive segment,
+              \c false otherwise.
+
+      \warning Current implementation only checked for Siemens/CTI scanners.
+      It assumes interleaved data.
+      \warning Will call error() if certain conditions are not met.
+
+      \see get_det_num_pair_for_view_tangential_pos_num()
+  */
+  inline bool
+     get_view_tangential_pos_num_for_det_num_pair(int& view_num,
+						 int& tang_pos_num,
+						 const int det1_num,
+						 const int det2_num) const;
+  //! This routine gets \a det_num1 and \a det_num2
+  /*!
+      It sets the detectors in a particular order (i.e. it fixes the
+      orientation of the LOR) corresponding to the detector pair belonging
+      to a positive segment.
+
+      \warning This currently only works when no mashing of views is used,
+      as otherwise there would be multiple detector pairs corresponding
+      to a single bin.
+
+      \see get_view_tangential_pos_num_for_det_num_pair() for info and
+      restrictions.
+      \warning Will call error() if certain conditions are not met.
+   */
+  inline void
+    get_det_num_pair_for_view_tangential_pos_num(
+						 int& det1_num,
+						 int& det2_num,
+						 const int view_num,
+						 const int tang_pos_num) const;
+
+  //! This gets Bin coordinates for a particular detector pair
+  /*!
+    Note that when axial compression and/or mashing is applied, this is a many-to-one relation,
+    i.e. multiple detector pairs contribute to one bin.
+
+    \return Succeeded::yes when a corresponding bin is found in the range of projection data. Currently,
+    the Bin value is always set to 1.
+    \see get_view_tangential_pos_num_for_det_num_pair() for restrictions
+    \todo use member template for the coordT type to support continuous detectors.
+  */
+  inline Succeeded
+    get_bin_for_det_pos_pair(Bin&,
+			 const DetectionPositionPair<>&) const;
+
+
+  //! This routine gets the detector pair corresponding to a bin.
+  /*!
+    \see get_det_pair_for_view_tangential_pos_num() for
+    restrictions. In addition, this routine only works for span=1 data,
+    i.e. no axial compression.
+    \todo use member template for the coordT type to support continuous detectors.
+    \warning Will call error() if certain conditions are not met.
+  */
+  inline void
+    get_det_pos_pair_for_bin(DetectionPositionPair<>&,
+	                 const Bin&) const;
+
+  //! This routine returns the number of detector pairs that correspond to a bin
+  unsigned int
+    get_num_det_pos_pairs_for_bin(const Bin&) const;
+
+  //! This routine fills a vector with all the detector pairs that correspond to a bin.
+  /*!
+    \see ProjDataInfoCylindrical::get_all_ring_pairs_for_segment_axial_pos_num
+    for restrictions.
+    \todo It might be possible to return some weight factors in case there is
+    no many-to-one correspondence between detection positions and bins
+    (for instance for continuous detectors, or rotating scanners, or
+    arc-corrected data).
+  */
+  void
+    get_all_det_pos_pairs_for_bin(std::vector<DetectionPositionPair<> >&,
+				  const Bin&) const;
+
+  //! This gets Bin coordinates for a particular detector pair
+  /*!
+    \return Succeeded::yes when a corresponding segment is found
+    \see get_view_tangential_pos_num_for_det_num_pair() for restrictions
+    \obsolete
+  */
+  inline Succeeded
+    get_bin_for_det_pair(Bin&,
+			 const int det1_num, const int ring1_num,
+			 const int det2_num, const int ring2_num) const;
+
+
+  //! This routine gets the detector pair corresponding to a bin.
+  /*!
+    \see get_det_pair_for_view_tangential_pos_num() for
+    restrictions. In addition, this routine only works for span=1 data,
+    i.e. no axial compression.
+    \obsolete
+  */
+  inline void
+    get_det_pair_for_bin(
+			 int& det1_num, int& ring1_num,
+			 int& det2_num, int& ring2_num,
+			 const Bin&) const;
+
+  //@}
+
+  virtual
+    Bin
+    get_bin(const LOR<float>&) const;
+
+
+  //! \name set of obsolete functions to go between bins<->LORs (will disappear!)
+  //@{
+  /*! \warning These function take a different convention for the axial coordinate
+    compare to the get_m(), get_LOR() etc. In the current function, the axial coordinate (z)
+    is zero in the first ring, while for get_m() etc it is zero in the centre of the scanner.
+    \obsolete
+  */
+
+  virtual void find_cartesian_coordinates_of_detection(CartesianCoordinate3D<float>& coord_1,
+					       CartesianCoordinate3D<float>& coord_2,
+					       const Bin& bin) const;
+
+  virtual void find_cartesian_coordinates_given_scanner_coordinates (CartesianCoordinate3D<float>& coord_1,
+							     CartesianCoordinate3D<float>& coord_2,
+							     const int Ring_A,const int Ring_B,
+							     const int det1, const int det2) const;
+
+private:
+
+  // used in get_view_tangential_pos_num_for_det_num_pair()
+  struct Det1Det2 { int det1_num; int det2_num; };
+  mutable VectorWithOffset< VectorWithOffset<Det1Det2> > uncompressed_view_tangpos_to_det1det2;
+  mutable bool uncompressed_view_tangpos_to_det1det2_initialised;
+  //! build look-up table for get_view_tangential_pos_num_for_det_num_pair()
+  void initialise_uncompressed_view_tangpos_to_det1det2() const;
+
+  // used in get_view_tangential_pos_num_for_det_num_pair()
+  // we prestore a lookup-table in terms for unmashed view/tangpos
+  struct ViewTangPosSwap { int view_num; int tang_pos_num; bool swap_detectors; };
+  mutable VectorWithOffset< VectorWithOffset<ViewTangPosSwap> > det1det2_to_uncompressed_view_tangpos;
+  mutable bool det1det2_to_uncompressed_view_tangpos_initialised;
+  //! build look-up table for get_view_tangential_pos_num_for_det_num_pair()
+  void initialise_det1det2_to_uncompressed_view_tangpos() const;
+
+  //! build look-up table unless already done before
+  inline void initialise_uncompressed_view_tangpos_to_det1det2_if_not_done_yet() const;
+  //! build look-up table unless already done before
+  inline void initialise_det1det2_to_uncompressed_view_tangpos_if_not_done_yet() const;
+ protected:
+  virtual bool blindly_equals(const root_type * const) const;
+};
+
+END_NAMESPACE_STIR
+
+#include "stir/ProjDataInfoGenericNoArcCorr.inl"
+
+#endif
diff --git a/src/include/stir/ProjDataInfoGenericNoArcCorr.inl b/src/include/stir/ProjDataInfoGenericNoArcCorr.inl
new file mode 100644
index 000000000..f2363b465
--- /dev/null
+++ b/src/include/stir/ProjDataInfoGenericNoArcCorr.inl
@@ -0,0 +1,226 @@
+/*
+    Copyright (C) 2000- 2005, Hammersmith Imanet Ltd
+    Copyright (C) 2017, ETH Zurich, Institute of Particle Physics and Astrophysics
+    Copyright (C) 2021, University of Leeds
+    This file is part of STIR.
+
+    SPDX-License-Identifier: Apache-2.0
+
+    See STIR/LICENSE.txt for details
+*/
+
+/*!
+
+  \file
+  \ingroup projdata
+
+  \brief Implementation of inline functions of class stir::ProjDataInfoGenericNoArcCorr
+	
+  \author Kris Thielemans
+  \author Parisa Khateri
+  \author Michael Roethlisberger
+  \author Viet Ahn Dao
+*/
+
+
+#include "stir/Bin.h"
+#include "stir/Succeeded.h"
+#include "stir/LORCoordinates.h"
+#include <math.h>
+
+START_NAMESPACE_STIR
+
+void
+ProjDataInfoGenericNoArcCorr::
+initialise_uncompressed_view_tangpos_to_det1det2_if_not_done_yet() const
+{
+  // for efficiency reasons, use "Double-Checked-Locking(DCL) pattern" with OpenMP atomic operation
+  // OpenMP v3.1 or later required
+  // thanks to yohjp: http://stackoverflow.com/questions/27975737/how-to-handle-cached-data-structures-with-multi-threading-e-g-openmp
+#if defined(STIR_OPENMP) &&  _OPENMP >=201012
+  bool initialised;
+#pragma omp atomic read
+  initialised = uncompressed_view_tangpos_to_det1det2_initialised;
+
+  if (!initialised)
+#endif
+    {
+#if defined(STIR_OPENMP)
+#pragma omp critical(PROJDATAINFOCYLINDRICALNOARCCORR_VIEWTANGPOS_TO_DETS)
+#endif
+          {
+            if (!uncompressed_view_tangpos_to_det1det2_initialised)
+              initialise_uncompressed_view_tangpos_to_det1det2();
+          }
+    }
+}
+
+void
+ProjDataInfoGenericNoArcCorr::
+initialise_det1det2_to_uncompressed_view_tangpos_if_not_done_yet() const
+{
+  // as above
+#if defined(STIR_OPENMP) &&  _OPENMP >=201012
+  bool initialised;
+#pragma omp atomic read
+  initialised = det1det2_to_uncompressed_view_tangpos_initialised;
+
+  if (!initialised)
+#endif
+    {
+#if defined(STIR_OPENMP)
+#pragma omp critical(PROJDATAINFOCYLINDRICALNOARCCORR_DETS_TO_VIEWTANGPOS)
+#endif
+          {
+            if (!det1det2_to_uncompressed_view_tangpos_initialised)
+              initialise_det1det2_to_uncompressed_view_tangpos();
+          }
+    }
+}
+
+/*! warning In cylindrical s is found from bin: sin(beta) = sin(tang_pos*angular_increment)
+	In block it is calculated directly from corresponding lor
+*/
+float
+ProjDataInfoGenericNoArcCorr::
+get_s(const Bin& bin) const
+{
+  LORInAxialAndNoArcCorrSinogramCoordinates<float> lor;
+	get_LOR(lor, bin);
+  // REQUIREMENT: Euclidean coordinate of 3 points, a,b and c.
+  // CALCULATION: // Equation of a line, in parametric form, given two point a, b: p(t) = a + (b-a)*t
+  //              // Let a,b,c be points in 2D and let a,b form a line then shortest distance between c and line ab is:
+  //              // || (p0-p1) - [(p0-p1)*(p2-p1)/||p2-p1||^2]*(p2-p1) ||
+  //              p1 = _p1, p2=_p2 and p0=(0,0,0)
+  // OUTPUT:      replace the ring_radius*sin(lor.beta()) with distance from o to ab.
+
+  // Can't access coordinate of detection from this class so we have to recalculate where it is:
+  
+  CartesianCoordinate3D<float> _p1;
+	CartesianCoordinate3D<float> _p2;
+	find_cartesian_coordinates_of_detection(_p1, _p2, bin);
+
+  // // Get p1-p0 and p2-p1 vector.
+  CartesianCoordinate3D<float> p2_minus_p1 = _p2 - _p1;
+  CartesianCoordinate3D<float> p0_minus_p1 = CartesianCoordinate3D<float>(0,0,0) - _p1;
+  float p0_minus_p1_dot_p2_minus_p1 = p0_minus_p1.x()* p2_minus_p1.x() + p0_minus_p1.y()*p2_minus_p1.y();
+  float p2_minus_p1_magitude = square(p2_minus_p1.x()) + square(p2_minus_p1.y());
+  float x = 0;
+  float y = 0;
+  float sign = sin(lor.beta());
+  if (p2_minus_p1_magitude > 0.01)
+  {
+    x = p0_minus_p1.x() - (p0_minus_p1_dot_p2_minus_p1/p2_minus_p1_magitude)*p2_minus_p1.x();
+    y = p0_minus_p1.y() - (p0_minus_p1_dot_p2_minus_p1/p2_minus_p1_magitude)*p2_minus_p1.y();
+  }
+  else
+  {
+     error("get_s(): 2 detection points are too close to each other. This indicates an internal error.");
+  }
+  float s = sqrt(square(x) + square(y));
+
+  if(sign < 0.0){
+    return -s;
+  }else{
+    return s;
+  }
+}
+
+void
+ProjDataInfoGenericNoArcCorr::
+get_det_num_pair_for_view_tangential_pos_num(
+					     int& det1_num,
+					     int& det2_num,
+					     const int view_num,
+					     const int tang_pos_num) const
+{
+  assert(get_view_mashing_factor() == 1);
+	this->initialise_uncompressed_view_tangpos_to_det1det2_if_not_done_yet();
+
+  det1_num = uncompressed_view_tangpos_to_det1det2[view_num][tang_pos_num].det1_num;
+  det2_num = uncompressed_view_tangpos_to_det1det2[view_num][tang_pos_num].det2_num;
+}
+
+bool
+ProjDataInfoGenericNoArcCorr::
+get_view_tangential_pos_num_for_det_num_pair(int& view_num,
+					     int& tang_pos_num,
+					     const int det1_num,
+					     const int det2_num) const
+{
+	assert(det1_num!=det2_num);
+	this->initialise_det1det2_to_uncompressed_view_tangpos_if_not_done_yet();
+
+  view_num =
+    det1det2_to_uncompressed_view_tangpos[det1_num][det2_num].view_num/get_view_mashing_factor();
+  tang_pos_num =
+    det1det2_to_uncompressed_view_tangpos[det1_num][det2_num].tang_pos_num;
+  return
+    det1det2_to_uncompressed_view_tangpos[det1_num][det2_num].swap_detectors;
+}
+
+Succeeded
+ProjDataInfoGenericNoArcCorr::
+get_bin_for_det_pair(Bin& bin,
+		     const int det_num1, const int ring_num1,
+		     const int det_num2, const int ring_num2) const
+{
+  if (get_view_tangential_pos_num_for_det_num_pair(bin.view_num(), bin.tangential_pos_num(), det_num1, det_num2))
+    return get_segment_axial_pos_num_for_ring_pair(bin.segment_num(), bin.axial_pos_num(), ring_num1, ring_num2);
+  else
+    return get_segment_axial_pos_num_for_ring_pair(bin.segment_num(), bin.axial_pos_num(), ring_num2, ring_num1);
+}
+
+Succeeded
+ProjDataInfoGenericNoArcCorr::
+get_bin_for_det_pos_pair(Bin& bin,
+                         const DetectionPositionPair<>& dp) const
+{
+  return
+    get_bin_for_det_pair(bin,
+                         dp.pos1().tangential_coord(),
+                         dp.pos1().axial_coord(),
+		         		 dp.pos2().tangential_coord(),
+                         dp.pos2().axial_coord());
+}
+
+void
+ProjDataInfoGenericNoArcCorr::
+get_det_pair_for_bin(
+		     int& det_num1, int& ring_num1,
+		     int& det_num2, int& ring_num2,
+		     const Bin& bin) const
+{
+  get_det_num_pair_for_view_tangential_pos_num(det_num1, det_num2, bin.view_num(), bin.tangential_pos_num());
+  get_ring_pair_for_segment_axial_pos_num( ring_num1, ring_num2, bin.segment_num(), bin.axial_pos_num());
+}
+
+void
+ProjDataInfoGenericNoArcCorr::
+get_det_pos_pair_for_bin(
+		     DetectionPositionPair<>& dp,
+		     const Bin& bin) const
+{
+  //lousy work around because types don't match TODO remove!
+#if 1
+  int t1=dp.pos1().tangential_coord(),
+    a1=dp.pos1().axial_coord(),
+    t2=dp.pos2().tangential_coord(),
+    a2=dp.pos2().axial_coord();
+  get_det_pair_for_bin(t1, a1, t2, a2, bin);
+  dp.pos1().tangential_coord()=t1;
+  dp.pos1().axial_coord()=a1;
+  dp.pos2().tangential_coord()=t2;
+  dp.pos2().axial_coord()=a2;
+
+#else
+
+  get_det_pair_for_bin(dp.pos1().tangential_coord(),
+                       dp.pos1().axial_coord(),
+		       dp.pos2().tangential_coord(),
+                       dp.pos2().axial_coord(),
+                       bin);
+#endif
+}
+
+END_NAMESPACE_STIR
diff --git a/src/include/stir/Scanner.h b/src/include/stir/Scanner.h
index d05ba44f0..27ff99ee8 100644
--- a/src/include/stir/Scanner.h
+++ b/src/include/stir/Scanner.h
@@ -2,9 +2,9 @@
     Copyright (C) 2000 PARAPET partners
     Copyright (C) 2000-2010, Hammersmith Imanet Ltd
     Copyright (C) 2011-2013, King's College London
-    Copyright (C) 2016, 2019, UCL
+    Copyright (C) 2016, 2019, 2021 UCL
+    Copyright 2017 ETH Zurich, Institute of Particle Physics and Astrophysics
     Copyright (C 2017-2018, University of Leeds
- 
     This file is part of STIR.
 
     SPDX-License-Identifier: Apache-2.0 AND License-ref-PARAPET-license
@@ -25,18 +25,28 @@
   \author Ottavia Bertolli
   \author Palak Wadhwa
   \author PARAPET project
+  \author Parisa Khateri
+
 */
 #ifndef __stir_buildblock_SCANNER_H__
 #define __stir_buildblock_SCANNER_H__
 
 #include "stir/DetectionPosition.h"
+#include "stir/CartesianCoordinate3D.h"
+#include "stir/DetectorCoordinateMap.h"
+#include "stir/shared_ptr.h"
 #include <string>
 #include <list>
+#include <vector>
+#include <cmath>
+#include <algorithm>
+#include <fstream>
+#include <boost/algorithm/string.hpp>
+#include <boost/unordered_map.hpp>
 
 START_NAMESPACE_STIR
 
 class Succeeded;
-
 /*!
   \ingroup buildblock
   \brief A class for storing some info on the scanner
@@ -81,12 +91,16 @@ class Succeeded;
       \todo Some scanners do not have all info filled in at present. Values are then
       set to 0.
 
+      \warning You have to call set_up() after using the \c set_* functions (except set_params()).
+
   \todo  
     a hierarchy distinguishing between different types of scanners
   \todo derive from ParsingObject
 */
 class Scanner 
 {
+    friend class BlocksTests;
+    
  public:
 
    /************* static members*****************************/
@@ -120,9 +134,11 @@ class Scanner
   enum Type {E931, E951, E953, E921, E925, E961, E962, E966, E1080, Siemens_mMR,Siemens_mCT, RPT,HiDAC,
 	     Advance, DiscoveryLS, DiscoveryST, DiscoverySTE, DiscoveryRX, Discovery600, PETMR_Signa,
 	     Discovery690, DiscoveryMI3ring, DiscoveryMI4ring, DiscoveryMI5ring,
-	     HZLR, RATPET, PANDA, HYPERimage, nanoPET, HRRT, Allegro, GeminiTF, User_defined_scanner,
+	     HZLR, RATPET, PANDA, HYPERimage, nanoPET, HRRT, Allegro, GeminiTF, SAFIRDualRingPrototype, User_defined_scanner,
 	     Unknown_scanner};
-  
+
+  virtual ~Scanner() {}
+
   //! constructor that takes scanner type as an input argument
   Scanner(Type scanner_type);
 
@@ -144,7 +160,14 @@ class Scanner
           int num_transaxial_crystals_per_singles_unit_v,
           int num_detector_layers_v,
           float energy_resolution_v = -1.0f,
-          float reference_energy_v = -1.0f);
+          float reference_energy_v = -1.0f,
+          const std::string& scanner_orientation_v = "X",
+          const std::string& scanner_geometry_v = "Cylindrical",
+          float axial_crystal_spacing_v = -1.0f,
+          float transaxial_crystal_spacing_v = -1.0f,
+          float axial_block_spacing_v = -1.0f,
+          float transaxial_block_spacing_v = -1.0f,
+          const std::string& crystal_map_file_name = "");
 
   //! constructor ( a single name)
   /*! size info is in mm
@@ -163,9 +186,20 @@ class Scanner
           int num_transaxial_crystals_per_singles_unit_v,
           int num_detector_layers_v,
           float energy_resolution_v = -1.0f,
-          float reference_energy_v = -1.0f);
-
-
+          float reference_energy_v = -1.0f,
+          const std::string& scanner_orientation_v = "X",
+          const std::string& scanner_geometry_v = "Cylindrical",
+          float axial_crystal_spacing_v = -1.0f,
+          float transaxial_crystal_spacing_v = -1.0f,
+          float axial_block_spacing_v = -1.0f,
+          float transaxial_block_spacing_v = -1.0f,
+          const std::string& crystal_map_file_name = "");
+
+  //! Initialised internal geometry
+  /*! Currently called in the set_params() functions, but needs to be
+      called explicitly when afterwards using any of the other \c set_ functions
+  */
+  virtual void set_up();
 
   //! get scanner parameters as a std::string
   std::string parameter_info() const;
@@ -273,6 +307,8 @@ class Scanner
   /*! Some scanners (including many Siemens scanners) insert virtual crystals in the sinogram data.
     The other members of the class return the size of the "virtual" block. With these
     functions you can find its true size (or set it).
+
+    You have to call set_up() after using the \c set_* functions.
   */
   //@{! 
   int get_num_virtual_axial_crystals_per_block() const;
@@ -281,6 +317,26 @@ class Scanner
   void set_num_virtual_transaxial_crystals_per_block(int);
   //@}
 
+  //! \name functions to get block geometry info
+  //@{
+  //! get scanner orientation
+  inline std::string get_scanner_orientation() const;
+  //! get scanner geometry
+  inline std::string get_scanner_geometry() const;
+  //! get crystal spacing in axial direction
+  inline float get_axial_crystal_spacing() const;
+  //! get crystal spacing in transaxial direction
+  inline float get_transaxial_crystal_spacing() const;
+  //! get block spacing in axial direction
+  inline float get_axial_block_spacing() const;
+  //! get block spacing in transaxial direction
+  inline float get_transaxial_block_spacing() const;
+  //@} (end of get block geometry info)
+  
+  //! \name functions to get generic geometry info
+  //! get crystal map file name
+  inline std::string get_crystal_map_file_name() const;
+  
   //@} (end of block/bucket info)
 
   //@} (end of get geometrical info)
@@ -296,7 +352,10 @@ class Scanner
   //@} (end of get detector responce info)
 
   //! \name Functions setting info
-  /*! Be careful to keep consistency by setting all relevant parameters*/
+  /*! Be careful to keep consistency by setting all relevant parameters.
+
+    You have to call set_up() after using any of these.
+  */
   //@{
   // zlong, 08-04-2004, add set_methods
   //! set scanner type
@@ -336,6 +395,25 @@ class Scanner
   //! set number of transaxial crystals per singles unit
   inline void set_num_transaxial_crystals_per_singles_unit(const int & new_num);
   // TODO accomodate more complex geometries of singles units.
+  //@{
+  //! name functions to set block geometry info
+  //! set scanner orientation
+  inline void set_scanner_orientation(const std::string& new_scanner_orientation);
+  //! set scanner geometry
+  /*! Will also read the detector map from file if the geometry is \c Generic */
+  void set_scanner_geometry(const std::string& new_scanner_geometry);
+  //! set crystal spacing in axial direction
+  inline void set_axial_crystal_spacing(const float & new_spacing);
+  //! set crystal spacing in transaxial direction
+  inline void set_transaxial_crystal_spacing(const float & new_spacing);
+  //! set block spacing in axial direction
+  inline void set_axial_block_spacing(const float & new_spacing);
+  //! set block spacing in transaxial direction
+  inline void set_transaxial_block_spacing(const float & new_spacing);
+  //! set crystal map file name for the generic geometry
+  /*! \warning, data is not read yet. use set_scanner_geometry() after calling this function */
+  inline void set_crystal_map_file_name(const std::string& new_crystal_map_file_name);
+  //@} (end of block geometry info)
 
   //@} (end of block/bucket info)
   //! set the energy resolution of the system
@@ -347,7 +425,6 @@ class Scanner
 
   inline bool has_energy_information() const;
   //@} (end of set info)
-  //@} (end of set info)
   
   // Calculate a singles bin index from axial and transaxial singles bin coordinates.
   inline int get_singles_bin_index(int axial_index, int transaxial_index) const;
@@ -363,8 +440,25 @@ class Scanner
   // Get the transaxial singles bin coordinate from a singles bin.
   inline int get_transaxial_singles_unit(int singles_bin_index) const;
   
+  //! Get the STIR detection position (det#, ring#, layer#) given the detection position id in the input crystal map
+  // used in CListRecordSAFIR.inl for accessing the coordinates
+  inline stir::DetectionPosition<> get_det_pos_for_index(const stir::DetectionPosition<> & det_pos) const;
+  //! Get the Cartesian coordinates (x,y,z) given the STIR detection position (det#, ring#, layer#)
+  // used in ProjInfoDataGenericNoArcCorr.cxx for accessing the coordinates
+  inline stir::CartesianCoordinate3D<float> get_coordinate_for_det_pos(const stir::DetectionPosition<>& det_pos) const;
+  //! Get the Cartesian coordinates (x,y,z) given the detection position id in the input crystal map
+  inline stir::CartesianCoordinate3D<float> get_coordinate_for_index(const stir::DetectionPosition<>& det_pos) const;
+  //! Find detection position at a coordinate
+  // used  in ProjInfoDataGenericNoArcCorr.cxx for accessing the get_bin
+  inline Succeeded
+     find_detection_position_given_cartesian_coordinate(DetectionPosition<>& det_pos,
+                                                        const CartesianCoordinate3D<float>& cart_coord) const;
+
+  shared_ptr<const DetectorCoordinateMap> get_detector_map_sptr() const
+  { return detector_map_sptr; }
 
 private:
+  bool _already_setup;
   Type type;
   std::list<std::string> list_of_names;
   int num_rings;                /* number of direct planes */
@@ -402,6 +496,25 @@ class Scanner
   //! A negative value indicates, unknown.
   float reference_energy;
 
+  //!
+  //! \brief scanner info needed for block geometry
+  //! \author Parisa Khateri
+  //! A negative value indicates unknown.
+  std::string scanner_orientation;       /*! scanner orientation */
+  std::string scanner_geometry;          /*! scanner geometry */
+  float axial_crystal_spacing;           /*! crystal pitch in axial direction in mm*/
+  float transaxial_crystal_spacing;      /*! crystal pitch in transaxial direction in mm*/
+  float axial_block_spacing;             /*! block pitch in axial direction in mm*/
+  float transaxial_block_spacing;        /*! block pitch in transaxial direction in mm*/
+  
+  std::string crystal_map_file_name;
+  shared_ptr<DetectorCoordinateMap> detector_map_sptr;
+
+  void set_detector_map( const DetectorCoordinateMap::det_pos_to_coord_type& coord_map );
+
+  // function to create the maps
+  void read_detectormap_from_file( const std::string& filename );
+
 
   // ! set all parameters, case where default_num_arccorrected_bins==max_num_non_arccorrected_bins
   void set_params(Type type_v, const std::list<std::string>& list_of_names_v,
@@ -418,7 +531,14 @@ class Scanner
                   int num_transaxial_crystals_per_singles_unit_v,
                   int num_detector_layers_v,
                   float energy_resolution_v = -1.0f,
-                  float reference_energy = -1.0f);
+                  float reference_energy = -1.0f,
+                  const std::string& scanner_orientation_v = "",
+                  const std::string& scanner_geometry_v = "",
+                  float axial_crystal_spacing_v = -1.0f,
+                  float transaxial_crystal_spacing_v = -1.0f,
+                  float axial_block_spacing_v = -1.0f,
+                  float transaxial_block_spacing_v = -1.0f,
+                  const std::string& crystal_map_file_name = "");
 
   // ! set all parameters
   void set_params(Type type_v, const std::list<std::string>& list_of_names_v,
@@ -436,7 +556,14 @@ class Scanner
                   int num_transaxial_crystals_per_singles_unit_v,
                   int num_detector_layers_v,
                   float energy_resolution_v = -1.0f,
-                  float reference_energy = -1.0f);
+                  float reference_energy = -1.0f,
+                  const std::string& scanner_orientation_v = "",
+                  const std::string& scanner_geometry_v = "",
+                  float axial_crystal_spacing_v = -1.0f,
+                  float transaxial_crystal_spacing_v = -1.0f,
+                  float axial_block_spacing_v = -1.0f,
+                  float transaxial_block_spacing_v = -1.0f,
+                  const std::string& crystal_map_file_name = "");
 
 
 };
diff --git a/src/include/stir/Scanner.inl b/src/include/stir/Scanner.inl
index 1f0af8d5f..85ba13477 100644
--- a/src/include/stir/Scanner.inl
+++ b/src/include/stir/Scanner.inl
@@ -3,7 +3,8 @@
 /*
     Copyright (C) 2000 PARAPET partners
     Copyright (C) 2000- 2007, Hammersmith Imanet Ltd
-    Copyright (C) 2016, UCL
+    Copyright (C) 2016, 2021 University College London
+    Copyright 2017 ETH Zurich, Institute of Particle Physics and Astrophysics
     This file is part of STIR.
 
     SPDX-License-Identifier: Apache-2.0 AND License-ref-PARAPET-license
@@ -20,9 +21,12 @@
   \author Kris Thielemans
   \author Long Zhang (set*() functions)
   \author PARAPET project
+  \author Parisa Khateri
 
 
 */
+#include "stir/error.h"
+#include "stir/Succeeded.h"
 
 START_NAMESPACE_STIR
 
@@ -228,42 +232,91 @@ Scanner::get_reference_energy() const
     return reference_energy;
 }
 
+std::string
+Scanner::get_scanner_orientation() const
+{
+  return scanner_orientation;
+}
+
+std::string
+Scanner::get_scanner_geometry() const
+{
+  return scanner_geometry;
+}
+
+float
+Scanner::get_axial_crystal_spacing() const
+{
+       return axial_crystal_spacing;
+}
+
+float
+Scanner::get_transaxial_crystal_spacing() const
+{
+       return transaxial_crystal_spacing;
+}
+
+float
+Scanner::get_transaxial_block_spacing() const
+{
+       return transaxial_block_spacing;
+}
+
+float
+Scanner::get_axial_block_spacing() const
+{
+       return axial_block_spacing;
+}
+
+std::string
+Scanner::get_crystal_map_file_name() const
+{
+  return crystal_map_file_name;
+}
+
 //************************ set ******************************8
 
 void Scanner::set_type(const Type & new_type)
 {
    type = new_type;
+   _already_setup = false;
 }
 
 void Scanner::set_num_rings(const int & new_num)
 {
   num_rings = new_num;
+   _already_setup = false;
 }
   
 void Scanner::set_num_detectors_per_ring(const int & new_num) 
 {
   num_detectors_per_ring = new_num;  
+   _already_setup = false;
 }
 
 void Scanner::set_max_num_non_arccorrected_bins(const int&  new_num)
 {
   max_num_non_arccorrected_bins = new_num;
+   _already_setup = false;
 }
 
 void Scanner::set_default_num_arccorrected_bins(const int&  new_num)
 {
   default_num_arccorrected_bins = new_num;
+   _already_setup = false;
 }
 
 
 void Scanner::set_inner_ring_radius(const float & new_radius)
 {
   inner_ring_radius = new_radius;
+   _already_setup = false;
 }
 
 void Scanner::set_average_depth_of_interaction(const float & new_depth_of_interaction)
 {
   average_depth_of_interaction = new_depth_of_interaction;
+   _already_setup = false;
 }
 
 bool Scanner::has_energy_information() const
@@ -280,37 +333,44 @@ void Scanner::set_ring_spacing(const float&  new_spacing)
 void Scanner::set_default_bin_size(const float  & new_size)
 {
   bin_size = new_size;
+   _already_setup = false;
 }
 
 void Scanner::set_intrinsic_azimuthal_tilt(const float new_tilt)
 {
   intrinsic_tilt = new_tilt;
+   _already_setup = false;
 }
 
 void Scanner::set_num_transaxial_blocks_per_bucket(const int&  new_num)
 {
   num_transaxial_blocks_per_bucket = new_num;
+   _already_setup = false;
 }
 
 void Scanner::set_num_axial_blocks_per_bucket(const int&  new_num)
 {
   num_axial_blocks_per_bucket = new_num;
+   _already_setup = false;
 }
 
 void Scanner::set_num_detector_layers(const int& new_num)
 {
   num_detector_layers = new_num;
+   _already_setup = false;
 }
 
 
 void Scanner::set_num_axial_crystals_per_block(const int&  new_num)
 {
   num_axial_crystals_per_block = new_num;
+   _already_setup = false;
 }
 
 void Scanner::set_num_transaxial_crystals_per_block(const int& new_num)
 {
   num_transaxial_crystals_per_block = new_num;
+   _already_setup = false;
 }
 
 
@@ -318,23 +378,63 @@ void Scanner::set_num_transaxial_crystals_per_block(const int& new_num)
 void Scanner::set_num_axial_crystals_per_singles_unit(const int& new_num)
 {
   num_axial_crystals_per_singles_unit = new_num;
+   _already_setup = false;
 }
 
 void Scanner::set_num_transaxial_crystals_per_singles_unit(const int& new_num)
 {
   num_transaxial_crystals_per_singles_unit = new_num;
+   _already_setup = false;
 }
 
 void
 Scanner::set_energy_resolution(const float new_num)
 {
     energy_resolution = new_num;
+   _already_setup = false;
 }
 
 void
 Scanner::set_reference_energy(const float new_num)
 {
     reference_energy = new_num;
+   _already_setup = false;
+}
+
+void Scanner::set_scanner_orientation(const std::string& new_scanner_orientation)
+{
+  scanner_orientation = new_scanner_orientation;
+   _already_setup = false;
+}
+
+void Scanner::set_axial_crystal_spacing(const float&  new_spacing)
+{
+  axial_crystal_spacing = new_spacing;
+   _already_setup = false;
+}
+
+void Scanner::set_transaxial_crystal_spacing(const float&  new_spacing)
+{
+  transaxial_crystal_spacing = new_spacing;
+   _already_setup = false;
+}
+
+void Scanner::set_transaxial_block_spacing(const float&  new_spacing)
+{
+  transaxial_block_spacing = new_spacing;
+   _already_setup = false;
+}
+
+void Scanner::set_axial_block_spacing(const float&  new_spacing)
+{
+  axial_block_spacing = new_spacing;
+   _already_setup = false;
+}
+
+void Scanner::set_crystal_map_file_name(const std::string& new_crystal_map_file_name)
+{
+  crystal_map_file_name = new_crystal_map_file_name;
+   _already_setup = false;
 }
 
 /********    Calculate singles bin index from detection position    *********/
@@ -381,7 +481,49 @@ Scanner::get_transaxial_singles_unit(int singles_bin_index) const {
   return(singles_bin_index % get_num_transaxial_singles_units());
 }
 
+// For retrieving the coordinates / detector, ring id from the scanner
+stir::DetectionPosition<>
+Scanner::get_det_pos_for_index(const stir::DetectionPosition<> & det_pos) const
+{
+    if (!detector_map_sptr)
+        stir::error("Scanner: detector_map not defined. Did you run set_up()?");
+
+    return detector_map_sptr->get_det_pos_for_index(det_pos);
+}
+
+stir::CartesianCoordinate3D<float>
+Scanner::get_coordinate_for_det_pos(const stir::DetectionPosition<>& det_pos) const
+{
+  if (!_already_setup)
+    stir::error("Scanner: you forgot to call set_up().");
+  if (!detector_map_sptr)
+    stir::error("Scanner: detector_map not defined. Did you run set_up()?");
+
+  return detector_map_sptr->get_coordinate_for_det_pos(det_pos);
+}
 
+stir::CartesianCoordinate3D<float>
+Scanner::get_coordinate_for_index(const stir::DetectionPosition<>& index) const
+{
+  if (!_already_setup)
+    stir::error("Scanner: you forgot to call set_up().");
+  if (!detector_map_sptr)
+    stir::error("Scanner: detector_map not defined. Did you run set_up()?");
+
+  return detector_map_sptr->get_coordinate_for_index(index);
+}
+
+Succeeded
+Scanner::find_detection_position_given_cartesian_coordinate(DetectionPosition<>& det_pos,
+                                                            const CartesianCoordinate3D<float>& cart_coord) const
+{
+  if (!_already_setup)
+    stir::error("Scanner: you forgot to call set_up().");
+  if (!detector_map_sptr)
+    stir::error("Scanner: detector_map not defined. Did you run set_up()?");
+
+  return detector_map_sptr->find_detection_position_given_cartesian_coordinate(det_pos, cart_coord);
+}
 
 END_NAMESPACE_STIR
 
diff --git a/src/include/stir/listmode/CListModeDataSAFIR.h b/src/include/stir/listmode/CListModeDataSAFIR.h
index a7018c089..6cb7d0145 100644
--- a/src/include/stir/listmode/CListModeDataSAFIR.h
+++ b/src/include/stir/listmode/CListModeDataSAFIR.h
@@ -45,7 +45,7 @@
 #include "stir/shared_ptr.h"
 
 #include "stir/listmode/CListRecordSAFIR.h"
-#include "stir/listmode/DetectorCoordinateMapFromFile.h"
+#include "stir/DetectorCoordinateMap.h"
 
 START_NAMESPACE_STIR
 
@@ -90,7 +90,7 @@ template <class CListRecordT> class CListModeDataSAFIR : public CListModeData
 	mutable shared_ptr<InputStreamWithRecords<CListRecordT, bool> > current_lm_data_ptr;
 	mutable std::vector< unsigned int> saved_get_positions;
 	Succeeded open_lm_file() const;
-	shared_ptr<DetectorCoordinateMapFromFile> map;
+	shared_ptr<DetectorCoordinateMap> map;
 };
 	
 END_NAMESPACE_STIR
diff --git a/src/include/stir/listmode/CListRecordSAFIR.h b/src/include/stir/listmode/CListRecordSAFIR.h
index f951a4b87..cc0e4bc5e 100644
--- a/src/include/stir/listmode/CListRecordSAFIR.h
+++ b/src/include/stir/listmode/CListRecordSAFIR.h
@@ -3,6 +3,7 @@
  Coincidence Event Class for SAFIR: Header File
 
 	Copyright 2015 ETH Zurich, Institute of Particle Physics
+	Copyright 2017 ETH Zurich, Institute of Particle Physics and Astrophysics
 	Copyright 2020 Positrigo AG, Zurich
 
 	Licensed under the Apache License, Version 2.0 (the "License");
@@ -26,6 +27,7 @@
   \brief Declaration of class stir::CListEventSAFIR and stir::CListRecordSAFIR with supporting classes
 
   \author Jannis Fischer
+	\author Parisa Khateri
 */
 
 #ifndef __stir_listmode_CListRecordSAFIR_H__
@@ -42,13 +44,13 @@
 #include "boost/static_assert.hpp"
 #include "boost/cstdint.hpp"
 
-#include "stir/listmode/DetectorCoordinateMapFromFile.h"
-
+#include "stir/DetectorCoordinateMap.h"
+#include "boost/make_shared.hpp"
 
 START_NAMESPACE_STIR
 
 /*!
-Provides interface of the record class to STIR by implementing get_LOR(). It uses a map from detector indices to coordinates to specify LORAs2Points from given detection pair indices.
+Provides interface of the record class to STIR by implementing get_LOR(). It uses an optional map from detector indices to coordinates to specify LORAs2Points from given detection pair indices.
 
 The record has the following format (for little-endian byte order)
 \code
@@ -67,12 +69,17 @@ template <class Derived>
 class CListEventSAFIR : public CListEvent
 {
 public:
-	/*! Constructor which initializes map upon construction.
+	/*! Default constructor will not work as it does not initialize a map to relate
+	detector indices and space coordinates. Always use either set_scanner_sptr or set_map_sptr after default construction.
 	*/
-	inline CListEventSAFIR( shared_ptr<DetectorCoordinateMapFromFile> map ) : map(map) {}
-	
+	inline CListEventSAFIR( ) {}
+
 	//! Returns LOR corresponding to the given event.
 	inline virtual LORAs2Points<float> get_LOR() const;
+	
+  //! Override the default implementation
+  inline virtual void get_bin(Bin& bin, const ProjDataInfo& proj_data_info) const;
+  
   //! This method checks if the template is valid for LmToProjData
   /*! Used before the actual processing of the data (see issue #61), before calling get_bin()
    *  Most scanners have listmode data that correspond to non arc-corrected data and
@@ -84,14 +91,19 @@ class CListEventSAFIR : public CListEvent
 	inline bool is_prompt()
 		const { return !(static_cast<const Derived*>(this)->is_prompt()); }
 	//! Function to set map for detector indices to coordinates.
-	inline void set_map( shared_ptr<DetectorCoordinateMapFromFile> new_map ) { map = new_map; }
+	/*! Use a null pointer to disable the mapping functionality */
+	inline void set_map_sptr( shared_ptr<const DetectorCoordinateMap> new_map_sptr ) { map_sptr = new_map_sptr; }
+    /*! Set the scanner */
+    /*! Currently only used if the map is not set. */
+	inline void set_scanner_sptr( shared_ptr<const Scanner> new_scanner_sptr ) { scanner_sptr = new_scanner_sptr; }
+
 private:
 	friend class CListRecordSAFIR;
-	/*! Default constructor will not work as it does not initialize a map to relate
-	detector indices and space coordinates. Always use other constructor with a map pointer. Or use set_map( shared_ptr<DetectorCoordinateMapFromFile> new_map ) after default construction.
-	*/
-	inline CListEventSAFIR( ) {}
-	shared_ptr<DetectorCoordinateMapFromFile> map;
+	shared_ptr<const DetectorCoordinateMap> map_sptr;
+	shared_ptr<const Scanner> scanner_sptr;
+
+	const DetectorCoordinateMap& map_to_use() const
+	{ return  map_sptr ? *map_sptr : *this->scanner_sptr->get_detector_map_sptr(); }
 };
 
 
diff --git a/src/include/stir/listmode/CListRecordSAFIR.inl b/src/include/stir/listmode/CListRecordSAFIR.inl
index c63fb3eb6..76ffbf565 100644
--- a/src/include/stir/listmode/CListRecordSAFIR.inl
+++ b/src/include/stir/listmode/CListRecordSAFIR.inl
@@ -3,7 +3,9 @@
  Coincidence Event Class for SAFIR: Inline File
 
 	Copyright 2015 ETH Zurich, Institute of Particle Physics
+	Copyright 2017 ETH Zurich, Institute of Particle Physics and Astrophysics
 	Copyright 2020 Positrigo AG, Zurich
+    Copyright 2021 University College London
 
 	Licensed under the Apache License, Version 2.0 (the "License");
 	you may not use this file except in compliance with the License.
@@ -18,6 +20,17 @@
 	limitations under the License.
 
  */
+/*!
+
+  \file
+  \ingroup listmode
+  \brief Inline implementation of class stir::CListEventSAFIR and stir::CListRecordSAFIR with supporting classes
+
+  \author Jannis Fischer
+  \author Parisa Khateri
+  \author Kris Thielemans
+*/
+
 #include<random>
 
 #include "stir/LORCoordinates.h"
@@ -27,6 +40,11 @@
 #include "stir/LORCoordinates.h"
 #include "stir/Succeeded.h"
 
+#include "stir/ProjDataInfoCylindricalNoArcCorr.h"
+#include "stir/ProjDataInfoBlocksOnCylindricalNoArcCorr.h"
+#include "stir/ProjDataInfoGenericNoArcCorr.h"
+#include "stir/CartesianCoordinate3D.h"
+
 START_NAMESPACE_STIR
 
 template <class Derived>
@@ -38,12 +56,57 @@ CListEventSAFIR<Derived>::get_LOR() const
 
 	static_cast<const Derived*>(this)->get_data().get_detection_position_pair(det_pos_pair);
 
-	if(!map) stir::error("Crystal map not set.");
+    lor.p1() = map_to_use().get_coordinate_for_index(det_pos_pair.pos1());
+    lor.p2() = map_to_use().get_coordinate_for_index(det_pos_pair.pos2());
 
-	lor.p1() = map->get_detector_coordinate(det_pos_pair.pos1());
-	lor.p2() = map->get_detector_coordinate(det_pos_pair.pos2());
+    return lor;
+}
 
-	return lor;
+namespace detail
+{
+template <class PDIT>
+static inline bool
+get_bin_for_det_pos_pair(Bin& bin, DetectionPositionPair<>& det_pos_pair, const ProjDataInfo& proj_data_info)
+{
+  if (auto proj_data_info_ptr = dynamic_cast<const PDIT*>(&proj_data_info))
+    {
+      if (proj_data_info_ptr->get_bin_for_det_pos_pair(bin, det_pos_pair) == Succeeded::yes)
+        bin.set_bin_value(1);
+      else
+        bin.set_bin_value(-1);
+      return true;
+    }
+  else
+    return false;
+}
+} // namespace detail
+
+template <class Derived>
+void
+CListEventSAFIR<Derived>::get_bin(Bin& bin, const ProjDataInfo& proj_data_info) const
+{
+  DetectionPositionPair<> det_pos_pair;
+  static_cast<const Derived*>(this)->get_data().get_detection_position_pair(det_pos_pair);
+
+  if (!map_sptr)
+    {
+      // transform det_pos_pair into stir conventions
+      det_pos_pair.pos1() = map_to_use().get_det_pos_for_index(det_pos_pair.pos1());
+      det_pos_pair.pos2() = map_to_use().get_det_pos_for_index(det_pos_pair.pos2());
+
+      if (!detail::get_bin_for_det_pos_pair<ProjDataInfoGenericNoArcCorr>(bin, det_pos_pair, proj_data_info))
+        {
+          if (!detail::get_bin_for_det_pos_pair<ProjDataInfoCylindricalNoArcCorr>(bin, det_pos_pair, proj_data_info))
+            error("Wrong type of proj-data-info for SAFIR");
+        }
+    }
+  else
+    {
+      const stir::CartesianCoordinate3D<float> c1 = map_sptr->get_coordinate_for_index(det_pos_pair.pos1());
+      const stir::CartesianCoordinate3D<float> c2 = map_sptr->get_coordinate_for_index(det_pos_pair.pos2());
+      const LORAs2Points<float> lor(c1, c2);
+      bin = proj_data_info.get_bin(lor);
+    }
 }
 
 void CListEventDataSAFIR::get_detection_position_pair(DetectionPositionPair<>& det_pos_pair)
diff --git a/src/include/stir/listmode/DetectorCoordinateMapFromFile.h b/src/include/stir/listmode/DetectorCoordinateMapFromFile.h
deleted file mode 100644
index ac746bddd..000000000
--- a/src/include/stir/listmode/DetectorCoordinateMapFromFile.h
+++ /dev/null
@@ -1,93 +0,0 @@
-/* DetectorCoordinateMapFromFile.h
- Read List-Mode Event Data using map from file: Header File
-
-	Copyright 2015 ETH Zurich, Institute of Particle Physics
-	Copyright 2020 Positrigo AG, Zurich
-
-	Licensed under the Apache License, Version 2.0 (the "License");
-	you may not use this file except in compliance with the License.
-	You may obtain a copy of the License at
-
-		http://www.apache.org/licenses/LICENSE-2.0
-
-	Unless required by applicable law or agreed to in writing, software
-	distributed under the License is distributed on an "AS IS" BASIS,
-	WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-	See the License for the specific language governing permissions and
-	limitations under the License.
- */
-
-/*!
-
-  \file
-  \ingroup listmode
-  \brief Declaration of class stir::DetectorCoordinateMapFromFile
-
-  \author Jannis Fischer
-*/
-
-#include <fstream>
-#include <string>
-#include <vector>
-#include <random>
-#include <boost/algorithm/string.hpp>
-#include <boost/unordered_map.hpp>
-
-#include "stir/CartesianCoordinate3D.h"
-#include "stir/DetectionPosition.h"
-
-#ifndef __stir_listmode_DetectorCoordinateMapFromFile_H__
-#define __stir_listmode_DetectorCoordinateMapFromFile_H__
-
-START_NAMESPACE_STIR
-
-/*! Class providing map functionality to convert detector indices to spatial coordinates. 
-	Map files can have 5 or 6 tab- or comma-separated columns. Lines beginning with '#' are ignored. The layer column is optional
-	\par Format:
-	ring,detector,(layer,)x,y,z
-	An empty line will terminate the reading at that line.
-*/
-class DetectorCoordinateMapFromFile
-{
-public:
-	//! Constructor calls read_detectormap_from_file( filename ).
-	DetectorCoordinateMapFromFile(const std::string& filename, double sigma = 0.0) :
-		sigma(sigma),
-		distribution(0.0, sigma)
-		{ read_detectormap_from_file( filename ); }
-
-	//! Reads map from file and stores it.
-	void read_detectormap_from_file( const std::string& filename );
-
-	//! Returns a cartesian coordinate given a detection position.
-	stir::CartesianCoordinate3D<float> get_detector_coordinate( const stir::DetectionPosition<>& det_pos )
-	{ 
-		auto coord = coord_map.at(det_pos); 
-		coord.x() += distribution(generator);
-		coord.y() += distribution(generator);
-		coord.z() += distribution(generator);
-		return coord;
-	}
-
-private:
-	struct ihash
-	    : std::unary_function<stir::DetectionPosition<> , std::size_t>
-	{
-	    std::size_t operator()(stir::DetectionPosition<>  const& detpos) const
-	    {
-		    std::size_t seed = 0;
-		    boost::hash_combine(seed, detpos.axial_coord());
-		    boost::hash_combine(seed, detpos.radial_coord());
-		    boost::hash_combine(seed, detpos.tangential_coord());
-		    return seed;
-	    }
-	};
-
-	boost::unordered_map< stir::DetectionPosition<>, stir::CartesianCoordinate3D<float>, ihash > coord_map;
-	const double sigma;
-	std::default_random_engine generator;
-	std::normal_distribution<double> distribution;
-};
-
-END_NAMESPACE_STIR
-#endif
diff --git a/src/include/stir/recon_buildblock/DataSymmetriesForBins_PET_CartesianGrid.inl b/src/include/stir/recon_buildblock/DataSymmetriesForBins_PET_CartesianGrid.inl
index d79f43f9a..d7b491d34 100644
--- a/src/include/stir/recon_buildblock/DataSymmetriesForBins_PET_CartesianGrid.inl
+++ b/src/include/stir/recon_buildblock/DataSymmetriesForBins_PET_CartesianGrid.inl
@@ -8,11 +8,14 @@
   \author Mustapha Sadki
   \author Kris Thielemans
   \author PARAPET project
+  \author Parisa Khateri
 
 */
 /*
     Copyright (C) 2000 PARAPET partners
     Copyright (C) 2000- 2009, Hammersmith Imanet Ltd
+    Copyright 2017 ETH Zurich, Institute of Particle Physics and Astrophysics
+
     This file is part of STIR.
 
     SPDX-License-Identifier: Apache-2.0 AND License-ref-PARAPET-license
@@ -25,7 +28,8 @@
 */
 #include "stir/ProjDataInfoCylindrical.h"
 #include "stir/recon_buildblock/SymmetryOperations_PET_CartesianGrid.h"
-
+#include "stir/ProjDataInfoBlocksOnCylindrical.h"
+#include "stir/ProjDataInfoGeneric.h"
 
 START_NAMESPACE_STIR
 
@@ -67,7 +71,11 @@ find_transform_z(
 		 const int segment_num, 
 		 const int  axial_pos_num) const
 {
-  const ProjDataInfoCylindrical* proj_data_info_cyl_ptr =
+  int transform_z;
+    //cylindrical implementaion
+    if (proj_data_info_ptr->get_scanner_ptr()->get_scanner_geometry()=="Cylindrical")
+      {
+  const ProjDataInfoCylindrical* proj_data_info_cyl_ptr = 
     static_cast<const ProjDataInfoCylindrical *>(proj_data_info_ptr.get());
 
   const float delta = proj_data_info_cyl_ptr->get_average_ring_difference(segment_num);
@@ -81,11 +89,56 @@ find_transform_z(
 				     + num_planes_per_scanner_ring*delta
 				     + 2*axial_pos_to_z_offset[segment_num]); 
     // now use rounding to be safe
-    int transform_z = (int)floor(transform_z_float + 0.5);
+    transform_z = (int)floor(transform_z_float + 0.5);
     assert(fabs(transform_z-transform_z_float) < 10E-4);
 
-    return transform_z;
   }
+      }
+    //block implementaion
+    else if (proj_data_info_ptr->get_scanner_ptr()->get_scanner_geometry()=="BlocksOnCylindrical")
+      {
+  const ProjDataInfoBlocksOnCylindrical* proj_data_info_blk_ptr =
+      static_cast<const ProjDataInfoBlocksOnCylindrical *>(proj_data_info_ptr.get());
+
+    const float delta = proj_data_info_blk_ptr->get_average_ring_difference(segment_num);
+
+
+    // Find symmetric value in Z by 'mirroring' it around the centre z of the LOR:
+    // Z+Q = 2*centre_of_LOR_in_image_coordinates == transform_z
+    {
+      // first compute it as floating point (although it has to be an int really)
+      const float transform_z_float = (2*num_planes_per_axial_pos[segment_num]*(axial_pos_num)
+               + num_planes_per_scanner_ring*delta
+               + 2*axial_pos_to_z_offset[segment_num]);
+      // now use rounding to be safe
+      transform_z = (int)floor(transform_z_float + 0.5);
+      assert(fabs(transform_z-transform_z_float) < 10E-4);
+
+    }
+      }
+    // generic implementation
+    else
+    {
+        const ProjDataInfoGeneric* proj_data_info_gen_ptr =
+        static_cast<const ProjDataInfoGeneric *>(proj_data_info_ptr.get());
+
+        const float delta = proj_data_info_gen_ptr->get_average_ring_difference(segment_num);
+
+        // Find symmetric value in Z by 'mirroring' it around the centre z of the LOR:
+        // Z+Q = 2*centre_of_LOR_in_image_coordinates == transform_z
+        {
+            // first compute it as floating point (although it has to be an int really)
+            const float transform_z_float = (2*num_planes_per_axial_pos[segment_num]*(axial_pos_num)
+                + num_planes_per_scanner_ring*delta
+                + 2*axial_pos_to_z_offset[segment_num]);
+            // now use rounding to be safe
+            int transform_z = (int)floor(transform_z_float + 0.5);
+            assert(fabs(transform_z-transform_z_float) < 10E-4);
+
+            return transform_z;
+        }
+    }
+    return transform_z;
 }
 
 SymmetryOperation*
@@ -95,6 +148,9 @@ find_sym_op_bin0(
                  int view_num, 
                  int axial_pos_num) const
 {
+    //cylindrical implementaion
+    if (proj_data_info_ptr->get_scanner_ptr()->get_scanner_geometry()=="Cylindrical")
+    {
   // note: if do_symmetry_shift_z==true, then basic axial_pos_num will be 0
   const int transform_z = 
 	find_transform_z(abs(segment_num), 
@@ -152,6 +208,48 @@ find_sym_op_bin0(
         return new SymmetryOperation_PET_CartesianGrid_z_shift(axial_pos_num, z_shift);
     }
   }
+    }
+    //block implementaion
+    if (proj_data_info_ptr->get_scanner_ptr()->get_scanner_geometry()=="BlocksOnCylindrical")
+    {
+  if (do_symmetry_90degrees_min_phi
+        || do_symmetry_swap_segment
+        || do_symmetry_swap_s
+        || do_symmetry_180degrees_min_phi)
+  {
+    warning("Currently, no symmetry  is implemented for block geometry.\n");
+    return new TrivialSymmetryOperation();
+  }
+
+  if (do_symmetry_shift_z)
+  {
+    Bin basic_bin(segment_num, view_num, axial_pos_num, 0);
+    find_basic_bin(basic_bin);
+    const int z_shift =
+          num_planes_per_axial_pos[segment_num]
+          *(axial_pos_num - basic_bin.axial_pos_num());
+
+     if (z_shift==0)
+        return new TrivialSymmetryOperation();
+     else
+        return new SymmetryOperation_PET_CartesianGrid_z_shift(axial_pos_num, z_shift);
+  }
+
+  if (!do_symmetry_90degrees_min_phi
+        && !do_symmetry_swap_segment
+        && !do_symmetry_swap_s
+        && !do_symmetry_180degrees_min_phi
+        && !do_symmetry_shift_z)
+  {
+      return new TrivialSymmetryOperation();
+  }
+
+    }
+    if(proj_data_info_ptr->get_scanner_ptr()->get_scanner_geometry()=="Generic")
+    {
+        // No symmetry is implemented for generic scanner
+        return new TrivialSymmetryOperation();
+    }
 }
 
 // from symmetries
@@ -162,7 +260,10 @@ find_sym_op_general_bin(
                         int segment_num, 
                         int view_num, 
                         int axial_pos_num) const
-{ 
+{
+  //cylindrical implementaion
+ if (proj_data_info_ptr->get_scanner_ptr()->get_scanner_geometry()=="Cylindrical")
+ { 
   // note: if do_symmetry_shift_z==true, then basic axial_pos_num will be 0
   const int transform_z = 
 	find_transform_z(abs(segment_num), 
@@ -289,7 +390,48 @@ find_sym_op_general_bin(
             return new SymmetryOperation_PET_CartesianGrid_z_shift(axial_pos_num, z_shift);
         }
       }
-  }			
+  }	
+    }
+    //block implementaion
+  //the implementation is as the above function for the current status of block symmetry.
+  if (proj_data_info_ptr->get_scanner_ptr()->get_scanner_geometry()=="BlocksOnCylindrical")
+  {
+    if (do_symmetry_90degrees_min_phi
+        || do_symmetry_swap_segment
+        || do_symmetry_swap_s
+        || do_symmetry_180degrees_min_phi)
+    {
+      warning("Currently, only symmetry along z is implemented for block geometry.\n");
+      return new TrivialSymmetryOperation();
+    }
+    if (do_symmetry_shift_z)
+    {
+      Bin basic_bin(segment_num, view_num, axial_pos_num, s);
+      find_basic_bin(basic_bin);
+      const int z_shift =
+            num_planes_per_axial_pos[segment_num]
+            *(axial_pos_num - basic_bin.axial_pos_num());
+
+      if (z_shift==0)
+       return new TrivialSymmetryOperation();
+      else
+        return new SymmetryOperation_PET_CartesianGrid_z_shift(axial_pos_num, z_shift);
+    }
+    if (!do_symmetry_90degrees_min_phi
+        && !do_symmetry_swap_segment
+        && !do_symmetry_swap_s
+        && !do_symmetry_180degrees_min_phi
+        && !do_symmetry_shift_z)
+    {
+      return new TrivialSymmetryOperation();
+    }
+  }
+  if(proj_data_info_ptr->get_scanner_ptr()->get_scanner_geometry()=="Generic")
+  {
+      // No symmetry is implemented for generic scanner
+      return new TrivialSymmetryOperation();
+  }
+
 }
 
 
@@ -333,9 +475,13 @@ bool
 DataSymmetriesForBins_PET_CartesianGrid::
 find_basic_bin(int &segment_num, int &view_num, int &axial_pos_num, int &tangential_pos_num) const 
 {
+    bool change=false;
+    //cylindrical implementaion
+    if (proj_data_info_ptr->get_scanner_ptr()->get_scanner_geometry()=="Cylindrical")
+    {
   ViewSegmentNumbers v_s(view_num, segment_num);
 
-  bool change=find_basic_view_segment_numbers(v_s);
+  change=find_basic_view_segment_numbers(v_s);
 
   view_num = v_s.view_num();
   segment_num = v_s.segment_num();
@@ -344,6 +490,179 @@ find_basic_bin(int &segment_num, int &view_num, int &axial_pos_num, int &tangent
   if ( do_symmetry_shift_z && axial_pos_num != 0    )  { axial_pos_num  =  0;     change = true; }   
   
   return change;
+    }
+  
+  //block implementaion
+  if (proj_data_info_ptr->get_scanner_ptr()->get_scanner_geometry()=="BlocksOnCylindrical")
+  {
+    /*
+    ax_pos_num = (ring1 + ring2 - ax_pos_num_offset[seg_num])*num_ax_pos_per_ring_inc(seg_num)/2
+    ax_pos_num_offset = num_rings - 1 - (max_ax_pos_num + min_ax_pos_num)/num_ax_pos_per_ring_inc(seg_num)
+      Then
+    ax_pos_num = (ring1 + ring2 - num_rings + 1)*ax_pos_inc/2 - (max_ax_pos_num + min_ax_pos_num)/2
+      and
+    max_ax_pos_num + min_ax_pos_num =  (num_ax_pos_per_seg -1) + 0 = num_rings - seg_num - 1
+      Then
+    ax_pos_num = (ring1 + ring2 - num_rings + 1)*ax_pos_inc/2 - (num_rings - seg_num - 1)/2
+      if ax_pos_inc == 1
+    ax_pos_num = (ring1 + ring2 - seg_num)/2
+    */
+    const ProjDataInfoBlocksOnCylindrical* proj_data_info_blk_ptr =
+      static_cast<const ProjDataInfoBlocksOnCylindrical *>(proj_data_info_ptr.get());
+    if (do_symmetry_shift_z)
+    {
+      int ring1, ring2;
+      proj_data_info_blk_ptr->get_ring_pair_for_segment_axial_pos_num (ring1, ring2, segment_num, axial_pos_num);
+      //to check
+      //std::cout<<"before seg, ax, r1, r2 = "<<segment_num<<"\t"<<axial_pos_num<<"\t"<<ring1<<"\t"<<ring2<<"\n";
+
+      int axial_crys_diff = ring2 - ring1;
+      int num_axial_crys_per_block = proj_data_info_ptr->get_scanner_ptr()->get_num_axial_crystals_per_block();
+      int axial_blk_diff = ring2/num_axial_crys_per_block - ring1/num_axial_crys_per_block;
+
+      if (axial_crys_diff >=0)
+      { // seg_num > =0
+        if (axial_crys_diff%num_axial_crys_per_block == 0)
+        { // In this case, axial block difference can be only equal to axial_crys_diff/num_axial_crys_per_block. So we only have one type of related bins
+          // basic bin will be the first lor from the corresponding group
+          ring1= (ring1/num_axial_crys_per_block)*num_axial_crys_per_block;
+          ring2= ring1 + axial_crys_diff;
+        }
+        else
+        {  /* In this case, axial block difference can be equal to axial_crys_diff/num_axial_crys_per_block
+           or one less.
+           So we can have two types of of related bins*/
+           if (axial_blk_diff == axial_crys_diff/num_axial_crys_per_block)
+           {// basic bin will be the first lor from the corresponding group
+             ring1= (ring1/num_axial_crys_per_block)*num_axial_crys_per_block;
+             ring2= ring1 + axial_crys_diff;
+           }
+           else if (axial_blk_diff > axial_crys_diff/num_axial_crys_per_block)
+           {// basic bin will be the last lor from the corresponding group
+             ring1= (ring1/num_axial_crys_per_block)*num_axial_crys_per_block + num_axial_crys_per_block-1;
+             ring2= ring1 + axial_crys_diff;
+           }
+        }
+      }
+      else if (axial_crys_diff <0)
+      { // seg_num < 0
+        if (abs(axial_crys_diff)%num_axial_crys_per_block == 0)
+        { // In this case, axial block difference can be only equal to axial_crys_diff/num_axial_crys_per_block. So we only have one type of related bins
+          // basic bin will be the first lor from the corresponding group
+          ring2= (ring2/num_axial_crys_per_block)*num_axial_crys_per_block;
+          ring1= ring2 - axial_crys_diff;
+        }
+        else
+        {  /* In this case, axial block difference can be equal to axial_crys_diff/num_axial_crys_per_block
+           or one less.
+           So we can have two types of of related bins*/
+          if (abs(axial_blk_diff) == abs(axial_crys_diff)/num_axial_crys_per_block)
+          {// basic bin will be the first lor from the corresponding group
+           ring2= (ring2/num_axial_crys_per_block)*num_axial_crys_per_block;
+           ring1= ring2 - axial_crys_diff;
+          }
+          else if (abs(axial_blk_diff) > abs(axial_crys_diff)/num_axial_crys_per_block)
+          {// basic bin will be the last lor from the corresponding group
+           ring2= (ring2/num_axial_crys_per_block)*num_axial_crys_per_block + num_axial_crys_per_block-1;
+           ring1= ring2 - axial_crys_diff;
+          }
+        }
+      }
+ 
+      int segment_num_temp, axial_pos_num_temp;
+      proj_data_info_blk_ptr->
+              get_segment_axial_pos_num_for_ring_pair(segment_num_temp, axial_pos_num_temp, ring1, ring2);
+ 
+      //to check
+      //std::cout<<"after seg, ax, r1, r2 = "<<segment_num_temp<<"\t"<<axial_pos_num_temp<<"\t"<<ring1<<"\t"<<ring2<<"\n";
+ 
+      if (segment_num_temp != segment_num)
+        error("segment number shouldn't change in basic bin when implementing only symmetry in z.\n"
+              "segment_num = %d while segment_num_temp = %d \n", segment_num, segment_num_temp);
+      else if (axial_pos_num_temp != axial_pos_num)
+      {
+        axial_pos_num = axial_pos_num_temp;
+        change = true;
+      }
+    }
+  }
+    if (proj_data_info_ptr->get_scanner_ptr()->get_scanner_geometry()=="Generic")
+    { //same procedure as for the block implementation above
+        const ProjDataInfoGeneric* proj_data_info_gen_ptr =
+            static_cast<const ProjDataInfoGeneric *>(proj_data_info_ptr.get());
+        if (do_symmetry_shift_z)
+        {
+            int ring1, ring2;
+            proj_data_info_gen_ptr->get_ring_pair_for_segment_axial_pos_num (ring1, ring2, segment_num, axial_pos_num);
+
+            int axial_crys_diff = ring2 - ring1;
+            int num_axial_crys_per_block = proj_data_info_ptr->get_scanner_ptr()->get_num_axial_crystals_per_block();
+            int axial_blk_diff = ring2/num_axial_crys_per_block - ring1/num_axial_crys_per_block;
+
+            if (axial_crys_diff >=0)
+            { // seg_num > 0
+                if (axial_crys_diff%num_axial_crys_per_block == 0)
+                { // axial block difference can be only axial_crys_diff/num_axial_crys_per_block. So we only have one type of related bins
+                    // basic bin will be the first lor from the corresponding group
+                    ring1= (ring1/num_axial_crys_per_block)*num_axial_crys_per_block;
+                    ring2= ring1 + axial_crys_diff;
+                }
+                else
+                {  /* axial block difference can be axial_crys_diff/num_axial_crys_per_block
+                    or one less.
+                    So we can have two types of of related bins*/
+                    if (axial_blk_diff == axial_crys_diff/num_axial_crys_per_block)
+                    {// basic bin will be the first lor from the corresponding group
+                        ring1= (ring1/num_axial_crys_per_block)*num_axial_crys_per_block;
+                        ring2= ring1 + axial_crys_diff;
+                    }
+                    else if (axial_blk_diff > axial_crys_diff/num_axial_crys_per_block)
+                    {// basic bin will be the last lor from the corresponding group
+                        ring1= (ring1/num_axial_crys_per_block)*num_axial_crys_per_block + num_axial_crys_per_block-1;
+                        ring2= ring1 + axial_crys_diff;
+                    }
+                }
+            }
+            else if (axial_crys_diff <0)
+            { // seg_num < 0
+                if (abs(axial_crys_diff)%num_axial_crys_per_block == 0)
+                { // axial block difference can be only axial_crys_diff/num_axial_crys_per_block. So we only have one type of related bins
+                    // basic bin will be the first lor from the corresponding group
+                    ring2= (ring2/num_axial_crys_per_block)*num_axial_crys_per_block;
+                    ring1= ring2 - axial_crys_diff;
+                }
+                else
+                {  /* axial block difference can be axial_crys_diff/num_axial_crys_per_block
+                    or one less.
+                    So we can have two types of of related bins*/
+                    if (abs(axial_blk_diff) == abs(axial_crys_diff)/num_axial_crys_per_block)
+                    {// basic bin will be the first lor from the corresponding group
+                        ring2= (ring2/num_axial_crys_per_block)*num_axial_crys_per_block;
+                        ring1= ring2 - axial_crys_diff;
+                    }
+                    else if (abs(axial_blk_diff) > abs(axial_crys_diff)/num_axial_crys_per_block)
+                    {// basic bin will be the last lor from the corresponding group
+                        ring2= (ring2/num_axial_crys_per_block)*num_axial_crys_per_block + num_axial_crys_per_block-1;
+                        ring1= ring2 - axial_crys_diff;
+                    }
+                }
+            }
+
+            int segment_num_temp, axial_pos_num_temp;
+            proj_data_info_gen_ptr->
+                get_segment_axial_pos_num_for_ring_pair(segment_num_temp, axial_pos_num_temp, ring1, ring2);
+             
+            if (segment_num_temp != segment_num)
+                error("segment number shouldn't change in basic bin when implementing only symmetry in z.\n"
+                "segment_num = %d while segment_num_temp = %d \n", segment_num, segment_num_temp);
+            else if (axial_pos_num_temp != axial_pos_num)
+            {
+                axial_pos_num = axial_pos_num_temp;
+                change = true;
+            }
+        }
+    }
+    return change;
 }
 
 bool  
@@ -388,7 +707,11 @@ int
 DataSymmetriesForBins_PET_CartesianGrid::
 num_related_bins(const Bin& b) const
 {
-  int num = do_symmetry_180degrees_min_phi  && (b.view_num() % (num_views/2)) != 0 ? 2 : 1;
+    int num;
+    //cylindrical implementaion
+    if (proj_data_info_ptr->get_scanner_ptr()->get_scanner_geometry()=="Cylindrical")
+    {
+  num = do_symmetry_180degrees_min_phi  && (b.view_num() % (num_views/2)) != 0 ? 2 : 1;
   if (do_symmetry_90degrees_min_phi && (b.view_num() % (num_views/2)) != num_views/4)
     num *= 2;
   if (do_symmetry_swap_segment && b.segment_num() != 0)
@@ -399,6 +722,39 @@ num_related_bins(const Bin& b) const
   
   if (do_symmetry_shift_z)
     num *= proj_data_info_ptr->get_num_axial_poss(b.segment_num());
+    }
+  
+  //block implementaion
+  if (proj_data_info_ptr->get_scanner_ptr()->get_scanner_geometry()=="BlocksOnCylindrical")
+{
+    const ProjDataInfoBlocksOnCylindrical* proj_data_info_blk_ptr =
+      static_cast<const ProjDataInfoBlocksOnCylindrical *>(proj_data_info_ptr.get());
+    if (do_symmetry_shift_z)
+    {
+      int ring1, ring2;
+      proj_data_info_blk_ptr->get_ring_pair_for_segment_axial_pos_num
+                          (ring1, ring2, b.segment_num(), b.axial_pos_num());
+      int axial_crys_diff = ring1 - ring2;
+      int num_axial_crys_per_block = proj_data_info_ptr->get_scanner_ptr()->get_num_axial_crystals_per_block();
+      int axial_blk_diff = ring1/num_axial_crys_per_block - ring2/num_axial_crys_per_block;
+
+      if (axial_blk_diff == axial_crys_diff/num_axial_crys_per_block)
+      {
+        num = num_axial_crys_per_block
+                  - abs(axial_crys_diff)%num_axial_crys_per_block;
+      }
+      else if (axial_blk_diff > axial_crys_diff/num_axial_crys_per_block)
+      {
+        num = abs(axial_crys_diff)%num_axial_crys_per_block;
+      }
+    }
+  }
+  //generic implementation
+  if (proj_data_info_ptr->get_scanner_ptr()->get_scanner_geometry()=="Generic")
+  {
+      num = 1;
+  }
+
   return num;
 }
 
@@ -408,6 +764,9 @@ get_related_bins_factorised(std::vector<AxTangPosNumbers>& ax_tang_poss, const B
                             const int min_axial_pos_num, const int max_axial_pos_num,
                             const int min_tangential_pos_num, const int max_tangential_pos_num) const
 {
+    //cylindrical implementaion
+    if (proj_data_info_ptr->get_scanner_ptr()->get_scanner_geometry()=="Cylindrical")
+    {
   for (int axial_pos_num=do_symmetry_shift_z?min_axial_pos_num:b.axial_pos_num();
        axial_pos_num <= (do_symmetry_shift_z?max_axial_pos_num:b.axial_pos_num());
        ++axial_pos_num)
@@ -419,7 +778,48 @@ get_related_bins_factorised(std::vector<AxTangPosNumbers>& ax_tang_poss, const B
          -b.tangential_pos_num() >= min_tangential_pos_num &&
          -b.tangential_pos_num() <= max_tangential_pos_num)
         ax_tang_poss.push_back(AxTangPosNumbers(axial_pos_num, -b.tangential_pos_num()));
+  }
     }
+    
+  //block implementaion
+  //currently it only saves related bins according to z-symmetry
+  if (proj_data_info_ptr->get_scanner_ptr()->get_scanner_geometry()=="BlocksOnCylindrical")
+   {
+    for (int axial_pos_num=do_symmetry_shift_z?min_axial_pos_num:b.axial_pos_num();
+         axial_pos_num <= (do_symmetry_shift_z?max_axial_pos_num:b.axial_pos_num());
+         ++axial_pos_num)
+    {
+       if (b.tangential_pos_num() >= min_tangential_pos_num &&
+           b.tangential_pos_num() <= max_tangential_pos_num)
+       {
+         Bin basic_bin(b);
+         find_basic_bin(basic_bin);
+         Bin bin_temp(b.segment_num(), b.view_num(), axial_pos_num, b.tangential_pos_num());
+         find_basic_bin(bin_temp);
+         if (basic_bin == bin_temp)
+            ax_tang_poss.push_back(AxTangPosNumbers(axial_pos_num, b.tangential_pos_num()));
+       }
+     }
+  }
+  if (proj_data_info_ptr->get_scanner_ptr()->get_scanner_geometry()=="Generic")
+   {
+     for (int axial_pos_num=do_symmetry_shift_z?min_axial_pos_num:b.axial_pos_num();
+          axial_pos_num <= (do_symmetry_shift_z?max_axial_pos_num:b.axial_pos_num());
+          ++axial_pos_num)
+     {
+        if (b.tangential_pos_num() >= min_tangential_pos_num &&
+            b.tangential_pos_num() <= max_tangential_pos_num)
+        {
+          Bin basic_bin(b);
+          find_basic_bin(basic_bin);
+          Bin bin_temp(b.segment_num(), b.view_num(), axial_pos_num, b.tangential_pos_num());
+          find_basic_bin(bin_temp);
+          if (basic_bin == bin_temp)
+             ax_tang_poss.push_back(AxTangPosNumbers(axial_pos_num, b.tangential_pos_num()));
+        }
+     }
+   }
+
 }
     
 void
diff --git a/src/include/stir/scatter/ScatterSimulation.h b/src/include/stir/scatter/ScatterSimulation.h
index 88de1cc98..8a2e5209e 100644
--- a/src/include/stir/scatter/ScatterSimulation.h
+++ b/src/include/stir/scatter/ScatterSimulation.h
@@ -26,7 +26,9 @@
 #include "stir/RegisteredObject.h"
 #include "stir/ProjData.h"
 #include "stir/VoxelsOnCartesianGrid.h"
+#include "stir/ProjDataInfoBlocksOnCylindricalNoArcCorr.h"
 #include "stir/ProjDataInfoCylindricalNoArcCorr.h"
+#include "stir/ProjDataInfoGenericNoArcCorr.h"
 
 START_NAMESPACE_STIR
 
@@ -110,7 +112,7 @@ class ScatterSimulation : public RegisteredObject<ScatterSimulation>
     inline int get_num_scatter_points() const
     { return static_cast<int>(this->scatt_points_vector.size());}
     //! Get the template ProjDataInfo
-    shared_ptr<const ProjDataInfoCylindricalNoArcCorr> get_template_proj_data_info_sptr() const;
+    shared_ptr<const ProjDataInfo> get_template_proj_data_info_sptr() const;
     //! Get the ExamInfo
     shared_ptr<const ExamInfo> get_exam_info_sptr() const;
 
@@ -345,8 +347,7 @@ class ScatterSimulation : public RegisteredObject<ScatterSimulation>
 
     std::string template_proj_data_filename;
 
-    shared_ptr<ProjDataInfoCylindricalNoArcCorr> proj_data_info_cyl_noarc_cor_sptr;
-
+    shared_ptr<ProjDataInfo> proj_data_info_cyl_noarc_cor_sptr;
     //! \details Exam info extracted from the scanner template
     shared_ptr<ExamInfo> template_exam_info_sptr;
 
diff --git a/src/listmode_buildblock/CListModeDataSAFIR.cxx b/src/listmode_buildblock/CListModeDataSAFIR.cxx
index 4baf4382a..d46ba09c3 100644
--- a/src/listmode_buildblock/CListModeDataSAFIR.cxx
+++ b/src/listmode_buildblock/CListModeDataSAFIR.cxx
@@ -4,6 +4,7 @@ Coincidence LM Data Class for SAFIR: Implementation
 
 	Copyright 2015 ETH Zurich, Institute of Particle Physics
 	Copyright 2020 Positrigo AG, Zurich
+    Copyright 2021 University College London
 
 	Licensed under the Apache License, Version 2.0 (the "License");
 	you may not use this file except in compliance with the License.
@@ -17,7 +18,15 @@ Coincidence LM Data Class for SAFIR: Implementation
 	See the License for the specific language governing permissions and
 	limitations under the License.
 */
+/*!
 
+  \file
+  \ingroup listmode
+  \brief implementation of class stir::CListModeDataSAFIR
+
+  \author Jannis Fischer
+  \author Kris Thielemans
+*/
 #include <iostream>
 #include <fstream>
 #include <typeinfo>
@@ -40,23 +49,32 @@ using std::istream;
 
 START_NAMESPACE_STIR;
 
-
 template <class CListRecordT>
-CListModeDataSAFIR<CListRecordT>::
-CListModeDataSAFIR(const std::string& listmode_filename, const std::string& crystal_map_filename, const std::string& template_proj_data_filename, const double lor_randomization_sigma)
-  : listmode_filename(listmode_filename), map(MAKE_SHARED<DetectorCoordinateMapFromFile>(crystal_map_filename, lor_randomization_sigma))
+CListModeDataSAFIR<CListRecordT>::CListModeDataSAFIR(const std::string& listmode_filename,
+                                                     const std::string& crystal_map_filename,
+                                                     const std::string& template_proj_data_filename,
+                                                     const double lor_randomization_sigma)
+    : listmode_filename(listmode_filename)
 {
-	this->exam_info_sptr.reset(new ExamInfo);
-
-	// Here we are reading the scanner data from the template projdata
-    shared_ptr<ProjData> template_proj_data_sptr =
-            ProjData::read_from_file(template_proj_data_filename);
-    this->set_proj_data_info_sptr(template_proj_data_sptr->get_proj_data_info_sptr()->create_shared_clone());
-
-	if( open_lm_file() == Succeeded::no )
-	{
-		error("CListModeDataSAFIR: Could not open listmode file " +listmode_filename + "\n");
-	}
+  if (!crystal_map_filename.empty())
+    {
+      map = MAKE_SHARED<DetectorCoordinateMap>(crystal_map_filename, lor_randomization_sigma);
+    }
+  else
+    {
+      if (lor_randomization_sigma != 0)
+        error("SAFIR currently does not support LOR-randomisation unless a map is specified");
+    }
+  this->exam_info_sptr.reset(new ExamInfo);
+
+  // Here we are reading the scanner data from the template projdata
+  shared_ptr<ProjData> template_proj_data_sptr = ProjData::read_from_file(template_proj_data_filename);
+  this->set_proj_data_info_sptr(template_proj_data_sptr->get_proj_data_info_sptr()->create_shared_clone());
+
+  if (open_lm_file() == Succeeded::no)
+    {
+      error("CListModeDataSAFIR: Could not open listmode file " + listmode_filename + "\n");
+    }
 }
 
 
@@ -73,9 +91,10 @@ shared_ptr <CListRecord>
 CListModeDataSAFIR<CListRecordT>::
 get_empty_record_sptr() const
 {
-	shared_ptr<CListRecordSAFIR> sptr(new CListRecordSAFIR);
-	sptr->event_SAFIR().set_map(map);
-	return static_pointer_cast<CListRecord>(sptr);
+  shared_ptr<CListRecordSAFIR> sptr(new CListRecordSAFIR);
+  sptr->event_SAFIR().set_scanner_sptr(this->get_proj_data_info_sptr()->get_scanner_sptr());
+  sptr->event_SAFIR().set_map_sptr(map);
+  return static_pointer_cast<CListRecord>(sptr);
 }
 
 template <class CListRecordT>
@@ -85,8 +104,8 @@ get_next_record(CListRecord& record_of_general_type) const
 {
 	CListRecordT& record = static_cast<CListRecordT&>(record_of_general_type);
 	Succeeded status = current_lm_data_ptr->get_next_record(record);
-	if( status == Succeeded::yes ) record.event_SAFIR().set_map(map);
-	return status;
+        // if( status == Succeeded::yes ) record.event_SAFIR().set_map_sptr(map);
+        return status;
 	
 }
 
diff --git a/src/listmode_buildblock/CMakeLists.txt b/src/listmode_buildblock/CMakeLists.txt
index b3e42aa1d..eac6fa899 100644
--- a/src/listmode_buildblock/CMakeLists.txt
+++ b/src/listmode_buildblock/CMakeLists.txt
@@ -15,7 +15,6 @@ set(${dir_LIB_SOURCES}
         CListModeDataECAT8_32bit.cxx
         CListRecordECAT8_32bit.cxx
 	CListModeDataSAFIR.cxx
-	DetectorCoordinateMapFromFile.cxx
 )
 
 if (HAVE_HDF5)
diff --git a/src/listmode_buildblock/DetectorCoordinateMapFromFile.cxx b/src/listmode_buildblock/DetectorCoordinateMapFromFile.cxx
deleted file mode 100644
index af06cff10..000000000
--- a/src/listmode_buildblock/DetectorCoordinateMapFromFile.cxx
+++ /dev/null
@@ -1,59 +0,0 @@
-/* DetectorCoordinateMapFromFile.cxx
-
- Read List-Mode Event Data using map from file:  Implementation
-
-	Copyright 2015 ETH Zurich, Institute of Particle Physics
-
-	Licensed under the Apache License, Version 2.0 (the "License");
-	you may not use this file except in compliance with the License.
-	You may obtain a copy of the License at
-
-		http://www.apache.org/licenses/LICENSE-2.0
-
-	Unless required by applicable law or agreed to in writing, software
-	distributed under the License is distributed on an "AS IS" BASIS,
-	WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-	See the License for the specific language governing permissions and
-	limitations under the License.
-*/
-
-#include "stir/error.h"
-#include "stir/listmode/DetectorCoordinateMapFromFile.h"
-
-START_NAMESPACE_STIR
-	
-void DetectorCoordinateMapFromFile::read_detectormap_from_file( const std::string& filename )
-{
-	std::ifstream myfile(filename.c_str());
-	if( !myfile ) 
-	{
-		error("Error opening file " + filename + ".\n");
-		return;
-	}
-
-//	char line[80];
-	std::string line;
-	while( std::getline( myfile, line))
-	{
-		if( line.size() && line[0] == '#' ) continue;
-		bool has_layer_index = false;
-		stir::CartesianCoordinate3D<float> coord;
-		stir::DetectionPosition<> detpos;
-		std::vector<std::string> col;
-		boost::split(col, line, boost::is_any_of("\t,"));
-		if( !col.size() ) break;
-		else if( col.size() == 5 ) has_layer_index = false;
-		else if( col.size() == 6 ) has_layer_index = true;
-		coord[1] = static_cast<float>(atof(col[4+has_layer_index].c_str() ));
-		coord[2] = static_cast<float>(atof(col[3+has_layer_index].c_str() ));
-		coord[3] = static_cast<float>(atof(col[2+has_layer_index].c_str() ));
-		
-		if( !has_layer_index ) detpos.radial_coord() = 0;
-		else detpos.radial_coord() = atoi(col[2].c_str());
-		detpos.axial_coord() = atoi(col[0].c_str());
-		detpos.tangential_coord() = atoi(col[1].c_str());
-
-		coord_map[detpos] = coord;
-	}
-}
-END_NAMESPACE_STIR
diff --git a/src/recon_buildblock/BackProjectorByBin.cxx b/src/recon_buildblock/BackProjectorByBin.cxx
index 004894839..cadb7c2f1 100644
--- a/src/recon_buildblock/BackProjectorByBin.cxx
+++ b/src/recon_buildblock/BackProjectorByBin.cxx
@@ -306,6 +306,8 @@ void
 BackProjectorByBin::
 start_accumulating_in_new_target()
 {
+    if (!this->_already_set_up)
+      error("BackProjectorByBin method called without calling set_up first.");
 #ifdef STIR_OPENMP
   if (omp_get_num_threads()!=1)
       error("BackProjectorByBin::start_accumulating_in_new_target cannot be called inside a thread");
diff --git a/src/recon_buildblock/DataSymmetriesForBins_PET_CartesianGrid.cxx b/src/recon_buildblock/DataSymmetriesForBins_PET_CartesianGrid.cxx
index a7338a89b..d761172dd 100644
--- a/src/recon_buildblock/DataSymmetriesForBins_PET_CartesianGrid.cxx
+++ b/src/recon_buildblock/DataSymmetriesForBins_PET_CartesianGrid.cxx
@@ -3,6 +3,7 @@
 /*
     Copyright (C) 2000 PARAPET partners
     Copyright (C) 2000- 2009, Hammersmith Imanet Ltd
+    Copyright 2017 ETH Zurich, Institute of Particle Physics and Astrophysics
     Copyright (C) 2018, Palak Wadhwa
     This file is part of STIR.
 
@@ -18,6 +19,8 @@
   \author Kris Thielemans
   \author Palak Wadhwa
   \author PARAPET project
+  \author Parisa Khateri
+
 
 */
 #include "stir/recon_buildblock/DataSymmetriesForBins_PET_CartesianGrid.h"
@@ -28,6 +31,9 @@
 #include <typeinfo>
 #include <algorithm>
 #include <boost/format.hpp>
+#include "stir/ProjDataInfoBlocksOnCylindrical.h"
+#include "stir/ProjDataInfoGeneric.h"
+
 using std::min;
 using std::max;
 
@@ -108,6 +114,119 @@ find_relation_between_coordinate_systems(int& num_planes_per_scanner_ring,
   }
 }
 
+#if 0 // disabled as currently the same as ProjDataInfoGeneric
+//overload for block geometry
+static void
+find_relation_between_coordinate_systems(int& num_planes_per_scanner_ring,
+                                         VectorWithOffset<int>& num_planes_per_axial_pos,
+                                         VectorWithOffset<float>& axial_pos_to_z_offset,
+                                         const ProjDataInfoBlocksOnCylindrical* proj_data_info_blk_ptr,
+                                         const DiscretisedDensityOnCartesianGrid<3,float> *  cartesian_grid_info_ptr)
+
+{
+  const int min_segment_num = proj_data_info_blk_ptr->get_min_segment_num();
+  const int max_segment_num = proj_data_info_blk_ptr->get_max_segment_num();
+
+  num_planes_per_axial_pos = VectorWithOffset<int>(min_segment_num, max_segment_num);
+  axial_pos_to_z_offset = VectorWithOffset<float>(min_segment_num, max_segment_num);
+
+  // TODO and WARNING: get_grid_spacing()[1] is z()
+  const float image_plane_spacing = cartesian_grid_info_ptr->get_grid_spacing()[1];
+
+  {
+    const float num_planes_per_scanner_ring_float =
+      proj_data_info_blk_ptr->get_ring_spacing() / image_plane_spacing;
+
+    num_planes_per_scanner_ring = round(num_planes_per_scanner_ring_float);
+    //parisa: temporarily comment
+    /*if (fabs(num_planes_per_scanner_ring_float - num_planes_per_scanner_ring) > 1.E-2)
+      error("DataSymmetriesForBins_PET_CartesianGrid can currently only support z-grid spacing "
+           "equal to the ring spacing of the scanner divided by an integer. Sorry\n");*/
+  }
+
+  /* disabled as we support this now
+  if (fabs( cartesian_grid_info_ptr->get_origin().x()) > 1.E-2)
+    error("DataSymmetriesForBins_PET_CartesianGrid can currently only support x-origin = 0 "
+         "Sorry\n");
+  if (fabs( cartesian_grid_info_ptr->get_origin().y()) > 1.E-2)
+    error("DataSymmetriesForBins_PET_CartesianGrid can currently only support y-origin = 0 "
+         "Sorry\n");
+  */
+
+  for (int segment_num=min_segment_num; segment_num<=max_segment_num; ++segment_num)
+  {
+    {
+      const float
+        num_planes_per_axial_pos_float =
+        proj_data_info_blk_ptr->get_axial_sampling(segment_num)/image_plane_spacing;
+
+      num_planes_per_axial_pos[segment_num] = round(num_planes_per_axial_pos_float);
+      //parisa: temporarily comment
+      /*if (fabs(num_planes_per_axial_pos_float - num_planes_per_axial_pos[segment_num]) > 1.E-5)
+        error("DataSymmetriesForBins_PET_CartesianGrid can currently only support z-grid spacing "
+             "equal to the axial sampling in the projection data divided by an integer. Sorry\n");*/
+
+    }
+
+    const float delta = proj_data_info_blk_ptr->get_average_ring_difference(segment_num);
+
+    // KT 20/06/2001 take origin.z() into account
+    axial_pos_to_z_offset[segment_num] =
+      (cartesian_grid_info_ptr->get_max_index() + cartesian_grid_info_ptr->get_min_index())/2.F
+      - cartesian_grid_info_ptr->get_origin().z()/image_plane_spacing
+      -
+      (num_planes_per_axial_pos[segment_num]
+       *(proj_data_info_blk_ptr->get_max_axial_pos_num(segment_num)
+         + proj_data_info_blk_ptr->get_min_axial_pos_num(segment_num))
+       + num_planes_per_scanner_ring*delta)/2;
+  }
+}
+#endif
+
+#if 0 // disabled as now derived from Cylindrical
+// overloading for generic case
+static void
+find_relation_between_coordinate_systems(int& num_planes_per_scanner_ring,
+                                         VectorWithOffset<int>& num_planes_per_axial_pos,
+                                         VectorWithOffset<float>& axial_pos_to_z_offset,
+                                         const ProjDataInfoGeneric* proj_data_info_blk_ptr,
+                                         const DiscretisedDensityOnCartesianGrid<3,float> *  cartesian_grid_info_ptr)
+{
+    const int min_segment_num = proj_data_info_blk_ptr->get_min_segment_num();
+    const int max_segment_num = proj_data_info_blk_ptr->get_max_segment_num();
+
+    num_planes_per_axial_pos = VectorWithOffset<int>(min_segment_num, max_segment_num);
+    axial_pos_to_z_offset = VectorWithOffset<float>(min_segment_num, max_segment_num);
+
+    // TODO and WARNING: get_grid_spacing()[1] is z()
+    const float image_plane_spacing = cartesian_grid_info_ptr->get_grid_spacing()[1];
+
+  
+    const float num_planes_per_scanner_ring_float =
+            proj_data_info_blk_ptr->get_ring_spacing() / image_plane_spacing;
+
+    num_planes_per_scanner_ring = round(num_planes_per_scanner_ring_float);
+
+
+    for (int segment_num=min_segment_num; segment_num<=max_segment_num; ++segment_num)
+    {
+        const float num_planes_per_axial_pos_float =
+                proj_data_info_blk_ptr->get_axial_sampling(segment_num)/image_plane_spacing;
+                
+        num_planes_per_axial_pos[segment_num] = round(num_planes_per_axial_pos_float);
+
+        const float delta = proj_data_info_blk_ptr->get_average_ring_difference(segment_num);
+        axial_pos_to_z_offset[segment_num] =
+                (cartesian_grid_info_ptr->get_max_index() + cartesian_grid_info_ptr->get_min_index())/2.F
+                - cartesian_grid_info_ptr->get_origin().z()/image_plane_spacing
+                - (num_planes_per_axial_pos[segment_num]
+                *(proj_data_info_blk_ptr->get_max_axial_pos_num(segment_num)
+                + proj_data_info_blk_ptr->get_min_axial_pos_num(segment_num))
+                + num_planes_per_scanner_ring*delta)/2;
+    }
+}
+#endif
+
 /*! The DiscretisedDensity pointer has to point to an object of 
   type  DiscretisedDensityOnCartesianGrid (or a derived type).
   
@@ -132,7 +251,10 @@ DataSymmetriesForBins_PET_CartesianGrid
     do_symmetry_swap_s(do_symmetry_swap_s_v),
     do_symmetry_shift_z(do_symmetry_shift_z)
 {
-  if(is_null_ptr(dynamic_cast<const ProjDataInfoCylindrical *>(proj_data_info_ptr.get())))
+    //Cylindrical implementation
+    if (proj_data_info_ptr->get_scanner_ptr()->get_scanner_geometry()=="Cylindrical")
+    {
+  if(dynamic_cast<const ProjDataInfoCylindrical *>(proj_data_info_ptr.get()) == NULL)
     error("DataSymmetriesForBins_PET_CartesianGrid constructed with wrong type of ProjDataInfo: %s\n"
           "(can only handle projection data corresponding to a cylinder)\n",
       typeid(*proj_data_info_ptr).name());
@@ -220,6 +342,116 @@ DataSymmetriesForBins_PET_CartesianGrid
                                          axial_pos_to_z_offset,
                                          static_cast<const ProjDataInfoCylindrical *>(proj_data_info_ptr.get()),
                                          cartesian_grid_info_ptr);
+    }
+  //Block implementation
+  if (proj_data_info_ptr->get_scanner_ptr()->get_scanner_geometry()=="BlocksOnCylindrical")
+  {
+    if (dynamic_cast<const ProjDataInfoBlocksOnCylindrical *>(proj_data_info_ptr.get()) == NULL)
+      error("DataSymmetriesForBins_PET_CartesianGrid constructed with wrong type of ProjDataInfo: %s\n"
+            "(can only handle projection data corresponding to blocks on a cylinder)\n",
+            typeid(*proj_data_info_ptr).name());
+
+    const DiscretisedDensityOnCartesianGrid<3,float> *
+      cartesian_grid_info_ptr =
+       dynamic_cast<const DiscretisedDensityOnCartesianGrid<3,float> *>
+        (image_info_ptr.get());
+
+    if (cartesian_grid_info_ptr == NULL)
+      error("DataSymmetriesForBins_PET_CartesianGrid constructed with wrong type of image info: %s\n",
+        typeid(*image_info_ptr).name());
+
+    // WARNING get_grid_spacing()[1] == z
+    //note: origin by default is (0,0,0)
+    const float z_origin_in_planes =
+      image_info_ptr->get_origin().z()/cartesian_grid_info_ptr->get_grid_spacing()[1];
+    // z_origin_in_planes should be an integer
+    if (fabs(round(z_origin_in_planes) - z_origin_in_planes) > 1.E-3F)
+      error("DataSymmetriesForBins_PET_CartesianGrid: the shift in the "
+            "z-direction of the origin (which is %g) should be a multiple of the plane "
+            "separation (%g)\n",
+            image_info_ptr->get_origin().z(), cartesian_grid_info_ptr->get_grid_spacing()[1]);
+
+    if (this->do_symmetry_90degrees_min_phi||
+        this->do_symmetry_180degrees_min_phi||
+        this->do_symmetry_swap_segment||
+        this->do_symmetry_swap_s)
+     {
+       warning("Disabling all symmetries except for symmtery_z since they are not implemented in block geometry yet.");
+       this->do_symmetry_90degrees_min_phi =
+       this->do_symmetry_180degrees_min_phi =
+       this->do_symmetry_swap_segment =
+       this->do_symmetry_swap_s =
+       this->do_symmetry_shift_z=false;
+     }
+    if (!dynamic_cast<const ProjDataInfoBlocksOnCylindrical *>(proj_data_info_ptr.get())->axial_sampling_is_uniform())
+      {
+        this->do_symmetry_shift_z = false;
+        this->do_symmetry_swap_segment = false;
+      }
+
+    // TODOBLOCK. should probably not call next function for non-uniform sampling
+    find_relation_between_coordinate_systems(
+            num_planes_per_scanner_ring,
+            num_planes_per_axial_pos,
+            axial_pos_to_z_offset,
+            dynamic_cast<const ProjDataInfoCylindrical *>(proj_data_info_ptr.get()),
+            cartesian_grid_info_ptr);
+  }
+    // generic implementation
+  if (proj_data_info_ptr->get_scanner_ptr()->get_scanner_geometry()=="Generic")
+  {
+    if (dynamic_cast<const ProjDataInfoGeneric *>(proj_data_info_ptr.get()) == NULL)
+        error("DataSymmetriesForBins_PET_CartesianGrid constructed with wrong type of ProjDataInfo: %s\n"
+        "(can only handle projection data corresponding to a generig geometry)\n",
+        typeid(*proj_data_info_ptr).name());
+
+    const DiscretisedDensityOnCartesianGrid<3,float> *
+        cartesian_grid_info_ptr =
+        dynamic_cast<const DiscretisedDensityOnCartesianGrid<3,float> *>
+        (image_info_ptr.get());
+
+    if (cartesian_grid_info_ptr == NULL)
+        error("DataSymmetriesForBins_PET_CartesianGrid constructed with wrong type of image info: %s\n",
+        typeid(*image_info_ptr).name());
+
+    // WARNING get_grid_spacing()[1] == z
+    const float z_origin_in_planes =
+    image_info_ptr->get_origin().z()/cartesian_grid_info_ptr->get_grid_spacing()[1];
+    // z_origin_in_planes should be an integer
+    if (fabs(round(z_origin_in_planes) - z_origin_in_planes) > 1.E-3F)
+        error("DataSymmetriesForBins_PET_CartesianGrid: the shift in the "
+          "z-direction of the origin (which is %g) should be a multiple of the plane "
+          "separation (%g)\n",
+          image_info_ptr->get_origin().z(), cartesian_grid_info_ptr->get_grid_spacing()[1]);
+
+    if (this->do_symmetry_90degrees_min_phi||
+        this->do_symmetry_180degrees_min_phi||
+        this->do_symmetry_swap_segment||
+        this->do_symmetry_swap_s||
+        this->do_symmetry_shift_z)
+    {
+        warning("Disabling all symmetries since they are not implemented in generic geometry.");
+        this->do_symmetry_90degrees_min_phi =
+        this->do_symmetry_180degrees_min_phi =
+        this->do_symmetry_swap_segment =
+        this->do_symmetry_swap_s =
+        this->do_symmetry_shift_z = false;
+    }
+
+    if (!dynamic_cast<const ProjDataInfoGeneric *>(proj_data_info_ptr.get())->axial_sampling_is_uniform())
+      {
+        this->do_symmetry_shift_z = false;
+        this->do_symmetry_swap_segment = false;
+      }
+
+    // TODOBLOCK. should probably not call next function for non-uniform sampling
+    find_relation_between_coordinate_systems(
+          num_planes_per_scanner_ring,
+          num_planes_per_axial_pos,
+          axial_pos_to_z_offset,
+          dynamic_cast<const ProjDataInfoCylindrical *>(proj_data_info_ptr.get()),
+          cartesian_grid_info_ptr);
+    }
 }
 
 
diff --git a/src/recon_buildblock/ProjMatrixByBinUsingRayTracing.cxx b/src/recon_buildblock/ProjMatrixByBinUsingRayTracing.cxx
index eaff65a88..55a6f7b5a 100644
--- a/src/recon_buildblock/ProjMatrixByBinUsingRayTracing.cxx
+++ b/src/recon_buildblock/ProjMatrixByBinUsingRayTracing.cxx
@@ -2,6 +2,7 @@
     Copyright (C) 2000 PARAPET partners
     Copyright (C) 2000-2011, Hammersmith Imanet Ltd
     Copyright (C) 2013-2014, University College London
+    Copyright 2017 ETH Zurich, Institute of Particle Physics and Astrophysics
     This file is part of STIR.
 
     SPDX-License-Identifier: Apache-2.0 AND License-ref-PARAPET-license
@@ -18,6 +19,7 @@
   \author Mustapha Sadki
   \author Kris Thielemans
   \author PARAPET project
+  \author Parisa Khateri
 */
 
 /* History
@@ -50,6 +52,8 @@
 #include <algorithm>
 #include <math.h>
 #include <boost/format.hpp>
+#include "stir/ProjDataInfoBlocksOnCylindricalNoArcCorr.h"
+#include "stir/ProjDataInfoGenericNoArcCorr.h"
 
 #ifndef STIR_NO_NAMESPACE
 using std::min;
@@ -301,6 +305,8 @@ set_up(
              "Backprojecting with this matrix might have artefacts at views 0 and 90 degrees.\n");
 
   if (use_actual_detector_boundaries)
+    {
+  if (proj_data_info_ptr->get_scanner_ptr()->get_scanner_geometry()== "Cylindrical")
     {
       const ProjDataInfoCylindricalNoArcCorr * proj_data_info_cyl_ptr =
         dynamic_cast<const ProjDataInfoCylindricalNoArcCorr *>(proj_data_info_ptr.get());
@@ -328,13 +334,74 @@ set_up(
               use_actual_detector_boundaries = false;
             }
         }
+      }
+      else if(proj_data_info_ptr->get_scanner_ptr()->get_scanner_geometry()== "BlocksOnCylindrical")
+      {
+      const ProjDataInfoBlocksOnCylindricalNoArcCorr * proj_data_info_blk_ptr =
+        dynamic_cast<const ProjDataInfoBlocksOnCylindricalNoArcCorr *>(proj_data_info_ptr.get());
+
+      if (proj_data_info_blk_ptr== 0)
+      {
+        warning("ProjMatrixByBinUsingRayTracing: use_actual_detector_boundaries"
+                " is reset to false as the projection data should be non-arccorected.\n");
+        use_actual_detector_boundaries = false;
+      }
+      else
+      {
+        bool nocompression =
+          proj_data_info_blk_ptr->get_view_mashing_factor()==1;
+        for (int segment_num=proj_data_info_blk_ptr->get_min_segment_num();
+             nocompression && segment_num <= proj_data_info_blk_ptr->get_max_segment_num();
+             ++segment_num)
+          nocompression=
+            proj_data_info_blk_ptr->get_min_ring_difference(segment_num) ==
+            proj_data_info_blk_ptr->get_max_ring_difference(segment_num);
+
+        if (!nocompression)
+         {
+          warning("ProjMatrixByBinUsingRayTracing: use_actual_detector_boundaries"
+                    " is reset to false as the projection data as either mashed or uses axial compression\n");
+            use_actual_detector_boundaries = false;
+         }
+      }
+    }
+    else
+    {
+        const ProjDataInfoGenericNoArcCorr * proj_data_info_blk_ptr =
+          dynamic_cast<const ProjDataInfoGenericNoArcCorr *>(proj_data_info_ptr.get());
+          
+        if (proj_data_info_blk_ptr== 0)
+        {
+          warning("ProjMatrixByBinUsingRayTracing: use_actual_detector_boundaries"
+                  " is reset to false as the projection data should be non-arccorected.\n");
+          use_actual_detector_boundaries = false;
+        }
+        else
+        {
+          bool nocompression =
+            proj_data_info_blk_ptr->get_view_mashing_factor()==1;
+          for (int segment_num=proj_data_info_blk_ptr->get_min_segment_num();
+               nocompression && segment_num <= proj_data_info_blk_ptr->get_max_segment_num();
+               ++segment_num)
+            nocompression=
+              proj_data_info_blk_ptr->get_min_ring_difference(segment_num) ==
+              proj_data_info_blk_ptr->get_max_ring_difference(segment_num);
 
-      if (use_actual_detector_boundaries)
+          if (!nocompression)
+          {
+            warning("ProjMatrixByBinUsingRayTracing: use_actual_detector_boundaries"
+                      " is reset to false as the projection data as either mashed or uses axial compression\n");
+            use_actual_detector_boundaries = false;
+          }
+        }
+    }
+ 
+    if (use_actual_detector_boundaries)
         warning("ProjMatrixByBinUsingRayTracing: use_actual_detector_boundaries==true\n");
 
-    }  
+  }  
 
-#if 0
+  #if 0
   // test if our 2D code does not have problems
   {
     // currently 2D code relies on the LOR falling in the middle of a voxel (in z-direction)
@@ -347,7 +414,7 @@ set_up(
             "- or an even number of planes and z_origin=(n+1/2)*z_voxel_size\n"
             "(for some integer n).\n");
   }
-#endif
+  #endif
 
 
   this->already_setup = true;
@@ -557,6 +624,8 @@ calculate_proj_matrix_elems_for_one_bin(
   }
   else
   {
+    if (proj_data_info_ptr->get_scanner_ptr()->get_scanner_geometry()== "Cylindrical")
+    {
     // can be static_cast later on
     const ProjDataInfoCylindricalNoArcCorr& proj_data_info_noarccor =
     dynamic_cast<const ProjDataInfoCylindricalNoArcCorr&>(*proj_data_info_ptr);
@@ -582,6 +651,24 @@ calculate_proj_matrix_elems_for_one_bin(
     const float old_s_in_mm=proj_data_info_ptr->get_s(bin);
     if (fabs(s_in_mm-old_s_in_mm)>proj_data_info_ptr->get_sampling_in_s(bin)*.0001)
       warning("tangential_pos_num %d old_s_in_mm %g new_s_in_mm %g\n",bin.tangential_pos_num(), old_s_in_mm, s_in_mm);
+    }
+    else if(proj_data_info_ptr->get_scanner_ptr()->get_scanner_geometry()== "BlocksOnCylindrical")
+    {
+      // can be static_cast later on
+      const ProjDataInfoBlocksOnCylindricalNoArcCorr& proj_data_info_noarccor =
+      dynamic_cast<const ProjDataInfoBlocksOnCylindricalNoArcCorr&>(*proj_data_info_ptr);
+
+      phi = proj_data_info_noarccor.get_phi(bin);
+      s_in_mm = proj_data_info_noarccor.get_s(bin);
+    }
+    else
+    {
+      const ProjDataInfoGenericNoArcCorr& proj_data_info_noarccor =
+      dynamic_cast<const ProjDataInfoGenericNoArcCorr&>(*proj_data_info_ptr);
+
+      phi = proj_data_info_noarccor.get_phi(bin);
+      s_in_mm = proj_data_info_noarccor.get_s(bin);
+    }
 
   }
   
@@ -668,9 +755,15 @@ calculate_proj_matrix_elems_for_one_bin(
     min((min(max_index.x(), -min_index.x())+.45F)*voxel_size.x(),
         (min(max_index.y(), -min_index.y())+.45F)*voxel_size.y()); 
 #else
-  const float fovrad_in_mm = 
+  float fovrad_in_mm = 
     min((min(max_index.x(), -min_index.x()))*voxel_size.x(),
         (min(max_index.y(), -min_index.y()))*voxel_size.y()); 
+        if (proj_data_info_ptr->get_scanner_ptr()->get_scanner_geometry() == "BlocksOnCylindrical")
+  {
+    fovrad_in_mm =
+        min((min(max_index.x(), -min_index.x()) - 5.f) * voxel_size.x(),
+            (min(max_index.y(), -min_index.y()) - 5.f) * voxel_size.y());
+  }
 #endif
 
   if (num_tangential_LORs == 1)
@@ -775,8 +868,11 @@ add_adjacent_z(ProjMatrixElemsForOneBin& lor,
   assert(z_of_first_voxel-.5<=right_edge_of_TOR);
   // first reserve enough memory for the whole vector
   // this speeds things up.
-  const int num_overlapping_voxels =
-    round(ceil(right_edge_of_TOR-z_of_first_voxel+.5));
+  // !author Parisa Khateri: modify to take into account voxels before the first LOR in raytracing.
+  const int num_overlapping_voxels = z_of_first_voxel > 0.5?
+           round(ceil(right_edge_of_TOR-z_of_first_voxel+.5)) + 1:
+           round(ceil(right_edge_of_TOR-z_of_first_voxel+.5));
+
   lor.reserve(lor.size() * num_overlapping_voxels);
   
   // point to end of original LOR, i.e. first plane
@@ -834,6 +930,47 @@ add_adjacent_z(ProjMatrixElemsForOneBin& lor,
             }
         }
     } // loop over z_index
+    
+    // !author Parisa Khateri: modify to take into account voxels before the first LOR in raytracing.
+    if (z_of_first_voxel > 0.5)
+    {
+      int z_index= -1;
+      const float overlap_of_voxel_with_TOR = z_of_first_voxel - .5F;
+      assert(num_overlapping_voxels>=z_index);
+      assert(overlap_of_voxel_with_TOR < 1.0001);
+      const int new_z = lor.begin()->coord1()+z_index;
+      if (overlap_of_voxel_with_TOR>.9999) // test if it is 1
+      {
+        // just copy the value
+        std::size_t count = 0; // counter for elements in original LOR
+        for (  ProjMatrixElemsForOneBin::const_iterator element_ptr = lor.begin();
+               count != org_size; //element_ptr != element_end;
+               ++element_ptr, ++count)
+        {
+          assert(lor.size()+1 <= lor.capacity()); // not really necessary now, but check on reserve()  best for performance
+          assert(new_z == element_ptr->coord1()+z_index);
+          lor.push_back(ProjMatrixElemsForOneBin::value_type(
+                        Coordinate3D<int>(new_z, element_ptr->coord2(), element_ptr->coord3()),
+                        element_ptr->get_value()));
+        }
+      }
+      else
+      {
+        // multiply the value with the overlap
+        std::size_t count = 0; // counter for elements in original LOR
+        for (  ProjMatrixElemsForOneBin::const_iterator element_ptr = lor.begin();
+               count != org_size; //element_ptr != element_end;
+               ++element_ptr, ++count)
+        {
+          assert(lor.size()+1 <= lor.capacity());
+          assert(new_z == element_ptr->coord1()+z_index);
+          lor.push_back(ProjMatrixElemsForOneBin::value_type(
+                        Coordinate3D<int>(new_z, element_ptr->coord2(), element_ptr->coord3()),
+                        element_ptr->get_value()*overlap_of_voxel_with_TOR));
+        }
+      }
+    
+    }//Parisa end
 
   // now check original z
   {
diff --git a/src/recon_test/CMakeLists.txt b/src/recon_test/CMakeLists.txt
index cb70f86e0..fdaaacd9a 100644
--- a/src/recon_test/CMakeLists.txt
+++ b/src/recon_test/CMakeLists.txt
@@ -19,6 +19,7 @@ set(${dir_SIMPLE_TEST_EXE_SOURCES}
         test_FBP2D.cxx
         test_FBP3DRP.cxx
         test_priors.cxx
+        test_blocks_on_cylindrical_projectors.cxx
 )
 
 
diff --git a/src/recon_test/test_blocks_on_cylindrical_projectors.cxx b/src/recon_test/test_blocks_on_cylindrical_projectors.cxx
new file mode 100644
index 000000000..925168eb6
--- /dev/null
+++ b/src/recon_test/test_blocks_on_cylindrical_projectors.cxx
@@ -0,0 +1,698 @@
+/*!
+
+  \file
+  \ingroup recontest
+
+  \brief Test program for back projection and forward projection using stir::ProjDataInfoBlockOnCylindrical
+
+  \author Daniel Deidda
+
+*/
+/*  Copyright (C) 2021-2022, National Physical Laboratory
+    This file is part of STIR.
+
+    This file is free software; you can redistribute it and/or modify
+    it under the terms of the GNU Lesser General Public License as published by
+    the Free Software Foundation; either version 2.1 of the License, or
+    (at your option) any later version.
+
+    This file is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU Lesser General Public License for more details.
+
+    See STIR/LICENSE.txt for details
+*/
+
+#include "stir/info.h"
+#include "stir/make_array.h"
+#include "stir/ProjDataInMemory.h"
+#include "stir/DiscretisedDensity.h"
+#include "stir/ProjDataInterfile.h"
+#include "stir/recon_buildblock/ProjMatrixElemsForOneBin.h"
+#include "stir/recon_buildblock/ProjMatrixByBinUsingRayTracing.h"
+#include "stir/ExamInfo.h"
+#include "stir/Verbosity.h"
+#include "stir/LORCoordinates.h"
+#include "stir/ProjDataInfo.h"
+#include "stir/ProjDataInfoBlocksOnCylindricalNoArcCorr.h"
+#include "stir/ProjDataInfoGenericNoArcCorr.h"
+#include "stir/ProjDataInfoCylindricalNoArcCorr.h"
+#include "stir/recon_buildblock/ProjMatrixByBinUsingRayTracing.h"
+#include "stir/Sinogram.h"
+#include "stir/Viewgram.h"
+#include "stir/Succeeded.h"
+#include "stir/RunTests.h"
+#include "stir/Scanner.h"
+#include "stir/copy_fill.h"
+#include "stir/IndexRange3D.h"
+#include "stir/CPUTimer.h"
+#include "stir/Shape/Shape3DWithOrientation.h"
+#include "stir/Shape/Ellipsoid.h"
+#include "stir/Shape/Box3D.h"
+#include "stir/VoxelsOnCartesianGrid.h"
+#include "stir/recon_buildblock/ForwardProjectorByBin.h"
+#include "stir/recon_buildblock/ForwardProjectorByBinUsingProjMatrixByBin.h"
+#include "stir/recon_buildblock/BackProjectorByBinUsingProjMatrixByBin.h"
+#include "stir/IO/write_to_file.h"
+#include "stir/VoxelsOnCartesianGrid.h"
+//#include "stir/Shape/Shape3D.h"
+
+START_NAMESPACE_STIR
+
+/*!
+  \ingroup test
+  \brief Test class for Blocks
+*/
+class BlocksTests : public RunTests
+{
+public:
+  void run_tests();
+
+private:
+  void run_symmetry_test();
+  void run_plane_symmetry_test();
+  void run_map_orientation_test();
+  void run_axial_projection_test();
+  void run_voxelOnCartesianGrid_with_negative_offset();
+  template <class TProjDataInfo>
+  shared_ptr<TProjDataInfo> set_blocks_projdata_info(shared_ptr<Scanner> scanner_sptr);
+};
+/*! The following is a function to allow a projdata_info blocksONCylindrical to be created from the scanner.
+ */
+template <class TProjDataInfo>
+shared_ptr<TProjDataInfo>
+BlocksTests::set_blocks_projdata_info(shared_ptr<Scanner> scanner_sptr)
+{
+  VectorWithOffset<int> num_axial_pos_per_segment(scanner_sptr->get_num_rings() * 2 - 1);
+  VectorWithOffset<int> min_ring_diff_v(scanner_sptr->get_num_rings() * 2 - 1);
+  VectorWithOffset<int> max_ring_diff_v(scanner_sptr->get_num_rings() * 2 - 1);
+  for (int i = 0; i < 2 * scanner_sptr->get_num_rings() - 1; i++)
+    {
+      min_ring_diff_v[i] = -scanner_sptr->get_num_rings() + 1 + i;
+      max_ring_diff_v[i] = -scanner_sptr->get_num_rings() + 1 + i;
+      if (i < scanner_sptr->get_num_rings())
+        num_axial_pos_per_segment[i] = i + 1;
+      else
+        num_axial_pos_per_segment[i] = 2 * scanner_sptr->get_num_rings() - i - 1;
+    }
+
+  auto proj_data_info_blocks_sptr
+      = std::make_shared<TProjDataInfo>(scanner_sptr, num_axial_pos_per_segment, min_ring_diff_v, max_ring_diff_v,
+                                        scanner_sptr->get_max_num_views(), scanner_sptr->get_max_num_non_arccorrected_bins());
+
+  return proj_data_info_blocks_sptr;
+}
+
+/*! The following is a test for the view offset with voxelOnCartesianGrid: ascanner is created and its relative
+ * projdata info using a negative offset is set. When calling the voxelOnCartesianGrid constructor if everything ok
+ * a variable called is_OK is set to true and false otherwise. If false the test will fail.
+ */
+void
+BlocksTests::run_voxelOnCartesianGrid_with_negative_offset()
+{
+  //    create projadata info
+
+  auto scannerBlocks_sptr = std::make_shared<Scanner>(Scanner::SAFIRDualRingPrototype);
+
+  scannerBlocks_sptr->set_intrinsic_azimuthal_tilt(-30);
+  scannerBlocks_sptr->set_scanner_geometry("BlocksOnCylindrical");
+  scannerBlocks_sptr->set_up();
+
+  auto proj_data_info_blocks_sptr = std::make_shared<ProjDataInfoBlocksOnCylindricalNoArcCorr>();
+  proj_data_info_blocks_sptr = set_blocks_projdata_info<ProjDataInfoBlocksOnCylindricalNoArcCorr>(scannerBlocks_sptr);
+
+  bool is_ok = true;
+
+  try
+    {
+      auto grid = std::make_shared<VoxelsOnCartesianGrid<float>>(
+          *proj_data_info_blocks_sptr, 1, CartesianCoordinate3D<float>(0.F, 0.F, 0.F), CartesianCoordinate3D<int>(-1, -1, -1));
+    }
+  catch (...)
+    {
+      is_ok = false;
+    }
+
+  check_if_equal(is_ok, true);
+}
+
+/*! The following is a test for axial symmetries: a simulated image is created with a line along the z direction.
+ *  The image is forward projected to a sinogram and the sinogram back projected to an image. This image should
+ *  be symmetrical along z
+ */
+void
+BlocksTests::run_axial_projection_test()
+{
+
+  //-- ExamInfo
+  auto exam_info_sptr = std::make_shared<ExamInfo>();
+  exam_info_sptr->imaging_modality = ImagingModality::PT;
+
+  CartesianCoordinate3D<float> origin(0, 0, 0);
+  CartesianCoordinate3D<float> grid_spacing(1.1, 2.2, 2.2);
+
+  const IndexRange<3> range(Coordinate3D<int>(0, -45, -45), Coordinate3D<int>(24, 44, 44));
+  VoxelsOnCartesianGrid<float> image(exam_info_sptr, range, origin, grid_spacing);
+
+  //    60 degrees
+  float phi1 = 0 * _PI / 180;
+  const Array<2, float> direction_vectors
+      = make_array(make_1d_array(1.F, 0.F, 0.F), make_1d_array(0.F, cos(float(_PI) - phi1), sin(float(_PI) - phi1)),
+                   make_1d_array(0.F, -sin(float(_PI) - phi1), cos(float(_PI) - phi1)));
+
+  Ellipsoid plane(CartesianCoordinate3D<float>(/*edge_z*/ 50 * grid_spacing.z(),
+                                               /*edge_y*/ 2 * grid_spacing.y(),
+                                               /*edge_x*/ 2 * grid_spacing.x()),
+                  /*centre*/
+                  CartesianCoordinate3D<float>((image.get_min_index() + image.get_max_index()) / 2 * grid_spacing.z(),
+                                               0 * grid_spacing.y(), 0),
+                  direction_vectors);
+
+  plane.construct_volume(image, make_coordinate(3, 3, 3));
+
+  //    create projadata info
+
+  auto scannerBlocks_sptr = std::make_shared<Scanner>(Scanner::SAFIRDualRingPrototype);
+  scannerBlocks_sptr->set_scanner_geometry("BlocksOnCylindrical");
+  scannerBlocks_sptr->set_up();
+
+  auto proj_data_info_blocks_sptr = std::make_shared<ProjDataInfoBlocksOnCylindricalNoArcCorr>();
+  proj_data_info_blocks_sptr
+      = set_blocks_projdata_info<ProjDataInfoBlocksOnCylindricalNoArcCorr>(scannerBlocks_sptr); //    now forward-project image
+
+  shared_ptr<DiscretisedDensity<3, float>> image_sptr(image.clone());
+  shared_ptr<DiscretisedDensity<3, float>> bck_proj_image_sptr(image.clone());
+  write_to_file("axial_test", *image_sptr);
+
+  auto PM = std::make_shared<ProjMatrixByBinUsingRayTracing>();
+  PM->enable_cache(false);
+  //    PM->set_do_symmetry_90degrees_min_phi(false);
+  //    PM->set_do_symmetry_shift_z(false);
+  //    PM->set_do_symmetry_swap_segment(false);
+
+  auto forw_projector_sptr = std::make_shared<ForwardProjectorByBinUsingProjMatrixByBin>(PM);
+  auto bck_projector_sptr = std::make_shared<BackProjectorByBinUsingProjMatrixByBin>(PM);
+  info(boost::format("Test blocks on Cylindrical: Forward projector used: %1%") % forw_projector_sptr->parameter_info());
+
+  forw_projector_sptr->set_up(proj_data_info_blocks_sptr, image_sptr);
+  bck_projector_sptr->set_up(proj_data_info_blocks_sptr, bck_proj_image_sptr);
+
+  auto projdata = std::make_shared<ProjDataInterfile>(exam_info_sptr, proj_data_info_blocks_sptr, "test_axial.hs",
+                                                      std::ios::out | std::ios::trunc | std::ios::in);
+
+  forw_projector_sptr->forward_project(*projdata, *image_sptr);
+
+  bck_projector_sptr->back_project(*bck_proj_image_sptr, *projdata, 0, 1);
+  write_to_file("back_proj_axial_test", *bck_proj_image_sptr);
+
+  int min_z = bck_proj_image_sptr->get_min_index();
+  int max_z = bck_proj_image_sptr->get_max_index();
+  int min_y = (*bck_proj_image_sptr)[min_z].get_min_index();
+  int max_y = (*bck_proj_image_sptr)[min_z].get_max_index();
+  int min_x = (*bck_proj_image_sptr)[min_z][min_y].get_min_index();
+  int max_x = (*bck_proj_image_sptr)[min_z][min_y].get_max_index();
+
+  // get two planes in the image that are equidistant from the z center
+  int centre_z = (max_z - min_z) / 2;
+  int plane_idA = centre_z - 5;
+  int plane_idB = centre_z + 5;
+
+  for (int y = min_y; y < max_y; y++)
+    for (int x = min_x; x < max_x; x++)
+      {
+        check_if_equal((*bck_proj_image_sptr)[plane_idA][y][x], (*bck_proj_image_sptr)[plane_idB][y][x],
+                       "checking the symmetry along the axial direction");
+      }
+}
+
+/*! The following is a test for symmetries: a simulated image is created with a plane at known angles,
+ *  the forward projected sinogram should show the maximum value at the bin corresponding to the angle phi
+ *  equal to the orientation of the plane
+ */
+void
+BlocksTests::run_plane_symmetry_test()
+{
+
+  //-- ExamInfo
+  auto exam_info_sptr = std::make_shared<ExamInfo>();
+  exam_info_sptr->imaging_modality = ImagingModality::PT;
+
+  CartesianCoordinate3D<float> origin(0, 0, 0);
+  CartesianCoordinate3D<float> grid_spacing(1.1, 2.2, 2.2);
+  float phi1;
+  float phi2;
+  const IndexRange<3> range(Coordinate3D<int>(0, -45, -44), Coordinate3D<int>(24, 44, 45));
+  VoxelsOnCartesianGrid<float> image(exam_info_sptr, range, origin, grid_spacing);
+
+  //    60 degrees
+  phi1 = 60 * _PI / 180;
+  const Array<2, float> direction_vectors
+      = make_array(make_1d_array(1.F, 0.F, 0.F), make_1d_array(0.F, cos(float(_PI) - phi1), sin(float(_PI) - phi1)),
+                   make_1d_array(0.F, -sin(float(_PI) - phi1), cos(float(_PI) - phi1)));
+
+  Ellipsoid plane(CartesianCoordinate3D<float>(/*edge_z*/ 25 * grid_spacing.z(),
+                                               /*edge_y*/ 91 * grid_spacing.y(),
+                                               /*edge_x*/ 5 * grid_spacing.x()),
+                  /*centre*/
+                  CartesianCoordinate3D<float>((image.get_min_index() + image.get_max_index()) / 2 * grid_spacing.z(),
+                                               0 * grid_spacing.y(), 0),
+                  direction_vectors);
+
+  plane.construct_volume(image, make_coordinate(3, 3, 3));
+
+  //    rotate by 30 degrees
+  phi2 = 30 * _PI / 180;
+  VoxelsOnCartesianGrid<float> image2 = *image.get_empty_copy();
+  const Array<2, float> direction2
+      = make_array(make_1d_array(1.F, 0.F, 0.F), make_1d_array(0.F, cos(float(_PI) - phi2), sin(float(_PI) - phi2)),
+                   make_1d_array(0.F, -sin(float(_PI) - phi2), cos(float(_PI) - phi2)));
+
+  Ellipsoid plane2(CartesianCoordinate3D<float>(/*edge_z*/ 25 * grid_spacing.z(),
+                                                /*edge_y*/ 91 * grid_spacing.y(),
+                                                /*edge_x*/ 5 * grid_spacing.x()),
+                   /*centre*/
+                   CartesianCoordinate3D<float>((image.get_min_index() + image.get_max_index()) / 2 * grid_spacing.z(),
+                                                0 * grid_spacing.y(), 0),
+                   direction2);
+  //    plane.set_direction_vectors(direction2);
+
+  plane2.construct_volume(image2, make_coordinate(3, 3, 3));
+
+  //    create projadata info
+
+  auto scannerBlocks_sptr = std::make_shared<Scanner>(Scanner::SAFIRDualRingPrototype);
+  scannerBlocks_sptr->set_num_axial_crystals_per_block(1);
+  scannerBlocks_sptr->set_axial_block_spacing(scannerBlocks_sptr->get_axial_crystal_spacing()
+                                              * scannerBlocks_sptr->get_num_axial_crystals_per_block());
+  scannerBlocks_sptr->set_transaxial_block_spacing(scannerBlocks_sptr->get_transaxial_crystal_spacing()
+                                                   * scannerBlocks_sptr->get_num_transaxial_crystals_per_block());
+  //    scannerBlocks_sptr->set_num_transaxial_crystals_per_block(1);
+  scannerBlocks_sptr->set_num_axial_blocks_per_bucket(2);
+  //    scannerBlocks_sptr->set_num_transaxial_blocks_per_bucket(1);
+  scannerBlocks_sptr->set_num_rings(2);
+
+  scannerBlocks_sptr->set_scanner_geometry("BlocksOnCylindrical");
+  scannerBlocks_sptr->set_up();
+
+  auto proj_data_info_blocks_sptr = std::make_shared<ProjDataInfoBlocksOnCylindricalNoArcCorr>();
+  proj_data_info_blocks_sptr = set_blocks_projdata_info<ProjDataInfoBlocksOnCylindricalNoArcCorr>(scannerBlocks_sptr);
+
+  //    now forward-project image
+
+  shared_ptr<DiscretisedDensity<3, float>> image_sptr(image.clone());
+  write_to_file("plane60", *image_sptr);
+
+  shared_ptr<DiscretisedDensity<3, float>> image2_sptr(image2.clone());
+  write_to_file("plane30", *image2_sptr);
+
+  auto PM = std::make_shared<ProjMatrixByBinUsingRayTracing>();
+  PM->enable_cache(false);
+  auto forw_projector_sptr = std::make_shared<ForwardProjectorByBinUsingProjMatrixByBin>(PM);
+  info(boost::format("Test blocks on Cylindrical: Forward projector used: %1%") % forw_projector_sptr->parameter_info());
+
+  forw_projector_sptr->set_up(proj_data_info_blocks_sptr, image_sptr);
+
+  auto forw_projector2_sptr = std::make_shared<ForwardProjectorByBinUsingProjMatrixByBin>(PM);
+  forw_projector2_sptr->set_up(proj_data_info_blocks_sptr, image2_sptr);
+
+  auto projdata = std::make_shared<ProjDataInterfile>(exam_info_sptr, proj_data_info_blocks_sptr, "sino1_from_plane.hs",
+                                                      std::ios::out | std::ios::trunc | std::ios::in);
+
+  forw_projector_sptr->forward_project(*projdata, *image_sptr);
+
+  auto projdata2 = std::make_shared<ProjDataInterfile>(exam_info_sptr, proj_data_info_blocks_sptr, "sino2_from_plane.hs",
+                                                       std::ios::out | std::ios::trunc | std::ios::in);
+
+  forw_projector2_sptr->forward_project(*projdata2, *image2_sptr);
+
+  int view1_num = 0, view2_num = 0;
+  LORInAxialAndNoArcCorrSinogramCoordinates<float> lorB1;
+  for (int i = 0; i < projdata->get_max_view_num(); i++)
+    {
+      Bin bin(0, i, 0, 0);
+      proj_data_info_blocks_sptr->get_LOR(lorB1, bin);
+      if (abs(lorB1.phi() - phi1) / phi1 <= 1E-2)
+        {
+          view1_num = i;
+          break;
+        }
+    }
+
+  LORInAxialAndNoArcCorrSinogramCoordinates<float> lorB2;
+  for (int i = 0; i < projdata2->get_max_view_num(); i++)
+    {
+      Bin bin(0, i, 0, 0);
+      proj_data_info_blocks_sptr->get_LOR(lorB2, bin);
+      if (abs(lorB2.phi() - phi2) / phi2 <= 1E-2)
+        {
+          view2_num = i;
+          break;
+        }
+    }
+
+  float max1 = projdata->get_sinogram(0, 0).find_max();
+  float max2 = projdata2->get_sinogram(0, 0).find_max();
+
+  //    find the tang position with the max value
+  int tang1_num = 0, tang2_num = 0;
+  for (int tang = projdata->get_min_tangential_pos_num(); tang < projdata->get_max_tangential_pos_num(); tang++)
+    {
+
+      if ((max1 - projdata->get_sinogram(0, 0).at(view1_num).at(tang)) / max1 < 1E-3)
+        {
+          tang1_num = tang;
+          break;
+        }
+    }
+
+  for (int tang = projdata2->get_min_tangential_pos_num(); tang < projdata2->get_max_tangential_pos_num(); tang++)
+    {
+
+      if ((max2 - projdata2->get_sinogram(0, 0).at(view2_num).at(tang)) / max2 < 1E-3)
+        {
+          tang2_num = tang;
+          break;
+        }
+    }
+
+  float bin1 = projdata->get_sinogram(0, 0).at(view1_num).at(tang1_num);
+  float bin2 = projdata2->get_sinogram(0, 0).at(view2_num).at(tang2_num);
+  set_tolerance(10E-2);
+  check_if_equal(bin1, max1, "the value seen in the block at 60 degrees should be the same as the max value of the sinogram");
+  check_if_equal(bin2, max2, "the value seen in the block at 30 degrees should be the same as the max value of the sinogram");
+}
+
+/*! The following is a test for symmetries: a simulated image is created with spherical source in front of each detector block,
+ *  the forward projected sinogram should show the same bin values in symmetric places (in this test a dodecagon scanner is
+ * used so we have symmetry every 30 degrees. The above is repeated for an image with sources in front of the dodecagon corners.
+ * The sinogram should have now different values at fixed bin compared the previous image. In this test we are also testing a
+ * projdata_info with a negative view offset.
+ */
+void
+BlocksTests::run_symmetry_test()
+{
+
+  //-- ExamInfo
+  auto exam_info_sptr = std::make_shared<ExamInfo>();
+  exam_info_sptr->imaging_modality = ImagingModality::PT;
+
+  CartesianCoordinate3D<float> origin(0, 0, 0);
+  CartesianCoordinate3D<float> grid_spacing(1.1, 2.2, 2.2);
+  float theta1 = 0;
+  float theta2 = 0;
+
+  const IndexRange<3> range(Coordinate3D<int>(0, -45, -44), Coordinate3D<int>(24, 44, 45));
+  VoxelsOnCartesianGrid<float> image(exam_info_sptr, range, origin, grid_spacing);
+
+  const Array<2, float> direction_vectors = make_array(make_1d_array(1.F, 0.F, 0.F), make_1d_array(0.F, cos(theta1), sin(theta1)),
+                                                       make_1d_array(0.F, -sin(theta1), cos(theta1)));
+
+  Ellipsoid ellipsoid(CartesianCoordinate3D<float>(/*radius_z*/ 6 * grid_spacing.z(),
+                                                   /*radius_y*/ 6 * grid_spacing.y(),
+                                                   /*radius_x*/ 6 * grid_spacing.x()),
+                      /*centre*/
+                      CartesianCoordinate3D<float>((image.get_min_index() + image.get_max_index()) / 2 * grid_spacing.z(),
+                                                   -34 * grid_spacing.y(), 0),
+                      direction_vectors);
+
+  ellipsoid.construct_volume(image, make_coordinate(3, 3, 3));
+
+  VoxelsOnCartesianGrid<float> image1 = image;
+  VoxelsOnCartesianGrid<float> image22 = image;
+  //    rotate by 30 degrees, this scanner is a dodecagon and there is a 30 degrees angle between consecutive blocks
+  for (int i = 30; i < 360; i += 30)
+    {
+      theta1 = i * _PI / 180;
+
+      CartesianCoordinate3D<float> origin1((image.get_min_index() + image.get_max_index()) / 2 * grid_spacing.z(),
+                                           -34 * grid_spacing.y() * cos(theta1), 34 * grid_spacing.y() * sin(theta1));
+
+      ellipsoid.set_origin(origin1);
+      ellipsoid.construct_volume(image1, make_coordinate(3, 3, 3));
+      image += image1;
+    }
+  shared_ptr<DiscretisedDensity<3, float>> image1_sptr(image.clone());
+  write_to_file("image_for", *image1_sptr);
+
+  image = *image.get_empty_copy();
+  for (int i = 15; i < 360; i += 30)
+    {
+      theta2 = i * _PI / 180;
+
+      CartesianCoordinate3D<float> origin2((image.get_min_index() + image.get_max_index()) / 2 * grid_spacing.z(),
+                                           -34 * grid_spacing.y() * cos(theta2), 34 * grid_spacing.y() * sin(theta2));
+
+      ellipsoid.set_origin(origin2);
+      ellipsoid.construct_volume(image22, make_coordinate(3, 3, 3));
+      image += image22;
+    }
+
+  shared_ptr<DiscretisedDensity<3, float>> image2_sptr(image.clone());
+  write_to_file("image_for2", *image2_sptr);
+
+  //    create projadata info
+  auto scannerBlocks_sptr = std::make_shared<Scanner>(Scanner::SAFIRDualRingPrototype);
+  scannerBlocks_sptr->set_num_axial_crystals_per_block(1);
+  scannerBlocks_sptr->set_axial_block_spacing(scannerBlocks_sptr->get_axial_crystal_spacing()
+                                              * scannerBlocks_sptr->get_num_axial_crystals_per_block());
+  scannerBlocks_sptr->set_transaxial_block_spacing(scannerBlocks_sptr->get_transaxial_crystal_spacing()
+                                                   * scannerBlocks_sptr->get_num_transaxial_crystals_per_block());
+  //    scannerBlocks_sptr->set_num_transaxial_crystals_per_block(1);
+  scannerBlocks_sptr->set_num_axial_blocks_per_bucket(2);
+  //    scannerBlocks_sptr->set_num_transaxial_blocks_per_bucket(1);
+  scannerBlocks_sptr->set_num_rings(2);
+  scannerBlocks_sptr->set_intrinsic_azimuthal_tilt(-30);
+  scannerBlocks_sptr->set_scanner_geometry("BlocksOnCylindrical");
+  scannerBlocks_sptr->set_up();
+
+  auto proj_data_info_blocks_sptr = std::make_shared<ProjDataInfoBlocksOnCylindricalNoArcCorr>();
+  proj_data_info_blocks_sptr = set_blocks_projdata_info<ProjDataInfoBlocksOnCylindricalNoArcCorr>(scannerBlocks_sptr);
+  //    now forward-project images
+
+  auto PM = std::make_shared<ProjMatrixByBinUsingRayTracing>();
+  PM->enable_cache(false);
+  auto forw_projector1_sptr = std::make_shared<ForwardProjectorByBinUsingProjMatrixByBin>(PM);
+  info(boost::format("Test blocks on Cylindrical: Forward projector used: %1%") % forw_projector1_sptr->parameter_info());
+
+  forw_projector1_sptr->set_up(proj_data_info_blocks_sptr, image1_sptr);
+
+  auto forw_projector2_sptr = std::make_shared<ForwardProjectorByBinUsingProjMatrixByBin>(PM);
+  forw_projector2_sptr->set_up(proj_data_info_blocks_sptr, image2_sptr);
+
+  auto projdata1 = std::make_shared<ProjDataInterfile>(exam_info_sptr, proj_data_info_blocks_sptr, "sino1_from_image.hs",
+                                                       std::ios::out | std::ios::trunc | std::ios::in);
+
+  auto projdata2 = std::make_shared<ProjDataInterfile>(exam_info_sptr, proj_data_info_blocks_sptr, "sino2_from_image.hs",
+                                                       std::ios::out | std::ios::trunc | std::ios::in);
+
+  forw_projector1_sptr->forward_project(*projdata1, *image1_sptr);
+  forw_projector2_sptr->forward_project(*projdata2, *image2_sptr);
+  int crystals_in_ring = scannerBlocks_sptr->get_num_detectors_per_ring();
+  float bin1_0 = projdata1->get_sinogram(0, 0).at(0 / crystals_in_ring * _PI).at(0);
+  float bin1_90 = projdata1->get_sinogram(0, 0).at(90 / crystals_in_ring * _PI).at(0);
+  float bin1_30 = projdata1->get_sinogram(0, 0).at(30 / crystals_in_ring * _PI).at(0);
+  float bin1_60 = projdata1->get_sinogram(0, 0).at(60 / crystals_in_ring * _PI).at(0);
+  float bin1_150 = projdata1->get_sinogram(0, 0).at(150 / crystals_in_ring * _PI).at(0);
+
+  //    values of the asymetric image
+  float bin2_0 = projdata2->get_sinogram(0, 0).at(0 / crystals_in_ring * _PI).at(0);
+  float bin2_90 = projdata2->get_sinogram(0, 0).at(90 / crystals_in_ring * _PI).at(0);
+  float bin2_30 = projdata2->get_sinogram(0, 0).at(30 / crystals_in_ring * _PI).at(0);
+  float bin2_60 = projdata2->get_sinogram(0, 0).at(60 / crystals_in_ring * _PI).at(0);
+  float bin2_150 = projdata2->get_sinogram(0, 0).at(150 / crystals_in_ring * _PI).at(0);
+
+  set_tolerance(10E-3);
+  check_if_equal(bin1_0, bin1_90, "the value seen in the block 0 should be the same as the one at angle 90");
+  check_if_equal(bin1_30, bin1_150, "the value seen in the block at angle 30 should be the same as the one at angle 150 ");
+  check_if_equal(bin1_30, bin1_60, "the value seen in the block at angle 30 should be the same as the one at angle 60");
+
+  check(bin1_0 != bin2_0, "the two data have different symmetries, the values should be different");
+  check(bin1_30 != bin2_30, "the two data have different symmetries, the values should be different ");
+  check(bin1_60 != bin2_60, "the two data have different symmetries, the values should be different");
+  check(bin1_90 != bin2_90, "the two data have different symmetries, the values should be different");
+  check(bin1_30 != bin2_30, "the two data have different symmetries, the values should be different");
+  check(bin1_150 != bin2_150, "the two data have different symmetries, the values should be different");
+}
+
+/*!The following is a test for the crystal maps. Two scanners and ProjDataInfo are created, one with the standard map orientation
+ * and the other with an orientation along the view which is opposite to the first one.  A simulated sphere was forward projected
+ * to look at bin values in the two cases. The bin obtained from the two different projdata will have different coordinates but
+ * the same value.
+ */
+
+void
+BlocksTests::run_map_orientation_test()
+{
+  CPUTimer timer;
+  //-- ExamInfo
+  auto exam_info_sptr = std::make_shared<ExamInfo>();
+  exam_info_sptr->imaging_modality = ImagingModality::PT;
+
+  CartesianCoordinate3D<float> origin(0, 0, 0);
+  CartesianCoordinate3D<float> grid_spacing(1.1, 2.2, 2.2);
+  float theta1 = 0;
+
+  const IndexRange<3> range(Coordinate3D<int>(0, -45, -44), Coordinate3D<int>(24, 44, 45));
+  VoxelsOnCartesianGrid<float> image(exam_info_sptr, range, origin, grid_spacing);
+
+  const Array<2, float> direction_vectors = make_array(make_1d_array(1.F, 0.F, 0.F), make_1d_array(0.F, cos(theta1), sin(theta1)),
+                                                       make_1d_array(0.F, -sin(theta1), cos(theta1)));
+
+  Ellipsoid ellipsoid(CartesianCoordinate3D<float>(/*radius_z*/ 6 * grid_spacing.z(),
+                                                   /*radius_y*/ 6 * grid_spacing.y(),
+                                                   /*radius_x*/ 6 * grid_spacing.x()),
+                      /*centre*/
+                      CartesianCoordinate3D<float>((image.get_min_index() + image.get_max_index()) / 2 * grid_spacing.z(),
+                                                   -34 * grid_spacing.y(), 0),
+                      direction_vectors);
+
+  ellipsoid.construct_volume(image, make_coordinate(3, 3, 3));
+
+  VoxelsOnCartesianGrid<float> image1 = image;
+  VoxelsOnCartesianGrid<float> image22 = image;
+  //    rotate by 30 degrees
+  for (int i = 30; i < 90; i += 30)
+    {
+      theta1 = i * _PI / 180;
+
+      CartesianCoordinate3D<float> origin1((image.get_min_index() + image.get_max_index()) / 2 * grid_spacing.z(),
+                                           -34 * grid_spacing.y() * cos(theta1), 34 * grid_spacing.y() * sin(theta1));
+
+      ellipsoid.set_origin(origin1);
+      ellipsoid.construct_volume(image1, make_coordinate(3, 3, 3));
+      image += image1;
+    }
+  shared_ptr<DiscretisedDensity<3, float>> image1_sptr(image.clone());
+  write_to_file("image_to_fwp", *image1_sptr);
+
+  image = *image.get_empty_copy();
+
+  shared_ptr<const DetectorCoordinateMap> map_sptr;
+  auto scannerBlocks_sptr = std::make_shared<Scanner>(Scanner::SAFIRDualRingPrototype);
+  scannerBlocks_sptr->set_scanner_geometry("BlocksOnCylindrical");
+  scannerBlocks_sptr->set_num_transaxial_blocks_per_bucket(1);
+  scannerBlocks_sptr->set_up();
+
+  VectorWithOffset<int> num_axial_pos_per_segment(scannerBlocks_sptr->get_num_rings() * 2 - 1);
+  VectorWithOffset<int> min_ring_diff_v(scannerBlocks_sptr->get_num_rings() * 2 - 1);
+  VectorWithOffset<int> max_ring_diff_v(scannerBlocks_sptr->get_num_rings() * 2 - 1);
+  auto proj_data_info_blocks_sptr = std::make_shared<ProjDataInfoBlocksOnCylindricalNoArcCorr>();
+  proj_data_info_blocks_sptr = set_blocks_projdata_info<ProjDataInfoBlocksOnCylindricalNoArcCorr>(scannerBlocks_sptr);
+  Bin bin, bin1, bin2, binR1;
+  CartesianCoordinate3D<float> b1, b2, rb1, rb2;
+  DetectionPosition<> det_pos, det_pos_ord;
+  DetectionPositionPair<> dp1, dp2, dpR1;
+  CartesianCoordinate3D<float> coord_ord;
+  map_sptr = scannerBlocks_sptr->get_detector_map_sptr();
+  int rad_size = map_sptr->get_num_radial_coords();
+  int ax_size = map_sptr->get_num_axial_coords();
+  int tang_size = map_sptr->get_num_tangential_coords();
+
+  DetectorCoordinateMap::det_pos_to_coord_type coord_map_reordered;
+
+  //    reorder the tangential positions
+  for (int rad = 0; rad < rad_size; rad++)
+    for (int ax = 0; ax < ax_size; ax++)
+      for (int tang = 0; tang < tang_size; tang++)
+        {
+          det_pos.radial_coord() = rad;
+          det_pos.axial_coord() = ax;
+          det_pos.tangential_coord() = tang;
+          det_pos_ord.radial_coord() = rad;
+          det_pos_ord.axial_coord() = ax;
+          det_pos_ord.tangential_coord() = tang_size - 1 - tang;
+
+          coord_ord = map_sptr->get_coordinate_for_det_pos(det_pos_ord);
+          coord_map_reordered[det_pos] = coord_ord;
+        }
+
+  auto scannerBlocks_reord_sptr = std::make_shared<Scanner>(Scanner::SAFIRDualRingPrototype);
+  scannerBlocks_reord_sptr->set_scanner_geometry("Generic");
+  //    scannerBlocks_reord_sptr->set_num_transaxial_blocks_per_bucket(1);
+  scannerBlocks_reord_sptr->set_detector_map(coord_map_reordered);
+  scannerBlocks_reord_sptr->set_up();
+
+  auto proj_data_info_blocks_reord_sptr = std::make_shared<ProjDataInfoGenericNoArcCorr>();
+  proj_data_info_blocks_reord_sptr = set_blocks_projdata_info<ProjDataInfoGenericNoArcCorr>(scannerBlocks_reord_sptr);
+  timer.reset();
+  timer.start();
+
+  //    now forward-project images
+
+  auto PM = std::make_shared<ProjMatrixByBinUsingRayTracing>();
+  PM->enable_cache(false);
+  auto forw_projector1_sptr = std::make_shared<ForwardProjectorByBinUsingProjMatrixByBin>(PM);
+  info(boost::format("Test blocks on Cylindrical: Forward projector used: %1%") % forw_projector1_sptr->parameter_info());
+  forw_projector1_sptr->set_up(proj_data_info_blocks_sptr, image1_sptr);
+
+  auto forw_projector2_sptr = std::make_shared<ForwardProjectorByBinUsingProjMatrixByBin>(PM);
+  forw_projector2_sptr->set_up(proj_data_info_blocks_reord_sptr, image1_sptr);
+
+  auto projdata1 = std::make_shared<ProjDataInMemory>(exam_info_sptr,
+                                                      proj_data_info_blocks_sptr); //,
+  //                                             "sino1_map.hs",std::ios::out | std::ios::trunc | std::ios::in));
+
+  auto projdata2 = std::make_shared<ProjDataInMemory>(exam_info_sptr,
+                                                      proj_data_info_blocks_reord_sptr); //,
+  //                                             "sino2_map.hs",std::ios::out | std::ios::trunc | std::ios::in));
+
+  forw_projector1_sptr->forward_project(*projdata1, *image1_sptr);
+  forw_projector2_sptr->forward_project(*projdata2, *image1_sptr);
+
+  for (int view = 0; view <= proj_data_info_blocks_reord_sptr->get_max_view_num(); view++)
+    {
+
+      bin.segment_num() = 0;
+      bin.axial_pos_num() = 0;
+      bin.view_num() = view;
+      bin.tangential_pos_num() = 0;
+
+      proj_data_info_blocks_sptr->get_det_pos_pair_for_bin(dp1, bin);
+      proj_data_info_blocks_reord_sptr->get_det_pos_pair_for_bin(dp2, bin);
+
+      proj_data_info_blocks_sptr->get_bin_for_det_pos_pair(bin1, dp1);
+      proj_data_info_blocks_reord_sptr->get_bin_for_det_pos_pair(bin2, dp2);
+
+      //        //                check cartesian coordinates of detectors
+      proj_data_info_blocks_sptr->find_cartesian_coordinates_of_detection(b1, b2, bin1);
+      proj_data_info_blocks_reord_sptr->find_cartesian_coordinates_of_detection(rb1, rb2, bin1);
+
+      //        now get det_pos from the reordered coord ir shouls be different from the one obtained for bin and bin1
+      proj_data_info_blocks_sptr->find_bin_given_cartesian_coordinates_of_detection(binR1, rb1, rb2);
+      proj_data_info_blocks_sptr->get_det_pos_pair_for_bin(dpR1, binR1);
+
+      check_if_equal(projdata1->get_bin_value(bin1), projdata2->get_bin_value(bin2),
+                     " checking cartesian coordinate y1 are the same on a flat bucket");
+      check(b1 != rb1, " checking cartesian coordinate of detector 1 are different if  we use a reordered map");
+      check(b2 != rb2, " checking cartesian coordinate of detector 2 are different if  we use a reordered map");
+      check(dp1.pos1().tangential_coord() != dpR1.pos1().tangential_coord(),
+            " checking det_pos.tangential is different if we use a reordered map");
+    }
+  timer.stop();
+  std::cerr << "-- CPU Time " << timer.value() << '\n';
+}
+
+void
+BlocksTests::run_tests()
+{
+
+  std::cerr << "-------- Testing Blocks Geometry --------\n";
+  run_voxelOnCartesianGrid_with_negative_offset();
+  run_axial_projection_test();
+  run_map_orientation_test();
+  run_symmetry_test();
+  run_plane_symmetry_test();
+}
+END_NAMESPACE_STIR
+
+USING_NAMESPACE_STIR
+
+int
+main()
+{
+  Verbosity::set(1);
+  BlocksTests tests;
+  tests.run_tests();
+  return tests.main_return_value();
+}
diff --git a/src/scatter_buildblock/ScatterSimulation.cxx b/src/scatter_buildblock/ScatterSimulation.cxx
index ea0af7965..a3bb4adac 100644
--- a/src/scatter_buildblock/ScatterSimulation.cxx
+++ b/src/scatter_buildblock/ScatterSimulation.cxx
@@ -2,6 +2,7 @@
     Copyright (C) 2004 - 2009 Hammersmith Imanet Ltd
     Copyright (C) 2013 - 2016, 2019, 2020 University College London
     Copyright (C) 2018-2019, University of Hull
+    Copyright (C) 2021, University of Leeds
     This file is part of STIR.
 
     SPDX-License-Identifier: Apache-2.0
@@ -16,6 +17,7 @@
   \author Nikos Efthimiou
   \author Charalampos Tsoumpas
   \author Kris Thielemans
+  \author Viet Ahn Dao
 */
 #include "stir/scatter/ScatterSimulation.h"
 #include "stir/ViewSegmentNumbers.h"
@@ -118,7 +120,6 @@ process_data()
     float total_scatter = 0 ;
 
     info("ScatterSimulator: Initialization finished ...");
-
     for (vs_num.segment_num() = this->proj_data_info_cyl_noarc_cor_sptr->get_min_segment_num();
          vs_num.segment_num() <= this->proj_data_info_cyl_noarc_cor_sptr->get_max_segment_num();
          ++vs_num.segment_num())
@@ -373,8 +374,13 @@ set_up()
     {
         CartesianCoordinate3D<float> detector_coord_A, detector_coord_B;
         // check above statement
-        this->proj_data_info_cyl_noarc_cor_sptr->find_cartesian_coordinates_of_detection(
-                    detector_coord_A, detector_coord_B, Bin(0, 0, 0, 0));
+        if(dynamic_cast<ProjDataInfoCylindricalNoArcCorr*> (proj_data_info_cyl_noarc_cor_sptr.get())){
+            auto ptr = dynamic_cast<ProjDataInfoCylindricalNoArcCorr*> (proj_data_info_cyl_noarc_cor_sptr.get());
+            ptr->find_cartesian_coordinates_of_detection(detector_coord_A, detector_coord_B, Bin(0, 0, 0, 0));
+        }else{
+            auto ptr = dynamic_cast<ProjDataInfoBlocksOnCylindricalNoArcCorr*> (proj_data_info_cyl_noarc_cor_sptr.get());
+            ptr->find_cartesian_coordinates_of_detection(detector_coord_A, detector_coord_B, Bin(0, 0, 0, 0));
+        }
         assert(detector_coord_A.z() == 0);
         assert(detector_coord_B.z() == 0);
         // check that get_m refers to the middle of the scanner
@@ -385,11 +391,20 @@ set_up()
         assert(fabs(m_last + m_first) < m_last * 10E-4);
     }
 #endif
-    this->shift_detector_coordinates_to_origin =
+    if(dynamic_cast<ProjDataInfoCylindricalNoArcCorr*> (proj_data_info_cyl_noarc_cor_sptr.get())){
+            this->shift_detector_coordinates_to_origin =
             CartesianCoordinate3D<float>(this->proj_data_info_cyl_noarc_cor_sptr->get_m(Bin(0, 0, 0, 0)), 0, 0);
+    }else{
+        if(dynamic_cast<ProjDataInfoBlocksOnCylindricalNoArcCorr*> (proj_data_info_cyl_noarc_cor_sptr.get())){
+            // align BlocksOnCylindrical scanner ring 0 to z=0.
+            this->shift_detector_coordinates_to_origin =
+            CartesianCoordinate3D<float>(this->proj_data_info_cyl_noarc_cor_sptr->get_m(Bin(0, 0, 0, 0)), 0, 0);
+        }
+        // align Generic geometry here.
+    }
 
 #if 1
-    // checks on image zooming to avvoid getting incorrect results
+    // checks on image zooming to avoid getting incorrect results
     {
       check_z_to_middle_consistent(*this->activity_image_sptr, "activity");
       check_z_to_middle_consistent(*this->density_image_sptr, "attenuation");
@@ -717,7 +732,7 @@ set_output_proj_data_sptr(shared_ptr<ProjData> arg)
     this->output_proj_data_sptr = arg;
 }
 
-shared_ptr<const ProjDataInfoCylindricalNoArcCorr>
+shared_ptr<const ProjDataInfo>
 ScatterSimulation::
 get_template_proj_data_info_sptr() const
 {
@@ -746,10 +761,14 @@ void
 ScatterSimulation::set_template_proj_data_info(const ProjDataInfo& arg)
 {
     this->_already_set_up = false;
-    this->proj_data_info_cyl_noarc_cor_sptr.reset(dynamic_cast<ProjDataInfoCylindricalNoArcCorr* >(arg.clone()));
+    this->proj_data_info_cyl_noarc_cor_sptr.reset(dynamic_cast<ProjDataInfoBlocksOnCylindricalNoArcCorr* >(arg.clone()));
 
-    if (is_null_ptr(this->proj_data_info_cyl_noarc_cor_sptr))
-        error("ScatterSimulation: Can only handle non-arccorrected data");
+    if (is_null_ptr(this->proj_data_info_cyl_noarc_cor_sptr)){
+        this->proj_data_info_cyl_noarc_cor_sptr.reset(dynamic_cast<ProjDataInfoCylindricalNoArcCorr* >(arg.clone()));
+        if (is_null_ptr(this->proj_data_info_cyl_noarc_cor_sptr)){
+            error("ScatterSimulation: Can only handle non-arccorrected data");
+        }
+    }
 
     // find final size of detection_points_vector
     this->total_detectors =
@@ -825,7 +844,6 @@ ScatterSimulation::downsample_scanner(int new_num_rings, int new_num_dets)
       + 5; // add 5 to avoid strange edge-effects, certainly with B-splines
     new_scanner_sptr->set_max_num_non_arccorrected_bins(round(approx_num_non_arccorrected_bins+.5F));
     new_scanner_sptr->set_default_bin_size(new_scanner_sptr->get_effective_ring_radius() * _PI / new_num_dets); // approx new detector size
-
     // Find how much is the delta ring
     // If the previous projdatainfo had max segment == 1 then should be from SSRB
     // in ScatterEstimation. Otherwise use the max possible.
diff --git a/src/scatter_buildblock/scatter_detection_modelling.cxx b/src/scatter_buildblock/scatter_detection_modelling.cxx
index ddda34141..25edc73f0 100644
--- a/src/scatter_buildblock/scatter_detection_modelling.cxx
+++ b/src/scatter_buildblock/scatter_detection_modelling.cxx
@@ -2,6 +2,7 @@
 //
 /*
   Copyright (C) 2004- 2009, Hammersmith Imanet
+  Copyright (C) 2021, University of Leeds
   This file is part of STIR.
 
   SPDX-License-Identifier: Apache-2.0 
@@ -17,11 +18,11 @@
   \author Pablo Aguiar
   \author Nikolaos Dikaios
   \author Kris Thielemans
-
+  \author Viet Ahn Dao
 */
 
 #include "stir/scatter/ScatterSimulation.h"
-#include "stir/ProjDataInfoCylindricalNoArcCorr.h"
+#include "stir/ProjDataInfoBlocksOnCylindricalNoArcCorr.h"
 #include "stir/numerics/erf.h"
 #include "stir/info.h"
 #include <iostream>
@@ -67,9 +68,21 @@ find_detectors(unsigned& det_num_A, unsigned& det_num_B, const Bin& bin) const
         error("ScatterSimulation::find_detectors: need to call set_up() first");
 #endif
   CartesianCoordinate3D<float> detector_coord_A, detector_coord_B;
-  this->proj_data_info_cyl_noarc_cor_sptr->
-    find_cartesian_coordinates_of_detection(
-                                            detector_coord_A,detector_coord_B,bin);
+  auto ptr = dynamic_cast<ProjDataInfoBlocksOnCylindricalNoArcCorr*> (proj_data_info_cyl_noarc_cor_sptr.get());
+  if(ptr){
+    ptr->
+      find_cartesian_coordinates_of_detection(
+                                              detector_coord_A,detector_coord_B,bin);
+  }else{
+    auto ptr = dynamic_cast<ProjDataInfoCylindricalNoArcCorr*> (proj_data_info_cyl_noarc_cor_sptr.get());
+    if(ptr){
+      ptr->
+        find_cartesian_coordinates_of_detection(
+                                                detector_coord_A,detector_coord_B,bin);
+    }else{
+      error("wrong type of projection data for scatter simulation");
+    }
+  }
   det_num_A =
     this->find_in_detection_points_vector(detector_coord_A + 
                                           this->shift_detector_coordinates_to_origin);
diff --git a/src/swig/factory_shared.i b/src/swig/factory_shared.i
new file mode 100644
index 000000000..d44d54018
--- /dev/null
+++ b/src/swig/factory_shared.i
@@ -0,0 +1,95 @@
+/* A work-around by Kris Thielemans to be able to use %factory with %shared
+   See https://github.com/swig/swig/issues/2110
+
+   To avoid conflicts, the macro is called %factory_shared
+*/
+/*
+  Implement a more natural wrap for factory methods, for example, if
+  you have:
+
+  ----  geometry.h --------
+       struct Geometry {                          
+         enum GeomType{			     
+           POINT,				     
+           CIRCLE				     
+         };					     
+         					     
+         virtual ~Geometry() {}    		     
+         virtual int draw() = 0;
+	 
+	 //
+	 // Factory method for all the Geometry objects
+	 //
+         static Geometry *create(GeomType i);     
+       };					     
+       					     
+       struct Point : Geometry  {		     
+         int draw() { return 1; }		     
+         double width() { return 1.0; }    	     
+       };					     
+       					     
+       struct Circle : Geometry  {		     
+         int draw() { return 2; }		     
+         double radius() { return 1.5; }          
+       }; 					     
+       
+       //
+       // Factory method for all the Geometry objects
+       //
+       Geometry *Geometry::create(GeomType type) {
+         switch (type) {			     
+         case POINT: return new Point();	     
+         case CIRCLE: return new Circle(); 	     
+         default: return 0;			     
+         }					     
+       }					    
+  ----  geometry.h --------
+
+
+  You can use the %factory with the Geometry::create method as follows:
+
+    %newobject Geometry::create;
+    %factory(Geometry *Geometry::create, Point, Circle);
+    %include "geometry.h"
+
+  and Geometry::create will return a 'Point' or 'Circle' instance
+  instead of the plain 'Geometry' type. For example, in python:
+
+    circle = Geometry.create(Geometry.CIRCLE)
+    r = circle.radius()
+
+  where circle is a Circle proxy instance.
+
+  NOTES: remember to fully qualify all the type names and don't
+  use %factory inside a namespace declaration, ie, instead of
+  
+     namespace Foo {
+       %factory(Geometry *Geometry::create, Point, Circle);
+     }
+
+  use
+
+     %factory(Foo::Geometry *Foo::Geometry::create, Foo::Point,  Foo::Circle);   
+
+     
+*/
+
+%define %_factory_dispatch_shared(Type) 
+if (!dcast) {
+  Type *dobj = dynamic_cast<Type *>($1);
+  if (dobj) {
+    dcast = 1;
+    SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< Type > *smartresult = new SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< Type >(dobj);
+    %set_output(SWIG_NewPointerObj(%as_voidptr(smartresult),$descriptor(SWIG_SHARED_PTR_QNAMESPACE::shared_ptr<Type> *), $owner | %newpointer_flags));
+  }   
+}%enddef
+
+%define %factory_shared(Method,Types...)
+%typemap(out) Method {
+  int dcast = 0;
+  %formacro(%_factory_dispatch_shared, Types)
+  if (!dcast) {
+    %set_output(SWIG_NewPointerObj(%as_voidptr($1),$descriptor, $owner | %newpointer_flags));
+  }
+}%enddef
+
diff --git a/src/swig/stir.i b/src/swig/stir.i
index 5a1247144..52c606a3c 100644
--- a/src/swig/stir.i
+++ b/src/swig/stir.i
@@ -1,6 +1,6 @@
 /*
     Copyright (C) 2011-07-01 - 2012, Kris Thielemans
-    Copyright (C) 2013, 2018, 2020 University College London
+    Copyright (C) 2013, 2018, 2020, 2021 University College London
     This file is part of STIR.
 
     SPDX-License-Identifier: Apache-2.0
@@ -40,6 +40,9 @@
  #include "stir/Bin.h"
  #include "stir/ProjDataInfoCylindricalArcCorr.h"
  #include "stir/ProjDataInfoCylindricalNoArcCorr.h"
+ #include "stir/ProjDataInfoBlocksOnCylindricalNoArcCorr.h"
+ #include "stir/ProjDataInfoGenericNoArcCorr.h"
+
  #include "stir/Viewgram.h"
  #include "stir/RelatedViewgrams.h"
  #include "stir/Sinogram.h"
@@ -55,6 +58,7 @@
 
 #include "stir/CartesianCoordinate2D.h"
 #include "stir/CartesianCoordinate3D.h"
+#include "stir/LORCoordinates.h"
 #include "stir/IndexRange.h"
 #include "stir/IndexRange3D.h"
 #include "stir/Array.h"
@@ -475,6 +479,7 @@
 #endif
 
 %include "attribute.i"
+%include "factory_shared.i"
 
 %init %{
 #if defined(SWIGPYTHON)
@@ -801,6 +806,10 @@ namespace std {
 %shared_ptr(stir::ProjDataInfoCylindrical);
 %shared_ptr(stir::ProjDataInfoCylindricalArcCorr);
 %shared_ptr(stir::ProjDataInfoCylindricalNoArcCorr);
+%shared_ptr(stir::ProjDataInfoGeneric);
+%shared_ptr(stir::ProjDataInfoGenericNoArcCorr);
+%shared_ptr(stir::ProjDataInfoBlocksOnCylindricalNoArcCorr);
+
 %shared_ptr(stir::ProjData);
 %shared_ptr(stir::ProjDataFromStream);
 %shared_ptr(stir::ProjDataInterfile);
@@ -817,6 +826,9 @@ namespace std {
 %shared_ptr(stir::Segment<float>);
 %shared_ptr(stir::Sinogram<float>);
 %shared_ptr(stir::Viewgram<float>);
+%shared_ptr(stir::LORAs2Points<float>);
+%shared_ptr(stir::LOR<float>);
+%shared_ptr(stir::LORInAxialAndNoArcCorrSinogramCoordinates<float>);
 #else
 namespace boost {
 template<class T> class shared_ptr
@@ -873,6 +885,10 @@ T * operator-> () const;
 
 %include "stir/BasicCoordinate.h"
 %include "stir/Coordinate3D.h"
+%include "stir/LORCoordinates.h"
+
+%template(FloatLOR) stir::LOR<float>;
+%template(FloatLORInAxialAndNoArcCorrSinogramCoordinates) stir::LORInAxialAndNoArcCorrSinogramCoordinates<float>;
 // ignore non-const versions
 %ignore  stir::CartesianCoordinate3D::z();
 %ignore  stir::CartesianCoordinate3D::y();
@@ -1095,6 +1111,7 @@ namespace stir {
 
   %ADD_indexaccess(int,T,VectorWithOffset);
   %template(FloatVectorWithOffset) VectorWithOffset<float>;
+  %template(IntVectorWithOffset) VectorWithOffset<int>;
 
   // TODO need to instantiate with name?
   %template (FloatNumericVectorWithOffset) NumericVectorWithOffset<float, float>;
@@ -1213,7 +1230,7 @@ namespace stir {
   //  then setitem still doesn't modify the object for more than 1 level
 #if 1
   // note: next line has no memory allocation problems because all Array<1,...> objects
-  // are auto-converted to shared_ptrs.
+  // are auto-converted to _ptrs.
   // however, cannot use setitem to modify so ideally we would define getitem only (at least for python) (TODO)
   // TODO DISABLE THIS
   %ADD_indexaccess(int,%arg(Array<1,float>),%arg(Array<2,float>));
@@ -1320,15 +1337,79 @@ namespace stir {
 
 %newobject stir::ProjDataInfo::ProjDataInfoGE;
 %newobject stir::ProjDataInfo::ProjDataInfoCTI;
-
-// ignore this to avoid problems with unique_ptr, and add it later
+// ignore this to avoid problems with unique_ptr
 %ignore stir::ProjDataInfo::construct_proj_data_info;
+// make sure we can use the new name anyway (although this removes
+// ProjDataInfoCTI from the target language)
+// See also the %extend trick below which currently doesn't work
+%rename(construct_proj_data_info) ProjDataInfoCTI;
+
+%factory_shared(stir::ProjDataInfo*,
+                stir::ProjDataInfoCylindricalNoArcCorr,
+                stir::ProjDataInfoCylindricalArcCorr,
+                stir::ProjDataInfoBlocksOnCylindricalNoArcCorr,
+                stir::ProjDataInfoGenericNoArcCorr);
+%factory_shared(stir::ProjDataInfo const*,
+                stir::ProjDataInfoCylindricalNoArcCorr,
+                stir::ProjDataInfoCylindricalArcCorr,
+                stir::ProjDataInfoBlocksOnCylindricalNoArcCorr,
+                stir::ProjDataInfoGenericNoArcCorr);
 
 %include "stir/ProjDataInfo.h"
-%newobject *::construct_proj_data_info;
 
+%include "stir/ProjDataInfoCylindrical.h"
+%include "stir/ProjDataInfoCylindricalArcCorr.h"
+%include "stir/ProjDataInfoCylindricalNoArcCorr.h"
+%include "stir/ProjDataInfoGeneric.h"
+%include "stir/ProjDataInfoGenericNoArcCorr.h"
+%include "stir/ProjDataInfoBlocksOnCylindricalNoArcCorr.h"
+
+%extend stir::ProjDataInfoBlocksOnCylindricalNoArcCorr {
+    
+stir::LORInAxialAndNoArcCorrSinogramCoordinates<float> get_lor(const Bin bin){
+    stir::LORInAxialAndNoArcCorrSinogramCoordinates<float> lor;
+    $self->get_LOR(lor,bin);
+    return lor;
+}
+
+stir::CartesianCoordinate3D<float>
+    find_cartesian_coordinate_of_detection_1(const Bin bin) const 
+{
+    CartesianCoordinate3D<float> coord_1;
+    CartesianCoordinate3D<float> coord_2;
+    $self->find_cartesian_coordinates_of_detection(coord_1,
+                                                   coord_2,
+                                                   bin);
+    
+    return coord_1;
+}
+
+stir::CartesianCoordinate3D<float>
+    find_cartesian_coordinate_of_detection_2(const Bin bin) const 
+{
+    CartesianCoordinate3D<float> coord_1;
+    CartesianCoordinate3D<float> coord_2;
+    $self->find_cartesian_coordinates_of_detection(coord_1,
+                                                   coord_2,
+                                                   bin);
+    
+    return coord_2;
+}
+}
+        
+%include "stir/Viewgram.h"
+%include "stir/RelatedViewgrams.h"
+%include "stir/Sinogram.h"
+%include "stir/Segment.h"
+%include "stir/SegmentByView.h"
+%include "stir/SegmentBySinogram.h"
+
+%include "stir/ProjData.h"
+
+#if 0
 %extend stir::ProjDataInfo 
 {
+  // TODO this does not work due to %ignore statement above
   // work around the current SWIG limitation that it doesn't wrap unique_ptr. 
   // we do this with the crazy (and ugly) way to let SWIG create a new function
   // which is the same as the original, but returns a bare pointer.
@@ -1347,18 +1428,7 @@ namespace stir {
                                arc_corrected).get();
   }
 }
-%include "stir/ProjDataInfoCylindrical.h"
-%include "stir/ProjDataInfoCylindricalArcCorr.h"
-%include "stir/ProjDataInfoCylindricalNoArcCorr.h"
-
-%include "stir/Viewgram.h"
-%include "stir/RelatedViewgrams.h"
-%include "stir/Sinogram.h"
-%include "stir/Segment.h"
-%include "stir/SegmentByView.h"
-%include "stir/SegmentBySinogram.h"
-
-%include "stir/ProjData.h"
+#endif
 
 namespace stir {
 %extend ProjData
diff --git a/src/swig/test/python/test_buildblock.py b/src/swig/test/python/test_buildblock.py
index 3056fcd57..b5bb8f548 100755
--- a/src/swig/test/python/test_buildblock.py
+++ b/src/swig/test/python/test_buildblock.py
@@ -221,20 +221,28 @@ def test_ProjDataInfo():
     #		  const int span, const int max_delta,
     #             const int num_views, const int num_tangential_poss, 
     #
-    projdatainfo=ProjDataInfo.ProjDataInfoCTI(s,3,9,8,6)
-    #print projdatainfo
+    projdatainfo=ProjDataInfo.construct_proj_data_info(s,3,9,8,6)
+    #print( projdatainfo)
     assert projdatainfo.get_scanner().get_num_rings()==32
+    # use arc-correction specific keywords
+    projdatainfo.set_tangential_sampling(5) # dangerous of course, but just for the test
+    assert projdatainfo.get_tangential_sampling() == 5
+    # extract sinogram
     sinogram=projdatainfo.get_empty_sinogram(1,2)
     assert sinogram.sum()==0
     assert sinogram.get_segment_num()==2
     assert sinogram.get_axial_pos_num()==1
     assert sinogram.get_num_views() == projdatainfo.get_num_views()
-    assert sinogram.get_proj_data_info() == projdatainfo
+    print(sinogram.get_proj_data_info())
+    # TODO currently does not work due to TypeError
+    #assert sinogram.get_proj_data_info() == projdatainfo
+    assert sinogram.get_proj_data_info().parameter_info() == projdatainfo.parameter_info()
+
 
 def test_ProjData_from_to_Array3D():
     # define a projection with some dummy data (filled with segment no.)
     s=Scanner.get_scanner_from_name("ECAT 962")
-    projdatainfo=ProjDataInfo.ProjDataInfoCTI(s,3,9,8,6)
+    projdatainfo=ProjDataInfo.construct_proj_data_info(s,3,9,8,6)
     projdata=ProjDataInMemory(ExamInfo(),projdatainfo)
     for seg_idx in range(projdata.get_min_segment_num(),projdata.get_max_segment_num()+1):
         segment=projdata.get_empty_segment_by_sinogram(seg_idx)
diff --git a/src/test/CMakeLists.txt b/src/test/CMakeLists.txt
index c7d45e4ff..1b5b9b0bb 100644
--- a/src/test/CMakeLists.txt
+++ b/src/test/CMakeLists.txt
@@ -56,7 +56,9 @@ set(buildblock_simple_tests
 	test_Scanner.cxx
 	test_ArcCorrection.cxx
 	test_find_fwhm_in_image.cxx
+        test_DetectionPosition.cxx
 	test_proj_data_info.cxx
+	test_DetectorCoordinateMap.cxx
 	test_proj_data.cxx
 	test_proj_data_maths.cxx
 	test_export_array.cxx
diff --git a/src/test/test_DetectionPosition.cxx b/src/test/test_DetectionPosition.cxx
new file mode 100644
index 000000000..ba74bbba9
--- /dev/null
+++ b/src/test/test_DetectionPosition.cxx
@@ -0,0 +1,72 @@
+//
+//
+
+/*!
+  \file 
+ 
+  \brief A simple program to test the stir::DetectionPosition class
+
+  \author Kris Thielemans
+
+*/
+/*
+    Copyright (C) 2021, University College London
+    This file is part of STIR.
+
+    SPDX-License-Identifier: Apache-2.0
+
+    See STIR/LICENSE.txt for details
+*/
+
+#include "stir/DetectionPosition.h"
+#include "stir/RunTests.h"
+
+using std::cerr;
+using std::endl;
+
+START_NAMESPACE_STIR
+
+/*!
+  \brief Class with tests for DetectionPosition.
+*/
+class DetectionPosition_Tests : public RunTests
+{
+public:
+  void run_tests();
+};
+
+
+void
+DetectionPosition_Tests::run_tests()
+{
+  cerr << "Testing DetectionPosition classes" << endl
+       <<"  (There should be only informative messages here starting with 'Testing')" << endl;
+
+  DetectionPosition<> pos012(0,1,2);
+  DetectionPosition<> pos013(0,1,3);
+  DetectionPosition<> pos023(0,2,3);
+  DetectionPosition<> pos103(1,0,3);  
+
+  check(pos012 != pos013, "012 != 013");
+  check(pos012 == pos012, "012 == 012");
+  check(pos012 < pos013, "012 < 013");
+  check(pos012 < pos023, "012 < 023");
+  check(pos012 < pos103, "012 < 103");
+  check(pos103 > pos012, "103 > 012");
+  check(pos012 <= pos013, "012 <= 013");
+}
+
+END_NAMESPACE_STIR
+
+
+
+USING_NAMESPACE_STIR
+
+
+int main()
+{
+  DetectionPosition_Tests tests;
+  tests.run_tests();
+  return tests.main_return_value();
+
+}
diff --git a/src/test/test_DetectorCoordinateMap.cxx b/src/test/test_DetectorCoordinateMap.cxx
new file mode 100644
index 000000000..6fb252a2f
--- /dev/null
+++ b/src/test/test_DetectorCoordinateMap.cxx
@@ -0,0 +1,200 @@
+/*!
+
+  \file
+  \ingroup recontest
+
+  \brief Test program for detection position map using stir::ProjDataInfoBlockOnCylindrical
+
+  \author Daniel Deidda
+
+*/
+/*  Copyright (C) 2021, National Physical Laboratory
+    This file is part of STIR.
+
+    SPDX-License-Identifier: Apache-2.0 AND License-ref-PARAPET-license
+
+    See STIR/LICENSE.txt for details
+*/
+
+#include "stir/info.h"
+#include "stir/make_array.h"
+#include "stir/ProjDataInMemory.h"
+#include "stir/DiscretisedDensity.h"
+#include "stir/ProjDataInterfile.h"
+#include "stir/recon_buildblock/ProjMatrixElemsForOneBin.h"
+#include "stir/recon_buildblock/ProjMatrixByBinUsingRayTracing.h"
+#include "stir/ExamInfo.h"
+#include "stir/LORCoordinates.h"
+#include "stir/ProjDataInfo.h"
+#include "stir/ProjDataInfoBlocksOnCylindricalNoArcCorr.h"
+#include "stir/ProjDataInfoCylindricalNoArcCorr.h"
+#include "stir/recon_buildblock/ProjMatrixByBinUsingRayTracing.h"
+#include "stir/Sinogram.h"
+#include "stir/Viewgram.h"
+#include "stir/Succeeded.h"
+#include "stir/RunTests.h"
+#include "stir/Scanner.h"
+#include "stir/copy_fill.h"
+#include "stir/IndexRange3D.h"
+#include "stir/CPUTimer.h"
+#include "stir/VoxelsOnCartesianGrid.h"
+#include "stir/recon_buildblock/ForwardProjectorByBin.h"
+#include "stir/recon_buildblock/ForwardProjectorByBinUsingProjMatrixByBin.h"
+#include "stir/IO/write_to_file.h"
+//#include "stir/Shape/Shape3D.h"
+
+#include "stir/Shape/Shape3DWithOrientation.h"
+#include "stir/Shape/Ellipsoid.h"
+#include "stir/Shape/Box3D.h"
+
+START_NAMESPACE_STIR
+/*!
+  \ingroup test
+  \brief Test class for Blocks 
+*/
+class DetectionPosMapTests: public RunTests
+{
+public:
+  void run_tests();
+  float calculate_angle_within_half_bucket(const shared_ptr<Scanner> scanner_ptr,
+                                           const shared_ptr<ProjDataInfoBlocksOnCylindricalNoArcCorr> proj_data_info_ptr);
+private:
+  void run_coordinate_test_for_flat_first_bucket();
+};
+
+float
+DetectionPosMapTests::calculate_angle_within_half_bucket(const shared_ptr<Scanner> scanner_ptr,
+                                                         const shared_ptr<ProjDataInfoBlocksOnCylindricalNoArcCorr> proj_data_info_ptr){
+    Bin bin;
+    LORInAxialAndNoArcCorrSinogramCoordinates<float> lorB;
+    float csi;
+    float C_spacing=scanner_ptr->get_transaxial_crystal_spacing();
+    float csi_crystal=std::atan((C_spacing)/scanner_ptr->get_effective_ring_radius());
+//    float bucket_spacing=scanner_ptr->get_transaxial_block_spacing()*C_spacing;
+//    float blocks_gap=scanner_ptr->get_transaxial_block_spacing()
+//            -scanner_ptr->get_num_transaxial_crystals_per_block()*C_spacing;
+//    float csi_gap=std::atan((blocks_gap)/scanner_ptr->get_effective_ring_radius());
+    
+//    get angle within half bucket
+    for (int view = 0; view <= scanner_ptr->get_max_num_views(); view++){
+        int bucket_num=view/(scanner_ptr->get_num_transaxial_crystals_per_block()*scanner_ptr->get_num_transaxial_blocks_per_bucket());
+        if (bucket_num>0)
+            break;
+        
+        bin.segment_num() = 0;
+        bin.axial_pos_num() = 0;
+        bin.view_num() = view;
+        bin.tangential_pos_num() = 0;
+        
+        proj_data_info_ptr->get_LOR(lorB,bin);
+        csi=lorB.phi();
+    }
+    return (csi+csi_crystal)/2;
+}
+
+/*!
+  The following test checks that the y position of the detectors in buckets that are parallel to the x axis are the same. 
+  The calculation of csi is only valid for the scanner defined in stir::Scanner, if we modify the number of blocks per bucket
+  csi will be affected. However this does not happen when csi is calculated in the same way we do in the crystal map.
+*/
+void
+DetectionPosMapTests::run_coordinate_test_for_flat_first_bucket()
+{
+    CPUTimer timer;
+    auto scannerBlocks_ptr=std::make_shared<Scanner> (Scanner::SAFIRDualRingPrototype);
+    
+    scannerBlocks_ptr->set_scanner_geometry("BlocksOnCylindrical");
+    scannerBlocks_ptr->set_num_transaxial_blocks_per_bucket(1);
+    scannerBlocks_ptr->set_up();
+
+    
+
+    VectorWithOffset<int> num_axial_pos_per_segment(scannerBlocks_ptr->get_num_rings()*2-1);
+    VectorWithOffset<int> min_ring_diff_v(scannerBlocks_ptr->get_num_rings()*2-1);
+    VectorWithOffset<int> max_ring_diff_v(scannerBlocks_ptr->get_num_rings()*2-1);
+    
+    for (int i=0; i<2*scannerBlocks_ptr->get_num_rings()-1; i++){
+        min_ring_diff_v[i]=-scannerBlocks_ptr->get_num_rings()+1+i;
+        max_ring_diff_v[i]=-scannerBlocks_ptr->get_num_rings()+1+i;
+        if (i<scannerBlocks_ptr->get_num_rings())
+            num_axial_pos_per_segment[i]=i+1;
+        else
+            num_axial_pos_per_segment[i]=2*scannerBlocks_ptr->get_num_rings()-i-1;
+        }
+    
+    auto proj_data_info_blocks_ptr=std::make_shared<ProjDataInfoBlocksOnCylindricalNoArcCorr>(
+                    scannerBlocks_ptr,
+                    num_axial_pos_per_segment,
+                    min_ring_diff_v, max_ring_diff_v,
+                    scannerBlocks_ptr->get_max_num_views(),
+                    scannerBlocks_ptr->get_max_num_non_arccorrected_bins());
+
+    Bin bin, bin0=Bin(0,0,0,0);
+    CartesianCoordinate3D< float> b1,b2,b01,b02;
+    
+    //    estimate the angle covered by half bucket, csi
+    float csi;
+    csi=calculate_angle_within_half_bucket(scannerBlocks_ptr,
+                                           proj_data_info_blocks_ptr);
+    
+    auto scannerBlocks_firstFlat_ptr=std::make_shared<Scanner> (Scanner::SAFIRDualRingPrototype);
+    scannerBlocks_firstFlat_ptr->set_scanner_geometry("BlocksOnCylindrical");
+    scannerBlocks_firstFlat_ptr->set_num_transaxial_blocks_per_bucket(1);
+    scannerBlocks_firstFlat_ptr->set_intrinsic_azimuthal_tilt(-csi);
+    scannerBlocks_firstFlat_ptr->set_up();
+    
+    auto proj_data_info_blocks_firstFlat_ptr=std::make_shared<ProjDataInfoBlocksOnCylindricalNoArcCorr>(
+                    scannerBlocks_firstFlat_ptr,
+                    num_axial_pos_per_segment,
+                    min_ring_diff_v, max_ring_diff_v,
+                    scannerBlocks_firstFlat_ptr->get_max_num_views(),
+                    scannerBlocks_firstFlat_ptr->get_max_num_non_arccorrected_bins());
+    timer.reset(); timer.start();
+    
+    for (int view = 0; view <= proj_data_info_blocks_firstFlat_ptr->get_max_view_num(); view++)
+    {
+        int bucket_num=view/(scannerBlocks_firstFlat_ptr->get_num_transaxial_crystals_per_block()*
+                             scannerBlocks_firstFlat_ptr->get_num_transaxial_blocks_per_bucket());
+        if (bucket_num>0)
+            break;
+        
+        bin.segment_num() = 0;
+        bin.axial_pos_num() = 0;
+        bin.view_num() = view;
+        bin.tangential_pos_num() = 0;
+        
+        
+        //                check cartesian coordinates of detectors
+        proj_data_info_blocks_firstFlat_ptr->find_cartesian_coordinates_of_detection(b1,b2,bin);
+        proj_data_info_blocks_firstFlat_ptr->find_cartesian_coordinates_of_detection(b01,b02,bin0);
+        
+        
+        check_if_equal(b1.y(),b01.y(), " checking cartesian coordinate y1 are the same on a flat bucket");
+        check_if_equal(b2.y(),b02.y(), " checking cartesian coordinate y2 are the same on a flat bucket");
+        check_if_equal(b1.y(),-b2.y(), " checking cartesian coordinate y1 and y2 are of opposite sign on opposite flat buckets");
+        
+    }
+    timer.stop(); std::cerr<< "-- CPU Time " << timer.value() << '\n';
+    
+}
+
+
+void
+DetectionPosMapTests::
+run_tests()
+{
+    
+    std::cerr << "-------- Testing DetectorCoordinateMap --------\n";
+    run_coordinate_test_for_flat_first_bucket();
+}
+END_NAMESPACE_STIR
+
+
+USING_NAMESPACE_STIR
+
+int main()
+{
+  DetectionPosMapTests tests;
+  tests.run_tests();
+  return tests.main_return_value();
+}
diff --git a/src/test/test_ScatterSimulation.cxx b/src/test/test_ScatterSimulation.cxx
index 2b775ffab..eab90e98a 100644
--- a/src/test/test_ScatterSimulation.cxx
+++ b/src/test/test_ScatterSimulation.cxx
@@ -24,6 +24,7 @@
 #include "stir/Scanner.h"
 #include "stir/Viewgram.h"
 #include "stir/Succeeded.h"
+#include "stir/ProjDataInfoBlocksOnCylindricalNoArcCorr.h"
 #include "stir/ProjDataInfoCylindricalNoArcCorr.h"
 #include "stir/scatter/SingleScatterSimulation.h"
 #include "stir/zoom.h"
@@ -93,9 +94,8 @@ test_downsampling_ProjDataInfo()
 
     unique_ptr<SingleScatterSimulation> sss(new SingleScatterSimulation());
     sss->set_template_proj_data_info(*original_projdata);
-
     {
-        auto sss_projdata(sss->get_template_proj_data_info_sptr());
+        auto sss_projdata = dynamic_cast<const ProjDataInfoCylindricalNoArcCorr*>(sss->get_template_proj_data_info_sptr().get());
         check(*original_projdata == *sss_projdata, "Check the ProjDataInfo has been set correctly.");
     }
 
@@ -105,7 +105,7 @@ test_downsampling_ProjDataInfo()
         int down_dets = static_cast<int>(test_scanner->get_num_detectors_per_ring() * 0.5);
 
         sss->downsample_scanner(down_rings, down_dets);
-        auto sss_projdata(sss->get_template_proj_data_info_sptr());
+        auto sss_projdata = dynamic_cast<const ProjDataInfoCylindricalNoArcCorr*>(sss->get_template_proj_data_info_sptr().get());
         check_if_equal(original_projdata->get_scanner_ptr()->get_num_rings(), 2*sss_projdata->get_scanner_ptr()->get_num_rings(), "Check the number of rings is correct");
         check_if_equal(original_projdata->get_scanner_ptr()->get_num_detectors_per_ring(),
               2*sss_projdata->get_scanner_ptr()->get_num_detectors_per_ring(), "Check number of detectors per ring.");
diff --git a/src/test/test_proj_data_info.cxx b/src/test/test_proj_data_info.cxx
index f7e971885..7ac8e335c 100644
--- a/src/test/test_proj_data_info.cxx
+++ b/src/test/test_proj_data_info.cxx
@@ -10,6 +10,7 @@
   \author Sanida Mustafovic
   \author Kris Thielemans
   \author Palak Wadhwa
+  \author Daniel Deidda
   \author PARAPET project
 
 */
@@ -18,6 +19,7 @@
     Copyright (C) 2000- 2011, Hammersmith Imanet Ltd
     Copyright (C) 2018, 2021, University College London
     Copyright (C) 2018, University of Leeds
+    Copyright (C) 2021, National Physical Laboratory
     This file is part of STIR.
 
     SPDX-License-Identifier: Apache-2.0 AND License-ref-PARAPET-license
@@ -27,6 +29,10 @@
 
 #include "stir/ProjDataInfoCylindricalArcCorr.h"
 #include "stir/ProjDataInfoCylindricalNoArcCorr.h"
+#include "stir/LORCoordinates.h"
+#include "stir/ProjDataInfo.h"
+#include "stir/ProjDataInfoBlocksOnCylindricalNoArcCorr.h"
+#include "stir/ProjDataInfoCylindricalNoArcCorr.h"
 #include "stir/RunTests.h"
 #include "stir/Scanner.h"
 #include "stir/Bin.h"
@@ -37,6 +43,7 @@
 #include <iomanip>
 #include <algorithm>
 #include <math.h>
+#include "stir/CPUTimer.h"
 
 #ifndef STIR_NO_NAMESPACES
 using std::cerr;
@@ -49,37 +56,38 @@ using std::size_t;
 
 START_NAMESPACE_STIR
 
-static inline
-int intabs(const int x)
-{ return x>=0?x:-x; }
+static inline int
+intabs(const int x)
+{
+  return x >= 0 ? x : -x;
+}
 
 // prints a michelogram to the screen
 #if 1
 // TODO move somewhere else
-void michelogram(const ProjDataInfoCylindrical& proj_data_info)
+void
+michelogram(const ProjDataInfoCylindrical& proj_data_info)
 {
   cerr << '{';
-  for (int ring1=0; ring1<proj_data_info.get_scanner_ptr()->get_num_rings(); ++ring1)
-  {
-    cerr << '{';
-    for (int ring2=0; ring2<proj_data_info.get_scanner_ptr()->get_num_rings(); ++ring2)
+  for (int ring1 = 0; ring1 < proj_data_info.get_scanner_ptr()->get_num_rings(); ++ring1)
     {
-      int segment_num=0;
-      int ax_pos_num = 0;
-      if (proj_data_info.get_segment_axial_pos_num_for_ring_pair(segment_num, ax_pos_num, ring1, ring2)
-        == Succeeded::yes)
-        cerr << '{' << setw(3) << segment_num << ',' << setw(2) << ax_pos_num << "}";
-      else
-        cerr << "{}      ";
-      if (ring2 != proj_data_info.get_scanner_ptr()->get_num_rings()-1)
+      cerr << '{';
+      for (int ring2 = 0; ring2 < proj_data_info.get_scanner_ptr()->get_num_rings(); ++ring2)
+        {
+          int segment_num = 0;
+          int ax_pos_num = 0;
+          if (proj_data_info.get_segment_axial_pos_num_for_ring_pair(segment_num, ax_pos_num, ring1, ring2) == Succeeded::yes)
+            cerr << '{' << setw(3) << segment_num << ',' << setw(2) << ax_pos_num << "}";
+          else
+            cerr << "{}      ";
+          if (ring2 != proj_data_info.get_scanner_ptr()->get_num_rings() - 1)
+            cerr << ',';
+        }
+      cerr << '}';
+      if (ring1 != proj_data_info.get_scanner_ptr()->get_num_rings() - 1)
         cerr << ',';
-
+      cerr << endl;
     }
-    cerr << '}';
-    if (ring1 != proj_data_info.get_scanner_ptr()->get_num_rings()-1)
-        cerr << ',';
-    cerr << endl;
-  }
   cerr << '}' << endl;
 }
 #endif
@@ -88,213 +96,215 @@ void michelogram(const ProjDataInfoCylindrical& proj_data_info)
   \ingroup test
   \brief Test class for ProjDataInfo
 */
-class ProjDataInfoTests: public RunTests
+class ProjDataInfoTests : public RunTests
 {
-protected:  
+protected:
   void test_generic_proj_data_info(ProjDataInfo& proj_data_info);
+
+  template <class TProjDataInfo>
+  shared_ptr<TProjDataInfo> set_blocks_projdata_info(shared_ptr<Scanner> scanner_sptr);
+  void run_coordinate_test();
+  void run_coordinate_test_for_realistic_scanner();
+  void run_Blocks_DOI_test();
+  void run_lor_get_s_test();
 };
 
+/*! The following is a function to allow a projdata_info blocksONCylindrical to be created from the scanner.
+ */
+template <class TProjDataInfo>
+shared_ptr<TProjDataInfo>
+ProjDataInfoTests::set_blocks_projdata_info(shared_ptr<Scanner> scanner_sptr)
+{
+  VectorWithOffset<int> num_axial_pos_per_segment(scanner_sptr->get_num_rings() * 2 - 1);
+  VectorWithOffset<int> min_ring_diff_v(scanner_sptr->get_num_rings() * 2 - 1);
+  VectorWithOffset<int> max_ring_diff_v(scanner_sptr->get_num_rings() * 2 - 1);
+  for (int i = 0; i < 2 * scanner_sptr->get_num_rings() - 1; i++)
+    {
+      min_ring_diff_v[i] = -scanner_sptr->get_num_rings() + 1 + i;
+      max_ring_diff_v[i] = -scanner_sptr->get_num_rings() + 1 + i;
+      if (i < scanner_sptr->get_num_rings())
+        num_axial_pos_per_segment[i] = i + 1;
+      else
+        num_axial_pos_per_segment[i] = 2 * scanner_sptr->get_num_rings() - i - 1;
+    }
+
+  auto proj_data_info_blocks_sptr
+      = std::make_shared<TProjDataInfo>(scanner_sptr, num_axial_pos_per_segment, min_ring_diff_v, max_ring_diff_v,
+                                        scanner_sptr->get_max_num_views(), scanner_sptr->get_max_num_non_arccorrected_bins());
+
+  return proj_data_info_blocks_sptr;
+}
+
 void
-ProjDataInfoTests::
-test_generic_proj_data_info(ProjDataInfo& proj_data_info)
+ProjDataInfoTests::test_generic_proj_data_info(ProjDataInfo& proj_data_info)
 {
   cerr << "\tTests on get_LOR/get_bin\n";
-  int max_diff_segment_num=0;
-  int max_diff_view_num=0;
-  int max_diff_axial_pos_num=0;
-  int max_diff_tangential_pos_num=0;
+  int max_diff_segment_num = 0;
+  int max_diff_view_num = 0;
+  int max_diff_axial_pos_num = 0;
+  int max_diff_tangential_pos_num = 0;
 #ifdef STIR_OPENMP
-#pragma omp parallel for schedule(dynamic)
+#  pragma omp parallel for schedule(dynamic)
 #endif
-  for (int segment_num=proj_data_info.get_min_segment_num();
-       segment_num<=proj_data_info.get_max_segment_num();
-	 ++segment_num)
-      {
-	for (int view_num=proj_data_info.get_min_view_num();
-	     view_num<=proj_data_info.get_max_view_num();
-	     view_num+=3)
-	  {
-	    // loop over axial_positions. Avoid using first and last positions, as 
-	    // if there is axial compression, the central LOR of a bin might actually not
-	    // fall within the scanner. In this case, the get_bin(get_LOR(org_bin)) code 
-	    // will return an out-of-range bin (i.e. value<0).
-	    int axial_pos_num_margin=0;
-	    const ProjDataInfoCylindrical* const proj_data_info_cyl_ptr =
-	      dynamic_cast<const ProjDataInfoCylindrical* const>(&proj_data_info);
-	    if (proj_data_info_cyl_ptr!=0)
-	      {
-		axial_pos_num_margin =
-		  std::max(
-			   round(ceil(proj_data_info_cyl_ptr->get_average_ring_difference(segment_num) -
-				      proj_data_info_cyl_ptr->get_min_ring_difference(segment_num))),
-			   round(ceil(proj_data_info_cyl_ptr->get_max_ring_difference(segment_num) -
-				      proj_data_info_cyl_ptr->get_average_ring_difference(segment_num))));		
-	      }
-	    for (int axial_pos_num=proj_data_info.get_min_axial_pos_num(segment_num)+axial_pos_num_margin ;
-		 axial_pos_num<=proj_data_info.get_max_axial_pos_num(segment_num)-axial_pos_num_margin;
-		 axial_pos_num+=3)
-	      {
-		for (int tangential_pos_num=proj_data_info.get_min_tangential_pos_num()+1;
-		     tangential_pos_num<=proj_data_info.get_max_tangential_pos_num()-1;
-		     tangential_pos_num+=1)
-		  {
-		    const Bin org_bin(segment_num,view_num,axial_pos_num,tangential_pos_num, /* value*/1);
-		    LORInAxialAndNoArcCorrSinogramCoordinates<float> lor;
-		    proj_data_info.get_LOR(lor, org_bin);
-		    {
-		      const Bin new_bin = proj_data_info.get_bin(lor);
+  for (int segment_num = proj_data_info.get_min_segment_num(); segment_num <= proj_data_info.get_max_segment_num(); ++segment_num)
+    {
+      for (int view_num = proj_data_info.get_min_view_num(); view_num <= proj_data_info.get_max_view_num(); view_num += 3)
+        {
+          // loop over axial_positions. Avoid using first and last positions, as
+          // if there is axial compression, the central LOR of a bin might actually not
+          // fall within the scanner. In this case, the get_bin(get_LOR(org_bin)) code
+          // will return an out-of-range bin (i.e. value<0).
+          int axial_pos_num_margin = 0;
+          const ProjDataInfoCylindrical* const proj_data_info_cyl_ptr
+              = dynamic_cast<const ProjDataInfoCylindrical* const>(&proj_data_info);
+          if (proj_data_info_cyl_ptr != 0)
+            {
+              axial_pos_num_margin = std::max(round(ceil(proj_data_info_cyl_ptr->get_average_ring_difference(segment_num)
+                                                         - proj_data_info_cyl_ptr->get_min_ring_difference(segment_num))),
+                                              round(ceil(proj_data_info_cyl_ptr->get_max_ring_difference(segment_num)
+                                                         - proj_data_info_cyl_ptr->get_average_ring_difference(segment_num))));
+            }
+          for (int axial_pos_num = proj_data_info.get_min_axial_pos_num(segment_num) + axial_pos_num_margin;
+               axial_pos_num <= proj_data_info.get_max_axial_pos_num(segment_num) - axial_pos_num_margin; axial_pos_num += 3)
+            {
+              for (int tangential_pos_num = proj_data_info.get_min_tangential_pos_num() + 1;
+                   tangential_pos_num <= proj_data_info.get_max_tangential_pos_num() - 1; tangential_pos_num += 1)
+                {
+                  const Bin org_bin(segment_num, view_num, axial_pos_num, tangential_pos_num, /* value*/ 1);
+                  LORInAxialAndNoArcCorrSinogramCoordinates<float> lor;
+                  proj_data_info.get_LOR(lor, org_bin);
+                  {
+                    const Bin new_bin = proj_data_info.get_bin(lor);
 #if 1
-		      const int diff_segment_num =
-			intabs(org_bin.segment_num() - new_bin.segment_num());
-		      const int diff_view_num = 
-			intabs(org_bin.view_num() - new_bin.view_num());
-		      const int diff_axial_pos_num = 
-			intabs(org_bin.axial_pos_num() - new_bin.axial_pos_num());
-		      const int diff_tangential_pos_num = 
-			intabs(org_bin.tangential_pos_num() - new_bin.tangential_pos_num());
-		      if (new_bin.get_bin_value()>0)
-			{
-			  if (diff_segment_num>max_diff_segment_num)
-			    max_diff_segment_num=diff_segment_num;
-			  if (diff_view_num>max_diff_view_num)
-			    max_diff_view_num=diff_view_num;
-			  if (diff_axial_pos_num>max_diff_axial_pos_num)
-			    max_diff_axial_pos_num=diff_axial_pos_num;
-			  if (diff_tangential_pos_num>max_diff_tangential_pos_num)
-			    max_diff_tangential_pos_num=diff_tangential_pos_num;
-			}
-#ifdef STIR_OPENMP
+                    const int diff_segment_num = intabs(org_bin.segment_num() - new_bin.segment_num());
+                    const int diff_view_num = intabs(org_bin.view_num() - new_bin.view_num());
+                    const int diff_axial_pos_num = intabs(org_bin.axial_pos_num() - new_bin.axial_pos_num());
+                    const int diff_tangential_pos_num = intabs(org_bin.tangential_pos_num() - new_bin.tangential_pos_num());
+                    if (new_bin.get_bin_value() > 0)
+                      {
+                        if (diff_segment_num > max_diff_segment_num)
+                          max_diff_segment_num = diff_segment_num;
+                        if (diff_view_num > max_diff_view_num)
+                          max_diff_view_num = diff_view_num;
+                        if (diff_axial_pos_num > max_diff_axial_pos_num)
+                          max_diff_axial_pos_num = diff_axial_pos_num;
+                        if (diff_tangential_pos_num > max_diff_tangential_pos_num)
+                          max_diff_tangential_pos_num = diff_tangential_pos_num;
+                      }
+#  ifdef STIR_OPENMP
                       // add a pragma to avoid cerr output being jumbled up if there are any errors
-#pragma omp critical(TESTPROJDATAINFO)
-#endif
-		      if (!check(org_bin.get_bin_value() == new_bin.get_bin_value(), "round-trip get_LOR then get_bin: value") ||
-			  !check(diff_segment_num<=0, "round-trip get_LOR then get_bin: segment") ||
-			  !check(diff_view_num<=1, "round-trip get_LOR then get_bin: view") ||
-			  !check(diff_axial_pos_num<=1, "round-trip get_LOR then get_bin: axial_pos") ||
-			  !check(diff_tangential_pos_num<=1, "round-trip get_LOR then get_bin: tangential_pos"))
+#    pragma omp critical(TESTPROJDATAINFO)
+#  endif
+                    if (!check(org_bin.get_bin_value() == new_bin.get_bin_value(), "round-trip get_LOR then get_bin: value")
+                        || !check(diff_segment_num <= 0, "round-trip get_LOR then get_bin: segment")
+                        || !check(diff_view_num <= 1, "round-trip get_LOR then get_bin: view")
+                        || !check(diff_axial_pos_num <= 1, "round-trip get_LOR then get_bin: axial_pos")
+                        || !check(diff_tangential_pos_num <= 1, "round-trip get_LOR then get_bin: tangential_pos"))
 
 #else
-		      if (!check(org_bin == new_bin, "round-trip get_LOR then get_bin"))
+                    if (!check(org_bin == new_bin, "round-trip get_LOR then get_bin"))
 #endif
-			{
-			  cerr << "\tProblem at    segment = " << org_bin.segment_num() 
-			       << ", axial pos " << org_bin.axial_pos_num()
-			       << ", view = " << org_bin.view_num() 
-			       << ", tangential_pos_num = " << org_bin.tangential_pos_num() << "\n";
-			  if (new_bin.get_bin_value()>0)
-			    cerr << "\tround-trip to segment = " << new_bin.segment_num() 
-				 << ", axial pos " << new_bin.axial_pos_num()
-				 << ", view = " << new_bin.view_num() 
-				 << ", tangential_pos_num = " << new_bin.tangential_pos_num() 
-				 <<'\n';
-			}
-		    }
-		    // repeat test but with different type of LOR
-		    {
-		      LORAs2Points<float> lor_as_points;
-		      lor.get_intersections_with_cylinder(lor_as_points, lor.radius());
-		      const Bin new_bin = proj_data_info.get_bin(lor_as_points);
+                      {
+                        cerr << "\tProblem at    segment = " << org_bin.segment_num() << ", axial pos " << org_bin.axial_pos_num()
+                             << ", view = " << org_bin.view_num() << ", tangential_pos_num = " << org_bin.tangential_pos_num()
+                             << "\n";
+                        if (new_bin.get_bin_value() > 0)
+                          cerr << "\tround-trip to segment = " << new_bin.segment_num() << ", axial pos "
+                               << new_bin.axial_pos_num() << ", view = " << new_bin.view_num()
+                               << ", tangential_pos_num = " << new_bin.tangential_pos_num() << '\n';
+                      }
+                  }
+                  // repeat test but with different type of LOR
+                  {
+                    LORAs2Points<float> lor_as_points;
+                    lor.get_intersections_with_cylinder(lor_as_points, lor.radius());
+                    const Bin new_bin = proj_data_info.get_bin(lor_as_points);
 #if 1
-		      const int diff_segment_num =
-			intabs(org_bin.segment_num() - new_bin.segment_num());
-		      const int diff_view_num = 
-			  intabs(org_bin.view_num() - new_bin.view_num());
-		      const int diff_axial_pos_num = 
-			intabs(org_bin.axial_pos_num() - new_bin.axial_pos_num());
-		      const int diff_tangential_pos_num = 
-			intabs(org_bin.tangential_pos_num() - new_bin.tangential_pos_num());
-		      if (new_bin.get_bin_value()>0)
-			{
-			  if (diff_segment_num>max_diff_segment_num)
-			    max_diff_segment_num=diff_segment_num;
-			  if (diff_view_num>max_diff_view_num)
-			    max_diff_view_num=diff_view_num;
-			  if (diff_axial_pos_num>max_diff_axial_pos_num)
-			    max_diff_axial_pos_num=diff_axial_pos_num;
-			  if (diff_tangential_pos_num>max_diff_tangential_pos_num)
-			    max_diff_tangential_pos_num=diff_tangential_pos_num;
-			}
-		      if (!check(org_bin.get_bin_value() == new_bin.get_bin_value(), "round-trip get_LOR then get_bin (LORAs2Points): value") ||
-			  !check(diff_segment_num<=0, "round-trip get_LOR then get_bin (LORAs2Points): segment") ||
-			  !check(diff_view_num<=1, "round-trip get_LOR then get_bin (LORAs2Points): view") ||
-			  !check(diff_axial_pos_num<=1, "round-trip get_LOR then get_bin (LORAs2Points): axial_pos") ||
-			  !check(diff_tangential_pos_num<=1, "round-trip get_LOR then get_bin (LORAs2Points): tangential_pos"))
-			
+                    const int diff_segment_num = intabs(org_bin.segment_num() - new_bin.segment_num());
+                    const int diff_view_num = intabs(org_bin.view_num() - new_bin.view_num());
+                    const int diff_axial_pos_num = intabs(org_bin.axial_pos_num() - new_bin.axial_pos_num());
+                    const int diff_tangential_pos_num = intabs(org_bin.tangential_pos_num() - new_bin.tangential_pos_num());
+                    if (new_bin.get_bin_value() > 0)
+                      {
+                        if (diff_segment_num > max_diff_segment_num)
+                          max_diff_segment_num = diff_segment_num;
+                        if (diff_view_num > max_diff_view_num)
+                          max_diff_view_num = diff_view_num;
+                        if (diff_axial_pos_num > max_diff_axial_pos_num)
+                          max_diff_axial_pos_num = diff_axial_pos_num;
+                        if (diff_tangential_pos_num > max_diff_tangential_pos_num)
+                          max_diff_tangential_pos_num = diff_tangential_pos_num;
+                      }
+                    if (!check(org_bin.get_bin_value() == new_bin.get_bin_value(),
+                               "round-trip get_LOR then get_bin (LORAs2Points): value")
+                        || !check(diff_segment_num <= 0, "round-trip get_LOR then get_bin (LORAs2Points): segment")
+                        || !check(diff_view_num <= 1, "round-trip get_LOR then get_bin (LORAs2Points): view")
+                        || !check(diff_axial_pos_num <= 1, "round-trip get_LOR then get_bin (LORAs2Points): axial_pos")
+                        || !check(diff_tangential_pos_num <= 1, "round-trip get_LOR then get_bin (LORAs2Points): tangential_pos"))
+
 #else
-		      if (!check(org_bin == new_bin, "round-trip get_LOR then get_bin"))
+                    if (!check(org_bin == new_bin, "round-trip get_LOR then get_bin"))
 #endif
-			{
-			  cerr << "\tProblem at    segment = " << org_bin.segment_num() 
-			       << ", axial pos " << org_bin.axial_pos_num()
-			       << ", view = " << org_bin.view_num() 
-			       << ", tangential_pos_num = " << org_bin.tangential_pos_num() << "\n";
-			  if (new_bin.get_bin_value()>0)
-			    cerr << "\tround-trip to segment = " << new_bin.segment_num() 
-				 << ", axial pos " << new_bin.axial_pos_num()
-				 << ", view = " << new_bin.view_num() 
-				 << ", tangential_pos_num = " << new_bin.tangential_pos_num() 
-				 <<'\n';
-			}
-		    }
-		  }
-	      }
-	  }
-      }
-    cerr << "Max Deviation:  segment = " << max_diff_segment_num 
-	 << ", axial pos " << max_diff_axial_pos_num
-	 << ", view = " << max_diff_view_num 
-	 << ", tangential_pos_num = " << max_diff_tangential_pos_num << "\n";
-
-    // test on reduce_segment_range and operator>=
-    {
-      shared_ptr<ProjDataInfo> smaller(proj_data_info.clone());
-      check(proj_data_info >= *smaller, "check on operator>= and equal objects");
-      smaller->set_min_tangential_pos_num(0);
-      check(proj_data_info >= *smaller, "check on tangential_pos and operator>=");
-      smaller->set_min_axial_pos_num(4, 0);
-      check(proj_data_info >= *smaller, "check on axial_pos and operator>=");
-
-      smaller->reduce_segment_range(0,0);
-      check(proj_data_info >= *smaller, "check on reduce_segment_range and operator>=");
-      // make one range larger, so should now fail
-      smaller->set_min_tangential_pos_num(proj_data_info.get_min_tangential_pos_num() - 4);
-      check(!(proj_data_info >= *smaller), "check on mixed case with tangential_pos_num and operator>=");
-      // reset and do the same for axial pos
-      smaller->set_min_tangential_pos_num(proj_data_info.get_min_tangential_pos_num() + 4);
-      check(proj_data_info >= *smaller, "check on reduced segments and tangential_pos and operator>=");
-      smaller->set_max_axial_pos_num(proj_data_info.get_max_axial_pos_num(0)+4, 0);
-      check(!(proj_data_info >= *smaller), "check on mixed case with axial_pos_num and operator>=");
+                      {
+                        cerr << "\tProblem at    segment = " << org_bin.segment_num() << ", axial pos " << org_bin.axial_pos_num()
+                             << ", view = " << org_bin.view_num() << ", tangential_pos_num = " << org_bin.tangential_pos_num()
+                             << "\n";
+                        if (new_bin.get_bin_value() > 0)
+                          cerr << "\tround-trip to segment = " << new_bin.segment_num() << ", axial pos "
+                               << new_bin.axial_pos_num() << ", view = " << new_bin.view_num()
+                               << ", tangential_pos_num = " << new_bin.tangential_pos_num() << '\n';
+                      }
+                  }
+                }
+            }
+        }
     }
-}
+  cerr << "Max Deviation:  segment = " << max_diff_segment_num << ", axial pos " << max_diff_axial_pos_num
+       << ", view = " << max_diff_view_num << ", tangential_pos_num = " << max_diff_tangential_pos_num << "\n";
 
+  // test on reduce_segment_range and operator>=
+  {
+    shared_ptr<ProjDataInfo> smaller(proj_data_info.clone());
+    check(proj_data_info >= *smaller, "check on operator>= and equal objects");
+    smaller->set_min_tangential_pos_num(0);
+    check(proj_data_info >= *smaller, "check on tangential_pos and operator>=");
+    smaller->set_min_axial_pos_num(4, 0);
+    check(proj_data_info >= *smaller, "check on axial_pos and operator>=");
+
+    smaller->reduce_segment_range(0, 0);
+    check(proj_data_info >= *smaller, "check on reduce_segment_range and operator>=");
+    // make one range larger, so should now fail
+    smaller->set_min_tangential_pos_num(proj_data_info.get_min_tangential_pos_num() - 4);
+    check(!(proj_data_info >= *smaller), "check on mixed case with tangential_pos_num and operator>=");
+    // reset and do the same for axial pos
+    smaller->set_min_tangential_pos_num(proj_data_info.get_min_tangential_pos_num() + 4);
+    check(proj_data_info >= *smaller, "check on reduced segments and tangential_pos and operator>=");
+    smaller->set_max_axial_pos_num(proj_data_info.get_max_axial_pos_num(0) + 4, 0);
+    check(!(proj_data_info >= *smaller), "check on mixed case with axial_pos_num and operator>=");
+  }
+}
 
 /*!
   \ingroup test
   \brief Test class for ProjDataInfoCylindrical
 */
-class ProjDataInfoCylindricalTests: public ProjDataInfoTests
+class ProjDataInfoCylindricalTests : public ProjDataInfoTests
 {
-protected:  
+protected:
   void test_cylindrical_proj_data_info(ProjDataInfoCylindrical& proj_data_info);
 };
 
-
 void
-ProjDataInfoCylindricalTests::
-test_cylindrical_proj_data_info(ProjDataInfoCylindrical& proj_data_info) 
+ProjDataInfoCylindricalTests::test_cylindrical_proj_data_info(ProjDataInfoCylindrical& proj_data_info)
 {
   cerr << "\tTesting consistency between different implementations of geometric info\n";
   {
-    const Bin bin(proj_data_info.get_max_segment_num(),
-	    1,
-	    proj_data_info.get_max_axial_pos_num(proj_data_info.get_max_segment_num())/2,
-	    1);
-    check_if_equal(proj_data_info.get_sampling_in_m(bin),
-		   proj_data_info.ProjDataInfo::get_sampling_in_m(bin),
-		   "test consistency get_sampling_in_m");
-    check_if_equal(proj_data_info.get_sampling_in_t(bin),
-		   proj_data_info.ProjDataInfo::get_sampling_in_t(bin),
-		   "test consistency get_sampling_in_t");
+    const Bin bin(proj_data_info.get_max_segment_num(), 1,
+                  proj_data_info.get_max_axial_pos_num(proj_data_info.get_max_segment_num()) / 2, 1);
+    check_if_equal(proj_data_info.get_sampling_in_m(bin), proj_data_info.ProjDataInfo::get_sampling_in_m(bin),
+                   "test consistency get_sampling_in_m");
+    check_if_equal(proj_data_info.get_sampling_in_t(bin), proj_data_info.ProjDataInfo::get_sampling_in_t(bin),
+                   "test consistency get_sampling_in_t");
 #if 0
     // ProjDataInfo has no default implementation for get_tantheta
     // I just leave the code here to make this explicit
@@ -302,233 +312,674 @@ test_cylindrical_proj_data_info(ProjDataInfoCylindrical& proj_data_info)
 		   proj_data_info.ProjDataInfo::get_tantheta(bin),
 		   "test consistency get_tantheta");
 #endif
-    check_if_equal(proj_data_info.get_costheta(bin),
-		   proj_data_info.ProjDataInfo::get_costheta(bin),
-		   "test consistency get_costheta");
+    check_if_equal(proj_data_info.get_costheta(bin), proj_data_info.ProjDataInfo::get_costheta(bin),
+                   "test consistency get_costheta");
 
-    check_if_equal(proj_data_info.get_costheta(bin),
-		   cos(atan(proj_data_info.get_tantheta(bin))),
-		   "cross check get_costheta and get_tantheta");
+    check_if_equal(proj_data_info.get_costheta(bin), cos(atan(proj_data_info.get_tantheta(bin))),
+                   "cross check get_costheta and get_tantheta");
 
     // try the same with a non-standard ring spacing
     const float old_ring_spacing = proj_data_info.get_ring_spacing();
     proj_data_info.set_ring_spacing(2.1F);
 
-    check_if_equal(proj_data_info.get_sampling_in_m(bin),
-		   proj_data_info.ProjDataInfo::get_sampling_in_m(bin),
-		   "test consistency get_sampling_in_m");
-    check_if_equal(proj_data_info.get_sampling_in_t(bin),
-		   proj_data_info.ProjDataInfo::get_sampling_in_t(bin),
-		   "test consistency get_sampling_in_t");
+    check_if_equal(proj_data_info.get_sampling_in_m(bin), proj_data_info.ProjDataInfo::get_sampling_in_m(bin),
+                   "test consistency get_sampling_in_m");
+    check_if_equal(proj_data_info.get_sampling_in_t(bin), proj_data_info.ProjDataInfo::get_sampling_in_t(bin),
+                   "test consistency get_sampling_in_t");
 #if 0
     check_if_equal(proj_data_info.get_tantheta(bin),
 		   proj_data_info.ProjDataInfo::get_tantheta(bin),
 		   "test consistency get_tantheta");
 #endif
-    check_if_equal(proj_data_info.get_costheta(bin),
-		   proj_data_info.ProjDataInfo::get_costheta(bin),
-		   "test consistency get_costheta");
+    check_if_equal(proj_data_info.get_costheta(bin), proj_data_info.ProjDataInfo::get_costheta(bin),
+                   "test consistency get_costheta");
 
-    check_if_equal(proj_data_info.get_costheta(bin),
-		   cos(atan(proj_data_info.get_tantheta(bin))),
-		   "cross check get_costheta and get_tantheta");
+    check_if_equal(proj_data_info.get_costheta(bin), cos(atan(proj_data_info.get_tantheta(bin))),
+                   "cross check get_costheta and get_tantheta");
     // set back to usual value
     proj_data_info.set_ring_spacing(old_ring_spacing);
   }
 
   if (proj_data_info.get_max_ring_difference(0) == proj_data_info.get_min_ring_difference(0)
       && proj_data_info.get_max_ring_difference(1) == proj_data_info.get_min_ring_difference(1)
-      && proj_data_info.get_max_ring_difference(2) == proj_data_info.get_min_ring_difference(2)
-      )
+      && proj_data_info.get_max_ring_difference(2) == proj_data_info.get_min_ring_difference(2))
     {
       // these tests work only without axial compression
       cerr << "\tTest ring pair to segment,ax_pos (span 1)\n";
 #ifdef STIR_OPENMP
-#pragma omp parallel for schedule(dynamic)
+#  pragma omp parallel for schedule(dynamic)
 #endif
-    for (int ring1=0; ring1<proj_data_info.get_scanner_ptr()->get_num_rings(); ++ring1)
-      for (int ring2=0; ring2<proj_data_info.get_scanner_ptr()->get_num_rings(); ++ring2)
-	{
-	  int segment_num = 0, axial_pos_num = 0;
-	  check(proj_data_info.
-		get_segment_axial_pos_num_for_ring_pair(segment_num,
-							axial_pos_num,
-							ring1,
-							ring2) ==
-		    Succeeded::yes,
-		"test if segment,ax_pos_num found for a ring pair");
-	  check_if_equal(segment_num, ring2-ring1,
-			 "test if segment_num is equal to ring difference\n");
-	  check_if_equal(axial_pos_num, min(ring2,ring1),
-			 "test if segment_num is equal to ring difference\n");
-	  
-	  int check_ring1 = 0, check_ring2 = 0;
-	  proj_data_info.
-	    get_ring_pair_for_segment_axial_pos_num(check_ring1,
-						    check_ring2,
-						    segment_num,
-						    axial_pos_num);
-	  check_if_equal(ring1, check_ring1,
-			 "test ring1 equal after going to segment/ax_pos and returning\n");
-	  check_if_equal(ring2, check_ring2,
-			 "test ring2 equal after going to segment/ax_pos and returning\n");
-
-	  const ProjDataInfoCylindrical::RingNumPairs& ring_pairs =
-	    proj_data_info.
-	    get_all_ring_pairs_for_segment_axial_pos_num(segment_num,
-							 axial_pos_num);
-
-	  check_if_equal(ring_pairs.size(), static_cast<size_t>(1),
-			 "test total number of ring-pairs for 1 segment/ax_pos should be 1 for span=1\n");
-	  check_if_equal(ring1, ring_pairs[0].first,
-			 "test ring1 equal after going to segment/ax_pos and returning (version with all ring_pairs)\n");
-	  check_if_equal(ring2, ring_pairs[0].second,
-			 "test ring2 equal after going to segment/ax_pos and returning (version with all ring_pairs)\n");
-	}
-  }
+      for (int ring1 = 0; ring1 < proj_data_info.get_scanner_ptr()->get_num_rings(); ++ring1)
+        for (int ring2 = 0; ring2 < proj_data_info.get_scanner_ptr()->get_num_rings(); ++ring2)
+          {
+            int segment_num = 0, axial_pos_num = 0;
+            check(proj_data_info.get_segment_axial_pos_num_for_ring_pair(segment_num, axial_pos_num, ring1, ring2)
+                      == Succeeded::yes,
+                  "test if segment,ax_pos_num found for a ring pair");
+            check_if_equal(segment_num, ring2 - ring1, "test if segment_num is equal to ring difference\n");
+            check_if_equal(axial_pos_num, min(ring2, ring1), "test if segment_num is equal to ring difference\n");
+
+            int check_ring1 = 0, check_ring2 = 0;
+            proj_data_info.get_ring_pair_for_segment_axial_pos_num(check_ring1, check_ring2, segment_num, axial_pos_num);
+            check_if_equal(ring1, check_ring1, "test ring1 equal after going to segment/ax_pos and returning\n");
+            check_if_equal(ring2, check_ring2, "test ring2 equal after going to segment/ax_pos and returning\n");
+
+            const ProjDataInfoCylindrical::RingNumPairs& ring_pairs
+                = proj_data_info.get_all_ring_pairs_for_segment_axial_pos_num(segment_num, axial_pos_num);
+
+            check_if_equal(ring_pairs.size(), static_cast<size_t>(1),
+                           "test total number of ring-pairs for 1 segment/ax_pos should be 1 for span=1\n");
+            check_if_equal(ring1, ring_pairs[0].first,
+                           "test ring1 equal after going to segment/ax_pos and returning (version with all ring_pairs)\n");
+            check_if_equal(ring2, ring_pairs[0].second,
+                           "test ring2 equal after going to segment/ax_pos and returning (version with all ring_pairs)\n");
+          }
+    }
 
   cerr << "\tTest ring pair to segment,ax_pos and vice versa (for any axial compression)\n";
   {
 #ifdef STIR_OPENMP
-#pragma omp parallel for schedule(dynamic)
+#  pragma omp parallel for schedule(dynamic)
 #endif
-    for (int segment_num=proj_data_info.get_min_segment_num(); 
-	 segment_num<=proj_data_info.get_max_segment_num(); 
-	 ++segment_num)
-      for (int axial_pos_num=proj_data_info.get_min_axial_pos_num(segment_num); 
-	   axial_pos_num<=proj_data_info.get_max_axial_pos_num(segment_num); 
-	   ++axial_pos_num)
-	{
-	  const ProjDataInfoCylindrical::RingNumPairs& ring_pairs =
-	    proj_data_info.
-	    get_all_ring_pairs_for_segment_axial_pos_num(segment_num,
-							 axial_pos_num);
-	  for (ProjDataInfoCylindrical::RingNumPairs::const_iterator iter = ring_pairs.begin();
-	       iter != ring_pairs.end();
-	       ++iter)
-	    {
-	      int check_segment_num = 0, check_axial_pos_num = 0;
-	      check(proj_data_info.
-		    get_segment_axial_pos_num_for_ring_pair(check_segment_num,
-							    check_axial_pos_num,
-							    iter->first,
-							    iter->second) ==
-		    Succeeded::yes,
-		    "test if segment,ax_pos_num found for a ring pair");
-	      check_if_equal(check_segment_num, segment_num,
-			     "test if segment_num is consistent\n");
-	      check_if_equal(check_axial_pos_num, axial_pos_num,
-			     "test if axial_pos_num is consistent\n");
-	    }
-	}	      
+    for (int segment_num = proj_data_info.get_min_segment_num(); segment_num <= proj_data_info.get_max_segment_num();
+         ++segment_num)
+      for (int axial_pos_num = proj_data_info.get_min_axial_pos_num(segment_num);
+           axial_pos_num <= proj_data_info.get_max_axial_pos_num(segment_num); ++axial_pos_num)
+        {
+          const ProjDataInfoCylindrical::RingNumPairs& ring_pairs
+              = proj_data_info.get_all_ring_pairs_for_segment_axial_pos_num(segment_num, axial_pos_num);
+          for (ProjDataInfoCylindrical::RingNumPairs::const_iterator iter = ring_pairs.begin(); iter != ring_pairs.end(); ++iter)
+            {
+              int check_segment_num = 0, check_axial_pos_num = 0;
+              check(proj_data_info.get_segment_axial_pos_num_for_ring_pair(check_segment_num, check_axial_pos_num, iter->first,
+                                                                           iter->second)
+                        == Succeeded::yes,
+                    "test if segment,ax_pos_num found for a ring pair");
+              check_if_equal(check_segment_num, segment_num, "test if segment_num is consistent\n");
+              check_if_equal(check_axial_pos_num, axial_pos_num, "test if axial_pos_num is consistent\n");
+            }
+        }
   }
 
   test_generic_proj_data_info(proj_data_info);
 }
 
+/*!
+  The following tests that detection position is affected by the value of DOI
+*/
+void
+ProjDataInfoTests::run_Blocks_DOI_test()
+{
+  CPUTimer timer;
+  auto scannerBlocks_ptr = std::make_shared<Scanner>(Scanner::SAFIRDualRingPrototype);
+  scannerBlocks_ptr->set_average_depth_of_interaction(0);
+  scannerBlocks_ptr->set_scanner_geometry("BlocksOnCylindrical");
+  scannerBlocks_ptr->set_up();
+
+  auto proj_data_info_blocks_doi0_ptr = std::make_shared<ProjDataInfoBlocksOnCylindricalNoArcCorr>();
+  proj_data_info_blocks_doi0_ptr = set_blocks_projdata_info<ProjDataInfoBlocksOnCylindricalNoArcCorr>(scannerBlocks_ptr);
+
+  auto scannerBlocksDOI_ptr = std::make_shared<Scanner>(*scannerBlocks_ptr);
+  scannerBlocksDOI_ptr->set_average_depth_of_interaction(0.1);
+  scannerBlocksDOI_ptr->set_up();
+
+  auto proj_data_info_blocks_doi01_ptr = std::make_shared<ProjDataInfoBlocksOnCylindricalNoArcCorr>();
+  proj_data_info_blocks_doi01_ptr = set_blocks_projdata_info<ProjDataInfoBlocksOnCylindricalNoArcCorr>(scannerBlocksDOI_ptr);
+
+  Bin bin;
+  LORInAxialAndNoArcCorrSinogramCoordinates<float> lor;
+
+  int Bring1, Bring2, Bdet1, Bdet2, BDring1, BDring2, BDdet1, BDdet2;
+  CartesianCoordinate3D<float> b1, b2, bd1, bd2;
+  // float doi=scannerBlocksDOI_ptr->get_average_depth_of_interaction();
+  timer.reset();
+  timer.start();
+
+  for (int seg = proj_data_info_blocks_doi0_ptr->get_min_segment_num();
+       seg <= proj_data_info_blocks_doi0_ptr->get_max_segment_num(); ++seg)
+    for (int ax = proj_data_info_blocks_doi0_ptr->get_min_axial_pos_num(seg);
+         ax <= proj_data_info_blocks_doi0_ptr->get_max_axial_pos_num(seg); ++ax)
+      for (int view = 0; view <= proj_data_info_blocks_doi0_ptr->get_max_view_num(); view++)
+        for (int tang = proj_data_info_blocks_doi0_ptr->get_min_tangential_pos_num();
+             tang <= proj_data_info_blocks_doi0_ptr->get_max_tangential_pos_num(); ++tang)
+          {
+            bin.segment_num() = seg;
+            bin.axial_pos_num() = ax;
+            bin.view_num() = view;
+            bin.tangential_pos_num() = tang;
+
+            //                check det_pos instead
+            proj_data_info_blocks_doi0_ptr->get_det_pair_for_bin(Bdet1, Bring1, Bdet2, Bring2, bin);
+            proj_data_info_blocks_doi01_ptr->get_det_pair_for_bin(BDdet1, BDring1, BDdet2, BDring2, bin);
+
+            proj_data_info_blocks_doi0_ptr->get_LOR(lor, bin);
+            set_tolerance(10E-4);
+
+            check_if_equal(Bdet1, BDdet1, "");
+            check_if_equal(Bdet2, BDdet2, "");
+            check_if_equal(Bring1, BDring1, "");
+            check_if_equal(Bring2, BDring2, "");
+
+            //                checkcartesian coordinates of detectors
+            proj_data_info_blocks_doi0_ptr->find_cartesian_coordinates_of_detection(b1, b2, bin);
+            proj_data_info_blocks_doi01_ptr->find_cartesian_coordinates_of_detection(bd1, bd2, bin);
+
+            //               set_tolerance(10E-2);
+            check(b1 != bd1, "detector position should be different with different DOIs");
+            check(b2 != bd2, "detector position should be different with different DOIs");
+            // TODO improve check here
+          }
+  timer.stop();
+  std::cerr << "-- CPU Time " << timer.value() << '\n';
+}
+
+/*!
+  The following tests the consistency of coordinates obtained with a cilindrical scanner
+  and those of a blocks on cylindrical scanner. For this test, a scanner with 4 rings, 2
+  detector per block and 2 blcs per bucket is used axially. However, transaxially we have
+  1 crystal per block a 1 block per bucket
+
+  In this function, an extra test is performed to check that a roundtrip
+  transformation: detector_ID->cartesian_coord_detection_pos->detector_ID
+  provides the same as the starting point
+*/
+void
+ProjDataInfoTests::run_coordinate_test()
+{
+  CPUTimer timer;
+  auto scannerBlocks_ptr = std::make_shared<Scanner>(Scanner::SAFIRDualRingPrototype);
+  scannerBlocks_ptr->set_num_axial_crystals_per_block(2);
+  scannerBlocks_ptr->set_axial_block_spacing(scannerBlocks_ptr->get_axial_crystal_spacing()
+                                             * scannerBlocks_ptr->get_num_axial_crystals_per_block());
+  scannerBlocks_ptr->set_num_transaxial_crystals_per_block(1);
+  scannerBlocks_ptr->set_num_axial_blocks_per_bucket(2);
+  scannerBlocks_ptr->set_num_transaxial_blocks_per_bucket(1);
+  scannerBlocks_ptr->set_transaxial_block_spacing(scannerBlocks_ptr->get_transaxial_crystal_spacing()
+                                                  * scannerBlocks_ptr->get_num_transaxial_crystals_per_block());
+  scannerBlocks_ptr->set_num_rings(4);
+
+  scannerBlocks_ptr->set_scanner_geometry("BlocksOnCylindrical");
+  scannerBlocks_ptr->set_up();
+
+  auto scannerCyl_ptr = std::make_shared<Scanner>(Scanner::SAFIRDualRingPrototype);
+  scannerCyl_ptr->set_num_axial_crystals_per_block(2);
+  scannerCyl_ptr->set_axial_block_spacing(scannerCyl_ptr->get_axial_crystal_spacing()
+                                          * scannerCyl_ptr->get_num_axial_crystals_per_block());
+  scannerCyl_ptr->set_transaxial_block_spacing(scannerCyl_ptr->get_transaxial_crystal_spacing()
+                                               * scannerCyl_ptr->get_num_transaxial_crystals_per_block());
+  scannerCyl_ptr->set_num_transaxial_crystals_per_block(1);
+  scannerCyl_ptr->set_num_axial_blocks_per_bucket(2);
+  scannerCyl_ptr->set_num_transaxial_blocks_per_bucket(1);
+
+  scannerCyl_ptr->set_num_rings(4);
+  scannerCyl_ptr->set_scanner_geometry("Cylindrical");
+  scannerCyl_ptr->set_up();
+
+  auto proj_data_info_blocks_ptr = std::make_shared<ProjDataInfoBlocksOnCylindricalNoArcCorr>();
+  proj_data_info_blocks_ptr = set_blocks_projdata_info<ProjDataInfoBlocksOnCylindricalNoArcCorr>(scannerBlocks_ptr);
+
+  auto proj_data_info_cyl_ptr = std::make_shared<ProjDataInfoCylindricalNoArcCorr>();
+  proj_data_info_cyl_ptr = set_blocks_projdata_info<ProjDataInfoCylindricalNoArcCorr>(scannerCyl_ptr);
+  Bin bin, binRT;
+
+  int Bring1, Bring2, Bdet1, Bdet2, Cring1, Cring2, Cdet1, Cdet2;
+  int RTring1, RTring2, RTdet1, RTdet2;
+  CartesianCoordinate3D<float> b1, b2, c1, c2, roundt1, roundt2;
+  timer.reset();
+  timer.start();
+  LORInAxialAndNoArcCorrSinogramCoordinates<float> lorB;
+  LORInAxialAndNoArcCorrSinogramCoordinates<float> lorC;
+
+  LORInAxialAndNoArcCorrSinogramCoordinates<float> lorC1, lorCn;
+
+  for (int seg = proj_data_info_blocks_ptr->get_min_segment_num(); seg <= proj_data_info_blocks_ptr->get_max_segment_num(); ++seg)
+    for (int ax = proj_data_info_blocks_ptr->get_min_axial_pos_num(seg);
+         ax <= proj_data_info_blocks_ptr->get_max_axial_pos_num(seg); ++ax)
+      for (int view = 0; view <= proj_data_info_blocks_ptr->get_max_view_num(); view++)
+        for (int tang = proj_data_info_blocks_ptr->get_min_tangential_pos_num();
+             tang <= proj_data_info_blocks_ptr->get_max_tangential_pos_num(); ++tang)
+          {
+            bin.segment_num() = seg;
+            bin.axial_pos_num() = ax;
+            bin.view_num() = view;
+            bin.tangential_pos_num() = tang;
+
+            proj_data_info_cyl_ptr->get_LOR(lorC, bin);
+            proj_data_info_blocks_ptr->get_LOR(lorB, bin);
+
+            const int num_detectors = proj_data_info_cyl_ptr->get_scanner_ptr()->get_num_detectors_per_ring();
+
+            int det_num1 = 0, det_num2 = 0;
+            proj_data_info_cyl_ptr->get_det_num_pair_for_view_tangential_pos_num(det_num1, det_num2, bin.view_num(),
+                                                                                 bin.tangential_pos_num());
+
+            float phi;
+            phi = static_cast<float>((det_num1 + det_num2) * _PI / num_detectors - _PI / 2
+                                     + proj_data_info_cyl_ptr->get_azimuthal_angle_offset());
+
+            lorC1 = LORInAxialAndNoArcCorrSinogramCoordinates<float>(lorC.z1(), lorC.z2(),
+                                                                     phi, // lorC.phi(),
+                                                                     lorC.beta(), proj_data_info_cyl_ptr->get_ring_radius());
+
+            const float old_phi = proj_data_info_cyl_ptr->get_phi(bin);
+            if (fabs(phi - old_phi) >= 2 * _PI / num_detectors)
+              {
+                // float ang=2*_PI/num_detectors/2;
+                //                  warning("view %d old_phi %g new_phi %g\n",bin.view_num(), old_phi, phi);
+
+                lorC1 = LORInAxialAndNoArcCorrSinogramCoordinates<float>(lorC.z2(), lorC.z1(),
+                                                                         phi, // lorC.phi(),
+                                                                         -lorC.beta(), proj_data_info_cyl_ptr->get_ring_radius());
+              }
+            //                check det_pos instead
+            proj_data_info_blocks_ptr->get_det_pair_for_bin(Bdet1, Bring1, Bdet2, Bring2, bin);
+            proj_data_info_cyl_ptr->get_det_pair_for_bin(Cdet1, Cring1, Cdet2, Cring2, bin);
+
+            set_tolerance(10E-4);
+
+            check_if_equal(Bdet1, Cdet1, "");
+            check_if_equal(Bdet2, Cdet2, "");
+            check_if_equal(Bring1, Cring1, "");
+            check_if_equal(Bring2, Cring2, "");
+
+            //                test round trip from detector ID to coordinates and from cordinates to detecto IDs
+            proj_data_info_blocks_ptr->find_cartesian_coordinates_given_scanner_coordinates(roundt1, roundt2, Bring1, Bring2,
+                                                                                            Bdet1, Bdet2);
+            proj_data_info_blocks_ptr->find_bin_given_cartesian_coordinates_of_detection(binRT, roundt1, roundt2);
+            proj_data_info_blocks_ptr->get_det_pair_for_bin(RTdet1, RTring1, RTdet2, RTring2, bin);
+
+            check_if_equal(Bdet1, RTdet1, "Roundtrip from detector A ID to coordinates and from cordinates to detector A ID");
+            check_if_equal(Bdet2, RTdet2, "Roundtrip from detector B ID to coordinates and from cordinates to detector B ID");
+            check_if_equal(Bring1, RTring1, "Roundtrip from ring A ID to coordinates and from cordinates to ring A ID");
+            check_if_equal(Bring2, RTring2, "Roundtrip from ring B ID to coordinates and from cordinates to ring B ID");
+
+            //                checkcartesian coordinates of detectors
+            proj_data_info_cyl_ptr->find_cartesian_coordinates_of_detection(c1, c2, bin);
+            proj_data_info_blocks_ptr->find_cartesian_coordinates_of_detection(b1, b2, bin);
+
+            check_if_equal(b1, c1, "");
+            check_if_equal(b2, c2, "");
+
+            set_tolerance(10E-3);
+
+            if (abs(lorB.phi() - lorC1.phi()) < tolerance)
+              {
+
+                check_if_equal(proj_data_info_blocks_ptr->get_s(bin), lorB.s(),
+                               "A get_s() from projdata is different from Block on Cylindrical LOR.s()");
+
+                check_if_equal(lorB.s(), lorC1.s(),
+                               "tang_pos=" + std::to_string(tang) + " PHI-C=" + std::to_string(lorC1.phi())
+                                   + " PHI-B=" + std::to_string(lorB.phi()) + " view=" + std::to_string(view)
+                                   + " Atest if BlocksOnCylindrical LOR.s is the same as the LOR produced by Cylindrical"); //)
+
+                check_if_equal(lorB.beta(), lorC1.beta(),
+                               "tang_pos=" + std::to_string(tang) + " ax_pos=" + std::to_string(ax)
+                                   + " segment=" + std::to_string(seg) + " view=" + std::to_string(view)
+                                   + " test if BlocksOnCylindrical LOR.beta is the same as the LOR produced by Cylindrical");
+                check_if_equal(lorB.z1(), lorC1.z1(),
+                               "tang_pos=" + std::to_string(tang) + " ax_pos=" + std::to_string(ax)
+                                   + " segment=" + std::to_string(seg) + " view=" + std::to_string(view)
+                                   + " test if BlocksOnCylindrical LOR.z1 is the same as the LOR produced by Cylindrical");
+                check_if_equal(lorB.z2(), lorC1.z2(),
+                               "tang_pos=" + std::to_string(tang) + " ax_pos=" + std::to_string(ax)
+                                   + " segment=" + std::to_string(seg) + " view=" + std::to_string(view)
+                                   + " test if BlocksOnCylindrical LOR.z2 is the same as the LOR produced by Cylindrical");
+
+                //                TODO: fix problem with interleaving when calculating Phi
+              }
+            else if (abs(lorB.phi() - lorC1.phi()) + _PI < tolerance || abs(lorB.phi() - lorC1.phi()) - _PI < tolerance)
+              {
+
+                check_if_equal(proj_data_info_blocks_ptr->get_s(bin), lorB.s(),
+                               "B get_s() from projdata is different from Block on Cylindrical LOR.s()");
+                check_if_equal(proj_data_info_blocks_ptr->get_phi(bin), phi - _PI,
+                               "B get_phi() from projdata Cylinder is different from Block on Cylindrical");
+
+                check_if_equal(lorB.s(), -lorC1.s(),
+                               "tang_pos=" + std::to_string(tang) + " PHYC=" + std::to_string(lorC1.phi())
+                                   + " PHIB=" + std::to_string(lorB.phi()) + " view=" + std::to_string(view)
+                                   + " Btest if BlocksOnCylindrical LOR.s is the same as the LOR produced by Cylindrical"); //)
+                check_if_equal(lorB.beta(), -lorC1.beta(),
+                               " Btest if BlocksOnCylindrical LOR.beta is the same as the LOR produced by Cylindrical");
+                check_if_equal(lorB.z1(), lorC1.z2(),
+                               "tang_pos=" + std::to_string(tang) + " ax_pos=" + std::to_string(ax)
+                                   + " segment=" + std::to_string(seg) + " view=" + std::to_string(view)
+                                   + " Btest if BlocksOnCylindrical LOR.z1 is the same as the LOR produced by Cylindrical");
+                check_if_equal(lorB.z2(), lorC1.z1(),
+                               " Btest if BlocksOnCylindrical LOR.z2 is the same as the LOR produced by Cylindrical");
+              }
+            else
+              {
+                check(false, "phi is different");
+              }
+            check_if_equal(proj_data_info_blocks_ptr->get_m(bin), proj_data_info_cyl_ptr->get_m(bin), " test get_m Cylindrical");
+          }
+  timer.stop();
+  std::cerr << "-- CPU Time " << timer.value() << '\n';
+}
+
+/*!
+  The following test is similar to the above but for a scanner that has multiple rings and
+  multiple detectors per block.
+*/
+void
+ProjDataInfoTests::run_coordinate_test_for_realistic_scanner()
+{
+  CPUTimer timer;
+  auto scannerBlocks_ptr = std::make_shared<Scanner>(Scanner::SAFIRDualRingPrototype);
+  scannerBlocks_ptr->set_axial_block_spacing(scannerBlocks_ptr->get_axial_crystal_spacing()
+                                             * scannerBlocks_ptr->get_num_axial_crystals_per_block());
+  scannerBlocks_ptr->set_transaxial_block_spacing(scannerBlocks_ptr->get_transaxial_crystal_spacing()
+                                                  * scannerBlocks_ptr->get_num_transaxial_crystals_per_block());
+
+  scannerBlocks_ptr->set_scanner_geometry("BlocksOnCylindrical");
+  scannerBlocks_ptr->set_up();
+
+  auto scannerCyl_ptr = std::make_shared<Scanner>(Scanner::SAFIRDualRingPrototype);
+  scannerCyl_ptr->set_axial_block_spacing(scannerCyl_ptr->get_axial_crystal_spacing()
+                                          * scannerCyl_ptr->get_num_axial_crystals_per_block());
+  scannerCyl_ptr->set_transaxial_block_spacing(scannerCyl_ptr->get_transaxial_crystal_spacing()
+                                               * scannerCyl_ptr->get_num_transaxial_crystals_per_block());
+
+  scannerCyl_ptr->set_scanner_geometry("Cylindrical");
+  scannerCyl_ptr->set_up();
+
+  auto proj_data_info_blocks_ptr = std::make_shared<ProjDataInfoBlocksOnCylindricalNoArcCorr>();
+  proj_data_info_blocks_ptr = set_blocks_projdata_info<ProjDataInfoBlocksOnCylindricalNoArcCorr>(scannerBlocks_ptr);
+
+  auto proj_data_info_cyl_ptr = std::make_shared<ProjDataInfoCylindricalNoArcCorr>();
+  proj_data_info_cyl_ptr = set_blocks_projdata_info<ProjDataInfoCylindricalNoArcCorr>(scannerCyl_ptr);
+
+  Bin bin;
+
+  int Bring1, Bring2, Bdet1, Bdet2, Cring1, Cring2, Cdet1, Cdet2;
+  CartesianCoordinate3D<float> b1, b2, c1, c2;
+
+  //    estimate the angle covered by half bucket, csi
+  float csi = _PI / scannerBlocks_ptr->get_num_transaxial_buckets();
+  //    distance between the center of the scannner and the first crystal in the bucket, r=Reffective/cos(csi)
+  float r = scannerBlocks_ptr->get_effective_ring_radius() / cos(csi);
+  float max_tolerance = abs(scannerBlocks_ptr->get_effective_ring_radius() - r);
+
+  timer.reset();
+  timer.start();
+  LORInAxialAndNoArcCorrSinogramCoordinates<float> lorB;
+  LORInAxialAndNoArcCorrSinogramCoordinates<float> lorC;
+
+  LORInAxialAndNoArcCorrSinogramCoordinates<float> lorC1, lorCn;
+
+  for (int seg = proj_data_info_blocks_ptr->get_min_segment_num(); seg <= proj_data_info_blocks_ptr->get_max_segment_num(); ++seg)
+    for (int ax = proj_data_info_blocks_ptr->get_min_axial_pos_num(seg);
+         ax <= proj_data_info_blocks_ptr->get_max_axial_pos_num(seg); ++ax)
+      for (int view = 0; view <= proj_data_info_blocks_ptr->get_max_view_num(); view++)
+        for (int tang = proj_data_info_blocks_ptr->get_min_tangential_pos_num();
+             tang <= proj_data_info_blocks_ptr->get_max_tangential_pos_num(); ++tang)
+          {
+            bin.segment_num() = seg;
+            bin.axial_pos_num() = ax;
+            bin.view_num() = view;
+            bin.tangential_pos_num() = tang;
+
+            proj_data_info_cyl_ptr->get_LOR(lorC, bin);
+            proj_data_info_blocks_ptr->get_LOR(lorB, bin);
+
+            int det_num1 = 0, det_num2 = 0;
+            proj_data_info_cyl_ptr->get_det_num_pair_for_view_tangential_pos_num(det_num1, det_num2, bin.view_num(),
+                                                                                 bin.tangential_pos_num());
+
+            //                check det_pos instead
+            proj_data_info_blocks_ptr->get_det_pair_for_bin(Bdet1, Bring1, Bdet2, Bring2, bin);
+            proj_data_info_cyl_ptr->get_det_pair_for_bin(Cdet1, Cring1, Cdet2, Cring2, bin);
+
+            set_tolerance(10E-4);
+
+            check_if_equal(Bdet1, Cdet1, "");
+            check_if_equal(Bdet2, Cdet2, "");
+            check_if_equal(Bring1, Cring1, "");
+            check_if_equal(Bring2, Cring2, "");
+
+            //                check cartesian coordinates of detectors
+            proj_data_info_cyl_ptr->find_cartesian_coordinates_of_detection(c1, c2, bin);
+            proj_data_info_blocks_ptr->find_cartesian_coordinates_of_detection(b1, b2, bin);
+
+            // we expect to be differences of the order of the mm in x and y due to the difference in geometry
+
+            set_tolerance(max_tolerance);
+
+            check_if_equal(b1.y(), c1.y(), " checking cartesian coordinate y1");
+            check_if_equal(b2.y(), c2.y(), " checking cartesian coordinate y2");
+            check_if_equal(b1.x(), c1.x(), " checking cartesian coordinate x1");
+            check_if_equal(b2.x(), c2.x(), " checking cartesian coordinate x2");
+
+            /*!calculate the max axial tolerance, the difference between m (blocks vs cylindrical) happens when the point A is at
+             * the beginning of a transaxial bucket and the point B is in the middle of the bucket (which is the point where the
+             * radius of circle and the radius of the poligon have the biggest difference
+             * !*/
+            float psi = atan(abs(lorB.z2() - lorB.z1()) / r);
+            float max_ax_tolerance = abs(scannerBlocks_ptr->get_effective_ring_radius() - r) / cos(psi);
+            set_tolerance(max_ax_tolerance);
+            check_if_equal(b1.z(), c1.z(), " checking cartesian coordinate z1");
+            check_if_equal(b2.z(), c2.z(), " checking cartesian coordinate z2");
+            check_if_equal(proj_data_info_blocks_ptr->get_m(bin), proj_data_info_cyl_ptr->get_m(bin), " test get_m Cylindrical");
+          }
+  timer.stop();
+  std::cerr << "-- CPU Time " << timer.value() << '\n';
+}
+
+/*!
+  The following tests the function get_s() for the BlockOnCylindrical case. the first test
+  checks that all lines passing for the center provide s=0. The second test checks that
+  parallel lines are always at the same angle phi, and that the step between consecutive
+  lines is the same and equal to the one calculated geometrically.
+*/
+void
+ProjDataInfoTests::run_lor_get_s_test()
+{
+  CPUTimer timer;
+  auto scannerBlocks_ptr = std::make_shared<Scanner>(Scanner::SAFIRDualRingPrototype);
+  scannerBlocks_ptr->set_axial_block_spacing(scannerBlocks_ptr->get_axial_crystal_spacing()
+                                             * scannerBlocks_ptr->get_num_axial_crystals_per_block());
+  scannerBlocks_ptr->set_transaxial_block_spacing(scannerBlocks_ptr->get_transaxial_crystal_spacing()
+                                                  * scannerBlocks_ptr->get_num_transaxial_crystals_per_block());
+
+  scannerBlocks_ptr->set_scanner_geometry("BlocksOnCylindrical");
+  scannerBlocks_ptr->set_up();
+
+  auto scannerCyl_ptr = std::make_shared<Scanner>(Scanner::SAFIRDualRingPrototype);
+  scannerCyl_ptr->set_axial_block_spacing(scannerCyl_ptr->get_axial_crystal_spacing()
+                                          * scannerCyl_ptr->get_num_axial_crystals_per_block());
+  scannerCyl_ptr->set_transaxial_block_spacing(scannerCyl_ptr->get_transaxial_crystal_spacing()
+                                               * scannerCyl_ptr->get_num_transaxial_crystals_per_block());
+
+  scannerCyl_ptr->set_scanner_geometry("Cylindrical");
+  scannerCyl_ptr->set_up();
+
+  auto proj_data_info_blocks_ptr = std::make_shared<ProjDataInfoBlocksOnCylindricalNoArcCorr>();
+  proj_data_info_blocks_ptr = set_blocks_projdata_info<ProjDataInfoBlocksOnCylindricalNoArcCorr>(scannerBlocks_ptr);
+
+  auto proj_data_info_cyl_ptr = std::make_shared<ProjDataInfoCylindricalNoArcCorr>();
+  proj_data_info_cyl_ptr = set_blocks_projdata_info<ProjDataInfoCylindricalNoArcCorr>(scannerCyl_ptr);
+  // select detection position 1
+
+  LORInAxialAndNoArcCorrSinogramCoordinates<float> lorB;
+  LORInAxialAndNoArcCorrSinogramCoordinates<float> lorC;
+  int Cring1, Cring2, Cdet1, Cdet2;
+  Bin bin;
+  //    Det<> pos1(0,0,0);
+  set_tolerance(10E-4);
+  for (int i = 0; i < scannerCyl_ptr->get_num_detectors_per_ring(); i++)
+    {
+
+      Cring1 = 0;
+      Cdet1 = i;
+      Cring2 = 0;
+      Cdet2 = scannerCyl_ptr->get_num_detectors_per_ring() / 2 + Cdet1;
+      if (Cdet2 >= scannerCyl_ptr->get_num_detectors_per_ring())
+        Cdet2 = Cdet1 - scannerCyl_ptr->get_num_detectors_per_ring() / 2;
+
+      proj_data_info_cyl_ptr->get_bin_for_det_pair(bin, Cdet1, Cring1, Cdet2, Cring2);
+      proj_data_info_cyl_ptr->get_LOR(lorC, bin);
+
+      proj_data_info_blocks_ptr->get_bin_for_det_pair(bin, Cdet1, Cring1, Cdet2, Cring2);
+      proj_data_info_blocks_ptr->get_LOR(lorB, bin);
+
+      check_if_equal(0., lorC.s(),
+                     std::to_string(i) + " Cylinder get_s() should be zero when the LOR passes at the center of the scanner");
+      check_if_equal(0., lorB.s(),
+                     std::to_string(i) + " Blocks get_s() should be zero when the LOR passes at the center of the scanner");
+    }
+
+  //    Check get_s() (for BlocksOnCylindrical) when the line is at a given angle. We consider two blocks at a relative angle of
+  //    90 degrees the angle covered by the detectors is 120 (each block is 30 degrees and the detector are 4 blocks apart). The
+  //    following LOR will be obtained by increasing detID1 and decreasing detID2 so that they are always parallel.
+  //
+
+  //    Let's calculate the relative ID difference between block1 and block2 in coincidence
+  //    num_det_per_ring:2PI=det_id_diff:PI/2
+  int det_id_diff = scannerBlocks_ptr->get_num_detectors_per_ring() / 4;
+  int Ctb = scannerCyl_ptr->get_num_transaxial_crystals_per_block();
+  float transaxial_crystal_spacing = scannerBlocks_ptr->get_transaxial_crystal_spacing();
+  float prev_s = 0;
+  float prev_phi = 0;
+  for (int i = 0; i < scannerCyl_ptr->get_num_transaxial_crystals_per_block(); i++)
+    {
+
+      Cring1 = 0;
+      Cdet1 = i + 2 * Ctb;
+      Cring2 = 0;
+      Cdet2 = 2 * Ctb + det_id_diff + Ctb - 1 - i;
+
+      proj_data_info_blocks_ptr->get_bin_for_det_pair(bin, Cdet1, Cring1, Cdet2, Cring1);
+      proj_data_info_blocks_ptr->get_LOR(lorB, bin);
+      /*float R=block_trans_spacing*(sin(_PI*5/12)+sin(_PI/4)+sin(_PI/12));
+        float s=R*cos(_PI/3)+
+              transaxial_crystal_spacing/2*sin(_PI/4)+
+              (i)*transaxial_crystal_spacing*sin(_PI/4);*/
+
+      float s_step = transaxial_crystal_spacing * sin(_PI / 4);
+
+      //        the following fails at the moment
+      //        check_if_equal(s, lorB.s(),std::to_string(i)+ " Blocks get_s()  is different");
+      //        the first value we expect to be different
+      set_tolerance(10E-3);
+      if (i > 0)
+        {
+          check_if_equal(s_step, lorB.s() - prev_s, std::to_string(i) + " Blocks get_s() the step is different");
+          check_if_equal(0.F, lorB.phi() - prev_phi,
+                         " Blocks get_phi() should be always the same as we are considering parallel LORs");
+        }
+      prev_s = lorB.s();
+      prev_phi = lorB.phi();
+    }
+}
+
 /*!
   \ingroup test
   \brief Test class for ProjDataInfoCylindricalArcCorr
 */
 
-class ProjDataInfoCylindricalArcCorrTests: public ProjDataInfoCylindricalTests
+class ProjDataInfoCylindricalArcCorrTests : public ProjDataInfoCylindricalTests
 {
-public:  
+public:
   void run_tests();
 };
 
-
 void
 ProjDataInfoCylindricalArcCorrTests::run_tests()
 
-{ 
+{
+
+  std::cerr << "-------- Testing ProjData Geometry --------\n";
+
+  std::cerr << "-------- Testing DOI for blocks --------\n";
+  run_Blocks_DOI_test();
+  std::cerr << "-------- Testing coordinates --------\n";
+  run_lor_get_s_test();
+  run_coordinate_test();
+  run_coordinate_test_for_realistic_scanner();
+
   cerr << "-------- Testing ProjDataInfoCylindricalArcCorr --------\n";
   {
     // Test on the empty constructor
-    
+
     ProjDataInfoCylindricalArcCorr ob1;
-    
+
     // Test on set.* & get.* + constructor
     const float test_tangential_sampling = 1.5;
-    //const float test_azimuthal_angle_sampling = 10.1;
-    
+    // const float test_azimuthal_angle_sampling = 10.1;
+
     ob1.set_tangential_sampling(test_tangential_sampling);
     // Set_azimuthal_angle_sampling
     // ob1.set_azimuthal_angle_sampling(test_azimuthal_angle_sampling);
-    
-    
-    check_if_equal( ob1.get_tangential_sampling(), test_tangential_sampling,"test on tangential_sampling");
-    //check_if_zero( ob1.get_azimuthal_angle_sampling() - test_azimuthal_angle_sampling, " test on azimuthal_angle_sampling");
-    
+
+    check_if_equal(ob1.get_tangential_sampling(), test_tangential_sampling, "test on tangential_sampling");
+    // check_if_zero( ob1.get_azimuthal_angle_sampling() - test_azimuthal_angle_sampling, " test on azimuthal_angle_sampling");
   }
   {
     shared_ptr<Scanner> scanner_ptr(new Scanner(Scanner::E953));
-    
-    VectorWithOffset<int> num_axial_pos_per_segment(-1,1);
-    VectorWithOffset<int> min_ring_diff(-1,1); 
-    VectorWithOffset<int> max_ring_diff(-1,1);
+
+    VectorWithOffset<int> num_axial_pos_per_segment(-1, 1);
+    VectorWithOffset<int> min_ring_diff(-1, 1);
+    VectorWithOffset<int> max_ring_diff(-1, 1);
     // simulate span=3 for segment 0, span=1 for segment 2
-    num_axial_pos_per_segment[-1]=14;
-    num_axial_pos_per_segment[0]=31;
-    num_axial_pos_per_segment[1]=14;
+    num_axial_pos_per_segment[-1] = 14;
+    num_axial_pos_per_segment[0] = 31;
+    num_axial_pos_per_segment[1] = 14;
     // KT 28/11/2001 corrected typo (bug): min_ring_diff[-1] was initialised twice, and max_ring_diff[-1] wasn't
     min_ring_diff[-1] = max_ring_diff[-1] = -2;
-    min_ring_diff[ 0] = -1; max_ring_diff[ 0] = 1;
+    min_ring_diff[0] = -1;
+    max_ring_diff[0] = 1;
     min_ring_diff[+1] = max_ring_diff[+1] = +2;
     const int num_views = 96;
     const int num_tangential_poss = 128;
-    
+
     const float bin_size = 1.2F;
-    
-    
-    //Test on the constructor
-    ProjDataInfoCylindricalArcCorr
-      ob2(scanner_ptr, bin_size, 
-      num_axial_pos_per_segment, min_ring_diff, max_ring_diff,
-      num_views,num_tangential_poss);
-    
-    check_if_equal( ob2.get_tangential_sampling(), bin_size,"test on tangential_sampling");
-    check_if_equal( ob2.get_azimuthal_angle_sampling() , _PI/num_views, " test on azimuthal_angle_sampling");
-    check_if_equal( ob2.get_axial_sampling(1),  scanner_ptr->get_ring_spacing(), "test on axial_sampling");
-    check_if_equal( ob2.get_axial_sampling(0), scanner_ptr->get_ring_spacing()/2, "test on axial_sampling for segment0");
-    
+
+    // Test on the constructor
+    ProjDataInfoCylindricalArcCorr ob2(scanner_ptr, bin_size, num_axial_pos_per_segment, min_ring_diff, max_ring_diff, num_views,
+                                       num_tangential_poss);
+
+    check_if_equal(ob2.get_tangential_sampling(), bin_size, "test on tangential_sampling");
+    check_if_equal(ob2.get_azimuthal_angle_sampling(), _PI / num_views, " test on azimuthal_angle_sampling");
+    check_if_equal(ob2.get_axial_sampling(1), scanner_ptr->get_ring_spacing(), "test on axial_sampling");
+    check_if_equal(ob2.get_axial_sampling(0), scanner_ptr->get_ring_spacing() / 2, "test on axial_sampling for segment0");
+
     {
       // segment 0
-      Bin bin(0,10,10,20);
+      Bin bin(0, 10, 10, 20);
       float theta = ob2.get_tantheta(bin);
-      float phi = ob2.get_phi(bin); 
+      float phi = ob2.get_phi(bin);
       // Get t
       float t = ob2.get_t(bin);
       //! Get s
       float s = ob2.get_s(bin);
-      
-      check_if_equal( theta, 0.F,"test on get_tantheta, seg 0");
-      check_if_equal( phi, 10*ob2.get_azimuthal_angle_sampling()+ ob2.get_azimuthal_angle_offset(), " get_phi , seg 0");
+
+      check_if_equal(theta, 0.F, "test on get_tantheta, seg 0");
+      check_if_equal(phi, 10 * ob2.get_azimuthal_angle_sampling() + ob2.get_azimuthal_angle_offset(), " get_phi , seg 0");
       // KT 25/10/2000 adjust to new convention
-      const float ax_pos_origin =
-	(ob2.get_min_axial_pos_num(0) + ob2.get_max_axial_pos_num(0))/2.F;
-      check_if_equal( t, (10-ax_pos_origin)*ob2.get_axial_sampling(0) , "get_t, seg 0");
-      check_if_equal( s, 20*ob2.get_tangential_sampling() , "get_s, seg 0");
+      const float ax_pos_origin = (ob2.get_min_axial_pos_num(0) + ob2.get_max_axial_pos_num(0)) / 2.F;
+      check_if_equal(t, (10 - ax_pos_origin) * ob2.get_axial_sampling(0), "get_t, seg 0");
+      check_if_equal(s, 20 * ob2.get_tangential_sampling(), "get_s, seg 0");
     }
     {
       // Segment 1
-      Bin bin (1,10,10,20);
+      Bin bin(1, 10, 10, 20);
       float theta = ob2.get_tantheta(bin);
-      float phi = ob2.get_phi(bin); 
+      float phi = ob2.get_phi(bin);
       // Get t
       float t = ob2.get_t(bin);
       // Get s
       float s = ob2.get_s(bin);
-      
-      float thetatest = 2*ob2.get_axial_sampling(1)/(2*sqrt(square(scanner_ptr->get_effective_ring_radius())-square(s)));
-      
-      check_if_equal( theta, thetatest,"test on get_tantheta, seg 1");
-      check_if_equal( phi, 10*ob2.get_azimuthal_angle_sampling()+ ob2.get_azimuthal_angle_offset(), " get_phi , seg 1");
+
+      float thetatest = 2 * ob2.get_axial_sampling(1) / (2 * sqrt(square(scanner_ptr->get_effective_ring_radius()) - square(s)));
+
+      check_if_equal(theta, thetatest, "test on get_tantheta, seg 1");
+      check_if_equal(phi, 10 * ob2.get_azimuthal_angle_sampling() + ob2.get_azimuthal_angle_offset(), " get_phi , seg 1");
       // KT 25/10/2000 adjust to new convention
-      const float ax_pos_origin =
-	(ob2.get_min_axial_pos_num(1) + ob2.get_max_axial_pos_num(1))/2.F;
-      check_if_equal( t, (10-ax_pos_origin)/sqrt(1+square(thetatest))*ob2.get_axial_sampling(1) , "get_t, seg 1");
-      check_if_equal( s, 20*ob2.get_tangential_sampling() , "get_s, seg 1");
+      const float ax_pos_origin = (ob2.get_min_axial_pos_num(1) + ob2.get_max_axial_pos_num(1)) / 2.F;
+      check_if_equal(t, (10 - ax_pos_origin) / sqrt(1 + square(thetatest)) * ob2.get_axial_sampling(1), "get_t, seg 1");
+      check_if_equal(s, 20 * ob2.get_tangential_sampling(), "get_s, seg 1");
     }
 
 #if 0
@@ -561,316 +1012,281 @@ ProjDataInfoCylindricalArcCorrTests::run_tests()
   }
 #endif
 
-
- shared_ptr<Scanner> scanner_ptr(new Scanner(Scanner::E953));
+  shared_ptr<Scanner> scanner_ptr(new Scanner(Scanner::E953));
   cerr << "Tests with proj_data_info without mashing and axial compression\n\n";
-  // Note: test without axial compression requires that all ring differences 
+  // Note: test without axial compression requires that all ring differences
   // are in some segment, so use maximum ring difference
   shared_ptr<ProjDataInfo> proj_data_info_ptr(
-	ProjDataInfo::construct_proj_data_info(scanner_ptr,
-				  /*span*/1, scanner_ptr->get_num_rings()-1,
-				  /*views*/ scanner_ptr->get_num_detectors_per_ring()/2, 
-				  /*tang_pos*/64, 
-				  /*arc_corrected*/ true));
-  test_cylindrical_proj_data_info(dynamic_cast<ProjDataInfoCylindricalArcCorr &>(*proj_data_info_ptr));
+      ProjDataInfo::construct_proj_data_info(scanner_ptr,
+                                             /*span*/ 1, scanner_ptr->get_num_rings() - 1,
+                                             /*views*/ scanner_ptr->get_num_detectors_per_ring() / 2,
+                                             /*tang_pos*/ 64,
+                                             /*arc_corrected*/ true));
+  test_cylindrical_proj_data_info(dynamic_cast<ProjDataInfoCylindricalArcCorr&>(*proj_data_info_ptr));
 
   cerr << "\nTests with proj_data_info with mashing and axial compression (span 5)\n\n";
-  proj_data_info_ptr =
-    ProjDataInfo::construct_proj_data_info(scanner_ptr,
-				  /*span*/5, scanner_ptr->get_num_rings()-1,
-				  /*views*/ scanner_ptr->get_num_detectors_per_ring()/2/8, 
-				  /*tang_pos*/64, 
-				  /*arc_corrected*/ true);
-  test_cylindrical_proj_data_info(dynamic_cast<ProjDataInfoCylindricalArcCorr &>(*proj_data_info_ptr));
+  proj_data_info_ptr = ProjDataInfo::construct_proj_data_info(scanner_ptr,
+                                                              /*span*/ 5, scanner_ptr->get_num_rings() - 1,
+                                                              /*views*/ scanner_ptr->get_num_detectors_per_ring() / 2 / 8,
+                                                              /*tang_pos*/ 64,
+                                                              /*arc_corrected*/ true);
+  test_cylindrical_proj_data_info(dynamic_cast<ProjDataInfoCylindricalArcCorr&>(*proj_data_info_ptr));
 
   cerr << "\nTests with proj_data_info with mashing and axial compression (span 4)\n\n";
-  proj_data_info_ptr =
-		ProjDataInfo::construct_proj_data_info(scanner_ptr,
-			/*span*/4, scanner_ptr->get_num_rings() - 1,
-			/*views*/ scanner_ptr->get_num_detectors_per_ring() / 2 / 8,
-			/*tang_pos*/64,
-			/*arc_corrected*/ true);
+  proj_data_info_ptr = ProjDataInfo::construct_proj_data_info(scanner_ptr,
+                                                              /*span*/ 4, scanner_ptr->get_num_rings() - 1,
+                                                              /*views*/ scanner_ptr->get_num_detectors_per_ring() / 2 / 8,
+                                                              /*tang_pos*/ 64,
+                                                              /*arc_corrected*/ true);
 #if 0
 	// disabled to get noninteractive test
 	michelogram(dynamic_cast<ProjDataInfoCylindrical&>(*proj_data_info_ptr));
 	cerr << endl;
 #endif
-  test_cylindrical_proj_data_info(dynamic_cast<ProjDataInfoCylindricalArcCorr &>(*proj_data_info_ptr)); 
+  test_cylindrical_proj_data_info(dynamic_cast<ProjDataInfoCylindricalArcCorr&>(*proj_data_info_ptr));
 }
 
-
 /*!
   \ingroup test
   \brief Test class for ProjDataInfoCylindricalNoArcCorr
 */
 
-class ProjDataInfoCylindricalNoArcCorrTests: public ProjDataInfoCylindricalTests
+class ProjDataInfoCylindricalNoArcCorrTests : public ProjDataInfoCylindricalTests
 {
-public:  
+public:
   void run_tests();
+
 private:
   void test_proj_data_info(ProjDataInfoCylindricalNoArcCorr& proj_data_info);
 };
 
-
 void
-ProjDataInfoCylindricalNoArcCorrTests::
-run_tests()
-{ 
+ProjDataInfoCylindricalNoArcCorrTests::run_tests()
+{
   cerr << "\n-------- Testing ProjDataInfoCylindricalNoArcCorr --------\n";
   shared_ptr<Scanner> scanner_ptr(new Scanner(Scanner::E953));
   cerr << "Tests with proj_data_info without mashing and axial compression\n\n";
-  // Note: test without axial compression requires that all ring differences 
+  // Note: test without axial compression requires that all ring differences
   // are in some segment, so use maximum ring difference
   shared_ptr<ProjDataInfo> proj_data_info_ptr(
-    ProjDataInfo::construct_proj_data_info(scanner_ptr,
-				  /*span*/1, scanner_ptr->get_num_rings()-1,
-				  /*views*/ scanner_ptr->get_num_detectors_per_ring()/2, 
-				  /*tang_pos*/64, 
-				  /*arc_corrected*/ false));
-  test_proj_data_info(dynamic_cast<ProjDataInfoCylindricalNoArcCorr &>(*proj_data_info_ptr));
+      ProjDataInfo::construct_proj_data_info(scanner_ptr,
+                                             /*span*/ 1, scanner_ptr->get_num_rings() - 1,
+                                             /*views*/ scanner_ptr->get_num_detectors_per_ring() / 2,
+                                             /*tang_pos*/ 64,
+                                             /*arc_corrected*/ false));
+  test_proj_data_info(dynamic_cast<ProjDataInfoCylindricalNoArcCorr&>(*proj_data_info_ptr));
 
   cerr << "\nTests with proj_data_info with mashing and axial compression (span 5)\n\n";
-  proj_data_info_ptr =
-    ProjDataInfo::construct_proj_data_info(scanner_ptr,
-				  /*span*/5, scanner_ptr->get_num_rings()-1,
-				  /*views*/ scanner_ptr->get_num_detectors_per_ring()/2/8, 
-				  /*tang_pos*/64, 
-				  /*arc_corrected*/ false);
-  test_proj_data_info(dynamic_cast<ProjDataInfoCylindricalNoArcCorr &>(*proj_data_info_ptr));
+  proj_data_info_ptr = ProjDataInfo::construct_proj_data_info(scanner_ptr,
+                                                              /*span*/ 5, scanner_ptr->get_num_rings() - 1,
+                                                              /*views*/ scanner_ptr->get_num_detectors_per_ring() / 2 / 8,
+                                                              /*tang_pos*/ 64,
+                                                              /*arc_corrected*/ false);
+  test_proj_data_info(dynamic_cast<ProjDataInfoCylindricalNoArcCorr&>(*proj_data_info_ptr));
 
   cerr << "\nTests with proj_data_info with mashing and axial compression (span 2)\n\n";
-  proj_data_info_ptr =
-    ProjDataInfo::construct_proj_data_info(scanner_ptr,
-			/*span*/2, scanner_ptr->get_num_rings() - 7,
-			/*views*/ scanner_ptr->get_num_detectors_per_ring() / 2 / 8,
-			/*tang_pos*/64,
-			/*arc_corrected*/ false);
-  test_proj_data_info(dynamic_cast<ProjDataInfoCylindricalNoArcCorr &>(*proj_data_info_ptr));
+  proj_data_info_ptr = ProjDataInfo::construct_proj_data_info(scanner_ptr,
+                                                              /*span*/ 2, scanner_ptr->get_num_rings() - 7,
+                                                              /*views*/ scanner_ptr->get_num_detectors_per_ring() / 2 / 8,
+                                                              /*tang_pos*/ 64,
+                                                              /*arc_corrected*/ false);
+  test_proj_data_info(dynamic_cast<ProjDataInfoCylindricalNoArcCorr&>(*proj_data_info_ptr));
 }
 
 void
-ProjDataInfoCylindricalNoArcCorrTests::
-test_proj_data_info(ProjDataInfoCylindricalNoArcCorr& proj_data_info)
+ProjDataInfoCylindricalNoArcCorrTests::test_proj_data_info(ProjDataInfoCylindricalNoArcCorr& proj_data_info)
 {
   test_cylindrical_proj_data_info(proj_data_info);
 
   const int num_detectors = proj_data_info.get_scanner_ptr()->get_num_detectors_per_ring();
 
 #ifndef TEST_ONLY_GET_BIN
-  if (proj_data_info.get_view_mashing_factor()==1)
+  if (proj_data_info.get_view_mashing_factor() == 1)
     {
       // these tests work only without mashing
 
       cerr << "\n\tTest code for sinogram <-> detector conversions.";
-      
-#ifdef STIR_OPENMP
-      #pragma omp parallel for schedule(dynamic)
-#endif
+
+#  ifdef STIR_OPENMP
+#    pragma omp parallel for schedule(dynamic)
+#  endif
       for (int det_num_a = 0; det_num_a < num_detectors; det_num_a++)
-	for (int det_num_b = 0; det_num_b < num_detectors; det_num_b++)
-	  {
-	    int det1, det2;
-	    bool positive_segment;
+        for (int det_num_b = 0; det_num_b < num_detectors; det_num_b++)
+          {
+            int det1, det2;
+            bool positive_segment;
             int tang_pos_num;
             int view;
-	    
-	    // skip case of equal detectors (as this is a singular LOR)
-	    if (det_num_a == det_num_b)
-	      continue;
-	    
-	    positive_segment = 
-	      proj_data_info.get_view_tangential_pos_num_for_det_num_pair(view, tang_pos_num, det_num_a, det_num_b);
-	    proj_data_info.get_det_num_pair_for_view_tangential_pos_num(det1, det2, view, tang_pos_num);
-	    if (!check((det_num_a == det1 && det_num_b == det2 && positive_segment) ||
-		       (det_num_a == det2 && det_num_b == det1 && !positive_segment)))
-	      {
-#ifdef STIR_OPENMP
+
+            // skip case of equal detectors (as this is a singular LOR)
+            if (det_num_a == det_num_b)
+              continue;
+
+            positive_segment
+                = proj_data_info.get_view_tangential_pos_num_for_det_num_pair(view, tang_pos_num, det_num_a, det_num_b);
+            proj_data_info.get_det_num_pair_for_view_tangential_pos_num(det1, det2, view, tang_pos_num);
+            if (!check((det_num_a == det1 && det_num_b == det2 && positive_segment)
+                       || (det_num_a == det2 && det_num_b == det1 && !positive_segment)))
+              {
+#  ifdef STIR_OPENMP
                 // add a pragma to avoid cerr output being jumbled up if there are any errors
-#pragma omp critical(TESTPROJDATAINFO)
-#endif
-		cerr << "Problem at det1 = " << det_num_a << ", det2 = " << det_num_b
-		     << "\n  dets -> sino -> dets gives new detector numbers "
-		     << det1 << ", " << det2 << endl;
-		continue;
-	      }
-	    if (!check(view < num_detectors/2))
-	      {
-#ifdef STIR_OPENMP
+#    pragma omp critical(TESTPROJDATAINFO)
+#  endif
+                cerr << "Problem at det1 = " << det_num_a << ", det2 = " << det_num_b
+                     << "\n  dets -> sino -> dets gives new detector numbers " << det1 << ", " << det2 << endl;
+                continue;
+              }
+            if (!check(view < num_detectors / 2))
+              {
+#  ifdef STIR_OPENMP
                 // add a pragma to avoid cerr output being jumbled up if there are any errors
-#pragma omp critical(TESTPROJDATAINFO)
-#endif
-		cerr << "Problem at det1 = " << det_num_a << ", det2 = " << det_num_b
-		     << ":\n  view is too big : " << view << endl;
-	      }
-	    if (!check(tang_pos_num < num_detectors/2 && tang_pos_num >= -(num_detectors/2)))
-	      {
-#ifdef STIR_OPENMP
+#    pragma omp critical(TESTPROJDATAINFO)
+#  endif
+                cerr << "Problem at det1 = " << det_num_a << ", det2 = " << det_num_b << ":\n  view is too big : " << view
+                     << endl;
+              }
+            if (!check(tang_pos_num < num_detectors / 2 && tang_pos_num >= -(num_detectors / 2)))
+              {
+#  ifdef STIR_OPENMP
                 // add a pragma to avoid cerr output being jumbled up if there are any errors
-#pragma omp critical(TESTPROJDATAINFO)
-#endif
-		cerr << "Problem at det1 = " << det_num_a << ", det2 = " << det_num_b
-		     << ":\n  tang_pos_num is out of range : " << tang_pos_num << endl;
-	      }
-	  } // end of detectors_to_sinogram, sinogram_to_detector test
-
-	
-#ifdef STIR_OPENMP
-#pragma omp parallel for
-#endif
-      for (int view = 0; view < num_detectors/2; ++view)
-	for (int tang_pos_num = -(num_detectors/2)+1; tang_pos_num < num_detectors/2; ++tang_pos_num)
-	  {
-	    int new_tang_pos_num, new_view;
-	    bool positive_segment;
+#    pragma omp critical(TESTPROJDATAINFO)
+#  endif
+                cerr << "Problem at det1 = " << det_num_a << ", det2 = " << det_num_b
+                     << ":\n  tang_pos_num is out of range : " << tang_pos_num << endl;
+              }
+          } // end of detectors_to_sinogram, sinogram_to_detector test
+
+#  ifdef STIR_OPENMP
+#    pragma omp parallel for
+#  endif
+      for (int view = 0; view < num_detectors / 2; ++view)
+        for (int tang_pos_num = -(num_detectors / 2) + 1; tang_pos_num < num_detectors / 2; ++tang_pos_num)
+          {
+            int new_tang_pos_num, new_view;
+            bool positive_segment;
             int det_num_a;
             int det_num_b;
 
-	    proj_data_info.get_det_num_pair_for_view_tangential_pos_num(det_num_a, det_num_b, view, tang_pos_num);
-	    positive_segment = 
-	      proj_data_info.get_view_tangential_pos_num_for_det_num_pair(new_view, new_tang_pos_num, det_num_a, det_num_b);
+            proj_data_info.get_det_num_pair_for_view_tangential_pos_num(det_num_a, det_num_b, view, tang_pos_num);
+            positive_segment
+                = proj_data_info.get_view_tangential_pos_num_for_det_num_pair(new_view, new_tang_pos_num, det_num_a, det_num_b);
 
-	    if (tang_pos_num != new_tang_pos_num || view != new_view || !positive_segment)
-	      {
-#ifdef STIR_OPENMP
-                      // add a pragma to avoid cerr output being jumbled up if there are any errors
-#pragma omp critical(TESTPROJDATAINFO)
-#endif
+            if (tang_pos_num != new_tang_pos_num || view != new_view || !positive_segment)
+              {
+#  ifdef STIR_OPENMP
+                // add a pragma to avoid cerr output being jumbled up if there are any errors
+#    pragma omp critical(TESTPROJDATAINFO)
+#  endif
                 {
                   cerr << "Problem at view = " << view << ", tang_pos_num = " << tang_pos_num
-		     << "\n   sino -> dets -> sino gives new view, tang_pos_num :"
-		     << new_view << ", " << new_tang_pos_num 
-		     << " with detector swapping " << positive_segment
-		     << endl;
+                       << "\n   sino -> dets -> sino gives new view, tang_pos_num :" << new_view << ", " << new_tang_pos_num
+                       << " with detector swapping " << positive_segment << endl;
                 }
-	      }
-	  } // end of sinogram_to_detector, detectors_to_sinogram test
-	
+              }
+          } // end of sinogram_to_detector, detectors_to_sinogram test
+
     } // end of tests that work only without mashing
 
-  if (proj_data_info.get_view_mashing_factor()==1
+  if (proj_data_info.get_view_mashing_factor() == 1
       && proj_data_info.get_max_ring_difference(0) == proj_data_info.get_min_ring_difference(0)
       && proj_data_info.get_max_ring_difference(1) == proj_data_info.get_min_ring_difference(1)
-      && proj_data_info.get_max_ring_difference(2) == proj_data_info.get_min_ring_difference(2)
-      )
+      && proj_data_info.get_max_ring_difference(2) == proj_data_info.get_min_ring_difference(2))
     {
       // these tests work only without mashing and axial compression
-	
+
       cerr << "\n\tTest code for detector,ring -> bin and back conversions.";
-      
+
       DetectionPositionPair<> det_pos_pair;
-      for (det_pos_pair.pos1().axial_coord() = 0; 
-           det_pos_pair.pos1().axial_coord() <= 2;
-	   det_pos_pair.pos1().axial_coord()++)
-	for (det_pos_pair.pos2().axial_coord() = 0; 
-	     det_pos_pair.pos2().axial_coord() <= 2; 
-	     det_pos_pair.pos2().axial_coord()++)
-#ifdef STIR_OPENMP
-            // insert a parallel for here for testing.
-            // we do it at this level to avoid too much overhead for the thread creation, while still having enough jobs to do
-            // note: for-loop writing somewhat awkwardly as openmp needs int variables for the loop
-#pragma omp parallel for firstprivate(det_pos_pair)
-#endif
-          for (int tangential_coord1 = 0; 
-               tangential_coord1 < num_detectors; 
-               tangential_coord1++)
-            for (det_pos_pair.pos2().tangential_coord() = 0; 
-                 det_pos_pair.pos2().tangential_coord() < (unsigned)num_detectors;
+      for (det_pos_pair.pos1().axial_coord() = 0; det_pos_pair.pos1().axial_coord() <= 2; det_pos_pair.pos1().axial_coord()++)
+        for (det_pos_pair.pos2().axial_coord() = 0; det_pos_pair.pos2().axial_coord() <= 2; det_pos_pair.pos2().axial_coord()++)
+#  ifdef STIR_OPENMP
+        // insert a parallel for here for testing.
+        // we do it at this level to avoid too much overhead for the thread creation, while still having enough jobs to do
+        // note: for-loop writing somewhat awkwardly as openmp needs int variables for the loop
+#    pragma omp parallel for firstprivate(det_pos_pair)
+#  endif
+          for (int tangential_coord1 = 0; tangential_coord1 < num_detectors; tangential_coord1++)
+            for (det_pos_pair.pos2().tangential_coord() = 0; det_pos_pair.pos2().tangential_coord() < (unsigned)num_detectors;
                  det_pos_pair.pos2().tangential_coord()++)
-	      {
+              {
                 // set from for-loop variable
                 det_pos_pair.pos1().tangential_coord() = (unsigned)tangential_coord1;
-		// skip case of equal detector numbers (as this is either a singular LOR)
-		// or an LOR parallel to the scanner axis
-		if (det_pos_pair.pos1().tangential_coord() == det_pos_pair.pos2().tangential_coord())
-		  continue;
-		Bin bin;
-		DetectionPositionPair<> new_det_pos_pair;
-		const bool there_is_a_bin =
-		  proj_data_info.get_bin_for_det_pos_pair(bin, det_pos_pair) ==
-		    Succeeded::yes;       
-		if (there_is_a_bin)
-		  proj_data_info.get_det_pos_pair_for_bin(new_det_pos_pair, bin);
-#ifdef STIR_OPENMP
-                // add a pragma to avoid cerr output being jumbled up if there are any errors
-#pragma omp critical(TESTPROJDATAINFO)
-#endif
-		if (!check(there_is_a_bin, "checking if there is a bin for this det_pos_pair") ||
-		    !check(det_pos_pair == new_det_pos_pair, "checking if we round-trip to the same detection positions"))
-		    {
-		      cerr << "Problem at det1 = " << det_pos_pair.pos1().tangential_coord() 
-			   << ", det2 = " << det_pos_pair.pos2().tangential_coord()
-			   << ", ring1 = " << det_pos_pair.pos1().axial_coord() 
-			   << ", ring2 = " << det_pos_pair.pos2().axial_coord()
-			   << endl;
-		      if (there_is_a_bin)
-			 cerr << "  dets,rings -> bin -> dets,rings, gives new numbers:\n\t"
-			      << "det1 = " << new_det_pos_pair.pos1().tangential_coord() 
-			   
-			      << ", det2 = " << new_det_pos_pair.pos2().tangential_coord()
-			      << ", ring1 = " << new_det_pos_pair.pos1().axial_coord() 
-			      << ", ring2 = " << new_det_pos_pair.pos2().axial_coord()
-			 << endl;
-		  }
-	
-	      } // end of get_bin_for_det_pos_pair and vice versa code
+                // skip case of equal detector numbers (as this is either a singular LOR)
+                // or an LOR parallel to the scanner axis
+                if (det_pos_pair.pos1().tangential_coord() == det_pos_pair.pos2().tangential_coord())
+                  continue;
+                Bin bin;
+                DetectionPositionPair<> new_det_pos_pair;
+                const bool there_is_a_bin = proj_data_info.get_bin_for_det_pos_pair(bin, det_pos_pair) == Succeeded::yes;
+                if (there_is_a_bin)
+                  proj_data_info.get_det_pos_pair_for_bin(new_det_pos_pair, bin);
+#  ifdef STIR_OPENMP
+                  // add a pragma to avoid cerr output being jumbled up if there are any errors
+#    pragma omp critical(TESTPROJDATAINFO)
+#  endif
+                if (!check(there_is_a_bin, "checking if there is a bin for this det_pos_pair")
+                    || !check(det_pos_pair == new_det_pos_pair, "checking if we round-trip to the same detection positions"))
+                  {
+                    cerr << "Problem at det1 = " << det_pos_pair.pos1().tangential_coord()
+                         << ", det2 = " << det_pos_pair.pos2().tangential_coord()
+                         << ", ring1 = " << det_pos_pair.pos1().axial_coord() << ", ring2 = " << det_pos_pair.pos2().axial_coord()
+                         << endl;
+                    if (there_is_a_bin)
+                      cerr << "  dets,rings -> bin -> dets,rings, gives new numbers:\n\t"
+                           << "det1 = " << new_det_pos_pair.pos1().tangential_coord()
+
+                           << ", det2 = " << new_det_pos_pair.pos2().tangential_coord()
+                           << ", ring1 = " << new_det_pos_pair.pos1().axial_coord()
+                           << ", ring2 = " << new_det_pos_pair.pos2().axial_coord() << endl;
+                  }
+
+              } // end of get_bin_for_det_pos_pair and vice versa code
 
       cerr << "\n\tTest code for bin -> detector,ring and back conversions. (This might take a while...)";
 
       {
-	Bin bin;
-	// set value for comparison later on
-	bin.set_bin_value(0);
-	for (bin.segment_num() = max(-5,proj_data_info.get_min_segment_num()); 
-	     bin.segment_num() <= min(5,proj_data_info.get_max_segment_num()); 
-	     ++bin.segment_num())
-	  for (bin.axial_pos_num() = proj_data_info.get_min_axial_pos_num(bin.segment_num());
-	       bin.axial_pos_num() <= proj_data_info.get_max_axial_pos_num(bin.segment_num());
-	       ++bin.axial_pos_num())
-#ifdef STIR_OPENMP
-            // insert a parallel for here for testing.
-            // we do it at this level to avoid too much overhead for the thread creation, while still having enough jobs to do
-            // Note that the omp construct needs an int loop variable
-#pragma omp parallel for firstprivate(bin)
-#endif
-            for (int tangential_pos_num = -(num_detectors/2)+1; 
-                 tangential_pos_num < num_detectors/2; 
-                 ++tangential_pos_num)
-              for (bin.view_num() = 0; bin.view_num() < num_detectors/2; ++bin.view_num())
-		{
+        Bin bin;
+        // set value for comparison later on
+        bin.set_bin_value(0);
+        for (bin.segment_num() = max(-5, proj_data_info.get_min_segment_num());
+             bin.segment_num() <= min(5, proj_data_info.get_max_segment_num()); ++bin.segment_num())
+          for (bin.axial_pos_num() = proj_data_info.get_min_axial_pos_num(bin.segment_num());
+               bin.axial_pos_num() <= proj_data_info.get_max_axial_pos_num(bin.segment_num()); ++bin.axial_pos_num())
+#  ifdef STIR_OPENMP
+          // insert a parallel for here for testing.
+          // we do it at this level to avoid too much overhead for the thread creation, while still having enough jobs to do
+          // Note that the omp construct needs an int loop variable
+#    pragma omp parallel for firstprivate(bin)
+#  endif
+            for (int tangential_pos_num = -(num_detectors / 2) + 1; tangential_pos_num < num_detectors / 2; ++tangential_pos_num)
+              for (bin.view_num() = 0; bin.view_num() < num_detectors / 2; ++bin.view_num())
+                {
                   // set from for-loop variable
                   bin.tangential_pos_num() = tangential_pos_num;
-		  Bin new_bin;
-		  // set value for comparison with bin
-		  new_bin.set_bin_value(0);
-		  DetectionPositionPair<> det_pos_pair;
-		  proj_data_info.get_det_pos_pair_for_bin(det_pos_pair, bin);
-	
-		  const bool there_is_a_bin =
-		    proj_data_info.get_bin_for_det_pos_pair(new_bin, 
-							    det_pos_pair) ==
-		    Succeeded::yes;
-#ifdef STIR_OPENMP
+                  Bin new_bin;
+                  // set value for comparison with bin
+                  new_bin.set_bin_value(0);
+                  DetectionPositionPair<> det_pos_pair;
+                  proj_data_info.get_det_pos_pair_for_bin(det_pos_pair, bin);
+
+                  const bool there_is_a_bin = proj_data_info.get_bin_for_det_pos_pair(new_bin, det_pos_pair) == Succeeded::yes;
+#  ifdef STIR_OPENMP
                   // add a pragma to avoid cerr output being jumbled up if there are any errors
-#pragma omp critical(TESTPROJDATAINFO)
-#endif
-		  if (!check(there_is_a_bin, "checking if there is a bin for this det_pos_pair") ||
-		      !check(bin == new_bin, "checking if we round-trip to the same bin"))
-		    {
-		      cerr << "Problem at  segment = " << bin.segment_num() 
-			   << ", axial pos " << bin.axial_pos_num()
-			   << ", view = " << bin.view_num() 
-			   << ", tangential_pos_num = " << bin.tangential_pos_num() << "\n";
-		      if (there_is_a_bin)
-			cerr  << "  bin -> dets -> bin, gives new numbers:\n\t"
-			      << "segment = " << new_bin.segment_num() 
-			      << ", axial pos " << new_bin.axial_pos_num()
-			      << ", view = " << new_bin.view_num() 
-			      << ", tangential_pos_num = " << new_bin.tangential_pos_num()
-			      << endl;
-		    }
-	
-		} // end of get_det_pos_pair_for_bin and back code
+#    pragma omp critical(TESTPROJDATAINFO)
+#  endif
+                  if (!check(there_is_a_bin, "checking if there is a bin for this det_pos_pair")
+                      || !check(bin == new_bin, "checking if we round-trip to the same bin"))
+                    {
+                      cerr << "Problem at  segment = " << bin.segment_num() << ", axial pos " << bin.axial_pos_num()
+                           << ", view = " << bin.view_num() << ", tangential_pos_num = " << bin.tangential_pos_num() << "\n";
+                      if (there_is_a_bin)
+                        cerr << "  bin -> dets -> bin, gives new numbers:\n\t"
+                             << "segment = " << new_bin.segment_num() << ", axial pos " << new_bin.axial_pos_num()
+                             << ", view = " << new_bin.view_num() << ", tangential_pos_num = " << new_bin.tangential_pos_num()
+                             << endl;
+                    }
+
+                } // end of get_det_pos_pair_for_bin and back code
       }
     } // end of tests which require no mashing nor axial compression
 
@@ -880,114 +1296,99 @@ test_proj_data_info(ProjDataInfoCylindricalNoArcCorr& proj_data_info)
     Bin bin;
     // set value for comparison later on
     bin.set_bin_value(0);
-    std::vector<DetectionPositionPair<> > det_pos_pairs;
-#ifdef STIR_OPENMP
+    std::vector<DetectionPositionPair<>> det_pos_pairs;
+#  ifdef STIR_OPENMP
     //#pragma omp parallel for schedule(dynamic)
-#endif
-    for (bin.segment_num() = proj_data_info.get_min_segment_num(); 
-	 bin.segment_num() <= proj_data_info.get_max_segment_num(); 
-	 ++bin.segment_num())
+#  endif
+    for (bin.segment_num() = proj_data_info.get_min_segment_num(); bin.segment_num() <= proj_data_info.get_max_segment_num();
+         ++bin.segment_num())
       for (bin.axial_pos_num() = proj_data_info.get_min_axial_pos_num(bin.segment_num());
-	   bin.axial_pos_num() <= proj_data_info.get_max_axial_pos_num(bin.segment_num());
-	   ++bin.axial_pos_num())
-	for (bin.view_num() = proj_data_info.get_min_view_num(); 
-	     bin.view_num() <= proj_data_info.get_max_view_num(); 
-	     ++bin.view_num())
-	  for (bin.tangential_pos_num() = proj_data_info.get_min_tangential_pos_num();
-	       bin.tangential_pos_num() <= proj_data_info.get_max_tangential_pos_num();
-	       ++bin.tangential_pos_num())
-	    {
-	      proj_data_info.get_all_det_pos_pairs_for_bin(det_pos_pairs, bin);
-	      Bin new_bin;
-	      // set value for comparison with bin
-	      new_bin.set_bin_value(0);
-	      for (std::vector<DetectionPositionPair<> >::const_iterator det_pos_pair_iter = det_pos_pairs.begin();
-		   det_pos_pair_iter != det_pos_pairs.end();
-		   ++det_pos_pair_iter)
-		{
-		  const bool there_is_a_bin =
-		    proj_data_info.get_bin_for_det_pos_pair(new_bin, 
-							    *det_pos_pair_iter) ==
-		    Succeeded::yes;
-		  if (!check(there_is_a_bin, "checking if there is a bin for this det_pos_pair") ||
-		      !check(bin == new_bin, "checking if we round-trip to the same bin"))
-		    {
-		      cerr << "Problem at  segment = " << bin.segment_num() 
-			   << ", axial pos " << bin.axial_pos_num()
-			   << ", view = " << bin.view_num() 
-			   << ", tangential_pos_num = " << bin.tangential_pos_num() << "\n";
-		      if (there_is_a_bin)
-			cerr << "  bin -> dets -> bin, gives new numbers:\n\t"
-			     << "segment = " << new_bin.segment_num() 
-			     << ", axial pos " << new_bin.axial_pos_num()
-			     << ", view = " << new_bin.view_num() 
-			     << ", tangential_pos_num = " << new_bin.tangential_pos_num()
-			     << endl;
-		    }
-		} // end of iteration of det_pos_pairs
-	    } // end of loop over all bins
-  } // end of get_all_det_pairs_for_bin and back code
-#endif //TEST_ONLY_GET_BIN
+           bin.axial_pos_num() <= proj_data_info.get_max_axial_pos_num(bin.segment_num()); ++bin.axial_pos_num())
+        for (bin.view_num() = proj_data_info.get_min_view_num(); bin.view_num() <= proj_data_info.get_max_view_num();
+             ++bin.view_num())
+          for (bin.tangential_pos_num() = proj_data_info.get_min_tangential_pos_num();
+               bin.tangential_pos_num() <= proj_data_info.get_max_tangential_pos_num(); ++bin.tangential_pos_num())
+            {
+              proj_data_info.get_all_det_pos_pairs_for_bin(det_pos_pairs, bin);
+              Bin new_bin;
+              // set value for comparison with bin
+              new_bin.set_bin_value(0);
+              for (std::vector<DetectionPositionPair<>>::const_iterator det_pos_pair_iter = det_pos_pairs.begin();
+                   det_pos_pair_iter != det_pos_pairs.end(); ++det_pos_pair_iter)
+                {
+                  const bool there_is_a_bin
+                      = proj_data_info.get_bin_for_det_pos_pair(new_bin, *det_pos_pair_iter) == Succeeded::yes;
+                  if (!check(there_is_a_bin, "checking if there is a bin for this det_pos_pair")
+                      || !check(bin == new_bin, "checking if we round-trip to the same bin"))
+                    {
+                      cerr << "Problem at  segment = " << bin.segment_num() << ", axial pos " << bin.axial_pos_num()
+                           << ", view = " << bin.view_num() << ", tangential_pos_num = " << bin.tangential_pos_num() << "\n";
+                      if (there_is_a_bin)
+                        cerr << "  bin -> dets -> bin, gives new numbers:\n\t"
+                             << "segment = " << new_bin.segment_num() << ", axial pos " << new_bin.axial_pos_num()
+                             << ", view = " << new_bin.view_num() << ", tangential_pos_num = " << new_bin.tangential_pos_num()
+                             << endl;
+                    }
+                } // end of iteration of det_pos_pairs
+            }     // end of loop over all bins
+  }               // end of get_all_det_pairs_for_bin and back code
+#endif            // TEST_ONLY_GET_BIN
 
   {
     cerr << endl;
     cerr << "\tTesting find scanner coordinates given cartesian and vice versa." << endl;
-    {   
-      const int num_detectors_per_ring =
-	proj_data_info.get_scanner_ptr()->get_num_detectors_per_ring();
-      const int num_rings =
-	proj_data_info.get_scanner_ptr()->get_num_rings();
+    {
+      const int num_detectors_per_ring = proj_data_info.get_scanner_ptr()->get_num_detectors_per_ring();
+      const int num_rings = proj_data_info.get_scanner_ptr()->get_num_rings();
 
 #ifdef STIR_OPENMP
-#pragma omp parallel for schedule(dynamic)
+#  pragma omp parallel for schedule(dynamic)
 #endif
-      for ( int Ring_A = 0; Ring_A < num_rings; Ring_A+=num_rings/3)
-	for ( int Ring_B = 0; Ring_B < num_rings; Ring_B+=num_rings/3)
-	  for ( int det1 =0; det1 < num_detectors_per_ring; ++det1)
-	    for ( int det2 =0; det2 < num_detectors_per_ring; ++det2)	  
-	      {
-		if (det1==det2)
-		  continue;
-		CartesianCoordinate3D<float> coord_1;
-		CartesianCoordinate3D<float> coord_2;
-	  
-		proj_data_info.find_cartesian_coordinates_given_scanner_coordinates (coord_1,coord_2,
-										     Ring_A,Ring_B, 
-										     det1,det2);
-	  
-		const CartesianCoordinate3D<float> coord_1_new = coord_1 + (coord_2-coord_1)*5;
-		const CartesianCoordinate3D<float> coord_2_new = coord_1 + (coord_2-coord_1)*2;
-	  
-		int det1_f, det2_f,ring1_f, ring2_f;
-	  
-		check(proj_data_info.find_scanner_coordinates_given_cartesian_coordinates(det1_f, det2_f, ring1_f, ring2_f,
-										    coord_1_new, coord_2_new) ==
-		      Succeeded::yes);
-		if (det1_f == det1 && Ring_A == ring1_f)
-		  { 
-		    check_if_equal( det1_f, det1, "test on det1");
-		    check_if_equal( Ring_A, ring1_f, "test on ring1");
-		    check_if_equal( det2_f, det2, "test on det2");
-		    check_if_equal( Ring_B, ring2_f, "test on ring1");
-		  }
-		else
-		  {
-		    check_if_equal( det2_f, det1, "test on det1");
-		    check_if_equal( Ring_B, ring1_f, "test on ring1");
-		    check_if_equal( det1_f, det2, "test on det2");
-		    check_if_equal( Ring_A, ring2_f, "test on ring1");
-		  }
-	      }
+      for (int Ring_A = 0; Ring_A < num_rings; Ring_A += num_rings / 3)
+        for (int Ring_B = 0; Ring_B < num_rings; Ring_B += num_rings / 3)
+          for (int det1 = 0; det1 < num_detectors_per_ring; ++det1)
+            for (int det2 = 0; det2 < num_detectors_per_ring; ++det2)
+              {
+                if (det1 == det2)
+                  continue;
+                CartesianCoordinate3D<float> coord_1;
+                CartesianCoordinate3D<float> coord_2;
+
+                proj_data_info.find_cartesian_coordinates_given_scanner_coordinates(coord_1, coord_2, Ring_A, Ring_B, det1, det2);
+
+                const CartesianCoordinate3D<float> coord_1_new = coord_1 + (coord_2 - coord_1) * 5;
+                const CartesianCoordinate3D<float> coord_2_new = coord_1 + (coord_2 - coord_1) * 2;
+
+                int det1_f, det2_f, ring1_f, ring2_f;
+
+                check(proj_data_info.find_scanner_coordinates_given_cartesian_coordinates(det1_f, det2_f, ring1_f, ring2_f,
+                                                                                          coord_1_new, coord_2_new)
+                      == Succeeded::yes);
+                if (det1_f == det1 && Ring_A == ring1_f)
+                  {
+                    check_if_equal(det1_f, det1, "test on det1");
+                    check_if_equal(Ring_A, ring1_f, "test on ring1");
+                    check_if_equal(det2_f, det2, "test on det2");
+                    check_if_equal(Ring_B, ring2_f, "test on ring1");
+                  }
+                else
+                  {
+                    check_if_equal(det2_f, det1, "test on det1");
+                    check_if_equal(Ring_B, ring1_f, "test on ring1");
+                    check_if_equal(det1_f, det2, "test on det2");
+                    check_if_equal(Ring_A, ring2_f, "test on ring1");
+                  }
+              }
     }
   }
 }
 
 END_NAMESPACE_STIR
 
-
 USING_NAMESPACE_STIR
 
-int main()
+int
+main()
 {
   set_default_num_threads();
 
diff --git a/src/utilities/CMakeLists.txt b/src/utilities/CMakeLists.txt
index a7c6c1766..65fe3c290 100644
--- a/src/utilities/CMakeLists.txt
+++ b/src/utilities/CMakeLists.txt
@@ -68,6 +68,11 @@ set(${dir_EXE_SOURCES}
 	find_ML_normfactors3D.cxx
 	find_ML_normfactors.cxx
 	find_ML_singles_from_delayed.cxx
+        find_normfactors_from_cylinder_data.cxx
+        find_recovery_coefficients_in_image_quality_phantom_nema_nu4.cxx
+        write_sinogram_to_txt.cxx
+        find_sum_projection_of_viewgram_and_sinogram.cxx
+        separate_true_from_random_scatter_for_necr.cxx
 )
 
 if (AVW_FOUND)
diff --git a/src/utilities/find_normfactors_from_cylinder_data.cxx b/src/utilities/find_normfactors_from_cylinder_data.cxx
new file mode 100644
index 000000000..2164546ac
--- /dev/null
+++ b/src/utilities/find_normfactors_from_cylinder_data.cxx
@@ -0,0 +1,158 @@
+/*
+Copyright 2017 ETH Zurich, Institute of Particle Physics and Astrophysics
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+	http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+/*!
+
+  \file
+  \ingroup utilities
+
+  \brief Find normalisation factors given projection data of a cylinder (direct method)
+
+  \author Parisa Khateri
+
+*/
+
+#include "stir/utilities.h"
+#include <iostream>
+#include <fstream>
+#include <string>
+#include "stir/shared_ptr.h"
+#include "stir/ProjData.h"
+#include "stir/CartesianCoordinate3D.h"
+#include "stir/LORCoordinates.h"
+#include "stir/Bin.h"
+#include "stir/ProjDataInterfile.h"
+#include "stir/IO/interfile.h"
+#include <limits>
+
+USING_NAMESPACE_STIR
+
+int main(int argc, char **argv)
+{
+  if (argc!=4)
+  {
+    std::cerr << "Usage: "<< argv[0]
+        <<" output_file_name_prefix cylider_measured_data cylinder_radius(mm)\n"
+        <<"only cylinder data are supported. The radius should be the radius of the measured cylinder data.\n"
+        <<"warning: mind the input order\n";
+    return EXIT_FAILURE;
+  }
+
+  shared_ptr<ProjData> cylinder_projdata_ptr = ProjData::read_from_file(argv[2]);
+  const std::string output_file_name = argv[1];
+  const float R = atof(argv[3]); // cylinder radius (mm)
+  if (R==0)
+  {
+    std::cerr << " Radius must be a float value\n"
+              <<"Usage: "<< argv[0]
+              <<" output_file_name_prefix cylider_measured_data cylinder_radius\n"
+              <<"warning: mind the input order\n";
+    return EXIT_FAILURE;
+  }
+
+  //output file
+  shared_ptr<ProjDataInfo> cylinder_pdi_ptr(cylinder_projdata_ptr->get_proj_data_info_sptr()->clone());
+
+  ProjDataInterfile output_projdata(cylinder_projdata_ptr->get_exam_info_sptr(), cylinder_pdi_ptr, output_file_name);
+  write_basic_interfile_PDFS_header(output_file_name, output_projdata);
+
+  CartesianCoordinate3D<float> c1, c2;
+  LORInAxialAndNoArcCorrSinogramCoordinates<float> lor;
+
+  // first find the average number of counts per LOR
+  float total_count=0;
+  float min_count=std::numeric_limits<double>::max(); // minimum number of counts per LOR
+  float average_count=0; //average number of counts per LOR in the active region
+  int num_active_LORs=0; //number of LORs which pass through the cylinder
+  for (int seg =cylinder_projdata_ptr->get_min_segment_num(); seg <=cylinder_projdata_ptr->get_max_segment_num(); ++seg)
+    for (int view =cylinder_projdata_ptr->get_min_view_num(); view <=cylinder_projdata_ptr->get_max_view_num(); ++view)
+  {
+    Viewgram<float> cylinder_viewgram = cylinder_projdata_ptr->get_viewgram(view, seg);
+    for (int ax =cylinder_projdata_ptr->get_min_axial_pos_num(seg); ax <=cylinder_projdata_ptr->get_max_axial_pos_num(seg); ++ax)
+      for (int tang =cylinder_projdata_ptr->get_min_tangential_pos_num(); tang <=cylinder_projdata_ptr->get_max_tangential_pos_num(); ++tang)
+    {
+      Bin bin(seg, view, ax, tang);
+      cylinder_projdata_ptr->get_proj_data_info_sptr()->get_LOR(lor, bin);
+      LORAs2Points<float> lor_as2points(lor);
+      LORAs2Points<float> intersection_coords;
+      if (find_LOR_intersections_with_cylinder(intersection_coords, lor_as2points, R) ==Succeeded::yes)
+      { //this only succeeds if LOR is intersecting with the cylinder
+        float N_lor = cylinder_viewgram[ax][tang]; //counts seen by this lor
+        c1 = intersection_coords.p1();
+        c2 = intersection_coords.p2();
+        float c12 = sqrt( pow(c1.z()-c2.z(), 2)    // length of intersection of lor with the cylinder
+                        + pow(c1.y()-c2.y(), 2)
+                        + pow(c1.x()-c2.x(), 2) );
+        if (c12>0.5) // if LOR intersection is lager than 0.5 mm, check the count per LOR
+        {
+          float N_lor_corrected=N_lor/c12; // corrected for the length
+          total_count+=N_lor_corrected;
+          num_active_LORs+=1;
+          if (N_lor_corrected<min_count && N_lor_corrected!=0) min_count=N_lor_corrected;
+        }
+      }
+    }
+  }
+  average_count=total_count/num_active_LORs;
+  std::cout<<"num_lor, tot_count_per_length_unit, average_count_per_length_unit, non_zero_min_per_length_unit = "<<num_active_LORs<<", "<<total_count<<", "<<average_count<<", "<<min_count<<"\n";
+
+  // find the norm factor per LOR
+  for (int seg =cylinder_projdata_ptr->get_min_segment_num(); seg <=cylinder_projdata_ptr->get_max_segment_num(); ++seg)
+    for (int view =cylinder_projdata_ptr->get_min_view_num(); view <=cylinder_projdata_ptr->get_max_view_num(); ++view)
+  {
+    Viewgram<float> cylinder_viewgram = cylinder_projdata_ptr->get_viewgram(view, seg);
+    Viewgram<float> out_viewgram = cylinder_projdata_ptr->get_empty_viewgram(view, seg);
+    for (int ax =cylinder_projdata_ptr->get_min_axial_pos_num(seg); ax <=cylinder_projdata_ptr->get_max_axial_pos_num(seg); ++ax)
+      for (int tang =cylinder_projdata_ptr->get_min_tangential_pos_num(); tang <=cylinder_projdata_ptr->get_max_tangential_pos_num(); ++tang)
+    {
+      Bin bin(seg, view, ax, tang);
+      cylinder_projdata_ptr->get_proj_data_info_sptr()->get_LOR(lor, bin);
+      LORAs2Points<float> lor_as2points(lor);
+      LORAs2Points<float> intersection_coords;
+      float NF_lor;
+      if (find_LOR_intersections_with_cylinder(intersection_coords, lor_as2points, R) ==Succeeded::yes)
+      { //this only succeeds if LOR is intersecting with the cylinder
+
+        /*
+          for each lor
+            find_LOR_intersections_with_cylinder => c1 & c2
+            c12 = |c1-c2| = sqrt(dx^2+dy^2+dz^2)
+            N_lor/c12 should be the same for all therefore:
+            NF_lor= <N> / (N_lor/c12)
+        */
+
+        float N_lor = cylinder_viewgram[ax][tang]; //counts seen by this lor
+        c1 = intersection_coords.p1();
+        c2 = intersection_coords.p2();
+        float c12 = sqrt( pow(c1.z()-c2.z(), 2)    // length of intersection of lor with the cylinder
+                        + pow(c1.y()-c2.y(), 2)
+                        + pow(c1.x()-c2.x(), 2) );
+        if (N_lor<1) //if inside the cylinder but the value is too small
+        {
+          NF_lor = average_count*c12/min_count;
+        }
+        else
+          NF_lor = average_count*c12/N_lor;
+      }
+      else //if out of the cylinder set it to a small value instead of zero, otherwise normalisation gives strange recon image.
+      {
+        NF_lor=0.0001;
+      }
+      out_viewgram[ax][tang] = NF_lor;
+    }
+    output_projdata.set_viewgram(out_viewgram);
+  }
+}
diff --git a/src/utilities/find_recovery_coefficients_in_image_quality_phantom_nema_nu4.cxx b/src/utilities/find_recovery_coefficients_in_image_quality_phantom_nema_nu4.cxx
new file mode 100644
index 000000000..739bb8cdf
--- /dev/null
+++ b/src/utilities/find_recovery_coefficients_in_image_quality_phantom_nema_nu4.cxx
@@ -0,0 +1,388 @@
+/*
+Copyright 2017 ETH Zurich, Institute of Particle Physics and Astrophysics
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+	http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+/*!
+
+  \file
+  \ingroup utilities
+
+  \brief Utility program for calculating recovery coeficient values in the image
+            quality phantom described in NEMA NU 4.
+
+  \author Parisa Khateri
+
+*/
+
+#include "stir/VoxelsOnCartesianGrid.h"
+#include "stir/DiscretisedDensity.h"
+#include "stir/Shape/EllipsoidalCylinder.h"
+#include "stir/CartesianCoordinate2D.h"
+#include "stir/CartesianCoordinate3D.h"
+
+#include <iostream>
+#include <iomanip>
+#include <fstream>
+#include <vector>
+#include "stir/IO/read_from_file.h"
+#include "stir/info.h"
+#include "stir/Succeeded.h"
+
+#ifndef STIR_NO_NAMESPACES
+using std::cerr;
+using std::endl;
+using std::ofstream;
+using std::vector;
+#endif
+
+USING_NAMESPACE_STIR
+
+
+class FindRecoveryCoefficient : public ParsingObject
+{
+public:
+
+  FindRecoveryCoefficient(const char * const par_filename);
+  Succeeded compute();
+
+private:
+  typedef ParsingObject base_type;
+  int min_index_for_average_plane; //min plane number
+  int max_index_for_average_plane; //max plane number
+  float mean_uniform_region;
+  float STD_uniform_region;
+  int start_z_of_rods; //axial position of start point of the rods
+  int stop_z_of_rods; //axial position of end point of the rods
+  std::vector<double> ROIs_x; // order is from the smallest ROI to the largest
+  std::vector<double> ROIs_y; // order is from the smallest ROI to the largest
+  std::string input_filename;
+  std::string output_filename;
+
+  void initialise_keymap();
+  void set_defaults();
+};
+
+void FindRecoveryCoefficient::
+initialise_keymap()
+{
+  this->parser.add_start_key("FindRecoveryCoefficient Parameters");
+  this->parser.add_key("input filename",&input_filename);
+  this->parser.add_key("output filename",&output_filename);
+  this->parser.add_key("minimun index to calculate the average plane", &min_index_for_average_plane);
+  this->parser.add_key("maximum index to calculate the average plane", &max_index_for_average_plane);
+  this->parser.add_key("mean value of uniform region", &mean_uniform_region);
+  this->parser.add_key("STD of uniform region", &STD_uniform_region);
+  this->parser.add_key("start index of rods (z value)", &start_z_of_rods);
+  this->parser.add_key("stop index of rods (z value)", &stop_z_of_rods);
+  this->parser.add_key("x coordinates of center of ROIs (in mm)", &ROIs_x);
+  this->parser.add_key("y coordinates of center of ROIs (in mm)", &ROIs_y);
+  this->parser.add_stop_key("END FindRecoveryCoefficient Parameters");
+}
+
+void FindRecoveryCoefficient::
+set_defaults()
+{
+  // specify defaults for the parameters in case they are not set.
+  min_index_for_average_plane= 88;
+  max_index_for_average_plane= 98;
+  mean_uniform_region = 0.00569557;
+  STD_uniform_region = 0.00107216;
+  start_z_of_rods = 86;
+  stop_z_of_rods = 102;
+  ROIs_x = {2.16312,-5.66312,-5.66312,2.16312,7.};
+  ROIs_y = {6.6574,4.1145,-4.1145,-6.6574,0.};
+  input_filename.resize(0);
+  output_filename.resize(0);
+}
+
+FindRecoveryCoefficient::
+FindRecoveryCoefficient(const char * const par_filename)
+{
+  set_defaults();
+  if (par_filename!=0)
+    {
+      if (parse(par_filename) == false)
+  exit(EXIT_FAILURE);
+    }
+  else
+    ask_parameters();
+}
+
+
+void
+compute_average_plane_in_given_range(VoxelsOnCartesianGrid<float>& average_plane,
+                      const VoxelsOnCartesianGrid<float>& image,
+                      const int& min_index, const int& max_index)
+{
+  int min_z = image.get_min_z();
+  int max_z = image.get_max_z();
+  int min_y = image.get_min_y();
+  int min_x = image.get_min_x();
+  int max_y = image.get_max_y();
+  int max_x = image.get_max_x();
+  if (min_index<min_z || max_index>max_z)
+  {
+    error("min_index & max_index are not in the range of provided image!");
+  }
+
+
+  shared_ptr<VoxelsOnCartesianGrid<float> > sum_planes_ptr(image.get_empty_voxels_on_cartesian_grid());
+  VoxelsOnCartesianGrid<float> sum_planes = *sum_planes_ptr;
+  int num_planes = max_index - min_index + 1;
+
+  for (int z=min_index; z<=max_index; z++)
+    for(int y=min_y; y<=max_y; y++)
+      for(int x=min_x; x<=max_x; x++)
+  {
+      sum_planes[0][y][x] += image[z][y][x];
+  }
+  for(int y=min_y; y<=max_y; y++)
+    for(int x=min_x; x<=max_x; x++)
+  {
+    average_plane[0][y][x] = sum_planes[0][y][x] / num_planes;
+  }
+}
+
+void
+build_ROIs(vector<EllipsoidalCylinder> & ROIs, float length_z, std::vector<double> ROIs_x, std::vector<double> ROIs_y)
+{
+  //note: the y coordinate is (-1*y) of coordinates in your images. STIR assumes y axis downward.
+  vector<CartesianCoordinate2D<float>> ROI_centers{CartesianCoordinate2D<float>(ROIs_y[0],ROIs_x[0]), //(y,x)
+                                                   CartesianCoordinate2D<float>(ROIs_y[1],ROIs_x[1]),
+                                                   CartesianCoordinate2D<float>(ROIs_y[2],ROIs_x[2]),
+                                                   CartesianCoordinate2D<float>(ROIs_y[3],ROIs_x[3]),
+                                                   CartesianCoordinate2D<float>(ROIs_y[4],ROIs_x[4])};
+  for (int i = 0; i<5; i++)
+  {
+    float d = 2*(i+1); //ROI diameter in mm
+    float radius_y =d/2.;
+    float radius_x = d/2.;
+    CartesianCoordinate3D<float> centre(0, ROI_centers[i].y(), ROI_centers[i].x());
+    EllipsoidalCylinder current_ROI(length_z, radius_y, radius_x, centre);
+    ROIs.push_back(current_ROI);
+  }
+}
+
+
+void
+find_max_in_ROI(float &max, CartesianCoordinate3D<int>& max_coord,
+                const VoxelsOnCartesianGrid<float>& image,
+                const EllipsoidalCylinder& ROI)
+{
+  bool change = 0; // to make sure there is any non-zero voxel
+  const int min_y = image.get_min_y();
+  const int min_x = image.get_min_x();
+  const int max_y = image.get_max_y();
+  const int max_x = image.get_max_x();
+
+  shared_ptr<VoxelsOnCartesianGrid<float> >
+            discretised_shape_ptr(image.get_empty_voxels_on_cartesian_grid());
+  ROI.construct_volume(*discretised_shape_ptr, Coordinate3D<int>(1,1,1)); // TODO number_samples=1, make it general
+  VoxelsOnCartesianGrid<float> discretised_shape = *discretised_shape_ptr;
+
+  max = std::numeric_limits<float>::lowest();
+
+  //iterate only over y , x. because the image is actualy the average plane in which only z=0 is valid
+  for(int y=min_y; y<=max_y; y++)
+    for(int x=min_x; x<=max_x; x++)
+  {
+    int z=0;
+    const float weight = discretised_shape[z][y][x];
+  	if (weight ==0)
+      continue;
+
+    change = 1;
+    CartesianCoordinate3D<int> current_index(z,y,x);
+    const float current_value = image[z][y][x];
+    if (current_value>max)
+    {
+      max=current_value;
+      max_coord = current_index;
+    }
+  }
+  if (change ==0)
+    error("Max was not found in this range. All voxels are zero\n");
+}
+
+void
+find_max_in_all_ROIs(vector<float>& maxs,
+                     vector<CartesianCoordinate3D<int>>& max_coords,
+                     const VoxelsOnCartesianGrid<float>& image,
+                     const vector<EllipsoidalCylinder>& ROIs)
+{
+  for (unsigned int i=0; i<ROIs.size(); i++)
+  {
+    float max;
+    CartesianCoordinate3D<int> max_coord;
+    find_max_in_ROI(max, max_coord, image, ROIs[i]);
+    maxs.push_back(max);
+    max_coords.push_back(max_coord);
+  }
+}
+
+void
+find_mean_STD_along_lineprofile(float & mean, float & STD,
+                               const VoxelsOnCartesianGrid<float>& image,
+                               char direction, int min_index, int max_index,
+                               const CartesianCoordinate3D<int>& pos)
+{
+  float sum = 0;
+  float variance = 0;
+  switch(direction)
+  {
+    case 'z':
+    {
+      for (int z=min_index; z<=max_index; z++)
+      {
+        sum += image[z][pos.y()][pos.x()];
+      }
+
+      mean = sum/(max_index-min_index+1);
+
+      for (int z=min_index; z<=max_index; z++)
+      {
+        variance += pow((image[z][pos.y()][pos.x()] - mean), 2);
+      }
+
+      variance /= (max_index-min_index+1);
+      STD = sqrt(variance);
+      break;
+    }
+    case 'y':
+    {
+      for (int y=min_index; y<=max_index; y++)
+      {
+        sum += image[pos.z()][y][pos.x()];
+      }
+
+      mean = sum/(max_index-min_index+1);
+
+      for (int y=min_index; y<=max_index; y++)
+      {
+        variance += pow((image[pos.z()][y][pos.x()] - mean), 2);
+      }
+
+      variance /= (max_index-min_index+1);
+      STD = sqrt(variance);
+      break;
+    }
+    case 'x':
+    {
+      for (int x=min_index; x<=max_index; x++)
+      {
+        sum += image[pos.z()][pos.y()][x];
+      }
+      mean = sum/(max_index-min_index+1);
+
+      for (int x=min_index; x<=max_index; x++)
+      {
+        variance += pow((image[pos.z()][pos.y()][x] - mean), 2);
+      }
+
+      variance /= (max_index-min_index+1);
+      STD = sqrt(variance);
+      break;
+    }
+  }
+}
+
+Succeeded FindRecoveryCoefficient::
+compute()
+{
+  shared_ptr<DiscretisedDensity<3,float> >
+    density(read_from_file<DiscretisedDensity<3,float> >(input_filename));
+
+  const VoxelsOnCartesianGrid<float>& image =
+     dynamic_cast<const VoxelsOnCartesianGrid<float>&>(*density);
+
+  ofstream out (output_filename +".txt");
+  if (!out)
+  {
+    warning("Cannot open output file.\n");
+    return Succeeded::no;
+  }
+
+  vector<float> ROI_maxs;
+  vector<CartesianCoordinate3D<int>> ROI_max_coords;
+
+  // average over 10 middle slices and save the result in one slice
+  shared_ptr<VoxelsOnCartesianGrid<float> > average_plane_ptr(image.get_empty_voxels_on_cartesian_grid());
+  VoxelsOnCartesianGrid<float> average_plane = *average_plane_ptr;
+  info("Computing average plane");
+  compute_average_plane_in_given_range(average_plane, image,
+                  min_index_for_average_plane, max_index_for_average_plane);
+  info("Done computing average plane");
+
+  // draw circular ROIs around each rod with D=2 * rod_d then find max in each ROIs
+  vector<EllipsoidalCylinder> ROIs;
+  float length_z =  image.get_voxel_size().z();
+  info("Building ROIs");
+  build_ROIs(ROIs, length_z, ROIs_x, ROIs_y);
+  info("Done building ROIs");
+
+  //find maximum and its corresponding coordinate in ROIs
+  info("Finding max in ROIs");
+  find_max_in_all_ROIs(ROI_maxs, ROI_max_coords, average_plane, ROIs);
+  info("Done find max in ROIs");
+
+  // draw line profiles along the rods on the pixel coordinates with max ROI
+  //find pixel values along line profiles
+  //determine mean and standard deviation of the valuse.
+  out<<"Results of recovery coeficient for "<<input_filename<<'\n';
+  out<<"ROI_max"<<'\t'<<"ROI_max_voxel_coord (y,x)"<<'\t'<<"mean\t"<<"RC\t"<<"STD\t"<<"Percentage_STD_of_RC"<<'\n';
+  info("Finding mean & STD");
+  for (unsigned int i = 0; i < ROIs.size(); i++)
+  {
+    float mean;
+    float RC;
+    float STD;
+    float percentage_STD;
+    char direction = 'z';
+    find_mean_STD_along_lineprofile(mean, STD, image,
+                                    direction, start_z_of_rods, stop_z_of_rods, ROI_max_coords[i]);
+    RC= mean/mean_uniform_region;
+    STD /= mean_uniform_region;
+    percentage_STD = 100*sqrt(pow(STD/RC, 2)
+                                      +pow(STD_uniform_region/mean_uniform_region, 2));
+
+    out<<std::setprecision(6)<<ROI_maxs[i]<<"\t("<<ROI_max_coords[i].y()<<", "<<ROI_max_coords[i].x()<<")\t";
+    out<<std::setprecision(6)<<mean<<'\t'<<std::setprecision(6)<<RC
+       <<'\t'<<std::setprecision(6)<<STD<<'\t'<<std::setprecision(6)<<percentage_STD<<'\n';
+  }
+  info("Done finding mean & STD");
+
+  //TODO check when yes
+  return Succeeded::yes;
+}
+
+int
+main(int argc, char *argv[])
+{
+  const char * const progname = argv[0];
+
+  if(argc!=2)
+  {
+    cerr<<"\nUsage: " << progname << "  parameter_file\n\n";
+    //TODO add ask_parameters()
+
+    exit(EXIT_FAILURE);
+  }
+
+  FindRecoveryCoefficient application(argc==2 ? argv[1] : 0);
+  Succeeded success = application.compute();
+
+  return success==Succeeded::yes ? EXIT_SUCCESS : EXIT_FAILURE;
+
+}
diff --git a/src/utilities/find_sum_projection_of_viewgram_and_sinogram.cxx b/src/utilities/find_sum_projection_of_viewgram_and_sinogram.cxx
new file mode 100644
index 000000000..b7cb516e2
--- /dev/null
+++ b/src/utilities/find_sum_projection_of_viewgram_and_sinogram.cxx
@@ -0,0 +1,140 @@
+/*
+Copyright 2017 ETH Zurich, Institute of Particle Physics and Astrophysics
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+	http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+/*!
+  \file
+  \ingroup utilities
+
+  \brief This program reads a projection data file and squeezes a given sinogrm or viewgram of it (from a 2D matrix to a 1D vector).
+
+  \author Parisa Khateri
+
+*/
+
+#include "stir/ProjData.h"
+#include "stir/IO/interfile.h"
+#include "stir/utilities.h"
+#include "stir/Bin.h"
+
+#include <fstream>
+#include <iostream>
+#include "stir/ProjDataFromStream.h"
+#include "stir/Sinogram.h"
+#include "stir/IO/read_from_file.h"
+#include "stir/SegmentByView.h"
+#include "stir/ProjDataInterfile.h"
+#include "stir/ProjDataInfo.h"
+
+
+
+
+#ifndef STIR_NO_NAMESPACES
+using std::cerr;
+#endif
+
+USING_NAMESPACE_STIR
+
+int main(int argc, char *argv[])
+{
+    if(argc<6)
+    {
+      cerr<<"\tUsage: " << argv[0] << " output_filename input_filename segment_number viewgram/simogram view_number/axial_pos_number\n";
+      cerr<<"\tviewgram: to calculate sum projection for a viewgram\n";
+      cerr<<"\tsinogram: to calculate sum projection for a sinogram\n";
+      exit(EXIT_FAILURE);
+    }
+    std::string output_filename=argv[1];
+    shared_ptr<ProjData>  in_proj_data_ptr = ProjData::read_from_file(argv[2]);
+    if (strcmp(argv[4], "viewgram")==0)
+    {
+      const int segment_num = atoi(argv[3]);
+      const int view_num = atoi(argv[5]);
+      shared_ptr<ProjDataInfo> pdi_ptr (in_proj_data_ptr->get_proj_data_info_sptr()->clone());
+      std::cout<<"[min_tang_pos, max_tang_pos]=["<<pdi_ptr->get_min_view_num()<<", "<<pdi_ptr->get_max_view_num()<<"]\n";
+      if (pdi_ptr->get_num_tangential_poss()/2.==0)
+        std::cout<<"num_tang_pos is even\n";
+
+      if (segment_num <in_proj_data_ptr->get_min_segment_num() || segment_num > in_proj_data_ptr->get_max_segment_num())
+        error("segment_num is out of range!\n");
+      if (view_num <in_proj_data_ptr->get_min_view_num() || view_num > in_proj_data_ptr->get_max_view_num())
+        error("view_num is out of range!\n");
+
+      SegmentByView<float> segment_by_view = in_proj_data_ptr->get_segment_by_view(segment_num);
+      Viewgram<float> view = segment_by_view.get_viewgram(view_num);
+      std::vector<float> squeezed_view;
+      squeezed_view.reserve(view.get_num_tangential_poss());
+      for (int tang = view.get_min_tangential_pos_num();
+               tang <= view.get_max_tangential_pos_num();
+               ++tang)
+      {
+        float sum_bins = 0;
+        for (int ax = view.get_min_axial_pos_num();
+                 ax <= view.get_max_axial_pos_num();
+                 ++ax)
+        {
+          sum_bins+= view[ax][tang];
+        }
+        squeezed_view.push_back(sum_bins);
+      }
+      std::ofstream out(output_filename+".txt");
+      out<<"Values of the squeezed view for segment_num="<<segment_num<<" and view_num="<<view_num<<"along the tangential direction\n";
+      std::ostream_iterator<float> output_iterator(out, "\n");
+      std::copy(squeezed_view.begin(), squeezed_view.end(), output_iterator);
+      return EXIT_SUCCESS;
+    }
+    else if (strcmp(argv[4], "sinogram")==0)
+    {
+      const int segment_num = atoi(argv[3]);
+      const int axial_pos_num = atoi(argv[5]);
+      shared_ptr<ProjDataInfo> pdi_ptr (in_proj_data_ptr->get_proj_data_info_sptr()->clone());
+      std::cout<<"[min_axial_pos, max_axial_pos]=["<<pdi_ptr->get_min_axial_pos_num(segment_num)<<", "<<pdi_ptr->get_max_axial_pos_num(segment_num)<<"]\n";
+
+      if (segment_num <in_proj_data_ptr->get_min_segment_num() || segment_num > in_proj_data_ptr->get_max_segment_num())
+        error("segment_num is out of range!\n");
+      if (axial_pos_num <in_proj_data_ptr->get_min_axial_pos_num(segment_num) || axial_pos_num > in_proj_data_ptr->get_max_axial_pos_num(segment_num))
+        error("axial_pos_num is out of range!\n");
+
+      SegmentBySinogram<float> segment_by_sino = in_proj_data_ptr->get_segment_by_sinogram(segment_num);
+      Sinogram<float> sino = segment_by_sino.get_sinogram(axial_pos_num);
+      std::vector<float> squeezed_sino;
+      squeezed_sino.reserve(sino.get_num_tangential_poss());
+      for (int tang = sino.get_min_tangential_pos_num();
+               tang <= sino.get_max_tangential_pos_num();
+               ++tang)
+      {
+        float sum_bins = 0;
+        for (int view = sino.get_min_view_num();
+                 view <= sino.get_max_view_num();
+                 ++view)
+        {
+          sum_bins+= sino[view][tang];
+        }
+        squeezed_sino.push_back(sum_bins);
+      }
+      std::ofstream out(output_filename+".txt");
+      out<<"Values of the squeezed sino for segment_num="<<segment_num<<" and axial_pos_num="<<axial_pos_num<<"along the tangential direction\n";
+      std::ostream_iterator<float> output_iterator(out, "\n");
+      std::copy(squeezed_sino.begin(), squeezed_sino.end(), output_iterator);
+      return EXIT_SUCCESS;
+    }
+    else
+    {
+      cerr<<"\tYou should determine either 'sinogram' or 'viewgram'\n";
+      cerr<<"\tUsage: " << argv[0] << " output_filename input_filename segment_number viewgram/simogram view_number/axial_pos_number\n";
+      cerr<<"\tviewgram: to calculate sum projection for a viewgram\n";
+      cerr<<"\tsinogram: to calculate sum projection for a sinogram\n";
+      exit(EXIT_FAILURE);
+    }
+}
diff --git a/src/utilities/separate_true_from_random_scatter_for_necr.cxx b/src/utilities/separate_true_from_random_scatter_for_necr.cxx
new file mode 100644
index 000000000..9deaee42b
--- /dev/null
+++ b/src/utilities/separate_true_from_random_scatter_for_necr.cxx
@@ -0,0 +1,301 @@
+/*
+Copyright 2017 ETH Zurich, Institute of Particle Physics and Astrophysics
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+	http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+/*!
+  \file
+  \ingroup utilities
+
+  \brief This program gets a projection data file of a mouse/rat scatter phantom measured according to NEMA NU 4. 
+          It seperates number of true events from number of random+scatter events.
+  
+  \author Parisa Khateri
+
+*/
+
+#include "stir/ProjData.h"
+#include "stir/IO/interfile.h"
+#include "stir/utilities.h"
+#include "stir/Bin.h"
+#include <math.h>
+#include <fstream>
+#include <iostream>
+#include "stir/ProjDataFromStream.h"
+#include "stir/Sinogram.h"
+#include "stir/IO/read_from_file.h"
+#include "stir/SegmentByView.h"
+#include "stir/ProjDataInterfile.h"
+#include "stir/ProjDataInfo.h"
+#include <algorithm>
+
+
+
+#ifndef STIR_NO_NAMESPACES
+using std::cerr;
+#endif
+
+USING_NAMESPACE_STIR
+
+int find_num_tang_pos_for_FOV(float a, float r, int n)
+{ //if r is radius, s is length of arc, a is length of chord, and n is number of azimuthal angles (num_detectors_per_ring)
+  float theta = asin((a/2.)/r); // the azimuthal angle (in radian) covered by the FOV in cylindrical geometry
+  float delta = 2*_PI/n;// the azimuthal angle covered by a detector element in cylindrical geometry
+  return int(round(2*theta/delta));
+}
+
+float find_length_of_arc_for_FOV(float a, float r)
+{ //if r is radius, s is length of arc and a is length of chord
+  // s = r * theta
+  // theta =  2* asin(a/2/r)
+  float theta = 2*asin((a/2.)/r); // the azimuthal angle (in radian) covered by the FOV in cylindrical geometry
+  float s = r * theta; //length of arc
+  return s;
+}
+
+int main(int argc, char *argv[])
+{
+    if(argc<5)
+    {
+      cerr<<"\tUsage: " << argv[0] << " output_filename input_filename phantom_diameter single/all [axial_pos_number]\n";
+      cerr<<"\tchoose single to calculate sum of the rows of a single sinogram. axial_pos_number is required for this option.\n";
+      cerr<<"\tchoose all to calculate sum of the sum of the rows of all sinograms\n";
+      cerr<<"\tthe input projection data should have already been processed by SSRB.\n";
+      exit(EXIT_FAILURE);
+    }
+    std::string output_filename=argv[1];
+    shared_ptr<ProjData>  in_proj_data_ptr = ProjData::read_from_file(argv[2]);
+    const float phantom_diameter = atof(argv[3]);
+    const int segment_num = 0;
+
+    if (strcmp(argv[4], "single")==0 && argc==6 )
+    {
+      const int axial_pos_num = atoi(argv[5]);
+      shared_ptr<ProjDataInfo> pdi_ptr (in_proj_data_ptr->get_proj_data_info_sptr()->clone());
+
+      if (axial_pos_num <in_proj_data_ptr->get_min_axial_pos_num(segment_num) || axial_pos_num > in_proj_data_ptr->get_max_axial_pos_num(segment_num))
+        error("axial_pos_num is out of range!\n");
+
+      SegmentBySinogram<float> segment_by_sino = in_proj_data_ptr->get_segment_by_sinogram(segment_num);
+      Sinogram<float> sino = segment_by_sino.get_sinogram(axial_pos_num);
+
+      //find max index in each row of sinogram and shift
+      Sinogram<float> shifted_sino = in_proj_data_ptr->get_empty_sinogram(axial_pos_num,segment_num);
+      for (int view = sino.get_min_view_num();
+               view <= sino.get_max_view_num();
+               ++view)
+      {
+        float max=0;
+        int max_idx=0;
+
+        //find max index in each row of sinogram
+        for (int tang = sino.get_min_tangential_pos_num();
+                 tang <= sino.get_max_tangential_pos_num();
+                 ++tang)
+        {
+          if (max<sino[view][tang])
+          {
+            max=sino[view][tang];
+            max_idx=tang;
+          }
+        }
+
+        //Shift the bins in each row of sinogram so that the maximum stays in the centre
+        //because the middle bin in each row of the sinogram corresponds to tang_pos=0
+        /*
+        tang_shifted = tang - (tang_max - tang_center)
+        tang_center = 0
+        tang_shifted = tang - tang_max
+        */
+        for (int tang = sino.get_min_tangential_pos_num();
+                 tang <= sino.get_max_tangential_pos_num();
+                 ++tang)
+        {
+          int shifted_tang = tang - max_idx;
+          if ( (shifted_tang)<sino.get_min_tangential_pos_num())
+            shifted_tang= tang + sino.get_num_tangential_poss() - max_idx;
+          shifted_sino[view][shifted_tang]=sino[view][tang];
+        }
+      }
+
+      //sum over the shifted rows in the sinogram
+      std::vector<float> squeezed_sino;
+      squeezed_sino.reserve(sino.get_num_tangential_poss());
+      for (int tang = sino.get_min_tangential_pos_num();
+               tang <= sino.get_max_tangential_pos_num();
+               ++tang)
+      {
+        float sum_bins = 0;
+        for (int view = sino.get_min_view_num();
+                 view <= sino.get_max_view_num();
+                 ++view)
+        {
+          sum_bins+= shifted_sino[view][tang];
+        }
+        squeezed_sino.push_back(sum_bins);
+      }
+      std::ofstream out(output_filename+".txt");
+      out<<"Values of the squeezed sino for segment_num="<<segment_num<<" and axial_pos_num="<<axial_pos_num<<"along the tangential direction\n";
+      std::ostream_iterator<float> output_iterator(out, "\n");
+      std::copy(squeezed_sino.begin(), squeezed_sino.end(), output_iterator);
+      return EXIT_SUCCESS;
+
+    }
+    if (strcmp(argv[4], "all")==0 && argc==5 )
+    {
+      shared_ptr<ProjDataInfo> pdi_ptr (in_proj_data_ptr->get_proj_data_info_sptr()->clone());
+
+      // keep sinograms out of the loop to avoid reallocations
+      // initialise to something because there's no default constructor
+      Sinogram<float> sino =
+        in_proj_data_ptr->get_empty_sinogram(in_proj_data_ptr->get_min_axial_pos_num(segment_num),segment_num);
+      Sinogram<float> shifted_sino =
+        in_proj_data_ptr->get_empty_sinogram(in_proj_data_ptr->get_min_axial_pos_num(segment_num),segment_num);
+
+      std::vector<float> squeezed_sino_all(in_proj_data_ptr->get_num_tangential_poss(), 0.0);
+      for (int axial_pos_num = pdi_ptr->get_min_axial_pos_num(segment_num);
+               axial_pos_num <= pdi_ptr->get_max_axial_pos_num(segment_num);
+               ++axial_pos_num)
+      {
+        sino = in_proj_data_ptr->get_sinogram(axial_pos_num, segment_num);
+        shifted_sino = in_proj_data_ptr->get_empty_sinogram(axial_pos_num,segment_num);
+
+        //find max index in each row of sinogram and shift
+        for (int view = sino.get_min_view_num();
+                 view <= sino.get_max_view_num();
+                 ++view)
+        {
+          float max=0;
+          int max_idx=0;
+
+          //find max index in each row of sinogram
+          for (int tang = sino.get_min_tangential_pos_num();
+                   tang <= sino.get_max_tangential_pos_num();
+                   ++tang)
+          {
+            if (max<sino[view][tang])
+            {
+              max=sino[view][tang];
+              max_idx=tang;
+            }
+          }
+          /*Shift the bins in each row of sinogram so that the maximum stays in the centre
+            because the middle bin in each row of the sinogram corresponds to tang_pos=0
+            tang_shifted = tang - (tang_max - tang_center)
+            tang_center = 0
+            tang_shifted = tang - tang_max
+          */
+          for (int tang = sino.get_min_tangential_pos_num();
+                   tang <= sino.get_max_tangential_pos_num();
+                   ++tang)
+          {
+            int shifted_tang = tang - max_idx;
+            if ( (shifted_tang)<sino.get_min_tangential_pos_num())
+              shifted_tang= tang + sino.get_num_tangential_poss() - max_idx;
+            if ( (shifted_tang)>sino.get_max_tangential_pos_num())
+              shifted_tang= tang - sino.get_num_tangential_poss() - max_idx;
+            assert(shifted_tang>=sino.get_min_tangential_pos_num() && shifted_tang<=sino.get_max_tangential_pos_num());
+            shifted_sino[view][shifted_tang]=sino[view][tang];
+          }
+        }
+
+        //sum over the shifted rows in sinograms
+        for (int tang = sino.get_min_tangential_pos_num();
+                 tang <= sino.get_max_tangential_pos_num();
+                 ++tang)
+        {
+          float sum_bins = 0;
+          for (int view = sino.get_min_view_num();
+                   view <= sino.get_max_view_num();
+                   ++view)
+          {
+            sum_bins+= shifted_sino[view][tang];
+          }
+          assert(tang+sino.get_max_tangential_pos_num()+1>=0 && tang+sino.get_max_tangential_pos_num()+1<squeezed_sino_all.size());
+          squeezed_sino_all[tang+sino.get_max_tangential_pos_num()+1]+=sum_bins;
+
+        }
+      }
+
+      std::ofstream out(output_filename+".txt");
+      out<<"Values of the squeezed sino for segment_num\n";
+      std::ostream_iterator<float> output_iterator(out, "\n");
+      std::copy(squeezed_sino_all.begin(), squeezed_sino_all.end(), output_iterator);
+
+      //trim sino with 8mm band around the phantom according to NEMA NU4
+      int num_tang_pos_for_FOV = find_num_tang_pos_for_FOV(phantom_diameter+16, //16 means 8 mm from each side of the sinogram
+                                    pdi_ptr->get_scanner_ptr()->get_inner_ring_radius(),
+                                    pdi_ptr->get_scanner_ptr()->get_num_detectors_per_ring());
+      int n = sino.get_max_tangential_pos_num() - num_tang_pos_for_FOV; // total number of tang pos to trim
+
+      squeezed_sino_all.erase(squeezed_sino_all.begin(),squeezed_sino_all.begin()+n/2+1);
+      squeezed_sino_all.erase(squeezed_sino_all.end()-n/2,squeezed_sino_all.end());
+
+      std::ofstream out_trimmed(output_filename+"_trimmed.txt");
+      out_trimmed<<"Values of the squeezed sino for segment_num\n";
+      std::ostream_iterator<float> output_iterator_trimmed(out_trimmed, "\n");
+      std::copy(squeezed_sino_all.begin(), squeezed_sino_all.end(), output_iterator_trimmed);
+
+
+      //find bin value at 7 mm from center according to NEMA NU4
+      float length_of_arc_for_14mm = find_length_of_arc_for_FOV(14, //7 mm from center to both sides
+                                    pdi_ptr->get_scanner_ptr()->get_inner_ring_radius());
+
+      int idx_mid = squeezed_sino_all.size()/2;
+      float delta_unit = length_of_arc_for_14mm/2.2;
+      // delta_unit-1/2 is number of bins from each side of central bin
+      float fraction1 = delta_unit/2 - floor(delta_unit/2);
+      float fraction2 = ceil(delta_unit/2) - delta_unit/2;
+
+      assert(idx_mid-floor(delta_unit/2)>=0 && idx_mid-floor(delta_unit/2)<squeezed_sino_all.size());
+      assert(idx_mid+floor(delta_unit/2)>=0 && idx_mid+floor(delta_unit/2)<squeezed_sino_all.size());
+      assert(idx_mid-ceil(delta_unit/2)>=0 && idx_mid-ceil(delta_unit/2)<squeezed_sino_all.size());
+      assert(idx_mid+ceil(delta_unit/2)>=0 && idx_mid+ceil(delta_unit/2)<squeezed_sino_all.size());
+
+      float c_left = ( fraction1*squeezed_sino_all[idx_mid - floor(delta_unit/2)]
+                     + fraction2*squeezed_sino_all[idx_mid - ceil(delta_unit/2)] );
+      float c_right = ( fraction1*squeezed_sino_all[idx_mid + floor(delta_unit/2)]
+                     + fraction2*squeezed_sino_all[idx_mid + ceil(delta_unit/2)] );
+      float random_and_scatter_inside_14mm = (c_right + c_left) * ceil(delta_unit) /2;
+
+      float random_and_scatter_outside_14mm = 0;
+      for (int idx = idx_mid + ceil(delta_unit/2); idx<squeezed_sino_all.size(); ++idx)
+      {
+        random_and_scatter_outside_14mm +=squeezed_sino_all[idx];
+      }
+      for (int idx = 0; idx<idx_mid - ceil(delta_unit/2); ++idx)
+      {
+        random_and_scatter_outside_14mm +=squeezed_sino_all[idx];
+      }
+      float random_and_scatter = random_and_scatter_inside_14mm + random_and_scatter_outside_14mm;
+
+      float total_event_number=0;
+      for (int idx = 0; idx<squeezed_sino_all.size(); ++idx)
+      {
+        total_event_number+=squeezed_sino_all[idx];
+      }
+      float true_event_number=total_event_number-random_and_scatter;
+      std::cout<<std::fixed<<total_event_number<<" "<<random_and_scatter<<" "<<true_event_number<<"\n";
+      return EXIT_SUCCESS;
+
+    }
+    else
+    {
+      cerr<<"\tUsage: " << argv[0] <<" output_filename input_filename phantom_diameter single/all [axial_pos_number]\n";
+      cerr<<"\tchoose single to calculate sum of the rows of a single sinogram. axial_pos_number is required for this option.\n";
+      cerr<<"\tchoose all to calculate sum of the sum of the rows of all sinograms\n";
+      cerr<<"\tthe input projection data should have already been processed by SSRB.\n";
+      exit(EXIT_FAILURE);
+    }
+}
diff --git a/src/utilities/write_sinogram_to_txt.cxx b/src/utilities/write_sinogram_to_txt.cxx
new file mode 100644
index 000000000..e9579498b
--- /dev/null
+++ b/src/utilities/write_sinogram_to_txt.cxx
@@ -0,0 +1,73 @@
+/* write_sinogram_to_txt.cxx
+
+ Extracts sinogram to txt file
+ Jannis Fischer
+ jannis.fischer@cern.ch
+
+	Copyright 2015 ETH Zurich, Institute of Particle Physics
+
+	Licensed under the Apache License, Version 2.0 (the "License");
+	you may not use this file except in compliance with the License.
+	You may obtain a copy of the License at
+
+		http://www.apache.org/licenses/LICENSE-2.0
+
+	Unless required by applicable law or agreed to in writing, software
+	distributed under the License is distributed on an "AS IS" BASIS,
+	WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+	See the License for the specific language governing permissions and
+	limitations under the License.
+*/
+
+#include "stir/ProjDataFromStream.h"
+#include "stir/SegmentByView.h"
+#include "stir/SegmentBySinogram.h"
+#include "stir/Sinogram.h"
+#include "stir/Viewgram.h"
+
+#include "stir/IO/interfile.h"
+#include "stir/shared_ptr.h"
+
+#include <fstream> 
+#include <iostream>
+
+USING_NAMESPACE_STIR
+using std::cerr;
+using std::cout;
+using std::endl;
+using std::ofstream;
+int main( int argc, char** argv )
+{
+	if( argc < 4 )
+	{
+		cerr << "Usage: " << argv[0] << " filename.hs axial_position segment_number" << endl;
+		return EXIT_FAILURE;
+	}
+	std::string filename(argv[1]);
+	
+	shared_ptr<ProjData> projdata_sptr = ProjData::read_from_file(filename.c_str());
+	Sinogram<float> sino = projdata_sptr->get_sinogram(atoi(argv[2]), atoi(argv[3]) );
+	
+	std::string outfilename;
+	size_t lastdot = filename.find_last_of(".");
+	if( lastdot == std::string::npos ) outfilename = filename;
+	else outfilename = filename.substr(0,lastdot);
+	outfilename.append("_axialposition");
+	outfilename.append(argv[2]);
+	outfilename.append("_segment");
+	outfilename.append(argv[3]);
+	outfilename.append(".csv");
+	
+	ofstream outfile(outfilename.c_str());
+	outfile << "#\tsegment=" << sino.get_segment_num() << "\taxial_pos=" << sino.get_axial_pos_num() << endl;
+	
+	for( int view = sino.get_min_view_num(); view <= sino.get_max_view_num(); view++ ) {
+		for( int tpos = sino.get_min_tangential_pos_num(); tpos <= sino.get_max_tangential_pos_num(); tpos++ ){
+			outfile << sino[view][tpos] << "\t";
+		}
+		outfile << endl;
+	}
+
+	outfile.close();
+	return EXIT_SUCCESS;
+}