diff --git a/PMTPositions_Scan.txt b/PMTPositions_Scan.txt
index 9a3e46bc6..3fb1ffdc0 100644
--- a/PMTPositions_Scan.txt
+++ b/PMTPositions_Scan.txt
@@ -1,132 +1,132 @@
-332	0	-64.341342	-169.39623	200.051707	0	1	0.00E+00	0
-333	0	-24.768463	-169.39623	160.37927	0	1	0.00E+00	0
-334	0	-77.542437	-169.39623	150.832364	0	1	0.00E+00	0
-335	0	-44.554903	-169.39623	180.215489	0	1	0.00E+00	0
-336	0	-57.755998	-168.52488	130.996145	0	1	0.00E+00	0
-337	0	19.125292	-169.39623	246.046266	0	1	0.00E+00	0
-338	0	7.66569018	-169.39623	192.087346	0	1	0.00E+00	0
-339	0	-31.907189	-169.39623	231.759783	0	1	0.00E+00	0
-340	0	38.9117314	-169.06278	226.210047	0	1	0.00E+00	0
-341	0	-12.120749	-169.39623	211.923565	0	1	0.00E+00	0
-342	0	-18.820509	-169.56896	91.4207652	0	1	0.00E+00	0
-343	0	14.8044156	-169.39623	120.706832	0	1	0.00E+00	0
-344	0	-4.9820238	-169.39623	140.543051	0	1	0.00E+00	0
-345	0	34.590855	-169.86855	100.870613	0	1	0.00E+00	0
-346	0	-38.606948	-169.39623	111.256984	0	1	0.00E+00	0
-347	0	27.4521296	-169.39623	172.251127	0	1	0.00E+00	0
-348	0	59.3254772	-169.39623	206.28688	0	1	0.00E+00	0
-349	0	47.2385689	-169.39623	152.414908	0	1	0.00E+00	0
-350	0	79.1119166	-168.49436	186.450661	0	1	0.00E+00	0
-351	0	67.0250083	-169.39623	132.578689	0	1	0.00E+00	0
-352	9	-15.239167	132.865366	249.65238	0.00E+00	-1	0.00E+00	1
-353	9	-81.33827	133.006131	183.127181	0.00E+00	-1	0.00E+00	1
-354	9	46.8804199	133.518815	234.884727	0.00E+00	-1	0.00E+00	1
-355	9	-47.802031	133.364449	236.496633	0.00E+00	-1	0.00E+00	1
-356	9	-67.930469	133.439206	215.757157	0.00E+00	-1	0.00E+00	1
-357	9	-81.581048	133.006131	154.452182	0.00E+00	-1	0.00E+00	1
-358	9	-68.507604	133.006131	121.748748	0.00E+00	-1	0.00E+00	1
-359	9	-15.114858	133.006131	86.7779769	0.00E+00	-1	0.00E+00	1
-360	9	-46.862741	133.464118	101.45482	0.00E+00	-1	0.00E+00	1
-361	9	48.3502277	133.312054	100.330305	0.00E+00	-1	0.00E+00	1
-362	9	81.4633409	133.006131	153.766317	0.00E+00	-1	0.00E+00	1
-363	9	15.4678669	133.213361	86.2532731	0.00E+00	-1	0.00E+00	1
-364	9	29.4471737	133.006131	170.200516	0.00E+00	-1	0.00E+00	1
-365	9	81.3601622	133.006131	183.008199	0.00E+00	-1	0.00E+00	1
-366	9	67.7823784	133.006131	215.50548	0.00E+00	-1	0.00E+00	1
-367	9	68.3523842	133.201528	121.010643	0.00E+00	-1	0.00E+00	1
-368	9	-0.5714347	133.006131	138.97572	0.00E+00	-1	0.00E+00	1
-369	9	15.0492684	133.006131	249.434187	0.00E+00	-1	0.00E+00	1
-370	9	-2.6891781	133.006131	198.122078	0.00E+00	-1	0.00E+00	1
-371	9	-29.699184	133.006131	168.082773	0.00E+00	-1	0.00E+00	1
-372	7	97.078044	45.9040574	228.731621	-0.92076	-0.0118607	-0.3879045	2
-373	6	111.202434	45.7640654	140.898261	-0.9249582	0.0034223	0.38005319	2
-374	7	97.0530886	-82.795372	228.682611	-0.92076	-0.0118607	-0.3879045	2
-375	7	110.596374	45.9040574	195.591138	-0.92076	-0.0118607	-0.3879045	2
-376	7	110.596374	-41.293856	195.591138	-0.92076	-0.0118607	-0.3879045	2
-377	7	97.1029995	-40.509264	228.78063	-0.92076	-0.0118607	-0.3879045	2
-378	6	111.233776	-40.139465	140.95894	-0.9249582	0.0034223	0.38005319	2
-379	6	111.171092	-82.453429	140.837581	-0.9249582	0.0034223	0.38005319	2
-380	6	97.7564857	45.7640654	108.23356	-0.9249582	0.0034223	0.38005319	2
-381	6	97.7564857	-41.01026	108.23356	-0.9249582	0.0034223	0.38005319	2
-382	6	93.0833577	1.00296458	113.184889	-0.9249582	0.0034223	0.38005319	3
-383	5	26.82842377	45.9152484	56.2031171	-0.3765238	-0.0130824	0.92629019	2
-384	4	-59.794259	46.2256333	70.5170267	0.3862042	-0.0223683	0.92213632	2
-385	4	-26.365738	-82.517546	56.0485575	0.3862042	-0.0223683	0.92213632	2
-386	4	-26.551872	46.0003072	56.1804642	0.3862042	-0.0223683	0.92213632	2
-387	5	26.82842377	-40.0115559	56.2031171	-0.3765238	-0.0130824	0.92629019	2
-388	4	-26.738007	-39.305354	56.3123709	0.3862042	-0.0223683	0.92213632	2
-389	5	59.28077687	45.91524844	69.57057188	-0.3765238	-0.0130824	0.92629019	2
-390	5	59.41121819	-41.0197411	69.64335382	-0.3765238	-0.0130824	0.92629019	2
-391	4	-59.539907	-39.462659	70.079862	0.3862042	-0.0223683	0.92213632	2
-392	5	59.15033555	-83.0106243	69.49778994	-0.3765238	-0.0130824	0.92629019	2
-393	4	-54.412482	1.30471456	75.196799	0.3862042	-0.0223683	0.92213632	3
-394	3	-97.8411513	-40.3141093	109.2089678	0.92372753	0.00187934	-0.3830443	2
-395	2	-111.52304	-83.653383	193.808857	0.92372753	0.00187934	-0.3830443	2
-396	2	-111.72646	-41.388658	194.262871	0.92372753	0.00187934	-0.3830443	2
-397	2	-111.62475	45.7781988	194.035864	0.92372753	0.00187934	-0.3830443	2
-398	3	-111.29397	45.8191773	140.957932	0.9222563	-0.0025943	0.3865435	2
-399	3	-97.5963639	-82.8059948	108.2012596	0.92372753	0.00187934	-0.3830443	2
-400	2	-98.009857	45.7781988	226.721705	0.92372753	0.00187934	-0.3830443	2
-401	3	-111.29397	-40.758622	140.957932	0.92372753	0.00187934	-0.3830443	2
-402	2	-98.009857	-40.933136	226.721705	0.92372753	0.00187934	-0.3830443	2
-403	3	-97.7187576	45.81917734	108.7051137	0.92372753	0.00187934	-0.3830443	2
-404	2	-92.856551	1.02101716	223.107643	0.92372753	0.00187934	-0.3830443	3
-405	8	54.9892187	1.038877872	260.87467	-0.3773816	0.00035279	-0.9260398	3
-406	8	27.32466247	-39.94106647	279.7456532	-0.3773816	0.00035279	-0.9260398	2
-407	8	59.83263167	-40.2121955	265.563198	-0.3773816	0.00035279	-0.9260398	2
-408	1	-59.342402	-86.097533	265.680163	0.38530308	0.00451611	-0.9227789	2
-409	1	-58.361223	-41.20414	266.279671	0.38530308	0.00451611	-0.9227789	2
-410	1	-26.896926	45.754046	279.763283	0.38530308	0.00451611	-0.9227789	2
-411	1	-58.851812	45.754046	265.979917	0.38530308	0.00451611	-0.9227789	2
-412	1	-26.896926	-40.853377	279.763283	0.38530308	0.00451611	-0.9227789	2
-413	8	59.83263167	45.7921821	265.563198	-0.3773816	0.00035279	-0.9260398	2
-414	8	26.2763762	-83.69909456	279.610581	-0.3773816	0.00035279	-0.9260398	2
-415	8	26.80051933	45.7921821	279.6781171	-0.3773816	0.00035279	-0.9260398	2
-416	3	-104.13511	86.3443883	140.794291	0.9222563	-0.0025943	0.3865435	0
-417	2	-104.70203	-128.53838	193.673598	0.92372753	0.00187934	-0.3830443	0
-418	3	-93.1738304	-129.224014	114.4791227	0.92372753	0.00187934	-0.3830443	0
-419	3	-103.70936	-85.732838	140.051511	0.92372753	0.00187934	-0.3830443	0
-420	2	-92.856551	-85.965084	223.107643	0.92372753	0.00187934	-0.3830443	0
-421	3	-93.1738304	1.373820036	114.4791227	0.92372753	0.00187934	-0.3830443	0
-422	3	-93.1738304	86.34438829	114.4791227	0.9222563	-0.0025943	0.3865435	0
-423	2	-104.70203	86.2920468	193.673598	0.92372753	0.00187934	-0.3830443	0
-424	2	-104.70203	1.02101716	193.673598	0.92372753	0.00187934	-0.3830443	0
-425	3	-104.56086	0.71407371	141.537072	0.92372753	0.00187934	-0.3830443	0
-426	2	-92.856551	86.2920468	223.107643	0.92372753	0.00187934	-0.3830443	0
-427	3	-104.13511	-129.22401	140.794291	0.92372753	0.00187934	-0.3830443	0
-428	1	-26.662038	0.99016696	272.809739	0.38530308	0.00451611	-0.9227789	0
-429	1	-26.935781	-129.81988	272.602087	0.38530308	0.00451611	-0.9227789	0
-430	8	26.58829938	86.64808493	272.262024	-0.3773816	0.00035279	-0.9260398	0
-431	8	26.39139432	-129.8036943	272.5644265	-0.3773816	0.00035279	-0.9260398	0
-432	4	-54.311045	-84.939124	74.2625027	0.3862042	-0.0223683	0.92213632	0
-433	5	54.67841137	-128.36873	74.71124133	-0.3765238	-0.0130824	0.92629019	0
-434	5	27.4190089	-128.508419	63.2579587	-0.3765238	-0.0130824	0.92629019	0
-435	4	-27.047035	1.30471456	64.2596705	0.3862042	-0.0223683	0.92213632	0
-436	4	-27.047035	-128.99266	64.2596705	0.3862042	-0.0223683	0.92213632	0
-437	5	27.20171088	86.4670992	62.9455071	-0.3765238	-0.0130824	0.92629019	0
-438	5	54.67841137	86.4670992	74.71124133	-0.3765238	-0.0130824	0.92629019	0
-439	5	26.98441285	-85.6511616	62.6330556	-0.3765238	-0.0130824	0.92629019	0
-440	5	27.20171088	1.19606959	62.9455071	-0.3765238	-0.0130824	0.92629019	0
-441	5	54.67841137	1.196069592	74.71124133	-0.3765238	-0.0130824	0.92629019	0
-442	4	-54.513919	86.8322458	76.1310952	0.3862042	-0.0223683	0.92213632	0
-443	4	-27.047035	86.7950364	64.2596705	0.3862042	-0.0223683	0.92213632	0
-444	1	-54.545446	-128.64868	260.815843	0.38530308	0.00451611	-0.9227789	0
-445	8	54.9892187	-85.868922	260.87467	-0.3773816	0.00035279	-0.9260398	0
-446	1	-54.545446	86.1469389	260.815843	0.38530308	0.00451611	-0.9227789	0
-447	1	-26.388295	-85.560377	273.017391	0.38530308	0.00451611	-0.9227789	0
-448	6	104.503815	86.2739942	141.856158	-0.9249582	0.0034223	0.38005319	0
-449	7	103.559466	-85.564861	195.661522	-0.92076	-0.0118607	-0.3879045	0
-450	7	92.085067	2.17166924	224.496886	-0.92076	-0.0118607	-0.3879045	0
-451	7	103.985993	1.41550995	197.255128	-0.92076	-0.0118607	-0.3879045	0
-452	7	92.085067	-129.1156	224.496886	-0.92076	-0.0118607	-0.3879045	0
-453	7	103.772729	-129.1156	196.458325	-0.92076	-0.0118607	-0.3879045	0
-454	6	104.503815	-128.8761	141.856158	-0.9249582	0.0034223	0.38005319	0
-455	7	103.772729	86.452805	196.458325	-0.92076	-0.0118607	-0.3879045	0
-456	6	93.0833577	86.2739942	113.184889	-0.9249582	0.0034223	0.38005319	0
-457	6	104.503815	1.00296458	141.856158	-0.9249582	0.0034223	0.38005319	0
-458	6	93.0833577	-85.036541	113.184889	-0.9249582	0.0034223	0.38005319	0
-459	7	92.085067	86.452805	224.496886	-0.92076	-0.0118607	-0.3879045	0
-460	1	-26.662038	86.2611966	272.809739	0.38530308	0.00451611	-0.9227789	0
-461	8	54.9892187	86.30990748	260.87467	-0.3773816	0.00035279	-0.9260398	0
-462	8	26.48984685	1.038877872	272.4132252	-0.3773816	0.00035279	-0.9260398	0
-463	1	-54.545446	0.99016696	260.815843	0.38530308	0.00451611	-0.9227789	0
+332	0	-64.341342	-169.39623	200.051707	0	1	0.00E+00	0	0
+333	0	-24.768463	-169.39623	160.37927	0	1	0.00E+00	0	0
+334	0	-77.542437	-169.39623	150.832364	0	1	0.00E+00	0	0
+335	0	-44.554903	-169.39623	180.215489	0	1	0.00E+00	0	0
+336	0	-57.755998	-168.52488	130.996145	0	1	0.00E+00	0	0
+337	0	19.125292	-169.39623	246.046266	0	1	0.00E+00	0	0
+338	0	7.66569018	-169.39623	192.087346	0	1	0.00E+00	0	0
+339	0	-31.907189	-169.39623	231.759783	0	1	0.00E+00	0	0
+340	0	38.9117314	-169.06278	226.210047	0	1	0.00E+00	0	0
+341	0	-12.120749	-169.39623	211.923565	0	1	0.00E+00	0	0
+342	0	-18.820509	-169.56896	91.4207652	0	1	0.00E+00	0	0
+343	0	14.8044156	-169.39623	120.706832	0	1	0.00E+00	0	0
+344	0	-4.9820238	-169.39623	140.543051	0	1	0.00E+00	0	0
+345	0	34.590855	-169.86855	100.870613	0	1	0.00E+00	0	0
+346	0	-38.606948	-169.39623	111.256984	0	1	0.00E+00	0	0
+347	0	27.4521296	-169.39623	172.251127	0	1	0.00E+00	0	0
+348	0	59.3254772	-169.39623	206.28688	0	1	0.00E+00	0	0
+349	0	47.2385689	-169.39623	152.414908	0	1	0.00E+00	0	0
+350	0	79.1119166	-168.49436	186.450661	0	1	0.00E+00	0	0
+351	0	67.0250083	-169.39623	132.578689	0	1	0.00E+00	0	0
+352	9	-15.239167	132.865366	249.65238	0.00E+00	-1	0.00E+00	1	0
+353	9	-81.33827	133.006131	183.127181	0.00E+00	-1	0.00E+00	1	0
+354	9	46.8804199	133.518815	234.884727	0.00E+00	-1	0.00E+00	1	0
+355	9	-47.802031	133.364449	236.496633	0.00E+00	-1	0.00E+00	1	0
+356	9	-67.930469	133.439206	215.757157	0.00E+00	-1	0.00E+00	1	0
+357	9	-81.581048	133.006131	154.452182	0.00E+00	-1	0.00E+00	1	0
+358	9	-68.507604	133.006131	121.748748	0.00E+00	-1	0.00E+00	1	0
+359	9	-15.114858	133.006131	86.7779769	0.00E+00	-1	0.00E+00	1	0
+360	9	-46.862741	133.464118	101.45482	0.00E+00	-1	0.00E+00	1	0
+361	9	48.3502277	133.312054	100.330305	0.00E+00	-1	0.00E+00	1	0
+362	9	81.4633409	133.006131	153.766317	0.00E+00	-1	0.00E+00	1	0
+363	9	15.4678669	133.213361	86.2532731	0.00E+00	-1	0.00E+00	1	0
+364	9	29.4471737	133.006131	170.200516	0.00E+00	-1	0.00E+00	1	0
+365	9	81.3601622	133.006131	183.008199	0.00E+00	-1	0.00E+00	1	0
+366	9	67.7823784	133.006131	215.50548	0.00E+00	-1	0.00E+00	1	0
+367	9	68.3523842	133.201528	121.010643	0.00E+00	-1	0.00E+00	1	0
+368	9	-0.5714347	133.006131	138.97572	0.00E+00	-1	0.00E+00	1	0
+369	9	15.0492684	133.006131	249.434187	0.00E+00	-1	0.00E+00	1	0
+370	9	-2.6891781	133.006131	198.122078	0.00E+00	-1	0.00E+00	1	0
+371	9	-29.699184	133.006131	168.082773	0.00E+00	-1	0.00E+00	1	0
+372	7	97.078044	45.9040574	228.731621	-0.92076	-0.0118607	-0.3879045	2	0
+373	6	111.202434	45.7640654	140.898261	-0.9249582	0.0034223	0.38005319	2	0
+374	7	97.0530886	-82.795372	228.682611	-0.92076	-0.0118607	-0.3879045	2	0
+375	7	110.596374	45.9040574	195.591138	-0.92076	-0.0118607	-0.3879045	2	0
+376	7	110.596374	-41.293856	195.591138	-0.92076	-0.0118607	-0.3879045	2	0
+377	7	97.1029995	-40.509264	228.78063	-0.92076	-0.0118607	-0.3879045	2	0
+378	6	111.233776	-40.139465	140.95894	-0.9249582	0.0034223	0.38005319	2	0
+379	6	111.171092	-82.453429	140.837581	-0.9249582	0.0034223	0.38005319	2	0
+380	6	97.7564857	45.7640654	108.23356	-0.9249582	0.0034223	0.38005319	2	0
+381	6	97.7564857	-41.01026	108.23356	-0.9249582	0.0034223	0.38005319	2	0
+382	6	93.0833577	1.00296458	113.184889	-0.9249582	0.0034223	0.38005319	3	53
+383	5	26.82842377	45.9152484	56.2031171	-0.3765238	-0.0130824	0.92629019	2	0
+384	4	-59.794259	46.2256333	70.5170267	0.3862042	-0.0223683	0.92213632	2	0
+385	4	-26.365738	-82.517546	56.0485575	0.3862042	-0.0223683	0.92213632	2	0
+386	4	-26.551872	46.0003072	56.1804642	0.3862042	-0.0223683	0.92213632	2	0
+387	5	26.82842377	-40.0115559	56.2031171	-0.3765238	-0.0130824	0.92629019	2	0
+388	4	-26.738007	-39.305354	56.3123709	0.3862042	-0.0223683	0.92213632	2	0
+389	5	59.28077687	45.91524844	69.57057188	-0.3765238	-0.0130824	0.92629019	2	0
+390	5	59.41121819	-41.0197411	69.64335382	-0.3765238	-0.0130824	0.92629019	2	0
+391	4	-59.539907	-39.462659	70.079862	0.3862042	-0.0223683	0.92213632	2	0
+392	5	59.15033555	-83.0106243	69.49778994	-0.3765238	-0.0130824	0.92629019	2	0
+393	4	-54.412482	1.30471456	75.196799	0.3862042	-0.0223683	0.92213632	3	53
+394	3	-97.8411513	-40.3141093	109.2089678	0.92372753	0.00187934	-0.3830443	2	0
+395	2	-111.52304	-83.653383	193.808857	0.92372753	0.00187934	-0.3830443	2	0
+396	2	-111.72646	-41.388658	194.262871	0.92372753	0.00187934	-0.3830443	2	0
+397	2	-111.62475	45.7781988	194.035864	0.92372753	0.00187934	-0.3830443	2	0
+398	3	-111.29397	45.8191773	140.957932	0.9222563	-0.0025943	0.3865435	2	0
+399	3	-97.5963639	-82.8059948	108.2012596	0.92372753	0.00187934	-0.3830443	2	0
+400	2	-98.009857	45.7781988	226.721705	0.92372753	0.00187934	-0.3830443	2	0
+401	3	-111.29397	-40.758622	140.957932	0.92372753	0.00187934	-0.3830443	2	0
+402	2	-98.009857	-40.933136	226.721705	0.92372753	0.00187934	-0.3830443	2	0
+403	3	-97.7187576	45.81917734	108.7051137	0.92372753	0.00187934	-0.3830443	2	0
+404	2	-92.856551	1.02101716	223.107643	0.92372753	0.00187934	-0.3830443	3	53
+405	8	54.9892187	1.038877872	260.87467	-0.3773816	0.00035279	-0.9260398	3	53
+406	8	27.32466247	-39.94106647	279.7456532	-0.3773816	0.00035279	-0.9260398	2	0
+407	8	59.83263167	-40.2121955	265.563198	-0.3773816	0.00035279	-0.9260398	2	0
+408	1	-59.342402	-86.097533	265.680163	0.38530308	0.00451611	-0.9227789	2	0
+409	1	-58.361223	-41.20414	266.279671	0.38530308	0.00451611	-0.9227789	2	0
+410	1	-26.896926	45.754046	279.763283	0.38530308	0.00451611	-0.9227789	2	0
+411	1	-58.851812	45.754046	265.979917	0.38530308	0.00451611	-0.9227789	2	0
+412	1	-26.896926	-40.853377	279.763283	0.38530308	0.00451611	-0.9227789	2	0
+413	8	59.83263167	45.7921821	265.563198	-0.3773816	0.00035279	-0.9260398	2	0
+414	8	26.2763762	-83.69909456	279.610581	-0.3773816	0.00035279	-0.9260398	2	0
+415	8	26.80051933	45.7921821	279.6781171	-0.3773816	0.00035279	-0.9260398	2	0
+416	3	-104.13511	86.3443883	140.794291	0.9222563	-0.0025943	0.3865435	0	53
+417	2	-104.70203	-128.53838	193.673598	0.92372753	0.00187934	-0.3830443	0	53
+418	3	-93.1738304	-129.224014	114.4791227	0.92372753	0.00187934	-0.3830443	0	53
+419	3	-103.70936	-85.732838	140.051511	0.92372753	0.00187934	-0.3830443	0	53
+420	2	-92.856551	-85.965084	223.107643	0.92372753	0.00187934	-0.3830443	0	53
+421	3	-93.1738304	1.373820036	114.4791227	0.92372753	0.00187934	-0.3830443	0	53
+422	3	-93.1738304	86.34438829	114.4791227	0.9222563	-0.0025943	0.3865435	0	53
+423	2	-104.70203	86.2920468	193.673598	0.92372753	0.00187934	-0.3830443	0	53
+424	2	-104.70203	1.02101716	193.673598	0.92372753	0.00187934	-0.3830443	0	53
+425	3	-104.56086	0.71407371	141.537072	0.92372753	0.00187934	-0.3830443	0	53
+426	2	-92.856551	86.2920468	223.107643	0.92372753	0.00187934	-0.3830443	0	53
+427	3	-104.13511	-129.22401	140.794291	0.92372753	0.00187934	-0.3830443	0	53
+428	1	-26.662038	0.99016696	272.809739	0.38530308	0.00451611	-0.9227789	0	53
+429	1	-26.935781	-129.81988	272.602087	0.38530308	0.00451611	-0.9227789	0	53
+430	8	26.58829938	86.64808493	272.262024	-0.3773816	0.00035279	-0.9260398	0	53
+431	8	26.39139432	-129.8036943	272.5644265	-0.3773816	0.00035279	-0.9260398	0	53
+432	4	-54.311045	-84.939124	74.2625027	0.3862042	-0.0223683	0.92213632	0	53
+433	5	54.67841137	-128.36873	74.71124133	-0.3765238	-0.0130824	0.92629019	0	53
+434	5	27.4190089	-128.508419	63.2579587	-0.3765238	-0.0130824	0.92629019	0	53
+435	4	-27.047035	1.30471456	64.2596705	0.3862042	-0.0223683	0.92213632	0	53
+436	4	-27.047035	-128.99266	64.2596705	0.3862042	-0.0223683	0.92213632	0	53
+437	5	27.20171088	86.4670992	62.9455071	-0.3765238	-0.0130824	0.92629019	0	53
+438	5	54.67841137	86.4670992	74.71124133	-0.3765238	-0.0130824	0.92629019	0	53
+439	5	26.98441285	-85.6511616	62.6330556	-0.3765238	-0.0130824	0.92629019	0	53
+440	5	27.20171088	1.19606959	62.9455071	-0.3765238	-0.0130824	0.92629019	0	53
+441	5	54.67841137	1.196069592	74.71124133	-0.3765238	-0.0130824	0.92629019	0	53
+442	4	-54.513919	86.8322458	76.1310952	0.3862042	-0.0223683	0.92213632	0	53
+443	4	-27.047035	86.7950364	64.2596705	0.3862042	-0.0223683	0.92213632	0	53
+444	1	-54.545446	-128.64868	260.815843	0.38530308	0.00451611	-0.9227789	0	53
+445	8	54.9892187	-85.868922	260.87467	-0.3773816	0.00035279	-0.9260398	0	53
+446	1	-54.545446	86.1469389	260.815843	0.38530308	0.00451611	-0.9227789	0	53
+447	1	-26.388295	-85.560377	273.017391	0.38530308	0.00451611	-0.9227789	0	53
+448	6	104.503815	86.2739942	141.856158	-0.9249582	0.0034223	0.38005319	0	53
+449	7	103.559466	-85.564861	195.661522	-0.92076	-0.0118607	-0.3879045	0	53
+450	7	92.085067	2.17166924	224.496886	-0.92076	-0.0118607	-0.3879045	0	53
+451	7	103.985993	1.41550995	197.255128	-0.92076	-0.0118607	-0.3879045	0	53
+452	7	92.085067	-129.1156	224.496886	-0.92076	-0.0118607	-0.3879045	0	53
+453	7	103.772729	-129.1156	196.458325	-0.92076	-0.0118607	-0.3879045	0	53
+454	6	104.503815	-128.8761	141.856158	-0.9249582	0.0034223	0.38005319	0	53
+455	7	103.772729	86.452805	196.458325	-0.92076	-0.0118607	-0.3879045	0	53
+456	6	93.0833577	86.2739942	113.184889	-0.9249582	0.0034223	0.38005319	0	53
+457	6	104.503815	1.00296458	141.856158	-0.9249582	0.0034223	0.38005319	0	53
+458	6	93.0833577	-85.036541	113.184889	-0.9249582	0.0034223	0.38005319	0	53
+459	7	92.085067	86.452805	224.496886	-0.92076	-0.0118607	-0.3879045	0	53
+460	1	-26.662038	86.2611966	272.809739	0.38530308	0.00451611	-0.9227789	0	53
+461	8	54.9892187	86.30990748	260.87467	-0.3773816	0.00035279	-0.9260398	0	53
+462	8	26.48984685	1.038877872	272.4132252	-0.3773816	0.00035279	-0.9260398	0	53
+463	1	-54.545446	0.99016696	260.815843	0.38530308	0.00451611	-0.9227789	0	53
diff --git a/src/WCSimConstructANNIECylinderScan.cc b/src/WCSimConstructANNIECylinderScan.cc
index a41e1b0cc..2ac71969d 100644
--- a/src/WCSimConstructANNIECylinderScan.cc
+++ b/src/WCSimConstructANNIECylinderScan.cc
@@ -231,19 +231,26 @@ G4LogicalVolume* WCSimDetectorConstruction::ConstructANNIECylinderScan()
 	
 	// Create rotation matrices for the orientations of the PMTs
 	std::vector<G4RotationMatrix*> pmt_rotation_matrices;
