--- java/branches/hps-java_ecal-commissioning/conditions/src/main/resources/HPS-ECalCommissioning/daqmap/ecal.txt	2014-10-11 14:47:35 UTC (rev 1170)
+++ java/branches/hps-java_ecal-commissioning/conditions/src/main/resources/HPS-ECalCommissioning/daqmap/ecal.txt	2014-10-11 14:54:33 UTC (rev 1171)
@@ -1,443 +1,452 @@

-# x y crate slot channel
-23 1 1 3 0
-23 2 1 3 1
-23 3 1 3 2
-23 4 1 3 3
-23 5 1 3 4
-22 1 1 3 5
-22 2 1 3 6
-22 3 1 3 7
-22 4 1 3 8
-22 5 1 3 9
-21 1 1 3 10
-21 2 1 3 11
-21 3 1 3 12
-21 4 1 3 13
-21 5 1 3 14
-20 1 1 3 15
-20 2 1 4 0
-20 3 1 4 1
-20 4 1 4 2
-20 5 1 4 3
-19 1 1 4 4
-19 2 1 4 5
-19 3 1 4 6
-19 4 1 4 7
-19 5 1 4 8
-18 1 1 4 9
-18 2 1 4 10
-18 3 1 4 11
-18 4 1 4 12
-18 5 1 4 13
-17 1 1 4 14
-17 2 1 4 15
-17 3 1 5 0
-17 4 1 5 1
-17 5 1 5 2
-16 1 1 5 3
-16 2 1 5 4
-16 3 1 5 5
-16 4 1 5 6
-16 5 1 5 7
-15 1 1 5 8
-15 2 1 5 9
-15 3 1 5 10
-15 4 1 5 11
-15 5 1 5 12
-14 1 1 5 13
-14 2 1 5 14
-14 3 1 5 15
-14 4 1 6 0
-14 5 1 6 1
-13 1 1 6 2
-13 2 1 6 3
-13 3 1 6 4
-13 4 1 6 5
-13 5 1 6 6
-12 1 1 6 7
-12 2 1 6 8
-12 3 1 6 9
-12 4 1 6 10
-12 5 1 6 11
-11 1 1 6 12
-11 2 1 6 13
-11 3 1 6 14
-11 4 1 6 15
-11 5 1 7 0
-10 1 1 7 1
-10 2 1 7 2
-10 3 1 7 3
-10 4 1 7 4
-10 5 1 7 5
-9 1 1 7 6
-9 2 1 7 7
-9 3 1 7 8
-9 4 1 7 9
-9 5 1 7 10
-8 1 1 7 11
-8 2 1 7 12
-8 3 1 7 13
-8 4 1 7 14
-8 5 1 7 15
-7 1 1 8 0
-7 2 1 8 1
-7 3 1 8 2
-7 4 1 8 3
-7 5 1 8 4
-6 1 1 8 5
-6 2 1 8 6
-6 3 1 8 7
-6 4 1 8 8
-6 5 1 8 9
-5 1 1 8 10
-5 2 1 8 11
-5 3 1 8 12
-5 4 1 8 13
-5 5 1 8 14
-4 1 1 8 15
-4 2 1 9 0
-4 3 1 9 1
-4 4 1 9 2
-4 5 1 9 3
-3 1 1 9 4
-3 2 1 9 5
-3 3 1 9 6
-3 4 1 9 7
-3 5 1 9 8
-2 1 1 9 9
-2 2 1 9 10
-2 3 1 9 11
-2 4 1 9 12
-2 5 1 9 13
-1 1 1 9 14
-1 2 1 9 15
-1 3 1 14 0
-1 4 1 14 1
-1 5 1 14 2
--1 1 1 14 3
--1 2 1 14 4
--1 3 1 14 5
--1 4 1 14 6
--1 5 1 14 7
--2 2 1 14 8
--2 3 1 14 9
--2 4 1 14 10
--2 5 1 14 11
--3 2 1 14 12
--3 3 1 14 13
--3 4 1 14 14
--3 5 1 14 15
--4 2 1 15 0
--4 3 1 15 1
--4 4 1 15 2
--4 5 1 15 3
--5 2 1 15 4
--5 3 1 15 5
--5 4 1 15 6
--5 5 1 15 7
--6 2 1 15 8
--6 3 1 15 9
--6 4 1 15 10
--6 5 1 15 11
--7 2 1 15 12
--7 3 1 15 13
--7 4 1 15 14
--7 5 1 15 15
--8 2 1 16 0
--8 3 1 16 1
--8 4 1 16 2
--8 5 1 16 3
--9 2 1 16 4
--9 3 1 16 5
--9 4 1 16 6
--9 5 1 16 7
--10 2 1 16 8
--10 3 1 16 9
--10 4 1 16 10
--10 5 1 16 11
--11 1 1 16 12
--11 2 1 16 13
--11 3 1 16 14
--11 4 1 16 15
--11 5 1 17 0
--12 1 1 17 1
--12 2 1 17 2
--12 3 1 17 3
--12 4 1 17 4
--12 5 1 17 5
--13 1 1 17 6
--13 2 1 17 7
--13 3 1 17 8
--13 4 1 17 9
--13 5 1 17 10
--14 1 1 17 11
--14 2 1 17 12
--14 3 1 17 13
--14 4 1 17 14
--14 5 1 17 15
--15 1 1 18 0
--15 2 1 18 1
--15 3 1 18 2
--15 4 1 18 3
--15 5 1 18 4
--16 1 1 18 5
--16 2 1 18 6
--16 3 1 18 7
--16 4 1 18 8
--16 5 1 18 9
--17 1 1 18 10
--17 2 1 18 11
--17 3 1 18 12
--17 4 1 18 13
--17 5 1 18 14
--18 1 1 18 15
--18 2 1 19 0
--18 3 1 19 1
--18 4 1 19 2
--18 5 1 19 3
--19 1 1 19 4
--19 2 1 19 5
--19 3 1 19 6
--19 4 1 19 7
--19 5 1 19 8
--20 1 1 19 9
--20 2 1 19 10
--20 3 1 19 11
--20 4 1 19 12
--20 5 1 19 13
--21 1 1 19 14
--21 2 1 19 15
--21 3 1 20 0
--21 4 1 20 1
--21 5 1 20 2
--22 1 1 20 3
--22 2 1 20 4
--22 3 1 20 5
--22 4 1 20 6
--22 5 1 20 7
--23 1 1 20 8
--23 2 1 20 9
--23 3 1 20 10
--23 4 1 20 11
--23 5 1 20 12
-23 -1 2 3 0
-23 -2 2 3 1
-23 -3 2 3 2
-23 -4 2 3 3
-23 -5 2 3 4
-22 -1 2 3 5
-22 -2 2 3 6
-22 -3 2 3 7
-22 -4 2 3 8
-22 -5 2 3 9
-21 -1 2 3 10
-21 -2 2 3 11
-21 -3 2 3 12
-21 -4 2 3 13
-21 -5 2 3 14
-20 -1 2 3 15
-20 -2 2 4 0
-20 -3 2 4 1
-20 -4 2 4 2
-20 -5 2 4 3
-19 -1 2 4 4
-19 -2 2 4 5
-19 -3 2 4 6
-19 -4 2 4 7
-19 -5 2 4 8
-18 -1 2 4 9
-18 -2 2 4 10
-18 -3 2 4 11
-18 -4 2 4 12
-18 -5 2 4 13
-17 -1 2 4 14
-17 -2 2 4 15
-17 -3 2 5 0
-17 -4 2 5 1
-17 -5 2 5 2
-16 -1 2 5 3
-16 -2 2 5 4
-16 -3 2 5 5
-16 -4 2 5 6
-16 -5 2 5 7
-15 -1 2 5 8
-15 -2 2 5 9
-15 -3 2 5 10
-15 -4 2 5 11
-15 -5 2 5 12
-14 -1 2 5 13
-14 -2 2 5 14
-14 -3 2 5 15
-14 -4 2 6 0
-14 -5 2 6 1
-13 -1 2 6 2
-13 -2 2 6 3
-13 -3 2 6 4
-13 -4 2 6 5
-13 -5 2 6 6
-12 -1 2 6 7
-12 -2 2 6 8
-12 -3 2 6 9
-12 -4 2 6 10
-12 -5 2 6 11
-11 -1 2 6 12
-11 -2 2 6 13
-11 -3 2 6 14
-11 -4 2 6 15
-11 -5 2 7 0
-10 -1 2 7 1
-10 -2 2 7 2
-10 -3 2 7 3
-10 -4 2 7 4
-10 -5 2 7 5
-9 -1 2 7 6
-9 -2 2 7 7
-9 -3 2 7 8
-9 -4 2 7 9
-9 -5 2 7 10
-8 -1 2 7 11
-8 -2 2 7 12
-8 -3 2 7 13
-8 -4 2 7 14
-8 -5 2 7 15
-7 -1 2 8 0
-7 -2 2 8 1
-7 -3 2 8 2
-7 -4 2 8 3
-7 -5 2 8 4
-6 -1 2 8 5
-6 -2 2 8 6
-6 -3 2 8 7
-6 -4 2 8 8
-6 -5 2 8 9
-5 -1 2 8 10
-5 -2 2 8 11
-5 -3 2 8 12
-5 -4 2 8 13
-5 -5 2 8 14
-4 -1 2 8 15
-4 -2 2 9 0
-4 -3 2 9 1
-4 -4 2 9 2
-4 -5 2 9 3
-3 -1 2 9 4
-3 -2 2 9 5
-3 -3 2 9 6
-3 -4 2 9 7
-3 -5 2 9 8
-2 -1 2 9 9
-2 -2 2 9 10
-2 -3 2 9 11
-2 -4 2 9 12
-2 -5 2 9 13
-1 -1 2 9 14
-1 -2 2 9 15
-1 -3 2 14 0
-1 -4 2 14 1
-1 -5 2 14 2
--1 -1 2 14 3
--1 -2 2 14 4
--1 -3 2 14 5
--1 -4 2 14 6
--1 -5 2 14 7
--2 -2 2 14 8
--2 -3 2 14 9
--2 -4 2 14 10
--2 -5 2 14 11
--3 -2 2 14 12
--3 -3 2 14 13
--3 -4 2 14 14
--3 -5 2 14 15
--4 -2 2 15 0
--4 -3 2 15 1
--4 -4 2 15 2
--4 -5 2 15 3
--5 -2 2 15 4
--5 -3 2 15 5
--5 -4 2 15 6
--5 -5 2 15 7
--6 -2 2 15 8
--6 -3 2 15 9
--6 -4 2 15 10
--6 -5 2 15 11
--7 -2 2 15 12
--7 -3 2 15 13
--7 -4 2 15 14
--7 -5 2 15 15
--8 -2 2 16 0
--8 -3 2 16 1
--8 -4 2 16 2
--8 -5 2 16 3
--9 -2 2 16 4
--9 -3 2 16 5
--9 -4 2 16 6
--9 -5 2 16 7
--10 -2 2 16 8
--10 -3 2 16 9
--10 -4 2 16 10
--10 -5 2 16 11
--11 -1 2 16 12
--11 -2 2 16 13
--11 -3 2 16 14
--11 -4 2 16 15
--11 -5 2 17 0
--12 -1 2 17 1
--12 -2 2 17 2
--12 -3 2 17 3
--12 -4 2 17 4
--12 -5 2 17 5
--13 -1 2 17 6
--13 -2 2 17 7
--13 -3 2 17 8
--13 -4 2 17 9
--13 -5 2 17 10
--14 -1 2 17 11
--14 -2 2 17 12
--14 -3 2 17 13
--14 -4 2 17 14
--14 -5 2 17 15
--15 -1 2 18 0
--15 -2 2 18 1
--15 -3 2 18 2
--15 -4 2 18 3
--15 -5 2 18 4
--16 -1 2 18 5
--16 -2 2 18 6
--16 -3 2 18 7
--16 -4 2 18 8
--16 -5 2 18 9
--17 -1 2 18 10
--17 -2 2 18 11
--17 -3 2 18 12
--17 -4 2 18 13
--17 -5 2 18 14
--18 -1 2 18 15
--18 -2 2 19 0
--18 -3 2 19 1
--18 -4 2 19 2
--18 -5 2 19 3
--19 -1 2 19 4
--19 -2 2 19 5
--19 -3 2 19 6
--19 -4 2 19 7
--19 -5 2 19 8
--20 -1 2 19 9
--20 -2 2 19 10
--20 -3 2 19 11
--20 -4 2 19 12
--20 -5 2 19 13
--21 -1 2 19 14
--21 -2 2 19 15
--21 -3 2 20 0
--21 -4 2 20 1
--21 -5 2 20 2
--22 -1 2 20 3
--22 -2 2 20 4
--22 -3 2 20 5
--22 -4 2 20 6
--22 -5 2 20 7
--23 -1 2 20 8
--23 -2 2 20 9
--23 -3 2 20 10
--23 -4 2 20 11
--23 -5 2 20 12

