diff --git a/examples/DBASE/test.database b/examples/DBASE/test.database
index 59790ba98ea08703314c7abaf958b99877f5e8fe..742f7073ae21178f571c6130a81b700d1d5f1dcf 100644
--- a/examples/DBASE/test.database
+++ b/examples/DBASE/test.database
@@ -2,6 +2,9 @@
50017
g_ctp_parm_filename="PARAM/general.param"
g_decode_map_filename="MAPS/jan03.map"
+52949
+g_ctp_parm_filename="PARAM/52949/general.param"
+g_decode_map_filename="MAPS/july04.map"
47000-48000
g_ctp_parm_filename="PARAM/general.param"
g_decode_map_filename="MAPS/jan03.map"
diff --git a/examples/MAPS/july04.map b/examples/MAPS/july04.map
index 1b963b508e1ccb69ce88e7e687958fbbb25bcc96..7551ce6553363614d187bee04425a57a7c93713c 100644
--- a/examples/MAPS/july04.map
+++ b/examples/MAPS/july04.map
@@ -1308,7 +1308,7 @@ Slot= 22
50, 2, 5, 3 !TDC ROC#1 Sl#23 Ch#50 HSCIN pl#2 [Y1] id#5 sig#3 [TDC-] (50 Y1N-05)
51, 2, 7, 3 !TDC ROC#1 Sl#23 Ch#51 HSCIN pl#2 [Y1] id#7 sig#3 [TDC-] (51 Y1N-07)
52, 2, 9, 3 !TDC ROC#1 Sl#23 Ch#52 HSCIN pl#2 [Y1] id#9 sig#3 [TDC-] (52 Y1N-09)
- 53, 2, 10, 3 !TDC ROC#1 Sl#23 Ch#53 Y1N-10 As Of 12 Apr 07
+! 53 !TDC ROC#1 Sl#23 Ch#53 unused
! 54 !TDC ROC#1 Sl#23 Ch#54 unused
! 55 !TDC ROC#1 Sl#23 Ch#55 unused
56, 2, 2, 3 !TDC ROC#1 Sl#23 Ch#56 HSCIN pl#2 [Y1] id#2 sig#3 [TDC-] (56 Y1N-02)
@@ -1316,10 +1316,9 @@ Slot= 22
58, 2, 6, 3 !TDC ROC#1 Sl#23 Ch#58 HSCIN pl#2 [Y1] id#6 sig#3 [TDC-] (58 Y1N-06)
59, 2, 8, 3 !TDC ROC#1 Sl#23 Ch#59 HSCIN pl#2 [Y1] id#8 sig#3 [TDC-] (59 Y1N-08)
! 60, 2, 10, 3 !TDC ROC#1 Sl#23 Ch#60 HSCIN pl#2 [Y1] id#10 sig#3 [TDC-] (60 Y1N-10)
-! 61, 2, 10, 3 !TDC ROC#1 Sl#23 Ch#61 swap location for h1y10-
+ 61 , 2, 10, 3 !TDC ROC#1 Sl#23 Ch#61 swap location for h1y10-
! 62 !TDC ROC#1 Sl#23 Ch#62 unused
! 63 !TDC ROC#1 Sl#23 Ch#63 unused
-! Channels 60-63 possibly bad 12 Apr 07 - moved Y1N-10 to 53
!
Slot= 21 ! TDC
!
@@ -1620,8 +1619,7 @@ Slot= 22
41, 2, 4, 0 !ADC ROC#1 Sl#9 Ch#41 HSCIN pl#2 [Y1] id#4 sig#0 [ADC+] (41 Y1P-04)
42, 2, 6, 0 !ADC ROC#1 Sl#9 Ch#42 HSCIN pl#2 [Y1] id#6 sig#0 [ADC+] (42 Y1P-06)
43, 2, 8, 0 !ADC ROC#1 Sl#9 Ch#43 HSCIN pl#2 [Y1] id#8 sig#0 [ADC+] (43 Y1P-08)
- 44, 2, 10, 0 !ADC ROC#1 Sl#9 Ch#44 HSCIN pl#2 [Y1] id#10 sig#0 [ADC+] (44 Y1P-10) as of 19 Apr 07 (PS)
-! 37, 2, 10, 0 !ADC ROC#1 Sl#9 Ch#44 HSCIN pl#2 [Y1] id#10 sig#0 [ADC+] (44 Y1P-10)
+ 44, 2, 10, 0 !ADC ROC#1 Sl#9 Ch#44 HSCIN pl#2 [Y1] id#10 sig#0 [ADC+] (44 Y1P-10)
! 45 !ADC ROC#1 Sl#9 Ch#45 unused
! 46 !ADC ROC#1 Sl#9 Ch#46 unused
! 47 !ADC ROC#1 Sl#9 Ch#47 unused
@@ -1715,22 +1713,22 @@ Slot= 22
detector= 4 !HCAL
!
Slot= 1 ! ADC
- 0, 1, 1 !Adc Roc#1 Sl#1 Ch#0 Hcal Col#1 Row#1 (0 A-01)
- 1, 1, 2 !Adc Roc#1 Sl#1 Ch#1 Hcal Col#1 Row#2 (1 A-02)
- 2, 1, 3 !Adc Roc#1 Sl#1 Ch#2 Hcal Col#1 Row#3 (2 A-03)
- 3, 1, 4 !Adc Roc#1 Sl#1 Ch#3 Hcal Col#1 Row#4 (3 A-04)
- 4, 1, 5 !Adc Roc#1 Sl#1 Ch#4 Hcal Col#1 Row#5 (4 A-05)
- 5, 1, 6 !Adc Roc#1 Sl#1 Ch#5 Hcal Col#1 Row#6 (5 A-06)
- 6, 1, 7 !Adc Roc#1 Sl#1 Ch#6 Hcal Col#1 Row#7 (6 A-07)
- 7, 1, 8 !Adc Roc#1 Sl#1 Ch#7 Hcal Col#1 Row#8 (7 A-08)
- 8, 1, 9 !Adc Roc#1 Sl#1 Ch#8 Hcal Col#1 Row#9 (8 A-09)
- 9, 1, 10 !Adc Roc#1 Sl#1 Ch#9 Hcal Col#1 Row#10 (9 A-10)
- 10, 1, 11 !Adc Roc#1 Sl#1 Ch#10 Hcal Col#1 Row#11 (10 A-11)
- 11, 1, 12 !Adc Roc#1 Sl#1 Ch#11 Hcal Col#1 Row#12 (11 A-12)
- 12, 1, 13 !Adc Roc#1 Sl#1 Ch#12 Hcal Col#1 Row#13 (12 A-13)
-! 13 !Adc Roc#1 Sl#1 Ch#13 Unused
-! 14 !Adc Roc#1 Sl#1 Ch#14 Unused
-! 15 !Adc Roc#1 Sl#1 Ch#15 Unused
+ 0, 1, 1 !ADC ROC#1 Sl#1 Ch#0 HCAL col#1 row#1 (0 A-01)
+ 1, 1, 2 !ADC ROC#1 Sl#1 Ch#1 HCAL col#1 row#2 (1 A-02)
+ 2, 1, 3 !ADC ROC#1 Sl#1 Ch#2 HCAL col#1 row#3 (2 A-03)
+ 3, 1, 4 !ADC ROC#1 Sl#1 Ch#3 HCAL col#1 row#4 (3 A-04)
+ 4, 1, 5 !ADC ROC#1 Sl#1 Ch#4 HCAL col#1 row#5 (4 A-05)
+ 5, 1, 6 !ADC ROC#1 Sl#1 Ch#5 HCAL col#1 row#6 (5 A-06)
+ 6, 1, 7 !ADC ROC#1 Sl#1 Ch#6 HCAL col#1 row#7 (6 A-07)
+ 7, 1, 8 !ADC ROC#1 Sl#1 Ch#7 HCAL col#1 row#8 (7 A-08)
+ 8, 1, 9 !ADC ROC#1 Sl#1 Ch#8 HCAL col#1 row#9 (8 A-09)
+ 9, 1, 10 !ADC ROC#1 Sl#1 Ch#9 HCAL col#1 row#10 (9 A-10)
+ 10, 1, 11 !ADC ROC#1 Sl#1 Ch#10 HCAL col#1 row#11 (10 A-11)
+ 11, 1, 12 !ADC ROC#1 Sl#1 Ch#11 HCAL col#1 row#12 (11 A-12)
+ 12, 1, 13 !ADC ROC#1 Sl#1 Ch#12 HCAL col#1 row#13 (12 A-13)
+! 13 !ADC ROC#1 Sl#1 Ch#13 unused
+! 14 !ADC ROC#1 Sl#1 Ch#14 unused
+! 15 !ADC ROC#1 Sl#1 Ch#15 unused
16, 2, 1 !ADC ROC#1 Sl#1 Ch#16 HCAL col#2 row#1 (16 B-01)
17, 2, 2 !ADC ROC#1 Sl#1 Ch#17 HCAL col#2 row#2 (17 B-02)
18, 2, 3 !ADC ROC#1 Sl#1 Ch#18 HCAL col#2 row#3 (18 B-03)
@@ -1772,16 +1770,16 @@ Slot= 22
54, 4, 7 !ADC ROC#1 Sl#1 Ch#54 HCAL col#4 row#7 (54 D-07)
55, 4, 8 !ADC ROC#1 Sl#1 Ch#55 HCAL col#4 row#8 (55 D-08)
56, 4, 9 !ADC ROC#1 Sl#1 Ch#56 HCAL col#4 row#9 (56 D-09)
- 63, 4, 10 !ADC ROC#1 Sl#1 Ch#57 HCAL col#4 row#10 (57 D-10)
-! 57, 4, 10 !ADC ROC#1 Sl#1 Ch#57 HCAL col#4 row#10 (57 D-10) (05/09/07, Patricia, flaky ribbon channel)
+ 57, 4, 10 !ADC ROC#1 Sl#1 Ch#57 HCAL col#4 row#10 (57 D-10)
58, 4, 11 !ADC ROC#1 Sl#1 Ch#58 HCAL col#4 row#11 (58 D-11)
59, 4, 12 !ADC ROC#1 Sl#1 Ch#59 HCAL col#4 row#12 (59 D-12)
60, 4, 13 !ADC ROC#1 Sl#1 Ch#60 HCAL col#4 row#13 (60 D-13)
+!
! 61 !ADC ROC#1 Sl#1 Ch#61 unused
detector= 5 !HMISC - scintillator (ADCs) - behind calorimeter
62, 2, 1, 0 !2,1,0 stands for: 2=adc,channel#1,0=dummy(pos vs. neg).
-! 63, 2, 2, 0 !
+ 63, 2, 2, 0 !
!
detector= 4 !HCAL
Slot= 5 ! ADC Second set of tubes on first two layers
@@ -1796,7 +1794,7 @@ Slot= 5 ! ADC Second set of tubes on first two layers
8, 1, 9, 1 !ADC ROC#1 Sl#5 Ch#8 HCAL col#1 row#9 (8 An-09)
9, 1, 10, 1 !ADC ROC#1 Sl#5 Ch#9 HCAL col#1 row#10 (9 An-10)
10, 1, 11, 1 !ADC ROC#1 Sl#5 Ch#10 HCAL col#1 row#11 (10 An-11)
- 11, 1, 12, 1 !ADC ROC#1 Sl#5 Ch#11 HCAL col#1 row#12 (11 An-12)
+ 11, 1, 12, 1 !ADC ROC#1 Sl#5 Ch#11 HCAL col#1 row#12 (11 An-112)
12, 1, 13, 1 !ADC ROC#1 Sl#5 Ch#12 HCAL col#1 row#13 (12 An-13)
! 13 !ADC ROC#1 Sl#5 Ch#13 unused
! 14 !ADC ROC#1 Sl#5 Ch#14 unused
@@ -1813,8 +1811,7 @@ Slot= 5 ! ADC Second set of tubes on first two layers
25, 2, 10, 1 !ADC ROC#1 Sl#5 Ch#25 HCAL col#2 row#10 (25 Bn-10)
26, 2, 11, 1 !ADC ROC#1 Sl#5 Ch#26 HCAL col#2 row#11 (26 Bn-11)
27, 2, 12, 1 !ADC ROC#1 Sl#5 Ch#27 HCAL col#2 row#12 (27 Bn-12)
- 30, 2, 13, 1 !ADC ROC#1 Sl#5 Ch#30 HCAL col#2 row#13 (30 Bn-13)
-! 28, 2, 13, 1 !ADC ROC#1 Sl#5 Ch#28 HCAL col#2 row#13 (28 Bn-13) (05/09/07, bad ADC channel, put it at 30)
+ 28, 2, 13, 1 !ADC ROC#1 Sl#5 Ch#28 HCAL col#2 row#13 (28 Bn-13)
! 29 !ADC ROC#1 Sl#1 Ch#29 unused
! 30 !ADC ROC#1 Sl#1 Ch#30 unused
! 31 !ADC ROC#1 Sl#1 Ch#31 unused
@@ -1891,9 +1888,6 @@ Slot= 5 ! ADC Second set of tubes on first two layers
! 13 !ADC ROC#1 Sl#3 Ch#13 unused
! 14 !ADC ROC#1 Sl#3 Ch#14 unused
! 15 !ADC ROC#1 Sl#3 Ch#15 unused
-! 13 !ADC ROC#1 Sl#1 Ch#13 unused
-! 14 !ADC ROC#1 Sl#1 Ch#14 unused
-! 15 !ADC ROC#1 Sl#1 Ch#15 unused
! 16 !ADC ROC#1 Sl#3 Ch#16 unused
! 17 !ADC ROC#1 Sl#3 Ch#17 unused
! 18 !ADC ROC#1 Sl#3 Ch#18 unused
@@ -1958,10 +1952,10 @@ Slot= 5 ! ADC Second set of tubes on first two layers
!
Slot= 13
!
- 0, 2, 17, 0 !ADC ROC#1 Sl#15 Ch#0 H00C X+
- 1, 2, 18, 0 !ADC ROC#1 Sl#15 Ch#1 H00C X-
- 2, 2, 19, 0 !ADC ROC#1 Sl#15 Ch#2 H00C Y+
- 3, 2, 20, 0 !ADC ROC#1 Sl#15 Ch#3 H00C Y-
+! 0, 2, 1, 0 !ADC ROC#1 Sl#15 Ch#0
+! 1, 2, 2, 0 !ADC ROC#1 Sl#15 Ch#1
+! 2, 2, 3, 0 !ADC ROC#1 Sl#15 Ch#2
+! 3, 2, 4, 0 !ADC ROC#1 Sl#15 Ch#3
4, 2, 5, 0 !ADC ROC#1 Sl#15 Ch#4 H00A X+
5, 2, 6, 0 !ADC ROC#1 Sl#15 Ch#5 H00A X-
6, 2, 7, 0 !ADC ROC#1 Sl#15 Ch#6 H00A Y+
@@ -1979,10 +1973,10 @@ Slot= 5 ! ADC Second set of tubes on first two layers
15, 2, 14, 0 !ADC ROC#1 Sl#15 Ch#15 Fast Raster X-signal
12, 2, 15, 0 !ADC ROC#1 Sl#15 Ch#12 Fast Raster Y-sync
13, 2, 16, 0 !ADC ROC#1 Sl#15 Ch#13 Fast Raster Y-signal
-! 16, 2, 17, 0 !ADC ROC#1 Sl#15 Ch#16 H00C X+
-! 17, 2, 18, 0 !ADC ROC#1 Sl#15 Ch#17 H00C X-
-! 18, 2, 19, 0 !ADC ROC#1 Sl#15 Ch#18 H00C Y+
-! 19, 2, 20, 0 !ADC ROC#1 Sl#15 Ch#19 H00C Y-
+ 16, 2, 17, 0 !ADC ROC#1 Sl#15 Ch#16 H00C X+
+ 17, 2, 18, 0 !ADC ROC#1 Sl#15 Ch#17 H00C X-
+ 18, 2, 19, 0 !ADC ROC#1 Sl#15 Ch#18 H00C Y+
+ 19, 2, 20, 0 !ADC ROC#1 Sl#15 Ch#19 H00C Y-
! 20 !ADC ROC#1 Sl#15 Ch#20 unused
! 21 !ADC ROC#1 Sl#15 Ch#21 unused
22, 2, 23, 0 !ADC ROC#1 Sl#15 Ch#22 Raster gate
@@ -2730,42 +2724,6 @@ Slot= 5 ! ADC Second set of tubes on first two layers
62, 10, 63
63, 10, 64
!
-! Use for runs before July 3rd 8:00am
-! detector= 15 !SMISC for tracker
-!95, 1, 81, 0 ! 0 !TDC ROC#4 Sl#12 track 3
-!83, 1, 82, 0 ! 0 !TDC ROC#4 Sl#12 track 4
-!82, 1, 83, 0 ! 0 !TDC ROC#4 Sl#12 track 5
-!81, 1, 84, 0 ! 0 !TDC ROC#4 Sl#12 track 6
-!84, 1, 85, 0 ! 0 !TDC ROC#4 Sl#12 track 7
-!85, 1, 86, 0 ! 0 !TDC ROC#4 Sl#12 track 8
-!86, 1, 87, 0 ! 0 !TDC ROC#4 Sl#12 track 9
-!87, 1, 88, 0 ! 0 !TDC ROC#4 Sl#12 track 10
-! before run 63466 track 11 in chan 88 and fiber 1 in chan 90
-! after run 63466 track 11 in chan 90 and fiber 1 in chan 88
-!90, 1, 89, 0 ! 0 !TDC ROC#4 Sl#12 track 11
-!89, 1, 90, 0 ! 0 !TDC ROC#4 Sl#12 track 12
-!88, 1, 91, 0 ! 0 !TDC ROC#4 Sl#12 fiber 1
-!91, 1, 92, 0 ! 0 !TDC ROC#4 Sl#12 bad
-!92, 1, 93, 0 ! 0 !TDC ROC#4 Sl#12 fiber 2
-!93, 1, 94, 0 ! 0 !TDC ROC#4 Sl#12 fiber 3
-!94, 1, 95, 0 ! 0 !TDC ROC#4 Sl#12 fiber 4
-!
-! Use for runs after July 3rd 8:00am ( CAMAC slot 19 mod 3412 8mV disc)
- 82, 1, 81, 0 ! 0 !TDC ROC#4 Sl#12 track 3
- 83, 1, 82, 0 ! 0 !TDC ROC#4 Sl#12 track 4
- 84, 1, 83, 0 ! 0 !TDC ROC#4 Sl#12 track 5
- 85, 1, 84, 0 ! 0 !TDC ROC#4 Sl#12 track 6
- 86, 1, 85, 0 ! 0 !TDC ROC#4 Sl#12 track 7
- 87, 1, 86, 0 ! 0 !TDC ROC#4 Sl#12 track 8
- 88, 1, 87, 0 ! 0 !TDC ROC#4 Sl#12 track 9
- 89, 1, 88, 0 ! 0 !TDC ROC#4 Sl#12 track 10
- 90, 1, 89, 0 ! 0 !TDC ROC#4 Sl#12 track 11
- 91, 1, 90, 0 ! 0 !TDC ROC#4 Sl#12 track 12
- 92, 1, 91, 0 ! 0 !TDC ROC#4 Sl#12 fiber 1
- 93, 1, 93, 0 ! 0 !TDC ROC#4 Sl#12 fiber 2
- 94, 1, 94, 0 ! 0 !TDC ROC#4 Sl#12 fiber 3
- 95, 1, 95, 0 ! 0 !TDC ROC#4 Sl#12 fiber 4
-
! SOS upstairs (SSCIN+SCAL+SCER) map K.B.Beard 13-Jun-1994
!
ROC= 3 !upstairs SOS crate (fbch2)
@@ -2998,8 +2956,6 @@ Slot= 5 ! ADC Second set of tubes on first two layers
! 44 !ADC ROC#3 Sl#9 Ch#44 unused
! 45 !ADC ROC#3 Sl#9 Ch#45 unused
! 46 !ADC ROC#3 Sl#9 Ch#46 unused
- 45, 3, 16, 0 !ADC ROC#3 Sl#7 Ch#15 SSCIN pl#3 [X2] id sig#16 [ADC+]
- 47, 3, 16, 1 !ADC ROC#3 Sl#7 Ch#31 SSCIN pl#3 [X2] id sig#16 [ADC-]
! 47 !ADC ROC#3 Sl#9 Ch#47 unused
48, 2, 1, 1 !ADC ROC#3 Sl#9 Ch#48 SSCIN pl#2 [Y1] id sig#1 [ADC-]
49, 2, 3, 1 !ADC ROC#3 Sl#9 Ch#49 SSCIN pl#2 [Y1] id sig#3 [ADC-]
@@ -3034,7 +2990,7 @@ Slot= 5 ! ADC Second set of tubes on first two layers
12, 3, 10, 0 !ADC ROC#3 Sl#7 Ch#12 SSCIN pl#3 [X2] id sig#10 [ADC+]
13, 3, 12, 0 !ADC ROC#3 Sl#7 Ch#13 SSCIN pl#3 [X2] id sig#12 [ADC+]
14, 3, 14, 0 !ADC ROC#3 Sl#7 Ch#14 SSCIN pl#3 [X2] id sig#14 [ADC+]
-! 15, 3, 16, 0 !ADC ROC#3 Sl#7 Ch#15 SSCIN pl#3 [X2] id sig#16 [ADC+]
+ 15, 3, 16, 0 !ADC ROC#3 Sl#7 Ch#15 SSCIN pl#3 [X2] id sig#16 [ADC+]
16, 3, 1, 1 !ADC ROC#3 Sl#7 Ch#16 SSCIN pl#3 [X2] id sig#1 [ADC-]
17, 3, 3, 1 !ADC ROC#3 Sl#7 Ch#17 SSCIN pl#3 [X2] id sig#3 [ADC-]
18, 3, 5, 1 !ADC ROC#3 Sl#7 Ch#18 SSCIN pl#3 [X2] id sig#5 [ADC-]
@@ -3050,7 +3006,7 @@ Slot= 5 ! ADC Second set of tubes on first two layers
28, 3, 10, 1 !ADC ROC#3 Sl#7 Ch#28 SSCIN pl#3 [X2] id sig#10 [ADC-]
29, 3, 12, 1 !ADC ROC#3 Sl#7 Ch#29 SSCIN pl#3 [X2] id sig#12 [ADC-]
30, 3, 14, 1 !ADC ROC#3 Sl#7 Ch#30 SSCIN pl#3 [X2] id sig#14 [ADC-]
-! 31, 3, 16, 1 !ADC ROC#3 Sl#7 Ch#31 SSCIN pl#3 [X2] id sig#16 [ADC-]
+ 31, 3, 16, 1 !ADC ROC#3 Sl#7 Ch#31 SSCIN pl#3 [X2] id sig#16 [ADC-]
32, 4, 1, 0 !ADC ROC#3 Sl#7 Ch#32 SSCIN pl#4 [Y2] id sig#1 [ADC+]
33, 4, 3, 0 !ADC ROC#3 Sl#7 Ch#33 SSCIN pl#4 [Y2] id sig#3 [ADC+]
34, 4, 5, 0 !ADC ROC#3 Sl#7 Ch#34 SSCIN pl#4 [Y2] id sig#5 [ADC+]
@@ -3088,7 +3044,7 @@ Slot= 5 ! ADC Second set of tubes on first two layers
!
Slot= 1 ! ADC
0, 1, 1 !ADC ROC#3 Sl#1 Ch#0 SCAL column#1 row#1
-! 1 !ADC ROC#3 Sl#1 Ch#2 unused
+ 1, 1, 2 !ADC ROC#3 Sl#1 Ch#1 SCAL column#1 row#2
2, 1, 3 !ADC ROC#3 Sl#1 Ch#2 SCAL column#1 row#3
3, 1, 4 !ADC ROC#3 Sl#1 Ch#3 SCAL column#1 row#4
4, 1, 5 !ADC ROC#3 Sl#1 Ch#4 SCAL column#1 row#5
@@ -3096,12 +3052,12 @@ Slot= 5 ! ADC Second set of tubes on first two layers
6, 1, 7 !ADC ROC#3 Sl#1 Ch#6 SCAL column#1 row#7
7, 1, 8 !ADC ROC#3 Sl#1 Ch#7 SCAL column#1 row#8
8, 1, 9 !ADC ROC#3 Sl#1 Ch#8 SCAL column#1 row#9
-! 9 !ADC ROC#3 Sl#1 Ch#9 unused
-! 10 !ADC ROC#3 Sl#1 Ch#10 unused
- 11, 1, 2 !ADC ROC#3 Sl#1 Ch#1 SCAL column#1 row#2
- 12, 1, 11 !ADC ROC#3 Sl#1 Ch#10 SCAL column#1 row#11
- 13, 1, 10 !ADC ROC#3 Sl#1 Ch#9 SCAL column#1 row#10
-! 14 !ADC ROC#3 Sl#1 Ch#14 unused
+ 9, 1, 10 !ADC ROC#3 Sl#1 Ch#9 SCAL column#1 row#10
+ 10, 1, 11 !ADC ROC#3 Sl#1 Ch#10 SCAL column#1 row#11
+! 11 !ADC ROC#3 Sl#1 Ch#11 unused
+! 12 !ADC ROC#3 Sl#1 Ch#12 unused
+! 13 !ADC ROC#3 Sl#1 Ch#13 unused
+! 14 !ADC ROC#3 Sl#1 Ch#14 unused
! 15 !ADC ROC#3 Sl#1 Ch#15 unused
16, 2, 1 !ADC ROC#3 Sl#1 Ch#16 SCAL column#2 row#1
17, 2, 2 !ADC ROC#3 Sl#1 Ch#17 SCAL column#2 row#2
@@ -3119,19 +3075,20 @@ Slot= 5 ! ADC Second set of tubes on first two layers
! 29 !ADC ROC#3 Sl#1 Ch#29 unused
! 30 !ADC ROC#3 Sl#1 Ch#30 unused
! 31 !ADC ROC#3 Sl#1 Ch#31 unused
- 32, 3, 1 !ADC ROC#3 Sl#1 Ch#32 SCAL column#3 row#1
+! 32, 3, 1 !ADC ROC#3 Sl#1 Ch#32 SCAL column#3 row#1
+ 44, 3, 1 !ADC ROC#3 Sl#1 Ch#32 SCAL column#3 row#1
33, 3, 2 !ADC ROC#3 Sl#1 Ch#33 SCAL column#3 row#2
34, 3, 3 !ADC ROC#3 Sl#1 Ch#34 SCAL column#3 row#3
35, 3, 4 !ADC ROC#3 Sl#1 Ch#35 SCAL column#3 row#4
36, 3, 5 !ADC ROC#3 Sl#1 Ch#36 SCAL column#3 row#5
-! 37 !ADC ROC#3 Sl#1 Ch#37 unused
+ 37, 3, 6 !ADC ROC#3 Sl#1 Ch#37 SCAL column#3 row#6
38, 3, 7 !ADC ROC#3 Sl#1 Ch#38 SCAL column#3 row#7
39, 3, 8 !ADC ROC#3 Sl#1 Ch#39 SCAL column#3 row#8
40, 3, 9 !ADC ROC#3 Sl#1 Ch#40 SCAL column#3 row#9
41, 3, 10 !ADC ROC#3 Sl#1 Ch#41 SCAL column#3 row#10
42, 3, 11 !ADC ROC#3 Sl#1 Ch#42 SCAL column#3 row#11
- 43, 3, 6 !ADC ROC#3 Sl#1 Ch#43 SCAL column#3 row#6
-! 44 !ADC ROC#3 Sl#1 Ch#43 unused
+! 43 !ADC ROC#3 Sl#1 Ch#43 unused
+! 44 !ADC ROC#3 Sl#1 Ch#44 unused
! 45 !ADC ROC#3 Sl#1 Ch#45 unused
! 46 !ADC ROC#3 Sl#1 Ch#46 unused
! 47 !ADC ROC#3 Sl#1 Ch#47 unused
@@ -3152,6 +3109,7 @@ Slot= 5 ! ADC Second set of tubes on first two layers
! 59 !ADC ROC#3 Sl#1 Ch#59 unused
! 60 !ADC ROC#3 Sl#1 Ch#60 unused
! 61 !ADC ROC#3 Sl#1 Ch#61 unused
+! 62 !ADC ROC#3 Sl#1 Ch#62 unused
62, 4, 1 !ADC ROC#3 Sl#1 Ch#48 SCAL column#4 row#1
! 63 !ADC ROC#3 Sl#1 Ch#63 unused
detector= 15 !smisc - photodiode for laser gain calibration system.
diff --git a/examples/calhit.C b/examples/calhit.C
deleted file mode 100644
index 5a61005f38667d59c32d209ca626069673531e84..0000000000000000000000000000000000000000
--- a/examples/calhit.C
+++ /dev/null
@@ -1,43 +0,0 @@
-{
- TFile* f = new TFile("hodtest.root");
-
- TCanvas *c1 = new TCanvas("c1", "Shower Hit Maps", 800, 800);
- c1->Divide(1, 4);
-
- TH1F* h[6];
-
- h[0] = chposadc1;
- h[1] = chnegadc1;
- h[2] = chposadc2;
- h[3] = chnegadc2;
- h[4] = chposadc3;
- h[5] = chposadc4;
-
-
- c1->cd(1);
- h[0]->SetFillColor(kGreen);
- h[0]->SetFillStyle(3345);
- h[0]->Draw();
- h[1]->SetFillColor(kBlue);
- h[1]->SetFillStyle(3354);
- h[1]->Draw("same");
-
- c1->cd(2);
- h[2]->SetFillColor(kGreen);
- h[2]->SetFillStyle(3345);
- h[2]->Draw();
- h[3]->SetFillColor(kBlue);
- h[3]->SetFillStyle(3354);
- h[3]->Draw("same");
-
- c1->cd(3);
- h[4]->SetFillColor(kGreen);
- h[4]->SetFillStyle(3345);
- h[4]->Draw();
-
- c1->cd(4);
- h[5]->SetFillColor(kGreen);
- h[5]->SetFillStyle(3345);
- h[5]->Draw();
-}
-
diff --git a/examples/compedeps.C b/examples/compedeps.C
index 790b4bfde154c682ddf1a5bb18e6bfab1448beba..5998740ed353b461180aeef97d72e59bb0659aa2 100644
--- a/examples/compedeps.C
+++ b/examples/compedeps.C
@@ -1,35 +1,70 @@
+void compedeps(Int_t run)
{
// Compare deposited energies in 4 planes from ENGINE with hcana.
- TFile* f = new TFile("hodtest.root");
+ TFile* f = new TFile(Form("hodtest_%d.root",run));
TH1F* h[4];
h[0] = edep1;
h[1] = edep2;
h[2] = edep3;
h[3] = edep4;
- TFile* f1 = new TFile("50017_hbk.root");
+ TFile* f1 = new TFile(Form("%d_hbk.root",run));
TH1F* h1[4];
- h1[0] = h683; //A
- h1[1] = h684; //B
- h1[2] = h685; //C
- h1[3] = h686; //C
+ switch (run) {
+ case 50017 :
+ h1[0] = h683; //A
+ h1[1] = h684; //B
+ h1[2] = h685; //C
+ h1[3] = h686; //C
+ break;
+ default :
+ h1[0] = h627; //A
+ h1[1] = h628; //B
+ h1[2] = h629; //C
+ h1[3] = h630; //C
+ }
- TCanvas *c1 = new TCanvas("c1", "Shower raw Edeps", 1000, 750);
+ TCanvas *c1 = new TCanvas("c1", "Shower raw Edeps", 1000, 667);
c1->Divide(2, 2);
for (int j = 0; j < 4; j++){
+
c1->cd(j+1);
- h[j]->SetFillColor(kGreen);
- h[j]->SetFillStyle(3345);
- h[j]->Draw();
-
+
h1[j]->SetFillColor(kBlue);
h1[j]->SetFillStyle(3354);
- h1[j]->Draw("same");
+ h1[j]->Draw();
+
+ h[j]->SetFillColor(kGreen);
+ h[j]->SetFillStyle(3345);
+ h[j]->Draw("same");
+
+ // gPad->SetLogy();
+ }
+
+ //
+ // Difference between the histograms.
+ //
+
+ TCanvas *c2 = new TCanvas("c2", "Edep histogram differences", 1000, 667);
+ c2->Divide(2, 2);
+
+ TH1F* d[4] = {h[0]->Clone(),h[0]->Clone(),h[0]->Clone(),h[0]->Clone()};
+
+ for (Int_t j = 0; j < 4; j++){
+
+ // d[j]->Divide(h[j],h1[j]);
+ d[j]->Add(h[j],h1[j],1.,-1.);
+
+ c2->cd(j+1);
+
+ d[j]->SetFillColor(kRed);
+ d[j]->SetFillStyle(1111);
+ d[j]->Draw();
- gPad->SetLogy();
+ // gPad->SetLogy();
}
}
diff --git a/examples/comphits.C b/examples/comphits.C
index e21eda24fc5e2dbf69e92268665e9365debd2fee..6489c463a1d83f40e113dcc6f9173b58bdcab562 100644
--- a/examples/comphits.C
+++ b/examples/comphits.C
@@ -1,5 +1,8 @@
+void comphits(Int_t run)
{
- TFile* f = new TFile("hodtest.root");
+ // TFile* f = new TFile("hodtest.root");
+ TFile* f = new TFile(Form("hodtest_%d.root",run));
+ cout << "hcana root file " << Form("hodtest_%d.root",run) << endl;
TH1F* h[6];
h[0] = chposadc1;
h[1] = chnegadc1;
@@ -8,16 +11,28 @@
h[4] = chposadc3;
h[5] = chposadc4;
- TFile* f1 = new TFile("50017_hbk.root");
+ TFile* f1 = new TFile(Form("%d_hbk.root",run));
+ cout << "Engine root file " << Form("%d_hbk.root",run) << endl;
TH1F* h1[6];
- h1[0] = h212; //A+
- h1[1] = h216; //A-
- h1[2] = h213; //B+
- h1[3] = h217; //B-
- h1[4] = h214; //C+
- h1[5] = h215; //D+
+ switch (run) {
+ case 50017 :
+ h1[0] = h212; //A+
+ h1[1] = h213; //A-
+ h1[2] = h214; //B+
+ h1[3] = h215; //B-
+ h1[4] = h216; //C+
+ h1[5] = h217; //D+
+ break;
+ default :
+ h1[0] = h213; //A+
+ h1[1] = h217; //A-
+ h1[2] = h214; //B+
+ h1[3] = h218; //B-
+ h1[4] = h215; //C+
+ h1[5] = h216; //D+
+ }
- TCanvas *c1 = new TCanvas("c1", "Shower Hit Maps", 1000, 750);
+ TCanvas *c1 = new TCanvas("c1", "Shower Hit Maps", 1000, 667);
c1->Divide(2, 3);
for (int j = 0; j < 6; j++){
@@ -29,7 +44,6 @@
h1[j]->SetFillColor(kBlue);
h1[j]->SetFillStyle(3354);
h1[j]->Draw("same");
-
}
}
diff --git a/examples/dcdriftdist.C b/examples/dcdriftdist.C
deleted file mode 100644
index fe67618e90a191c4e381d9b2a8e9dd7504cafcc9..0000000000000000000000000000000000000000
--- a/examples/dcdriftdist.C
+++ /dev/null
@@ -1,31 +0,0 @@
- {
- TFile* f = new TFile("hodtest.root");
-
- TCanvas *c1 = new TCanvas("c1", "Drift Chamber Drift Distance", 800, 800);
- c1->Divide(2, 6);
-
- TH1F* h[12];
-
- h[0] = hdc1x1_dd;
- h[1] = hdc1y1_dd;
- h[2] = hdc1u1_dd;
- h[3] = hdc1v1_dd;
- h[4] = hdc1y2_dd;
- h[5] = hdc1x2_dd;
- h[6] = hdc2x1_dd;
- h[7] = hdc2y1_dd;
- h[8] = hdc2u1_dd;
- h[9] = hdc2v1_dd;
- h[10] = hdc2y2_dd;
- h[11] = hdc2x2_dd;
-
- for(Int_t ih=0;ih<12;ih++) {
- Int_t ipad = 2*(ih%6)+1 + ih/6;
- cout << ipad << endl;
- TPad *pt = c1->cd(ipad);
- h[ih]->SetFillColor(kBlue);
- h[ih]->SetFillStyle(3354);
- h[ih]->Draw();
- }
-
-}
diff --git a/examples/dchitmaps.C b/examples/dchitmaps.C
deleted file mode 100644
index ce968cdd40c94219295fb1e60cfd25c285b5df53..0000000000000000000000000000000000000000
--- a/examples/dchitmaps.C
+++ /dev/null
@@ -1,31 +0,0 @@
- {
- TFile* f = new TFile("hodtest.root");
-
- TCanvas *c1 = new TCanvas("c1", "Drift Chamber Hit Maps", 800, 800);
- c1->Divide(2, 6);
-
- TH1F* h[12];
-
- h[0] = hdc1x1_wm;
- h[1] = hdc1y1_wm;
- h[2] = hdc1u1_wm;
- h[3] = hdc1v1_wm;
- h[4] = hdc1y2_wm;
- h[5] = hdc1x2_wm;
- h[6] = hdc2x1_wm;
- h[7] = hdc2y1_wm;
- h[8] = hdc2u1_wm;
- h[9] = hdc2v1_wm;
- h[10] = hdc2y2_wm;
- h[11] = hdc2x2_wm;
-
- for(Int_t ih=0;ih<12;ih++) {
- Int_t ipad = 2*(ih%6)+1 + ih/6;
- cout << ipad << endl;
- TPad *pt = c1->cd(ipad);
- h[ih]->SetFillColor(kBlue);
- h[ih]->SetFillStyle(3354);
- h[ih]->Draw();
- }
-
-}
diff --git a/examples/hitmaps.C b/examples/hitmaps.C
deleted file mode 100644
index 0874bc38ec8b21fcb094fde17b4fdebe3eee160d..0000000000000000000000000000000000000000
--- a/examples/hitmaps.C
+++ /dev/null
@@ -1,39 +0,0 @@
-{
- TFile* f = new TFile("hodtest.root");
-
- TCanvas *c1 = new TCanvas("c1", "Scintillator Hit Maps", 800, 800);
- c1->Divide(2, 4);
-
- TH1F* h[16];
-
- h[0] = hpostdc1;
- h[1] = hnegtdc1;
- h[4] = hpostdc2;
- h[5] = hnegtdc2;
- h[8] = hpostdc3;
- h[9] = hnegtdc3;
- h[12] = hpostdc4;
- h[13] = hnegtdc4;
-
- h[2] = hposadc1;
- h[3] = hnegadc1;
- h[6] = hposadc2;
- h[7] = hnegadc2;
- h[10] = hposadc3;
- h[11] = hnegadc3;
- h[14] = hposadc4;
- h[15] = hnegadc4;
-
- for(Int_t ipad=1;ipad<=8;ipad++) {
- TPad *pt = c1->cd(ipad);
- Int_t ihp = 2*(ipad-1);
- Int_t ihn = ihp+1;
- h[ihp]->SetFillColor(kGreen);
- h[ihp]->SetFillStyle(3345);
- h[ihp]->Draw();
- h[ihn]->SetFillColor(kBlue);
- h[ihn]->SetFillStyle(3354);
- h[ihn]->Draw("same");
- }
-
-}
diff --git a/examples/hodtest.C b/examples/hodtest.C
deleted file mode 100644
index 8968b15b68d9a21623d6efcd29a8a2c281041157..0000000000000000000000000000000000000000
--- a/examples/hodtest.C
+++ /dev/null
@@ -1,82 +0,0 @@
-void hodtest(Int_t Nevents)
-{
-
- //
- // Steering script to test hodoscope decoding
- //
-
- Int_t RunNumber=50017;
- char* RunFileNamePattern="daq04_%d.log.0";
-
- gHcParms->Define("gen_run_number", "Run Number", RunNumber);
- gHcParms->AddString("g_ctp_database_filename", "DBASE/test.database");
-
- gHcParms->Load(gHcParms->GetString("g_ctp_database_filename"), RunNumber);
-
- // g_ctp_parm_filename and g_decode_map_filename should now be defined
-
- gHcParms->Load(gHcParms->GetString("g_ctp_parm_filename"));
-
- // Constants not in ENGINE PARAM files that we want to be
- // configurable
- gHcParms->Load("PARAM/hcana.param");
-
- // Generate db_cratemap to correspond to map file contents
- char command[100];
- sprintf(command,"./make_cratemap.pl < %s > db_cratemap.dat",gHcParms->GetString("g_decode_map_filename"));
- system(command);
-
- // Load the Hall C style detector map
- gHcDetectorMap=new THcDetectorMap();
- gHcDetectorMap->Load(gHcParms->GetString("g_decode_map_filename"));
-
- // Set up the equipment to be analyzed.
-
- THaApparatus* HMS = new THcHallCSpectrometer("H","HMS");
- gHaApps->Add( HMS );
-
- // Add hodoscope
- HMS->AddDetector( new THcHodoscope("hod", "Hodoscope" ));
- HMS->AddDetector( new THcShower("cal", "Shower" ));
- HMS->AddDetector( new THcDC("dc", "Drift Chambers" ));
- THcAerogel* aerogel = new THcAerogel("aero", "Aerogel Cerenkov" );
- HMS->AddDetector( aerogel );
-
- // Set up the analyzer - we use the standard one,
- // but this could be an experiment-specific one as well.
- // The Analyzer controls the reading of the data, executes
- // tests/cuts, loops over Acpparatus's and PhysicsModules,
- // and executes the output routines.
- THcAnalyzer* analyzer = new THcAnalyzer;
-
-
- // A simple event class to be output to the resulting tree.
- // Creating your own descendant of THaEvent is one way of
- // defining and controlling the output.
- THaEvent* event = new THaEvent;
-
- // Define the run(s) that we want to analyze.
- // We just set up one, but this could be many.
- char RunFileName[100];
- sprintf(RunFileName,RunFileNamePattern,RunNumber);
- THaRun* run = new THaRun(RunFileName);
-
- // Eventually need to learn to skip over, or properly analyze
- // the pedestal events
- // run->SetEventRange(1,2000);// Physics Event number, does not
- // include scaler or control events
- // run->SetEventRange(1,999999);
- // run->SetEventRange(1,1);
- run->SetEventRange(1,Nevents);
-
- // Define the analysis parameters
- analyzer->SetEvent( event );
- analyzer->SetOutFile( "hodtest.root" );
- analyzer->SetOdefFile("output.def");
- analyzer->SetCutFile("hodtest_cuts.def"); // optional
-
- // File to record cuts accounting information
- // analyzer->SetSummaryFile("summary_example.log"); // optional
-
- analyzer->Process(run); // start the actual analysis
-}
diff --git a/examples/hodtest_cuts.def b/examples/hodtest_cuts.def
deleted file mode 100644
index f6003c2200a18b2f4d7156e51c0250c8b5ce2b06..0000000000000000000000000000000000000000
--- a/examples/hodtest_cuts.def
+++ /dev/null
@@ -1,17 +0,0 @@
-# Demo cuts for hodtest
-#
-
-Block: RawDecode
-
-Pedestal_event g.evtyp==4
-RawDecode_master 1
-
-Block: Decode
-Decode_master !Pedestal_event
-
-Block: CoarseTracking
-CoarseTracking_master !Pedestal_event
-
-Block: CoarseReconstruct
-RawCoarseReconstruct !Pedestal_event
-
diff --git a/examples/output.def b/examples/output.def
deleted file mode 100644
index ccbf7cd9def94f28b69c0f32c50e6f479b386e3d..0000000000000000000000000000000000000000
--- a/examples/output.def
+++ /dev/null
@@ -1,178 +0,0 @@
-# See $ANALYZER/examples/output_example.def for examples
-#
-block H.dc.*
-block H.hod.*
-block H.cal.*
-block H.aero.*
-block g.evtyp
-
-# TDC hits per paddle
-TH1F hpostdc1 'HMS s1x+ TDC hits' H.hod.1x.postdchits 16 0.5 16.5
-TH1F hnegtdc1 'HMS s1x- TDC hits' H.hod.1x.negtdchits 16 0.5 16.5
-TH1F hpostdc2 'HMS s1y+ TDC hits' H.hod.1y.postdchits 10 0.5 10.5
-TH1F hnegtdc2 'HMS s1y- TDC hits' H.hod.1y.negtdchits 10 0.5 10.5
-TH1F hpostdc3 'HMS s2x+ TDC hits' H.hod.2x.postdchits 16 0.5 16.5
-TH1F hnegtdc3 'HMS s2x- TDC hits' H.hod.2x.negtdchits 16 0.5 16.5
-TH1F hpostdc4 'HMS s2y+ TDC hits' H.hod.2y.postdchits 10 0.5 10.5
-TH1F hnegtdc4 'HMS s2y- TDC hits' H.hod.2y.negtdchits 10 0.5 10.5
-
-# ADC hits per paddle
-TH1F hposadc1 'HMS s1x+ ADC hits' H.hod.1x.posadchits 16 0.5 16.5
-TH1F hnegadc1 'HMS s1x- ADC hits' H.hod.1x.negadchits 16 0.5 16.5
-TH1F hposadc2 'HMS s1y+ ADC hits' H.hod.1y.posadchits 10 0.5 10.5
-TH1F hnegadc2 'HMS s1y- ADC hits' H.hod.1y.negadchits 10 0.5 10.5
-TH1F hposadc3 'HMS s2x+ ADC hits' H.hod.2x.posadchits 16 0.5 16.5
-TH1F hnegadc3 'HMS s2x- ADC hits' H.hod.2x.negadchits 16 0.5 16.5
-TH1F hposadc4 'HMS s2y+ ADC hits' H.hod.2y.posadchits 10 0.5 10.5
-TH1F hnegadc4 'HMS s2y- ADC hits' H.hod.2y.negadchits 10 0.5 10.5
-
-# ADC hits per Calorimeter layer
-TH1F chposadc1 'HMS Cal A+ ADC hits' H.cal.1pr.posadchits 13 0.5 13.5
-TH1F chnegadc1 'HMS Cal A- ADC hits' H.cal.1pr.negadchits 13 0.5 13.5
-TH1F chposadc2 'HMS Cal B+ ADC hits' H.cal.2ta.posadchits 13 0.5 13.5
-TH1F chnegadc2 'HMS Cal B- ADC hits' H.cal.2ta.negadchits 13 0.5 13.5
-TH1F chposadc3 'HMS Cal C+ ADC hits' H.cal.3ta.posadchits 13 0.5 13.5
-TH1F chposadc4 'HMS Cal D+ ADC hits' H.cal.4ta.posadchits 13 0.5 13.5
-
-# Deposited Energies per Calorimeter layer
-TH1F edep1 'HMS Cal A Edep' H.cal.1pr.eplane 100 -0.1 2.074
-TH1F edep2 'HMS Cal B Edep' H.cal.2ta.eplane 100 -0.1 2.074
-TH1F edep3 'HMS Cal C Edep' H.cal.3ta.eplane 100 -0.1 2.074
-TH1F edep4 'HMS Cal D Edep' H.cal.4ta.eplane 100 -0.1 2.074
-
-#Calorimeter ADC channels
-TH1F hcaladc_A1p 'HMS Cal ADC A1p - PED' H.cal.1pr.apos_p[0] 150 50 500
-TH1F hcaladc_A2p 'HMS Cal ADC A2p - PED' H.cal.1pr.apos_p[1] 150 50 500
-TH1F hcaladc_A3p 'HMS Cal ADC A3p - PED' H.cal.1pr.apos_p[2] 150 50 500
-TH1F hcaladc_A4p 'HMS Cal ADC A4p - PED' H.cal.1pr.apos_p[3] 150 50 500
-TH1F hcaladc_A5p 'HMS Cal ADC A5p - PED' H.cal.1pr.apos_p[4] 150 50 500
-TH1F hcaladc_A6p 'HMS Cal ADC A6p - PED' H.cal.1pr.apos_p[5] 150 50 500
-TH1F hcaladc_A7p 'HMS Cal ADC A7p - PED' H.cal.1pr.apos_p[6] 150 50 500
-TH1F hcaladc_A8p 'HMS Cal ADC A8p - PED' H.cal.1pr.apos_p[7] 150 50 500
-TH1F hcaladc_A9p 'HMS Cal ADC A9p - PED' H.cal.1pr.apos_p[8] 150 50 500
-TH1F hcaladc_A10p 'HMS Cal ADC A10p - PED' H.cal.1pr.apos_p[9] 150 50 500
-TH1F hcaladc_A11p 'HMS Cal ADC A11p - PED' H.cal.1pr.apos_p[10] 150 50 500
-TH1F hcaladc_A12p 'HMS Cal ADC A12p - PED' H.cal.1pr.apos_p[11] 150 50 500
-TH1F hcaladc_A13p 'HMS Cal ADC A13p - PED' H.cal.1pr.apos_p[12] 150 50 500
-
-TH1F hcaladc_B1p 'HMS Cal ADC B1p - PED' H.cal.2ta.apos_p[0] 150 50 500
-TH1F hcaladc_B2p 'HMS Cal ADC B2p - PED' H.cal.2ta.apos_p[1] 150 50 500
-TH1F hcaladc_B3p 'HMS Cal ADC B3p - PED' H.cal.2ta.apos_p[2] 150 50 500
-TH1F hcaladc_B4p 'HMS Cal ADC B4p - PED' H.cal.2ta.apos_p[3] 150 50 500
-TH1F hcaladc_B5p 'HMS Cal ADC B5p - PED' H.cal.2ta.apos_p[4] 150 50 500
-TH1F hcaladc_B6p 'HMS Cal ADC B6p - PED' H.cal.2ta.apos_p[5] 150 50 500
-TH1F hcaladc_B7p 'HMS Cal ADC B7p - PED' H.cal.2ta.apos_p[6] 150 50 500
-TH1F hcaladc_B8p 'HMS Cal ADC B8p - PED' H.cal.2ta.apos_p[7] 150 50 500
-TH1F hcaladc_B9p 'HMS Cal ADC B9p - PED' H.cal.2ta.apos_p[8] 150 50 500
-TH1F hcaladc_B10p 'HMS Cal ADC B10p - PED' H.cal.2ta.apos_p[9] 150 50 500
-TH1F hcaladc_B11p 'HMS Cal ADC B11p - PED' H.cal.2ta.apos_p[10] 150 50 500
-TH1F hcaladc_B12p 'HMS Cal ADC B12p - PED' H.cal.2ta.apos_p[11] 150 50 500
-TH1F hcaladc_B13p 'HMS Cal ADC B13p - PED' H.cal.2ta.apos_p[12] 150 50 500
-
-TH1F hcaladc_C1p 'HMS Cal ADC C1p - PED' H.cal.3ta.apos_p[0] 150 50 500
-TH1F hcaladc_C2p 'HMS Cal ADC C2p - PED' H.cal.3ta.apos_p[1] 150 50 500
-TH1F hcaladc_C3p 'HMS Cal ADC C3p - PED' H.cal.3ta.apos_p[2] 150 50 500
-TH1F hcaladc_C4p 'HMS Cal ADC C4p - PED' H.cal.3ta.apos_p[3] 150 50 500
-TH1F hcaladc_C5p 'HMS Cal ADC C5p - PED' H.cal.3ta.apos_p[4] 150 50 500
-TH1F hcaladc_C6p 'HMS Cal ADC C6p - PED' H.cal.3ta.apos_p[5] 150 50 500
-TH1F hcaladc_C7p 'HMS Cal ADC C7p - PED' H.cal.3ta.apos_p[6] 150 50 500
-TH1F hcaladc_C8p 'HMS Cal ADC C8p - PED' H.cal.3ta.apos_p[7] 150 50 500
-TH1F hcaladc_C9p 'HMS Cal ADC C9p - PED' H.cal.3ta.apos_p[8] 150 50 500
-TH1F hcaladc_C10p 'HMS Cal ADC C10p - PED' H.cal.3ta.apos_p[9] 150 50 500
-TH1F hcaladc_C11p 'HMS Cal ADC C11p - PED' H.cal.3ta.apos_p[10] 150 50 500
-TH1F hcaladc_C12p 'HMS Cal ADC C12p - PED' H.cal.3ta.apos_p[11] 150 50 500
-TH1F hcaladc_C13p 'HMS Cal ADC C13p - PED' H.cal.3ta.apos_p[12] 150 50 500
-
-TH1F hcaladc_D1p 'HMS Cal ADC D1p - PED' H.cal.4ta.apos_p[0] 150 50 500
-TH1F hcaladc_D2p 'HMS Cal ADC D2p - PED' H.cal.4ta.apos_p[1] 150 50 500
-TH1F hcaladc_D3p 'HMS Cal ADC D3p - PED' H.cal.4ta.apos_p[2] 150 50 500
-TH1F hcaladc_D4p 'HMS Cal ADC D4p - PED' H.cal.4ta.apos_p[3] 150 50 500
-TH1F hcaladc_D5p 'HMS Cal ADC D5p - PED' H.cal.4ta.apos_p[4] 150 50 500
-TH1F hcaladc_D6p 'HMS Cal ADC D6p - PED' H.cal.4ta.apos_p[5] 150 50 500
-TH1F hcaladc_D7p 'HMS Cal ADC D7p - PED' H.cal.4ta.apos_p[6] 150 50 500
-TH1F hcaladc_D8p 'HMS Cal ADC D8p - PED' H.cal.4ta.apos_p[7] 150 50 500
-TH1F hcaladc_D9p 'HMS Cal ADC D9p - PED' H.cal.4ta.apos_p[8] 150 50 500
-TH1F hcaladc_D10p 'HMS Cal ADC D10p - PED' H.cal.4ta.apos_p[9] 150 50 500
-TH1F hcaladc_D11p 'HMS Cal ADC D11p - PED' H.cal.4ta.apos_p[10] 150 50 500
-TH1F hcaladc_D12p 'HMS Cal ADC D12p - PED' H.cal.4ta.apos_p[11] 150 50 500
-TH1F hcaladc_D13p 'HMS Cal ADC D13p - PED' H.cal.4ta.apos_p[12] 150 50 500
-
-TH1F hcaladc_A1n 'HMS Cal ADC A1n - PED' H.cal.1pr.aneg_p[0] 150 50 500
-TH1F hcaladc_A2n 'HMS Cal ADC A2n - PED' H.cal.1pr.aneg_p[1] 150 50 500
-TH1F hcaladc_A3n 'HMS Cal ADC A3n - PED' H.cal.1pr.aneg_p[2] 150 50 500
-TH1F hcaladc_A4n 'HMS Cal ADC A4n - PED' H.cal.1pr.aneg_p[3] 150 50 500
-TH1F hcaladc_A5n 'HMS Cal ADC A5n - PED' H.cal.1pr.aneg_p[4] 150 50 500
-TH1F hcaladc_A6n 'HMS Cal ADC A6n - PED' H.cal.1pr.aneg_p[5] 150 50 500
-TH1F hcaladc_A7n 'HMS Cal ADC A7n - PED' H.cal.1pr.aneg_p[6] 150 50 500
-TH1F hcaladc_A8n 'HMS Cal ADC A8n - PED' H.cal.1pr.aneg_p[7] 150 50 500
-TH1F hcaladc_A9n 'HMS Cal ADC A9n - PED' H.cal.1pr.aneg_p[8] 150 50 500
-TH1F hcaladc_A10n 'HMS Cal ADC A10n - PED' H.cal.1pr.aneg_p[9] 150 50 500
-TH1F hcaladc_A11n 'HMS Cal ADC A11n - PED' H.cal.1pr.aneg_p[10] 150 50 500
-TH1F hcaladc_A12n 'HMS Cal ADC A12n - PED' H.cal.1pr.aneg_p[11] 150 50 500
-TH1F hcaladc_A13n 'HMS Cal ADC A13n - PED' H.cal.1pr.aneg_p[12] 150 50 500
-
-TH1F hcaladc_B1n 'HMS Cal ADC B1n - PED' H.cal.2ta.aneg_p[0] 150 50 500
-TH1F hcaladc_B2n 'HMS Cal ADC B2n - PED' H.cal.2ta.aneg_p[1] 150 50 500
-TH1F hcaladc_B3n 'HMS Cal ADC B3n - PED' H.cal.2ta.aneg_p[2] 150 50 500
-TH1F hcaladc_B4n 'HMS Cal ADC B4n - PED' H.cal.2ta.aneg_p[3] 150 50 500
-TH1F hcaladc_B5n 'HMS Cal ADC B5n - PED' H.cal.2ta.aneg_p[4] 150 50 500
-TH1F hcaladc_B6n 'HMS Cal ADC B6n - PED' H.cal.2ta.aneg_p[5] 150 50 500
-TH1F hcaladc_B7n 'HMS Cal ADC B7n - PED' H.cal.2ta.aneg_p[6] 150 50 500
-TH1F hcaladc_B8n 'HMS Cal ADC B8n - PED' H.cal.2ta.aneg_p[7] 150 50 500
-TH1F hcaladc_B9n 'HMS Cal ADC B9n - PED' H.cal.2ta.aneg_p[8] 150 50 500
-TH1F hcaladc_B10n 'HMS Cal ADC B10n - PED' H.cal.2ta.aneg_p[9] 150 50 500
-TH1F hcaladc_B11n 'HMS Cal ADC B11n - PED' H.cal.2ta.aneg_p[10] 150 50 500
-TH1F hcaladc_B12n 'HMS Cal ADC B12n - PED' H.cal.2ta.aneg_p[11] 150 50 500
-TH1F hcaladc_B13n 'HMS Cal ADC B13n - PED' H.cal.2ta.aneg_p[12] 150 50 500
-
-#TH1F hdcrawtdc
-#TH1F hdccuttdc
-
-# Can we use variables for the constants. In CTP we used hdc_nwire(i)
-#
-TH1F hdc1x1_wm 'HDC 1X1 Wiremap' H.dc.1x1.tdchits 113 0.5 113.5
-TH1F hdc1y1_wm 'HDC 1Y1 Wiremap' H.dc.1y1.tdchits 52 0.5 52.5
-TH1F hdc1u1_wm 'HDC 1U1 Wiremap' H.dc.1u1.tdchits 107 0.5 107.5
-TH1F hdc1v1_wm 'HDC 1V1 Wiremap' H.dc.1v1.tdchits 107 0.5 107.5
-TH1F hdc1y2_wm 'HDC 1Y2 Wiremap' H.dc.1y2.tdchits 52 0.5 52.5
-TH1F hdc1x2_wm 'HDC 1X2 Wiremap' H.dc.1x2.tdchits 113 0.5 113.5
-TH1F hdc2x1_wm 'HDC 2X1 Wiremap' H.dc.2x1.tdchits 113 0.5 113.5
-TH1F hdc2y1_wm 'HDC 2Y1 Wiremap' H.dc.2y1.tdchits 52 0.5 52.5
-TH1F hdc2u1_wm 'HDC 2U1 Wiremap' H.dc.2u1.tdchits 107 0.5 107.5
-TH1F hdc2v1_wm 'HDC 2V1 Wiremap' H.dc.2v1.tdchits 107 0.5 107.5
-TH1F hdc2y2_wm 'HDC 2Y2 Wiremap' H.dc.2y2.tdchits 52 0.5 52.5
-TH1F hdc2x2_wm 'HDC 2X2 Wiremap' H.dc.2x2.tdchits 113 0.5 113.5
-
-# Drift Time and Drift Distance Spectra
-TH1F hdc1x1_dt 'HDC 1X1 Drift Time' H.dc.1x1.time 200 -100 300
-TH1F hdc1y1_dt 'HDC 1Y1 Drift Time' H.dc.1y1.time 200 -100 300
-TH1F hdc1u1_dt 'HDC 1U1 Drift Time' H.dc.1u1.time 200 -100 300
-TH1F hdc1v1_dt 'HDC 1V1 Drift Time' H.dc.1v1.time 200 -100 300
-TH1F hdc1y2_dt 'HDC 1Y2 Drift Time' H.dc.1y2.time 200 -100 300
-TH1F hdc1x2_dt 'HDC 1X2 Drift Time' H.dc.1x2.time 200 -100 300
-TH1F hdc2x1_dt 'HDC 2X1 Drift Time' H.dc.2x1.time 200 -100 300
-TH1F hdc2y1_dt 'HDC 2Y1 Drift Time' H.dc.2y1.time 200 -100 300
-TH1F hdc2u1_dt 'HDC 2U1 Drift Time' H.dc.2u1.time 200 -100 300
-TH1F hdc2v1_dt 'HDC 2V1 Drift Time' H.dc.2v1.time 200 -100 300
-TH1F hdc2y2_dt 'HDC 2Y2 Drift Time' H.dc.2y2.time 200 -100 300
-TH1F hdc2x2_dt 'HDC 2X2 Drift Time' H.dc.2x2.time 200 -100 300
-
-TH1F hdc1x1_dd 'HDC 1X1 Drift Distance' H.dc.1x1.dist 300 -0.1 0.6
-TH1F hdc1y1_dd 'HDC 1Y1 Drift Distance' H.dc.1y1.dist 300 -0.1 0.6
-TH1F hdc1u1_dd 'HDC 1U1 Drift Distance' H.dc.1u1.dist 300 -0.1 0.6
-TH1F hdc1v1_dd 'HDC 1V1 Drift Distance' H.dc.1v1.dist 300 -0.1 0.6
-TH1F hdc1y2_dd 'HDC 1Y2 Drift Distance' H.dc.1y2.dist 300 -0.1 0.6
-TH1F hdc1x2_dd 'HDC 1X2 Drift Distance' H.dc.1x2.dist 300 -0.1 0.6
-TH1F hdc2x1_dd 'HDC 2X1 Drift Distance' H.dc.2x1.dist 300 -0.1 0.6
-TH1F hdc2y1_dd 'HDC 2Y1 Drift Distance' H.dc.2y1.dist 300 -0.1 0.6
-TH1F hdc2u1_dd 'HDC 2U1 Drift Distance' H.dc.2u1.dist 300 -0.1 0.6
-TH1F hdc2v1_dd 'HDC 2V1 Drift Distance' H.dc.2v1.dist 300 -0.1 0.6
-TH1F hdc2y2_dd 'HDC 2Y2 Drift Distance' H.dc.2y2.dist 300 -0.1 0.6
-TH1F hdc2x2_dd 'HDC 2X2 Drift Distance' H.dc.2x2.dist 300 -0.1 0.6
-
-# Focal Plane times
-TH1F hs1xfptime 'HODO s1x fptime' H.hod.1x.fptime 80 0 80 H.hod.hgoodstarttime
-TH1F hs1yfptime 'HODO s1y fptime' H.hod.1y.fptime 80 0 80 H.hod.hgoodstarttime
-TH1F hs2xfptime 'HODO s2x fptime' H.hod.2x.fptime 80 0 80 H.hod.hgoodstarttime
-TH1F hs2yfptime 'HODO s2y fptime' H.hod.2y.fptime 80 0 80 H.hod.hgoodstarttime
-TH1F starttime 'HODO start time' H.hod.starttime 80 0 80 H.hod.hgoodstarttime
diff --git a/src/THcShower.h b/src/THcShower.h
index be952c9819895805900440821a3462e67fdf3fe6..08ba824e3b0410e1e8a45222fa89d8063ef9bd15 100644
--- a/src/THcShower.h
+++ b/src/THcShower.h
@@ -34,29 +34,33 @@ public:
Int_t GetNTracks() const { return fTrackProj->GetLast()+1; }
const TClonesArray* GetTrackHits() const { return fTrackProj; }
- Int_t GetNBlocks(Int_t plane) const { return fNBlocks[plane-1];}
+ Int_t GetNBlocks(Int_t NLayer) const { return fNBlocks[NLayer];}
// friend class THaScCalib; not needed?
- Int_t fGetPedLimit(Int_t NBlock, Int_t NLayer, Int_t Side) {
+ Int_t GetPedLimit(Int_t NBlock, Int_t NLayer, Int_t Side) {
if (Side!=0&&Side!=1) {
- cout << "*** Wrong Side in fGetPedLimit:" << Side << " ***" << endl;
+ cout << "*** Wrong Side in GetPedLimit:" << Side << " ***" << endl;
return -1;
}
- Int_t nelem = NBlock+NLayer*fNBlocks[NLayer];
+ Int_t nelem = 0;
+ for (Int_t i=0; i<NLayer; i++) nelem += fNBlocks[i];
+ nelem += NBlock;
return ( Side == 0 ? fShPosPedLimit[nelem] : fShNegPedLimit[nelem]);
}
- Double_t fGetGain(Int_t NBlock, Int_t NLayer, Int_t Side) {
+ Double_t GetGain(Int_t NBlock, Int_t NLayer, Int_t Side) {
if (Side!=0&&Side!=1) {
- cout << "*** Wrong Side in fGetGain:" << Side << " ***" << endl;
+ cout << "*** Wrong Side in GetGain:" << Side << " ***" << endl;
return -1;
}
- Int_t nelem = NBlock+NLayer*fNBlocks[NLayer];
+ Int_t nelem = 0;
+ for (Int_t i=0; i<NLayer; i++) nelem += fNBlocks[i];
+ nelem += NBlock;
return ( Side == 0 ? fPosGain[nelem] : fNegGain[nelem]);
}
- Int_t fGetMinPeds() {
+ Int_t GetMinPeds() {
return fShMinPeds;
}
diff --git a/src/THcShowerPlane.cxx b/src/THcShowerPlane.cxx
index 35b5a318b5644f7765c689a88f5e1f57fd78ce9c..bfe626910e8103c9fc22846df5fb3dcd2c68fa17 100644
--- a/src/THcShowerPlane.cxx
+++ b/src/THcShowerPlane.cxx
@@ -109,7 +109,7 @@ Int_t THcShowerPlane::ReadDatabase( const TDatime& date )
fParent = (THcShower*) GetParent();
- fNelem = fParent->GetNBlocks(fLayerNum);
+ fNelem = fParent->GetNBlocks(fLayerNum-1);
// cout << "THcShowerPlane::ReadDatabase: fLayerNum=" << fLayerNum
// << " fNelem=" << fNelem << endl;
@@ -142,8 +142,8 @@ Int_t THcShowerPlane::ReadDatabase( const TDatime& date )
fNegPedLimit = new Int_t [fNelem];
for(Int_t i=0;i<fNelem;i++) {
- fPosPedLimit[i] = fParent->fGetPedLimit(i,fLayerNum,0);
- fNegPedLimit[i] = fParent->fGetPedLimit(i,fLayerNum,1);
+ fPosPedLimit[i] = fParent->GetPedLimit(i,fLayerNum-1,0);
+ fNegPedLimit[i] = fParent->GetPedLimit(i,fLayerNum-1,1);
}
cout << " fPosPedLimit:";
@@ -153,7 +153,7 @@ Int_t THcShowerPlane::ReadDatabase( const TDatime& date )
for(Int_t i=0;i<fNelem;i++) cout << " " << fNegPedLimit[i];
cout << endl;
- fMinPeds = fParent->fGetMinPeds();
+ fMinPeds = fParent->GetMinPeds();
cout << " fMinPeds = " << fMinPeds << endl;
InitializePedestals();
@@ -277,7 +277,7 @@ Int_t THcShowerPlane::ProcessHits(TClonesArray* rawhits, Int_t nexthit)
sighit->Set(hit->fCounter, hit->fADC_pos);
fEpos[hit->fCounter-1] += fA_Pos_p[hit->fCounter-1]*
- fParent->fGetGain(hit->fCounter-1,fLayerNum,0);
+ fParent->GetGain(hit->fCounter-1,fLayerNum-1,0);
}
double thresh_neg = fNegThresh[hit->fCounter -1];
@@ -287,7 +287,7 @@ Int_t THcShowerPlane::ProcessHits(TClonesArray* rawhits, Int_t nexthit)
sighit->Set(hit->fCounter, hit->fADC_neg);
fEneg[hit->fCounter-1] += fA_Neg_p[hit->fCounter-1]*
- fParent->fGetGain(hit->fCounter-1,fLayerNum,1);
+ fParent->GetGain(hit->fCounter-1,fLayerNum-1,1);
}
fEmean[hit->fCounter-1] += (fEpos[hit->fCounter-1] + fEneg[hit->fCounter-1]);