+	std::vector<G4RotationMatrix*> tilted_pmt_rotation_matrices;
 	// Bottom PMTs have panel number 0
 	G4RotationMatrix *WCBottomCapRotation = new G4RotationMatrix();
-	pmt_rotation_matrices.push_back(WCBottomCapRotation);	
+	pmt_rotation_matrices.push_back(WCBottomCapRotation);
+	tilted_pmt_rotation_matrices.push_back(WCBottomCapRotation);
 	// Barrel PMTs have panel numbers 1-8
 	for(int facei=0; facei<WCBarrelRingNPhi; facei++){
 		G4RotationMatrix* WCPMTRotationNext = new G4RotationMatrix(*WCPMTRotation);
+		G4RotationMatrix* WCPMTtiltRotationNext = new G4RotationMatrix(*WCPMTRotation);
 		WCPMTRotationNext->rotateX((dPhi*facei)-67.5*deg+180*deg);
+		WCPMTtiltRotationNext->rotateX((dPhi*facei)-67.5*deg+180*deg);
+		WCPMTtiltRotationNext->rotateY(-53*deg);
 		pmt_rotation_matrices.push_back(WCPMTRotationNext);
+		tilted_pmt_rotation_matrices.push_back(WCPMTtiltRotationNext);
 	}
 	// Top PMTs have panel number 9
 	G4RotationMatrix *WCTopCapRotation = new G4RotationMatrix();
 	WCTopCapRotation->rotateY(180.*deg);
 	pmt_rotation_matrices.push_back(WCTopCapRotation);