+#ix iy crate slot channel
+23 1 37 3 0
+23 2 37 3 1
+23 3 37 3 2
+23 4 37 3 3
+23 5 37 3 4
+22 1 37 3 5
+22 2 37 3 6
+22 3 37 3 7
+22 4 37 3 8
+22 5 37 3 9
+21 1 37 3 10
+21 2 37 3 11
+21 3 37 3 12
+21 4 37 3 13
+21 5 37 3 14
+20 1 37 3 15
+20 2 37 4 0
+20 3 37 4 1
+20 4 37 4 2
+20 5 37 4 3
+19 1 37 4 4
+19 2 37 4 5
+19 3 37 4 6
+19 4 37 4 7
+19 5 37 4 8
+18 1 37 4 9
+18 2 37 4 10
+18 3 37 4 11
+18 4 37 4 12
+18 5 37 4 13
+17 1 37 4 14
+17 2 37 4 15
+17 3 37 5 0
+17 4 37 5 1
+17 5 37 5 2
+16 1 37 5 3
+16 2 37 5 4
+16 3 37 5 5
+16 4 37 5 6
+16 5 37 5 7
+15 1 37 5 8
+15 2 37 5 9
+15 3 37 5 10
+15 4 37 5 11
+15 5 37 5 12
+14 1 37 5 13
+14 2 37 5 14
+14 3 37 5 15
+14 4 37 6 0
+14 5 37 6 1
+13 1 37 6 2
+13 2 37 6 3
+13 3 37 6 4
+13 4 37 6 5
+13 5 37 6 6
+12 1 37 6 7
+12 2 37 6 8
+12 3 37 6 9
+12 4 37 6 10
+12 5 37 6 11
+11 1 37 6 12
+11 2 37 6 13
+11 3 37 6 14
+11 4 37 6 15
+11 5 37 7 0
+10 1 37 7 1
+10 2 37 7 2
+10 3 37 7 3
+10 4 37 7 4
+10 5 37 7 5
+9 1 37 7 6
+9 2 37 7 7
+9 3 37 7 8
+9 4 37 7 9
+9 5 37 7 10
+8 1 37 7 11
+8 2 37 7 12
+8 3 37 7 13
+8 4 37 7 14
+8 5 37 7 15
+7 1 37 8 0
+7 2 37 8 1
+7 3 37 8 2
+7 4 37 8 3
+7 5 37 8 4
+6 1 37 8 5
+6 2 37 8 6
+6 3 37 8 7
+6 4 37 8 8
+6 5 37 8 9
+5 1 37 8 10
+5 2 37 8 11
+5 3 37 8 12
+5 4 37 8 13
+5 5 37 8 14
+4 1 37 8 15
+4 2 37 9 0
+4 3 37 9 1
+4 4 37 9 2
+4 5 37 9 3
+3 1 37 9 4
+3 2 37 9 5
+3 3 37 9 6
+3 4 37 9 7
+3 5 37 9 8
+2 1 37 9 9
+2 2 37 9 10
+2 3 37 9 11
+2 4 37 9 12
+2 5 37 9 13
+1 1 37 9 14
+1 2 37 9 15
+1 3 37 14 0
+1 4 37 14 1
+1 5 37 14 2
+-1 1 37 14 3
+-1 2 37 14 4
+-1 3 37 14 5
+-1 4 37 14 6
+-1 5 37 14 7
+-2 2 37 14 8
+-2 3 37 14 9
+-2 4 37 14 10
+-2 5 37 14 11
+-3 2 37 14 12
+-3 3 37 14 13
+-3 4 37 14 14
+-3 5 37 14 15
+-4 2 37 15 0
+-4 3 37 15 1
+-4 4 37 15 2
+-4 5 37 15 3
+-5 2 37 15 4
+-5 3 37 15 5
+-5 4 37 15 6
+-5 5 37 15 7
+-6 2 37 15 8
+-6 3 37 15 9
+-6 4 37 15 10
+-6 5 37 15 11
+-7 2 37 15 12
+-7 3 37 15 13
+-7 4 37 15 14
+-7 5 37 15 15
+-8 2 37 16 0
+-8 3 37 16 1
+-8 4 37 16 2
+-8 5 37 16 3
+-9 2 37 16 4
+-9 3 37 16 5
+-9 4 37 16 6
+-9 5 37 16 7
+-10 2 37 16 8
+-10 3 37 16 9
+-10 4 37 16 10
+-10 5 37 16 11
+-11 1 37 16 12
+-11 2 37 16 13
+-11 3 37 16 14
+-11 4 37 16 15
+-11 5 37 17 0
+-12 1 37 17 1
+-12 2 37 17 2
+-12 3 37 17 3
+-12 4 37 17 4
+-12 5 37 17 5
+-13 1 37 17 6
+-13 2 37 17 7
+-13 3 37 17 8
+-13 4 37 17 9
+-13 5 37 17 10
+-14 1 37 17 11
+-14 2 37 17 12
+-14 3 37 17 13
+-14 4 37 17 14
+-14 5 37 17 15
+-15 1 37 18 0
+-15 2 37 18 1
+-15 3 37 18 2
+-15 4 37 18 3
+-15 5 37 18 4
+-16 1 37 18 5
+-16 2 37 18 6
+-16 3 37 18 7
+-16 4 37 18 8
+-16 5 37 18 9
+-17 1 37 18 10
+-17 2 37 18 11
+-17 3 37 18 12
+-17 4 37 18 13
+-17 5 37 18 14
+-18 1 37 18 15
+-18 2 37 19 0
+-18 3 37 19 1
+-18 4 37 19 2
+-18 5 37 19 3
+-19 1 37 19 4
+-19 2 37 19 5
+-19 3 37 19 6
+-19 4 37 19 7
+-19 5 37 19 8
+-20 1 37 19 9
+-20 2 37 19 10
+-20 3 37 19 11
+-20 4 37 19 12
+-20 5 37 19 13
+-21 1 37 19 14
+-21 2 37 19 15
+-21 3 37 20 0
+-21 4 37 20 1
+-21 5 37 20 2
+-22 1 37 20 3
+-22 2 37 20 4
+-22 3 37 20 5
+-22 4 37 20 6
+-22 5 37 20 7
+-23 1 37 20 8
+-23 2 37 20 9
+-23 3 37 20 10
+-23 4 37 20 11
+-23 5 37 20 12
+23 -1 39 3 0
+23 -2 39 3 1
+23 -3 39 3 2
+23 -4 39 3 3
+23 -5 39 3 4
+22 -1 39 3 5
+22 -2 39 3 6
+22 -3 39 3 7
+22 -4 39 3 8
+22 -5 39 3 9
+21 -1 39 3 10
+21 -2 39 3 11
+21 -3 39 3 12
+21 -4 39 3 13
+21 -5 39 3 14
+20 -1 39 3 15
+20 -2 39 4 0
+20 -3 39 4 1
+20 -4 39 4 2
+20 -5 39 4 3
+19 -1 39 4 4
+19 -2 39 4 5
+19 -3 39 4 6
+19 -4 39 4 7
+19 -5 39 4 8
+18 -1 39 4 9
+18 -2 39 4 10
+18 -3 39 4 11
+18 -4 39 4 12
+18 -5 39 4 13
+17 -1 39 4 14
+17 -2 39 4 15
+17 -3 39 5 0
+17 -4 39 5 1
+17 -5 39 5 2
+16 -1 39 5 3
+16 -2 39 5 4
+16 -3 39 5 5
+16 -4 39 5 6
+16 -5 39 5 7
+15 -1 39 5 8
+15 -2 39 5 9
+15 -3 39 5 10
+15 -4 39 5 11
+15 -5 39 5 12
+14 -1 39 5 13
+14 -2 39 5 14
+14 -3 39 5 15
+14 -4 39 6 0
+14 -5 39 6 1
+13 -1 39 6 2
+13 -2 39 6 3
+13 -3 39 6 4
+13 -4 39 6 5
+13 -5 39 6 6
+12 -1 39 6 7
+12 -2 39 6 8
+12 -3 39 6 9
+12 -4 39 6 10
+12 -5 39 6 11
+11 -1 39 6 12
+11 -2 39 6 13
+11 -3 39 6 14
+11 -4 39 6 15
+11 -5 39 7 0
+10 -1 39 7 1
+10 -2 39 7 2
+10 -3 39 7 3
+10 -4 39 7 4
+10 -5 39 7 5
+9 -1 39 7 6
+9 -2 39 7 7
+9 -3 39 7 8
+9 -4 39 7 9
+9 -5 39 7 10
+8 -1 39 7 11
+8 -2 39 7 12
+8 -3 39 7 13
+8 -4 39 7 14
+8 -5 39 7 15
+7 -1 39 8 0
+7 -2 39 8 1
+7 -3 39 8 2
+7 -4 39 8 3
+7 -5 39 8 4
+6 -1 39 8 5
+6 -2 39 8 6
+6 -3 39 8 7
+6 -4 39 8 8
+6 -5 39 8 9
+5 -1 39 8 10
+5 -2 39 8 11
+5 -3 39 8 12
+5 -4 39 8 13
+5 -5 39 8 14
+4 -1 39 8 15
+4 -2 39 9 0
+4 -3 39 9 1
+4 -4 39 9 2
+4 -5 39 9 3
+3 -1 39 9 4
+3 -2 39 9 5
+3 -3 39 9 6
+3 -4 39 9 7
+3 -5 39 9 8
+2 -1 39 9 9
+2 -2 39 9 10
+2 -3 39 9 11
+2 -4 39 9 12
+2 -5 39 9 13
+1 -1 39 9 14
+1 -2 39 9 15
+1 -3 39 14 0
+1 -4 39 14 1
+1 -5 39 14 2
+-1 -1 39 14 3
+-1 -2 39 14 4
+-1 -3 39 14 5
+-1 -4 39 14 6
+-1 -5 39 14 7
+-2 -2 39 14 8
+-2 -3 39 14 9
+-2 -4 39 14 10
+-2 -5 39 14 11
+-3 -2 39 14 12
+-3 -3 39 14 13
+-3 -4 39 14 14
+-3 -5 39 14 15
+-4 -2 39 15 0
+-4 -3 39 15 1
+-4 -4 39 15 2
+-4 -5 39 15 3
+-5 -2 39 15 4
+-5 -3 39 15 5
+-5 -4 39 15 6
+-5 -5 39 15 7
+-6 -2 39 15 8
+-6 -3 39 15 9
+-6 -4 39 15 10
+-6 -5 39 15 11
+-7 -2 39 15 12
+-7 -3 39 15 13
+-7 -4 39 15 14
+-7 -5 39 15 15
+-8 -2 39 16 0
+-8 -3 39 16 1
+-8 -4 39 16 2
+-8 -5 39 16 3
+-9 -2 39 16 4
+-9 -3 39 16 5
+-9 -4 39 16 6
+-9 -5 39 16 7
+-10 -2 39 16 8
+-10 -3 39 16 9
+-10 -4 39 16 10
+-10 -5 39 16 11
+-11 -1 39 16 12
+-11 -2 39 16 13
+-11 -3 39 16 14
+-11 -4 39 16 15
+-11 -5 39 17 0
+-12 -1 39 17 1
+-12 -2 39 17 2
+-12 -3 39 17 3
+-12 -4 39 17 4
+-12 -5 39 17 5
+-13 -1 39 17 6
+-13 -2 39 17 7
+-13 -3 39 17 8
+-13 -4 39 17 9
+-13 -5 39 17 10
+-14 -1 39 17 11
+-14 -2 39 17 12
+-14 -3 39 17 13
+-14 -4 39 17 14
+-14 -5 39 17 15
+-15 -1 39 18 0
+-15 -2 39 18 1
+-15 -3 39 18 2
+-15 -4 39 18 3
+-15 -5 39 18 4
+-16 -1 39 18 5
+-16 -2 39 18 6
+-16 -3 39 18 7
+-16 -4 39 18 8
+-16 -5 39 18 9
+-17 -1 39 18 10
+-17 -2 39 18 11
+-17 -3 39 18 12
+-17 -4 39 18 13
+-17 -5 39 18 14
+-18 -1 39 18 15
+-18 -2 39 19 0
+-18 -3 39 19 1
+-18 -4 39 19 2
+-18 -5 39 19 3
+-19 -1 39 19 4
+-19 -2 39 19 5
+-19 -3 39 19 6
+-19 -4 39 19 7
+-19 -5 39 19 8
+-20 -1 39 19 9
+-20 -2 39 19 10
+-20 -3 39 19 11
+-20 -4 39 19 12
+-20 -5 39 19 13
+-21 -1 39 19 14
+-21 -2 39 19 15
+-21 -3 39 20 0
+-21 -4 39 20 1
+-21 -5 39 20 2
+-22 -1 39 20 3
+-22 -2 39 20 4
+-22 -3 39 20 5
+-22 -4 39 20 6
+-22 -5 39 20 7
+-23 -1 39 20 8
+-23 -2 39 20 9
+-23 -3 39 20 10
+-23 -4 39 20 11
+-23 -5 39 20 12
+
+
+#A. Celentano the 3 missing slots that (may) have data
+0 1 37 20 13
+0 2 37 20 14
+0 3 37 20 15
+0 -1 39 20 13
+0 -2 39 20 14
+0 -3 39 20 15

\ No newline at end of file

--- java/branches/hps-java_ecal-commissioning/ecal-recon/src/main/java/org/hps/recon/ecal/ECalUtils.java	2014-10-11 14:47:35 UTC (rev 1170)
+++ java/branches/hps-java_ecal-commissioning/ecal-recon/src/main/java/org/hps/recon/ecal/ECalUtils.java	2014-10-11 14:54:33 UTC (rev 1171)
@@ -23,7 +23,7 @@

     public static final int nBit = 12;  //number of bits used by the fADC to code a value
     public static final double maxVolt = 2.0;   //maximum volt intput of the fADC
     public static final double Req = 1.0 / 27.5; // equivalent resistance of the amplification chain

-    public static final double adcResolution = 2.0 / (Math.pow(2, nBit) - 1); //volts per ADC count

+    public static final double adcResolution = maxVolt / (Math.pow(2, nBit) - 1); //volts per ADC count

     public static final double readoutGain = Req * lightYield * quantumEff * surfRatio * gainAPD * gainPreAmpl * elemCharge;// = 15.0545 volt-seconds/GeV
     public static final double gainFactor = adcResolution / readoutGain;
     public static final double ecalReadoutPeriod = 4.0; // readout period in ns, it is hardcoded in the public declaration of EcalReadoutDriver. 