+	tilted_pmt_rotation_matrices.push_back(WCTopCapRotation);
 
 	G4cout <<"Size of pmt_rotation_matrices: "<<pmt_rotation_matrices.size()<<G4endl;
 
@@ -252,20 +259,38 @@ G4LogicalVolume* WCSimDetectorConstruction::ConstructANNIECylinderScan()
 	std::string next_pmt;
 	double pmt_x, pmt_y, pmt_z, pmt_dirx, pmt_diry, pmt_dirz;
 	double pmt_x_shift, pmt_y_shift, pmt_z_shift;
+	double tilt_pmt_x_shift, tilt_pmt_y_shift, tilt_pmt_z_shift;
+    double pmt_tilt_angle;
 	int panel_nr, pmt_type;
 	int PMTID;
+
 	while (!pmt_position_file.eof()){
-		pmt_position_file >> PMTID >> panel_nr >> pmt_x >> pmt_y >> pmt_z >> pmt_dirx >> pmt_diry >> pmt_dirz >> pmt_type;
+		pmt_position_file >> PMTID >> panel_nr >> pmt_x >> pmt_y >> pmt_z >> pmt_dirx >> pmt_diry >> pmt_dirz >> pmt_type >> pmt_tilt_angle;
 		if (pmt_position_file.eof()) break;
-		//G4cout << "Read in PMT "<<PMTID<<", panel nr: "<<panel_nr<<", Position ("<<pmt_x<<","<<pmt_y<<","<<pmt_z<<"), PMT type: "<<pmt_type<<G4endl;
 		G4LogicalVolume *logicWCPMT = logicWCPMTs.at(pmt_type);
+		G4RotationMatrix *tilt_pmt_rot = new G4RotationMatrix(*pmt_rotation_matrices.at(panel_nr));
+		//G4cout << "Read in PMT "<<PMTID<<", panel nr: "<<panel_nr<<", Position ("<<pmt_x<<","<<pmt_y<<","<<pmt_z<<"), PMT type: "<<pmt_type<<", Tilt angle: "<<pmt_tilt_angle<<G4endl;
+		tilt_pmt_rot->rotateY(-pmt_tilt_angle * deg);   // apply PMT tilt rotation
 		G4RotationMatrix *pmt_rot = pmt_rotation_matrices.at(panel_nr);
 		pmt_x_shift = pmt_x*cm;
 		pmt_y_shift = (168.1-pmt_z)*cm;
 		pmt_z_shift = ((pmt_y+14.45))*cm;
-		//pmt_z_shift = ((pmt_y+14.45)-InnerStructureCentreOffset/10.)*cm;
+		tilt_pmt_z_shift = (pmt_y+14.45+13.9)*cm;
 		//G4cout <<"Edited PMT position ("<<pmt_x_shift<<","<<pmt_y_shift<<","<<pmt_z_shift<<")"<<G4endl;
 		G4ThreeVector PMTPosition(pmt_x_shift,pmt_y_shift,pmt_z_shift);
+		G4ThreeVector PMTPosition_tilt(pmt_x_shift,pmt_y_shift,tilt_pmt_z_shift);
+
+		// only rotate the affected PMTs (ignore Top, Bottom, and ANNIE Hamamatsu PMTs)
+		if ((pmt_type == 3)||(pmt_type == 0 && panel_nr != 0)){
+		G4VPhysicalVolume *physicalWCPMT = new G4PVPlacement(tilt_pmt_rot,	//its rotation
+															PMTPosition_tilt,		//its position
+															logicWCPMT,			//its logical volume
+															"WCPMT",			//its name
+															logicWCBarrel,		//its mother volume
+															false,				//no boolean operations
+															PMTID,				//ID for this PMT (=channelkey in data)
+															true);				//check overlaps*/
+		} else { 
 		G4VPhysicalVolume *physicalWCPMT = new G4PVPlacement(pmt_rot,	//its rotation
 															PMTPosition,		//its position
 															logicWCPMT,			//its logical volume
@@ -274,6 +299,7 @@ G4LogicalVolume* WCSimDetectorConstruction::ConstructANNIECylinderScan()
 															false,				//no boolean operations
 															PMTID,				//ID for this PMT (=channelkey in data)
 															true);				//check overlaps*/
+		}
 	}
 	pmt_position_file.close();
 