@@ -100,5 +100,31 @@

         return ret;
     }
     

-    

+  
+     /**
+     * This is a very basic method that, given an array with the raw-waveform (in FADC units), returns the amplitude (in mV)
+     * @param data Array with data from FADC, in fadc units
+     * @param lenght The array lenght
+     * @param pedestalSamples How many samples at the beginning of the array to use for the pedestal. Must be < lenght
+     * @return
+     */
+    public static double computeAmplitude(short [] data, int lenght, int pedestalSamples){
+    	double amplitude,pedestal;
+    	pedestal=0;
+    	amplitude=data[0];
+    	if (pedestalSamples>lenght){
+    		return 0;
+    	}
+    	for (int jj = 0; jj < lenght; jj++){
+    		if (jj<pedestalSamples) pedestal+=data[jj];
+    		if (data[jj]>amplitude) amplitude=data[jj];
+    	}
+    	pedestal/=pedestalSamples;
+    	amplitude-=pedestal;
+    	
+    	amplitude*=adcResolution;
+    	
+    	return amplitude;
+    	
+    }

 }

--- java/branches/hps-java_ecal-commissioning/ecal-recon/src/main/java/org/hps/recon/ecal/EcalRawConverter.java	2014-10-11 14:47:35 UTC (rev 1170)
+++ java/branches/hps-java_ecal-commissioning/ecal-recon/src/main/java/org/hps/recon/ecal/EcalRawConverter.java	2014-10-11 14:54:33 UTC (rev 1171)
@@ -36,7 +36,8 @@

         if (debug) {
             System.out.println("Summing ADC for hit: " + hit.toString());
         }

-        double pedestal = EcalConditions.physicalToPedestal(hit.getCellID());

+       // double pedestal = EcalConditions.physicalToPedestal(hit.getCellID()); A.C. for now
+        double pedestal = 0;

         short sum = 0;
         short samples[] = hit.getADCValues();
         for (int isample = 0; isample < samples.length; ++isample) {

--- java/branches/hps-java_ecal-commissioning/monitoring-drivers/src/main/java/org/hps/monitoring/ecal/plots/EcalLedCommissioning.java	2014-10-11 14:47:35 UTC (rev 1170)
+++ java/branches/hps-java_ecal-commissioning/monitoring-drivers/src/main/java/org/hps/monitoring/ecal/plots/EcalLedCommissioning.java	2014-10-11 14:54:33 UTC (rev 1171)
@@ -55,7 +55,10 @@

     int eventRefreshRate = 1;
     int eventn = 0;
 	int ix,iy,id;

+	int pedSamples=10;

+	double amp,ped,sigma;
+	

     int[] windowRaw=new int[47*11];//in case we have the raw waveform, this is the window lenght (in samples)
 	boolean[] isFirstRaw=new boolean[47*11];
 	

@@ -81,6 +84,10 @@

         this.maxEch = maxEch;
     }
     

+    public void setPedSamples(int pedSamples) {
+        this.pedSamples = pedSamples;
+    }
+    

     public void setInputCollection(String inputCollection) {
         this.inputCollection = inputCollection;
     }