@@ -298,13 +324,18 @@ G4LogicalVolume* WCSimDetectorConstruction::ConstructANNIECylinderScan()
 		G4double CellCentreY = WCIDRadius * cos(dPhi*facei);
 		
 		double verticalSpacingLAPPD	= mainAnnulusHeight/(WCLAPPDperCellVertical+1);
-		
+		//G4cout<<"verticalSpacingLAPPD was: " << verticalSpacingLAPPD <<G4endl;
+		verticalSpacingLAPPD = 550;
+		//G4cout<<"verticalSpacingLAPPD now: " << verticalSpacingLAPPD <<G4endl;
 		for(G4double j = 0; j < WCLAPPDperCellVertical; j++){	// num LAPPD cols in the central ring
-		
-		G4ThreeVector LAPPDPosition = G4ThreeVector(CellCentreX,
-													CellCentreY,
-													-mainAnnulusHeight/2.+(j+1.)*verticalSpacingLAPPD);
-		
+	
+		//G4cout<< -mainAnnulusHeight/2. << " " << (j-1.)*verticalSpacingLAPPD<< G4endl;
+		G4ThreeVector LAPPDPosition = G4ThreeVector(CellCentreX, CellCentreY, -119.2+(j-1.)*verticalSpacingLAPPD);
+		if(CellCentreY > -100) continue;
+		if((facei == 4 && j == 0) || (facei == 4 && j == 2) || (facei == 3 && j == 1) || (facei == 5 && j == 1) ) continue;
+
+		//G4cout<< "Putting "<< facei<< "th LAPPD at "<<LAPPDPosition<<G4endl;
+
 		G4VPhysicalVolume* physiWCBarrelLAPPD =
 		new G4PVPlacement(WCLAPPDRotationNext,                      // its rotation
 							LAPPDPosition,                          // its position
diff --git a/src/WCSimLAPPDObject.cc b/src/WCSimLAPPDObject.cc
index afef37ca8..edf5380f2 100644
--- a/src/WCSimLAPPDObject.cc
+++ b/src/WCSimLAPPDObject.cc
@@ -62,6 +62,24 @@ G4float* WCSimLAPPDObject::GetCollectionEfficiencyArray(){
   static G4float CE[10] = { 100., 100., 100., 100., 100., 100., 100., 100., 100., 100.};
   // CollectionEfficiency before modification on 2015-03-27 (Different from SKDetSim)
   // static G4float CE[10]={100,100,99,95,90,85,80,69,35,13}; 
+
+  // 0.05 height
+  //static G4float CE[10] = {83.08139999999999,86.38524450659465,89.77418831538222,92.6474904290534,95.61177509118487,98.17723228980405,99.52376371657738,93.51187976305238,76.20134983323001,0.0};
+  // 0.05 height + 1
+  //static G4float CE[10] = {84.0814, 87.38524450659465, 90.77418831538222, 93.6474904290534, 96.61177509118487, 99.17723228980405, 100.52376371657739, 94.51187976305238, 77.20134983323001, 0.0};
+
+  //static G4float CE[10] = {0, 0, 0, 96.61177509118487, 99.17723228980405, 100.52376371657739, 94.51187976305238, 77.20134983323001, 0.0};
+  // ~ 5cm active
+  //static G4float CE[10] = {100, 100, 100, 100, 100, 0,0,0,0,0};
+  // ~ 1cm active
+  // ?
+  
+  
+  
+  // 0.0092456 height
+  //static G4float CE[10] = {83.08139999999999, 83.69232049540342, 84.34244850736174, 85.08174680488179, 85.98863042107332, 87.21047141188019, 89.08244041464535, 91.57234059392873, 97.78303362808366, 0.0};
+  //To enable the collection efficiency parameter, the user must set `/WCSim/PMTCollEff on` in the macro.
+
   return CE;
 }
 
@@ -84,6 +102,7 @@ float LAPPD::HitTimeSmearing(float Q) {
   if (timingResolution < 0.58) timingResolution=0.58;
   float Smearing_factor = G4RandGauss::shoot(0.0,timingResolution);
   return Smearing_factor;
+
 }
 
 G4float* LAPPD::Getqpe()
@@ -208,19 +227,39 @@ G4float* LAPPD::Getqpe()
 //data for QE for LAPPDs was obtained: http://indico.cern.ch/event/432527/contributions/1071935/attachments/1319657/1979729/Pilot_Production_of_LAPPD_-_Aug_5_2016_FINAL_V5.0_08-03-2016.pdf - Minot, ICHEP 2016
 //data exist from ~363. - 628. nm [everyhting else uses PMTs QE]
 G4float* LAPPD::GetQEWavelength(){
-  static G4float wavelength_value[20] = { 280., 300., 320., 340., 360., 380., 400., 420., 440., 460., 480., 500., 520., 540., 560., 580., 600., 620., 640., 660.};
+  // wavelength bin for 19 Celsius and RT
+  //static G4float wavelength_value[20] = { 280., 300., 320., 340., 360., 380., 400., 420., 440., 460., 480., 500., 520., 540., 560., 580., 600., 620., 640., 660.};
+
+  // wavelength bin for LAPPD 25 for 40
+  static G4float wavelength_value[20] = {220., 240., 260., 280., 300., 320., 340., 360., 380., 400., 420., 440., 460., 480., 500., 520., 540., 560., 580., 600.};
+  //static G4float wavelength_value[20] = {280., 300., 320., 340., 360., 380., 400., 420., 440., 460., 480., 500., 520., 540., 560., 580., 600.,  620., 640., 660.};
+
   return wavelength_value;
 }
 
 G4float* LAPPD::GetQE(){  
+// new data from LAPPD 25 for 40
+static G4float QE[20] = {0.02937435, 0.06062565, 0.09187696 , 0.12312826  ,  0.15437956  , 0.18471379  , 0.21641814 , 0.2428098   , 0.24469183 , 0.22234098  ,  0.207122    ,0.19884722  ,  0.17932031  ,  0.14470496  ,0.1113269  ,   0.09028386  ,  0.07672619  ,0.06275337  , 0.05160584 ,  0.03901694};
+//
+
+// new QE start from 280ns
+//static G4float QE[20] = {0.12312826  ,  0.15437956  , 0.18471379  , 0.21641814 , 0.2428098   , 0.24469183 , 0.22234098  ,  0.207122    ,0.19884722  ,  0.17932031  ,  0.14470496  ,0.1113269  ,   0.09028386  ,  0.07672619  ,0.06275337  , 0.05160584 ,  0.03901694, 0.03, 0.02, 0.01};
+
 // estimate QE @ 19 Celsius:  //the value @ 340nm cannot be 0.169 as for PMTs so I insert: 0.10!!
-static G4float QE[20] = { 0.00, .0139, .0854, .10, .12000, .10060, .09129, .09369, .09750, .09284, .07616, .05902, .05200, .04707, .04226, .03543, .03038, .02456, .00158, 0.00};
+//static G4float QE[20] = { 0.00, .0139, .0854, .10, .12000, .10060, .09129, .09369, .09750, .09284, .07616, .05902, .05200, .04707, .04226, .03543, .03038, .02456, .00158, 0.00};
+
 // estimate QE @ RT:  
 //static G4float QE[20] = { 0.00, .0139, .0854, .169, .22629, .18517, .15956, .16345, .16189, .14715, .11301, .08431, .07112, .06724, .06103, .05405, .04551, .03776, .00158, 0.00};
-  return QE;
+
+//static G4float QE[20] = { 1., 1.,1.,1.,1.,1.,1.,1.,1.,1.,1.,1.,1.,1.,1.,1.,1.,1.,1.,1.,};
+
+
+return QE;
 }
 G4float LAPPD::GetmaxQE(){
-  const G4float maxQE = 0.15; //for LAPPDs //0.211; if for PMTs
+
+  const G4float maxQE = 0.25; //for LAPPDs //0.211; if for PMTs
+
   return maxQE;
 }