@@ -249,7 +256,8 @@

                          channelRawWaveform.get(ii).reset();                     
                          for (int jj = 0; jj < windowRaw[ii]; jj++) {
                              channelRawWaveform.get(ii).fill(jj*ECalUtils.ecalReadoutPeriod, hit.getADCValues()[jj]*ECalUtils.adcResolution*1000);

-                         }                

+                         }                  
+                         channelRawWaveform.get(ii).setTitle("Amplitude: "+String.format("%4.1f",ECalUtils.computeAmplitude(hit.getADCValues(),windowRaw[ii],pedSamples))+" mV");

                      } 
                  }
             }

--- java/branches/hps-java_ecal-commissioning/steering-files/src/main/resources/org/hps/steering/monitoring/ECalLedCommissioning.lcsim	2014-10-11 14:47:35 UTC (rev 1170)
+++ java/branches/hps-java_ecal-commissioning/steering-files/src/main/resources/org/hps/steering/monitoring/ECalLedCommissioning.lcsim	2014-10-11 14:54:33 UTC (rev 1171)
@@ -39,6 +39,7 @@

             <inputCollection>EcalCalHits</inputCollection>
             <inputCollectionRaw>EcalReadoutHits</inputCollectionRaw>
             <inputClusterCollection>EcalClusters</inputClusterCollection>

+            <pedSamples>20</pedSamples>

             <maxEch>2.0</maxEch>
             <eventRefreshRate>100</eventRefreshRate>
         </driver>