From 24c461f669d02d4f4654146a1a471b1c6f5b85e3 Mon Sep 17 00:00:00 2001
From: RYAN A RIVERA <rrivera@FNAL.GOV>
Date: Tue, 10 Dec 2024 21:50:32 -0600
Subject: [PATCH] implemented set individual thresholds from database

---
 .../{boardMap.conf => boardMap.config}        |  70 +++----
 boardConfig/diracCalib/dirac120.baseline      |  20 ++
 boardConfig/diracCalib/dirac121.baseline      |  20 ++
 boardConfig/diracCalib/dirac122.baseline      |  20 ++
 boardConfig/diracCalib/dirac123.baseline      |  20 ++
 boardConfig/diracCalib/dirac124.baseline      |  20 ++
 boardConfig/diracCalib/dirac125.baseline      |  20 ++
 boardConfig/diracCalib/dirac126.baseline      |  20 ++
 boardConfig/diracCalib/dirac127.baseline      |  20 ++
 boardConfig/diracCalib/dirac128.baseline      |  20 ++
 boardConfig/diracCalib/dirac129.baseline      |  20 ++
 boardConfig/diracCalib/dirac130.baseline      |  20 ++
 boardConfig/diracCalib/dirac131.baseline      |  20 ++
 boardConfig/diracCalib/dirac132.baseline      |  20 ++
 boardConfig/diracCalib/dirac133.baseline      |  20 ++
 boardConfig/diracCalib/dirac134.baseline      |  20 ++
 boardConfig/diracCalib/dirac135.baseline      |  20 ++
 boardConfig/diracCalib/dirac136.baseline      |  20 ++
 boardConfig/diracCalib/dirac137.baseline      |  20 ++
 boardConfig/diracCalib/dirac138.baseline      |  20 ++
 boardConfig/diracCalib/dirac139.baseline      |  20 ++
 boardConfig/diracCalib/dirac140.baseline      |  20 ++
 boardConfig/diracCalib/dirac141.baseline      |  20 ++
 boardConfig/diracCalib/dirac144.baseline      |  20 ++
 boardConfig/diracCalib/dirac145.baseline      |  20 ++
 boardConfig/diracCalib/dirac146.baseline      |  20 ++
 boardConfig/diracCalib/dirac147.baseline      |  20 ++
 boardConfig/diracCalib/dirac148.baseline      |  20 ++
 boardConfig/diracCalib/dirac149.baseline      |  20 ++
 boardConfig/diracCalib/dirac152.baseline      |  20 ++
 boardConfig/diracCalib/dirac153.baseline      |  20 ++
 boardConfig/diracCalib/dirac154.baseline      |  20 ++
 boardConfig/diracCalib/dirac155.baseline      |  20 ++
 boardConfig/diracCalib/dirac156.baseline      |  20 ++
 boardConfig/diracCalib/dirac157.baseline      |  20 ++
 .../FEInterfaces/ROCCalorimeterInterface.h    |  53 +++---
 .../ROCCalorimeterInterface_interface.cc      | 175 +++++++++++++++---
 37 files changed, 897 insertions(+), 81 deletions(-)
 rename boardConfig/{boardMap.conf => boardMap.config} (69%)
 create mode 100644 boardConfig/diracCalib/dirac120.baseline
 create mode 100644 boardConfig/diracCalib/dirac121.baseline
 create mode 100644 boardConfig/diracCalib/dirac122.baseline
 create mode 100644 boardConfig/diracCalib/dirac123.baseline
 create mode 100644 boardConfig/diracCalib/dirac124.baseline
 create mode 100644 boardConfig/diracCalib/dirac125.baseline
 create mode 100644 boardConfig/diracCalib/dirac126.baseline
 create mode 100644 boardConfig/diracCalib/dirac127.baseline
 create mode 100644 boardConfig/diracCalib/dirac128.baseline
 create mode 100644 boardConfig/diracCalib/dirac129.baseline
 create mode 100644 boardConfig/diracCalib/dirac130.baseline
 create mode 100644 boardConfig/diracCalib/dirac131.baseline
 create mode 100644 boardConfig/diracCalib/dirac132.baseline
 create mode 100644 boardConfig/diracCalib/dirac133.baseline
 create mode 100644 boardConfig/diracCalib/dirac134.baseline
 create mode 100644 boardConfig/diracCalib/dirac135.baseline
 create mode 100644 boardConfig/diracCalib/dirac136.baseline
 create mode 100644 boardConfig/diracCalib/dirac137.baseline
 create mode 100644 boardConfig/diracCalib/dirac138.baseline
 create mode 100644 boardConfig/diracCalib/dirac139.baseline
 create mode 100644 boardConfig/diracCalib/dirac140.baseline
 create mode 100644 boardConfig/diracCalib/dirac141.baseline
 create mode 100644 boardConfig/diracCalib/dirac144.baseline
 create mode 100644 boardConfig/diracCalib/dirac145.baseline
 create mode 100644 boardConfig/diracCalib/dirac146.baseline
 create mode 100644 boardConfig/diracCalib/dirac147.baseline
 create mode 100644 boardConfig/diracCalib/dirac148.baseline
 create mode 100644 boardConfig/diracCalib/dirac149.baseline
 create mode 100644 boardConfig/diracCalib/dirac152.baseline
 create mode 100644 boardConfig/diracCalib/dirac153.baseline
 create mode 100644 boardConfig/diracCalib/dirac154.baseline
 create mode 100644 boardConfig/diracCalib/dirac155.baseline
 create mode 100644 boardConfig/diracCalib/dirac156.baseline
 create mode 100644 boardConfig/diracCalib/dirac157.baseline

diff --git a/boardConfig/boardMap.conf b/boardConfig/boardMap.config
similarity index 69%
rename from boardConfig/boardMap.conf
rename to boardConfig/boardMap.config
index 76d7eb2..bb6546f 100644
--- a/boardConfig/boardMap.conf
+++ b/boardConfig/boardMap.config
@@ -118,44 +118,44 @@
 117    0    0
 118    0    0
 119    0    0 
-120    0    0
-121    0    26880
-122    0    0
-123    0    0
-124    0    0
-125    0    0
-126    0    0
-127    0    0
-128    0    52480
-129    0    8192
-130    0    0
-131    0    0
-132    0    0
-133    0    0
-134    0    0
-135    0    0
-136    0    25856
-137    0    44032
-138    0    0
-139    0    0
-140    0    0
-141    0    0
+120    36353    46695
+121    36097    56769
+122    36353    41532
+123    36353    53521
+124    36097    29210
+125    36097    37343
+126    36097    53396
+127    36353    42532
+128    36353    51274
+129    36097    28973
+130    36097    26715
+131    36097    47256
+132    36353    60216
+133    36353    36936
+134    36353    54843
+135    36097    26137
+136    36353    35859
+137    36097    62148
+138    36097    57395
+139    36097    6267
+140    36353    8747
+141    36353    27751
 142    0    0
 143    0    0
-144    0    0
-145    0    0
-146    0    0
-147    0    0
-148    0    0
-149    0    0
+144    36097    26052
+145    36097    21574
+146    36097    4104
+147    36097    22381
+148    36097    50219
+149    36353    26655
 150    0    0
 151    0    0
-152    0    0
-153    0    0
-154    0    0
-155    0    0
-156    0    0
-157    0    0
+152    36097    46655
+153    36097    38930
+154    36353    62515
+155    36097    51056
+156    36353    44561
+157    36353    27239
 158    0    0
 159    0    0
-199    0    38144
\ No newline at end of file
+199    36097    8813
diff --git a/boardConfig/diracCalib/dirac120.baseline b/boardConfig/diracCalib/dirac120.baseline
new file mode 100644
index 0000000..1815fc2
--- /dev/null
+++ b/boardConfig/diracCalib/dirac120.baseline
@@ -0,0 +1,20 @@
+0	2067.86	5.10	2133
+1	2035.62	2.68	2094
+2	2049.40	4.00	2111
+3	2058.18	7.83	2132
+4	2046.65	2.03	2103
+5	2042.39	2.02	2098
+6	2053.01	4.75	2117
+7	2041.05	10.25	2122
+8	2054.65	1.82	2110
+9	2044.92	1.87	2101
+10	2043.64	1.77	2099
+11	2048.12	2.10	2104
+12	2049.99	1.84	2106
+13	2040.45	2.07	2097
+14	2044.68	1.79	2100
+15	2061.95	1.99	2118
+16	2055.73	2.79	2114
+17	2032.91	2.15	2089
+18	2044.76	2.28	2102
+19	2056.33	3.34	2116
diff --git a/boardConfig/diracCalib/dirac121.baseline b/boardConfig/diracCalib/dirac121.baseline
new file mode 100644
index 0000000..4050848
--- /dev/null
+++ b/boardConfig/diracCalib/dirac121.baseline
@@ -0,0 +1,20 @@
+0	2065.19	5.08	2130
+1	2048.53	2.65	2106
+2	2055.40	4.08	2118
+3	2058.90	10.79	2141
+4	2044.78	1.95	2101
+5	2047.73	1.94	2104
+6	2057.22	5.51	2124
+7	2048.77	7.84	2122
+8	2055.38	1.87	2111
+9	2041.29	1.87	2097
+10	2049.58	1.74	2105
+11	2063.51	1.74	2119
+12	2049.41	1.86	2105
+13	2043.04	1.96	2099
+14	2033.14	1.90	2089
+15	2039.89	1.99	2096
+16	2039.61	2.76	2098
+17	2031.76	2.05	2088
+18	2056.26	2.19	2113
+19	2057.26	3.24	2117
diff --git a/boardConfig/diracCalib/dirac122.baseline b/boardConfig/diracCalib/dirac122.baseline
new file mode 100644
index 0000000..6569e60
--- /dev/null
+++ b/boardConfig/diracCalib/dirac122.baseline
@@ -0,0 +1,20 @@
+0	2067.88	7.45	2140
+1	2072.32	4.22	2135
+2	2044.07	1.72	2099
+3	2056.93	2.20	2114
+4	2037.57	4.01	2100
+5	2044.87	3.47	2105
+6	2054.14	2.00	2110
+7	2060.16	3.01	2119
+8	2040.95	2.89	2100
+9	2037.78	3.59	2099
+10	2050.59	2.45	2108
+11	2046.14	1.77	2101
+12	2057.54	1.68	2113
+13	2042.66	1.84	2098
+14	2034.48	1.83	2090
+15	2056.65	1.71	2112
+16	2043.00	1.92	2099
+17	2047.29	3.02	2106
+18	2059.08	2.27	2116
+19	2049.41	2.10	2106
diff --git a/boardConfig/diracCalib/dirac123.baseline b/boardConfig/diracCalib/dirac123.baseline
new file mode 100644
index 0000000..c91f494
--- /dev/null
+++ b/boardConfig/diracCalib/dirac123.baseline
@@ -0,0 +1,20 @@
+0	2048.00	7.20	2120
+1	2053.90	4.45	2117
+2	2060.35	2.41	2118
+3	2063.10	2.26	2120
+4	2045.16	3.71	2106
+5	2055.58	3.58	2116
+6	2048.24	2.04	2104
+7	2038.53	3.08	2098
+8	2048.05	2.94	2107
+9	2046.60	3.17	2106
+10	2037.58	1.95	2093
+11	2047.75	1.83	2103
+12	2059.84	1.79	2115
+13	2043.76	1.76	2099
+14	2047.69	1.90	2103
+15	2043.14	1.78	2098
+16	2063.55	1.74	2119
+17	2032.10	2.79	2090
+18	2019.58	2.14	2076
+19	2046.91	2.12	2103
diff --git a/boardConfig/diracCalib/dirac124.baseline b/boardConfig/diracCalib/dirac124.baseline
new file mode 100644
index 0000000..56370db
--- /dev/null
+++ b/boardConfig/diracCalib/dirac124.baseline
@@ -0,0 +1,20 @@
+0	2057.30	9.19	2135
+1	2063.71	11.22	2147
+2	2044.80	12.60	2133
+3	2036.02	5.35	2102
+4	2045.51	6.36	2115
+5	2042.95	6.91	2114
+6	2031.33	8.29	2106
+7	2061.50	2.65	2119
+8	2034.96	2.34	2092
+9	2047.99	2.50	2105
+10	2052.92	2.90	2112
+11	2050.18	3.58	2111
+12	2051.23	2.89	2110
+13	2046.94	3.13	2106
+14	2049.96	1.85	2106
+15	2042.47	1.86	2098
+16	2046.71	1.90	2102
+17	2036.75	2.64	2095
+18	2038.65	2.22	2095
+19	2058.31	1.97	2114
diff --git a/boardConfig/diracCalib/dirac125.baseline b/boardConfig/diracCalib/dirac125.baseline
new file mode 100644
index 0000000..07a56d8
--- /dev/null
+++ b/boardConfig/diracCalib/dirac125.baseline
@@ -0,0 +1,20 @@
+0	2064.62	8.97	2142
+1	2047.82	11.51	2132
+2	2040.84	13.61	2132
+3	2042.46	5.40	2109
+4	2054.17	6.44	2123
+5	2046.71	7.27	2119
+6	2050.75	8.02	2125
+7	2056.39	2.52	2114
+8	2048.18	2.22	2105
+9	2050.58	2.31	2108
+10	2047.81	2.91	2107
+11	2048.50	3.79	2110
+12	2044.50	2.84	2103
+13	2070.20	3.02	2129
+14	2041.62	1.90	2097
+15	2043.66	1.58	2098
+16	2037.09	1.84	2093
+17	2045.69	2.67	2104
+18	2039.14	2.10	2095
+19	2042.42	1.94	2098
diff --git a/boardConfig/diracCalib/dirac126.baseline b/boardConfig/diracCalib/dirac126.baseline
new file mode 100644
index 0000000..966dde4
--- /dev/null
+++ b/boardConfig/diracCalib/dirac126.baseline
@@ -0,0 +1,20 @@
+0	2049.05	9.65	2128
+1	2068.45	8.17	2143
+2	2037.14	11.01	2120
+3	2050.93	9.29	2129
+4	2026.95	9.47	2105
+5	2056.41	7.67	2129
+6	2045.50	8.14	2120
+7	2041.24	8.96	2118
+8	2049.12	3.58	2110
+9	2046.36	4.70	2110
+10	2041.62	4.93	2106
+11	2027.85	5.49	2094
+12	2044.03	3.50	2105
+13	2051.76	3.54	2112
+14	2048.54	4.11	2111
+15	2047.03	3.19	2107
+16	2050.60	2.09	2107
+17	2033.19	2.09	2089
+18	2047.75	3.23	2107
+19	2045.05	3.12	2104
diff --git a/boardConfig/diracCalib/dirac127.baseline b/boardConfig/diracCalib/dirac127.baseline
new file mode 100644
index 0000000..1977775
--- /dev/null
+++ b/boardConfig/diracCalib/dirac127.baseline
@@ -0,0 +1,20 @@
+0	2052.07	0.80	2104
+1	2064.28	0.65	2116
+2	2052.65	0.57	2104
+3	2050.79	0.59	2103
+4	2042.71	9.54	2121
+5	2039.27	7.22	2111
+6	2055.32	8.35	2130
+7	2030.55	9.29	2108
+8	2048.35	0.66	2100
+9	2045.71	0.57	2097
+10	2056.57	0.71	2109
+11	2054.30	0.72	2106
+12	2054.18	3.40	2114
+13	2047.47	3.54	2108
+14	2042.97	4.12	2105
+15	2035.68	3.04	2095
+16	2047.17	0.89	2100
+17	2045.10	0.87	2098
+18	2053.43	0.81	2106
+19	2051.59	0.69	2104
diff --git a/boardConfig/diracCalib/dirac128.baseline b/boardConfig/diracCalib/dirac128.baseline
new file mode 100644
index 0000000..aaa6d87
--- /dev/null
+++ b/boardConfig/diracCalib/dirac128.baseline
@@ -0,0 +1,20 @@
+0	2065.90	0.84	2118
+1	2070.10	4.68	2134
+2	2055.72	6.29	2125
+3	2050.71	3.02	2110
+4	2043.35	4.18	2106
+5	2040.56	3.45	2101
+6	2035.29	2.46	2093
+7	2046.99	3.15	2106
+8	2040.32	3.62	2101
+9	2066.83	3.03	2126
+10	2052.57	2.47	2110
+11	2057.68	2.33	2115
+12	2052.26	2.33	2109
+13	2035.01	2.53	2093
+14	2063.18	2.11	2120
+15	2045.67	2.73	2104
+16	2054.33	2.32	2111
+17	2037.07	3.58	2098
+18	2043.34	2.99	2102
+19	2057.64	0.59	2109
diff --git a/boardConfig/diracCalib/dirac129.baseline b/boardConfig/diracCalib/dirac129.baseline
new file mode 100644
index 0000000..5a231f6
--- /dev/null
+++ b/boardConfig/diracCalib/dirac129.baseline
@@ -0,0 +1,20 @@
+0	2064.21	0.88	2117
+1	2061.10	4.32	2124
+2	2038.94	4.37	2102
+3	2049.42	3.03	2109
+4	2058.75	4.33	2122
+5	2066.25	3.35	2126
+6	2050.94	2.18	2107
+7	2042.60	3.26	2102
+8	2053.40	3.59	2114
+9	2062.70	4.07	2125
+10	2056.93	2.28	2114
+11	2057.57	2.37	2115
+12	2035.47	2.35	2093
+13	2067.74	2.40	2125
+14	2034.09	2.20	2091
+15	2040.99	2.64	2099
+16	2036.23	2.42	2093
+17	2045.67	3.67	2107
+18	2055.25	2.89	2114
+19	2049.32	0.62	2101
diff --git a/boardConfig/diracCalib/dirac130.baseline b/boardConfig/diracCalib/dirac130.baseline
new file mode 100644
index 0000000..ff260a1
--- /dev/null
+++ b/boardConfig/diracCalib/dirac130.baseline
@@ -0,0 +1,20 @@
+0	2063.01	0.83	2115
+1	2054.74	8.84	2131
+2	2050.58	5.16	2116
+3	2053.51	3.37	2114
+4	2052.61	7.63	2125
+5	2044.05	5.30	2110
+6	2059.99	4.27	2123
+7	2041.13	3.09	2100
+8	2061.04	8.11	2135
+9	2054.74	4.64	2119
+10	2060.19	4.48	2124
+11	2038.43	2.85	2097
+12	2054.30	2.55	2112
+13	2049.70	2.59	2107
+14	2065.99	3.00	2125
+15	2035.64	4.50	2099
+16	2050.25	2.53	2108
+17	2047.28	3.16	2107
+18	2045.41	2.88	2104
+19	2055.82	3.88	2117
diff --git a/boardConfig/diracCalib/dirac131.baseline b/boardConfig/diracCalib/dirac131.baseline
new file mode 100644
index 0000000..6c7ed6f
--- /dev/null
+++ b/boardConfig/diracCalib/dirac131.baseline
@@ -0,0 +1,20 @@
+0	2065.41	0.74	2118
+1	2061.92	8.29	2137
+2	2049.64	0.55	2101
+3	2046.24	4.22	2109
+4	2031.84	6.61	2102
+5	2047.74	5.51	2114
+6	2049.63	4.52	2113
+7	2056.23	3.25	2116
+8	2053.56	7.37	2126
+9	2057.99	4.67	2122
+10	2042.04	4.58	2106
+11	2054.31	3.02	2113
+12	2050.93	2.50	2108
+13	2057.87	2.61	2116
+14	2047.43	2.78	2106
+15	2030.01	5.11	2095
+16	2048.07	2.69	2106
+17	2045.68	3.03	2105
+18	2043.92	2.68	2102
+19	2044.46	4.27	2107
diff --git a/boardConfig/diracCalib/dirac132.baseline b/boardConfig/diracCalib/dirac132.baseline
new file mode 100644
index 0000000..9746c79
--- /dev/null
+++ b/boardConfig/diracCalib/dirac132.baseline
@@ -0,0 +1,20 @@
+0	2061.28	0.59	2113
+1	2062.29	0.60	2114
+2	2037.32	0.58	2089
+3	2042.82	0.53	2094
+4	2044.43	0.58	2096
+5	2049.94	0.56	2102
+6	2053.24	0.55	2105
+7	2059.60	0.67	2112
+8	2057.54	0.64	2109
+9	2055.04	0.59	2107
+10	2036.93	0.62	2089
+11	2042.13	0.57	2094
+12	2063.15	0.55	2115
+13	2041.49	0.71	2094
+14	2032.93	0.56	2085
+15	2045.25	0.59	2097
+16	2048.99	0.63	2101
+17	2049.26	0.75	2102
+18	2035.12	0.85	2088
+19	2058.24	0.57	2110
diff --git a/boardConfig/diracCalib/dirac133.baseline b/boardConfig/diracCalib/dirac133.baseline
new file mode 100644
index 0000000..9804ede
--- /dev/null
+++ b/boardConfig/diracCalib/dirac133.baseline
@@ -0,0 +1,20 @@
+0	2056.93	15.52	2153
+1	2055.80	4.46	2119
+2	2050.37	10.47	2132
+3	2039.91	3.46	2100
+4	2045.44	3.12	2105
+5	2053.30	2.46	2111
+6	2051.28	9.27	2129
+7	2047.69	3.80	2109
+8	2053.49	2.79	2112
+9	2066.81	2.54	2124
+10	2047.18	2.59	2105
+11	2047.95	3.34	2108
+12	2051.59	2.72	2110
+13	2044.86	2.76	2103
+14	2042.21	2.47	2100
+15	2059.32	4.22	2122
+16	2049.46	2.37	2107
+17	2035.55	2.75	2094
+18	2037.86	3.19	2097
+19	2042.36	5.27	2108
diff --git a/boardConfig/diracCalib/dirac134.baseline b/boardConfig/diracCalib/dirac134.baseline
new file mode 100644
index 0000000..c61b367
--- /dev/null
+++ b/boardConfig/diracCalib/dirac134.baseline
@@ -0,0 +1,20 @@
+0	2066.40	12.87	2155
+1	2061.61	6.18	2130
+2	2060.41	2.50	2118
+3	2050.96	13.31	2141
+4	2049.08	5.45	2115
+5	2060.82	2.48	2118
+6	2047.29	1.94	2103
+7	2058.92	1.84	2114
+8	2045.20	3.32	2105
+9	2052.64	2.63	2111
+10	2061.32	2.06	2118
+11	2055.33	2.51	2113
+12	2055.63	2.10	2112
+13	2046.96	2.43	2104
+14	2050.52	2.12	2107
+15	2044.48	1.95	2100
+16	2039.17	1.92	2095
+17	2036.30	2.63	2094
+18	2048.13	2.20	2105
+19	2061.30	4.48	2125
diff --git a/boardConfig/diracCalib/dirac135.baseline b/boardConfig/diracCalib/dirac135.baseline
new file mode 100644
index 0000000..8c757d8
--- /dev/null
+++ b/boardConfig/diracCalib/dirac135.baseline
@@ -0,0 +1,20 @@
+0	2060.37	0.85	2113
+1	2039.43	7.38	2112
+2	2046.40	0.61	2098
+3	2049.47	14.19	2142
+4	2034.73	5.20	2100
+5	2032.51	2.58	2090
+6	2036.57	1.97	2092
+7	2051.38	1.73	2107
+8	2042.11	3.57	2103
+9	2050.02	3.05	2109
+10	2061.54	2.33	2119
+11	2056.61	2.65	2115
+12	2052.23	2.05	2108
+13	2049.61	2.32	2107
+14	2039.29	2.20	2096
+15	2048.44	2.14	2105
+16	2047.61	2.02	2104
+17	2031.51	2.50	2089
+18	2024.59	2.60	2082
+19	2056.78	4.46	2120
diff --git a/boardConfig/diracCalib/dirac136.baseline b/boardConfig/diracCalib/dirac136.baseline
new file mode 100644
index 0000000..269f21e
--- /dev/null
+++ b/boardConfig/diracCalib/dirac136.baseline
@@ -0,0 +1,20 @@
+0	2055.70	0.85	2108
+1	2063.68	0.78	2116
+2	2044.33	0.59	2096
+3	2045.19	0.59	2097
+4	2049.48	0.64	2101
+5	2047.64	0.78	2100
+6	2044.75	0.52	2096
+7	2035.59	0.77	2088
+8	2041.38	1.93	2097
+9	2047.05	2.18	2104
+10	2058.66	2.16	2115
+11	2056.01	1.85	2112
+12	2059.82	1.90	2116
+13	2059.98	2.57	2118
+14	2056.92	1.81	2112
+15	2032.75	1.87	2088
+16	2047.52	2.29	2104
+17	2047.18	2.54	2105
+18	2041.44	3.34	2101
+19	2050.58	4.47	2114
diff --git a/boardConfig/diracCalib/dirac137.baseline b/boardConfig/diracCalib/dirac137.baseline
new file mode 100644
index 0000000..ccb4f2f
--- /dev/null
+++ b/boardConfig/diracCalib/dirac137.baseline
@@ -0,0 +1,20 @@
+0	2048.54	2.62	2106
+1	2056.09	2.28	2113
+2	2060.97	1.93	2117
+3	2045.33	1.82	2101
+4	2045.72	1.95	2102
+5	2051.62	1.84	2107
+6	2054.31	1.87	2110
+7	2044.06	2.60	2102
+8	2051.10	1.74	2106
+9	2056.70	1.83	2112
+10	2048.24	2.23	2105
+11	2061.52	1.91	2117
+12	2046.54	1.93	2102
+13	2050.56	2.42	2108
+14	2049.28	1.86	2105
+15	2040.87	2.07	2097
+16	2034.66	2.32	2092
+17	2037.60	2.54	2095
+18	2028.88	3.49	2089
+19	2053.42	4.63	2117
diff --git a/boardConfig/diracCalib/dirac138.baseline b/boardConfig/diracCalib/dirac138.baseline
new file mode 100644
index 0000000..a90a681
--- /dev/null
+++ b/boardConfig/diracCalib/dirac138.baseline
@@ -0,0 +1,20 @@
+0	2077.93	23.83	2199
+1	2042.39	14.38	2136
+2	2045.13	7.58	2118
+3	2040.27	11.86	2126
+4	2037.46	6.66	2107
+5	2050.16	5.58	2117
+6	2058.15	7.24	2130
+7	2036.06	4.38	2099
+8	2051.72	3.46	2112
+9	2038.48	4.95	2103
+10	2048.07	2.77	2106
+11	2056.16	2.82	2115
+12	2054.50	3.23	2114
+13	2051.01	2.32	2108
+14	2046.38	2.97	2105
+15	2047.06	2.33	2104
+16	2033.12	2.30	2090
+17	2040.35	2.63	2098
+18	2040.31	5.69	2107
+19	2061.10	8.37	2136
diff --git a/boardConfig/diracCalib/dirac139.baseline b/boardConfig/diracCalib/dirac139.baseline
new file mode 100644
index 0000000..e33b922
--- /dev/null
+++ b/boardConfig/diracCalib/dirac139.baseline
@@ -0,0 +1,20 @@
+0	2061.03	18.95	2168
+1	2055.12	12.99	2144
+2	2046.02	7.34	2118
+3	2055.96	9.62	2135
+4	2052.91	5.74	2120
+5	2042.09	5.19	2108
+6	2036.45	6.35	2106
+7	2054.08	3.95	2116
+8	2048.28	3.29	2108
+9	2062.20	4.83	2127
+10	2046.61	2.96	2105
+11	2049.85	2.69	2108
+12	2060.58	3.46	2121
+13	2054.44	2.36	2112
+14	2038.01	3.16	2097
+15	2041.24	2.41	2098
+16	2048.62	2.44	2106
+17	2028.07	2.55	2086
+18	2053.59	6.08	2122
+19	2061.69	9.72	2141
diff --git a/boardConfig/diracCalib/dirac140.baseline b/boardConfig/diracCalib/dirac140.baseline
new file mode 100644
index 0000000..17b3d9f
--- /dev/null
+++ b/boardConfig/diracCalib/dirac140.baseline
@@ -0,0 +1,20 @@
+0	2040.05	5.84	2108
+1	2062.13	15.14	2158
+2	2046.76	4.30	2110
+3	2043.84	7.44	2116
+4	2043.68	3.65	2105
+5	2060.38	6.75	2131
+6	2051.03	6.18	2120
+7	2057.58	4.05	2120
+8	2047.79	5.08	2113
+9	2051.76	4.27	2115
+10	2066.59	3.48	2127
+11	2062.88	4.64	2127
+12	2057.08	2.75	2115
+13	2063.74	4.12	2126
+14	2047.14	3.31	2107
+15	2054.21	2.89	2113
+16	2040.64	3.05	2100
+17	2037.13	3.50	2098
+18	2033.85	3.38	2094
+19	2041.65	4.46	2105
diff --git a/boardConfig/diracCalib/dirac141.baseline b/boardConfig/diracCalib/dirac141.baseline
new file mode 100644
index 0000000..90e8734
--- /dev/null
+++ b/boardConfig/diracCalib/dirac141.baseline
@@ -0,0 +1,20 @@
+0	2053.93	5.30	2120
+1	2057.89	13.45	2148
+2	2038.98	4.09	2101
+3	2041.43	8.22	2116
+4	2044.80	3.43	2105
+5	2030.70	8.17	2105
+6	2040.34	5.93	2108
+7	2033.25	3.70	2094
+8	2035.72	5.58	2102
+9	2049.65	4.95	2115
+10	2055.41	3.44	2116
+11	2053.58	4.45	2117
+12	2044.86	3.04	2104
+13	2064.25	3.95	2126
+14	2044.50	3.34	2105
+15	2045.84	2.99	2105
+16	2041.27	2.93	2100
+17	2034.46	3.63	2095
+18	2038.03	3.57	2099
+19	2058.01	4.36	2121
diff --git a/boardConfig/diracCalib/dirac144.baseline b/boardConfig/diracCalib/dirac144.baseline
new file mode 100644
index 0000000..7eed663
--- /dev/null
+++ b/boardConfig/diracCalib/dirac144.baseline
@@ -0,0 +1,20 @@
+0	2057.60	2.94	2116
+1	2061.17	2.22	2118
+2	2048.18	2.02	2104
+3	2050.12	1.81	2106
+4	2037.85	1.91	2094
+5	2052.94	2.04	2109
+6	2048.32	2.04	2104
+7	2045.43	2.80	2104
+8	2046.68	2.20	2103
+9	2047.20	1.93	2103
+10	2064.53	2.25	2121
+11	2046.42	2.32	2103
+12	2062.90	2.57	2121
+13	2042.14	2.57	2100
+14	2059.10	2.31	2116
+15	2030.41	2.10	2087
+16	2045.23	2.64	2103
+17	2052.91	2.51	2110
+18	2056.41	2.12	2113
+19	2058.14	2.61	2116
diff --git a/boardConfig/diracCalib/dirac145.baseline b/boardConfig/diracCalib/dirac145.baseline
new file mode 100644
index 0000000..2c702b2
--- /dev/null
+++ b/boardConfig/diracCalib/dirac145.baseline
@@ -0,0 +1,20 @@
+0	2059.90	2.88	2119
+1	2064.83	2.36	2122
+2	2051.50	1.86	2107
+3	2073.17	2.53	2131
+4	2046.34	1.76	2102
+5	2034.53	2.16	2091
+6	2058.98	2.34	2116
+7	2053.48	2.64	2111
+8	2045.21	1.87	2101
+9	2056.65	1.93	2112
+10	2047.14	2.36	2104
+11	2056.48	2.60	2114
+12	2047.07	2.83	2106
+13	2055.46	2.39	2113
+14	2041.71	2.65	2100
+15	2052.21	2.31	2109
+16	2046.94	2.57	2105
+17	2046.68	2.32	2104
+18	2041.09	2.35	2098
+19	2062.27	2.55	2120
diff --git a/boardConfig/diracCalib/dirac146.baseline b/boardConfig/diracCalib/dirac146.baseline
new file mode 100644
index 0000000..9e31c39
--- /dev/null
+++ b/boardConfig/diracCalib/dirac146.baseline
@@ -0,0 +1,20 @@
+0	2061.35	2.71	2119
+1	2052.36	1.73	2108
+2	2047.11	1.78	2102
+3	2037.71	1.72	2093
+4	2030.04	1.75	2085
+5	2044.92	1.84	2100
+6	2050.95	1.81	2106
+7	2033.87	2.88	2093
+8	2037.29	1.73	2092
+9	2046.56	2.13	2103
+10	2043.36	2.34	2100
+11	2052.10	2.04	2108
+12	2048.50	2.47	2106
+13	2044.86	1.95	2101
+14	2039.98	2.21	2097
+15	2047.78	2.48	2105
+16	2055.05	2.57	2113
+17	2038.56	2.89	2097
+18	2034.23	2.49	2092
+19	2040.77	3.84	2102
diff --git a/boardConfig/diracCalib/dirac147.baseline b/boardConfig/diracCalib/dirac147.baseline
new file mode 100644
index 0000000..b097723
--- /dev/null
+++ b/boardConfig/diracCalib/dirac147.baseline
@@ -0,0 +1,20 @@
+0	2069.08	2.64	2127
+1	2046.51	1.92	2102
+2	2057.47	1.74	2113
+3	2054.33	1.82	2110
+4	2034.43	1.79	2090
+5	2062.58	1.89	2118
+6	2034.15	1.91	2090
+7	2059.62	2.93	2118
+8	2055.21	1.92	2111
+9	2056.27	2.06	2112
+10	2049.42	2.19	2106
+11	2055.83	2.24	2113
+12	2050.57	2.30	2107
+13	2052.52	1.96	2108
+14	2044.27	2.18	2101
+15	2032.77	2.45	2090
+16	2039.90	2.61	2098
+17	2021.52	2.90	2080
+18	2042.10	2.57	2100
+19	2053.29	4.15	2116
diff --git a/boardConfig/diracCalib/dirac148.baseline b/boardConfig/diracCalib/dirac148.baseline
new file mode 100644
index 0000000..f28bd24
--- /dev/null
+++ b/boardConfig/diracCalib/dirac148.baseline
@@ -0,0 +1,20 @@
+0	2057.83	1.92	2114
+1	2062.08	2.02	2118
+2	2035.62	1.91	2091
+3	2045.56	1.85	2101
+4	2040.89	1.88	2097
+5	2068.96	1.89	2125
+6	2061.25	1.90	2117
+7	2027.53	2.02	2084
+8	2053.21	1.99	2109
+9	2049.88	1.71	2105
+10	2059.16	1.93	2115
+11	2072.32	1.94	2128
+12	2042.07	2.12	2098
+13	2047.16	2.24	2104
+14	2053.55	2.06	2110
+15	2039.32	2.04	2095
+16	2051.88	2.08	2108
+17	2030.59	4.30	2093
+18	2027.81	2.56	2085
+19	2044.52	5.21	2110
diff --git a/boardConfig/diracCalib/dirac149.baseline b/boardConfig/diracCalib/dirac149.baseline
new file mode 100644
index 0000000..12a36b1
--- /dev/null
+++ b/boardConfig/diracCalib/dirac149.baseline
@@ -0,0 +1,20 @@
+0	2049.97	1.82	2105
+1	2050.73	2.07	2107
+2	2057.08	1.68	2112
+3	2041.59	1.85	2097
+4	2048.35	1.87	2104
+5	2067.24	1.92	2123
+6	2042.00	1.91	2098
+7	2036.86	2.08	2093
+8	2037.90	1.94	2094
+9	2046.37	1.86	2102
+10	2045.10	1.94	2101
+11	2061.32	2.02	2117
+12	2048.32	2.21	2105
+13	2060.78	2.20	2117
+14	2034.60	2.12	2091
+15	2038.51	2.06	2095
+16	2050.32	2.00	2106
+17	2032.49	4.28	2095
+18	2035.72	2.55	2093
+19	2041.78	5.97	2110
diff --git a/boardConfig/diracCalib/dirac152.baseline b/boardConfig/diracCalib/dirac152.baseline
new file mode 100644
index 0000000..b52f147
--- /dev/null
+++ b/boardConfig/diracCalib/dirac152.baseline
@@ -0,0 +1,20 @@
+0	2061.94	21.74	2177
+1	2045.97	11.54	2131
+2	2039.36	6.93	2110
+3	2049.10	4.82	2114
+4	2042.55	4.05	2105
+5	2065.57	4.97	2130
+6	2037.91	3.38	2098
+7	2052.78	3.14	2112
+8	2046.75	4.65	2111
+9	2060.88	4.44	2124
+10	2043.36	4.06	2106
+11	2050.11	4.07	2112
+12	2042.54	5.08	2108
+13	2059.51	6.84	2130
+14	2063.79	5.86	2131
+15	2045.30	3.81	2107
+16	2048.46	9.95	2128
+17	2016.06	16.24	2115
+18	2053.42	8.81	2130
+19	2048.41	6.74	2119
diff --git a/boardConfig/diracCalib/dirac153.baseline b/boardConfig/diracCalib/dirac153.baseline
new file mode 100644
index 0000000..2d35740
--- /dev/null
+++ b/boardConfig/diracCalib/dirac153.baseline
@@ -0,0 +1,20 @@
+0	2052.87	22.52	2170
+1	2065.98	10.44	2147
+2	2060.85	7.09	2132
+3	2053.30	4.64	2117
+4	2038.99	4.43	2102
+5	2048.56	5.30	2114
+6	2045.76	3.54	2106
+7	2042.60	3.44	2103
+8	2055.21	4.75	2119
+9	2055.32	4.62	2119
+10	2040.91	4.06	2103
+11	2046.17	4.09	2108
+12	2052.13	9.53	2131
+13	2060.25	18.09	2165
+14	2040.11	10.00	2120
+15	2034.24	6.58	2104
+16	2039.63	5.36	2106
+17	2041.40	6.80	2112
+18	2049.73	5.18	2115
+19	2043.51	3.72	2105
diff --git a/boardConfig/diracCalib/dirac154.baseline b/boardConfig/diracCalib/dirac154.baseline
new file mode 100644
index 0000000..c7066c1
--- /dev/null
+++ b/boardConfig/diracCalib/dirac154.baseline
@@ -0,0 +1,20 @@
+0	2063.25	1.07	2116
+1	2062.14	0.82	2115
+2	2052.92	0.65	2105
+3	2041.89	0.78	2094
+4	2039.95	0.76	2092
+5	2044.65	0.79	2097
+6	2046.53	0.71	2099
+7	2047.12	0.82	2100
+8	2035.51	0.86	2088
+9	2064.44	0.73	2117
+10	2042.08	0.93	2095
+11	2037.32	0.70	2089
+12	2050.73	0.70	2103
+13	2057.46	0.74	2110
+14	2039.09	0.73	2091
+15	2037.45	0.80	2090
+16	2054.56	0.89	2107
+17	2033.82	1.04	2087
+18	2043.84	0.85	2096
+19	2058.35	0.79	2111
diff --git a/boardConfig/diracCalib/dirac155.baseline b/boardConfig/diracCalib/dirac155.baseline
new file mode 100644
index 0000000..8562ba0
--- /dev/null
+++ b/boardConfig/diracCalib/dirac155.baseline
@@ -0,0 +1,20 @@
+0	2049.23	6.03	2117
+1	2065.16	18.57	2171
+2	2041.39	7.18	2113
+3	2050.25	4.68	2114
+4	2046.05	5.77	2113
+5	2037.37	4.75	2102
+6	2042.02	3.36	2102
+7	2047.56	2.80	2106
+8	2048.37	2.73	2107
+9	2049.16	3.09	2108
+10	2049.12	3.24	2109
+11	2053.22	3.84	2115
+12	2049.84	3.93	2112
+13	2058.19	3.45	2119
+14	2048.61	6.51	2118
+15	2052.55	5.29	2118
+16	2040.86	3.76	2102
+17	2028.15	4.05	2090
+18	2061.18	4.05	2123
+19	2037.35	4.36	2100
diff --git a/boardConfig/diracCalib/dirac156.baseline b/boardConfig/diracCalib/dirac156.baseline
new file mode 100644
index 0000000..b738f6b
--- /dev/null
+++ b/boardConfig/diracCalib/dirac156.baseline
@@ -0,0 +1,20 @@
+0	2055.74	4.09	2118
+1	2057.38	3.23	2117
+2	2055.41	2.08	2112
+3	2055.09	4.57	2119
+4	2043.74	3.09	2103
+5	2045.94	2.47	2103
+6	2048.49	3.42	2109
+7	2043.94	3.76	2105
+8	2038.35	2.70	2096
+9	2060.45	6.10	2129
+10	2054.50	6.74	2125
+11	2052.07	3.47	2112
+12	2064.73	3.59	2126
+13	2047.80	14.15	2140
+14	2033.36	15.69	2130
+15	2044.62	5.21	2110
+16	2050.75	2.26	2108
+17	2045.50	15.37	2142
+18	2042.94	10.68	2125
+19	2053.84	3.58	2115
diff --git a/boardConfig/diracCalib/dirac157.baseline b/boardConfig/diracCalib/dirac157.baseline
new file mode 100644
index 0000000..b20769a
--- /dev/null
+++ b/boardConfig/diracCalib/dirac157.baseline
@@ -0,0 +1,20 @@
+0	2072.52	3.86	2134
+1	2063.67	3.10	2123
+2	2044.12	2.10	2100
+3	2049.13	4.31	2112
+4	2049.21	3.15	2109
+5	2058.39	2.51	2116
+6	2052.24	3.41	2112
+7	2042.46	3.63	2103
+8	2052.69	2.66	2111
+9	2059.23	5.71	2126
+10	2040.67	7.33	2113
+11	2057.86	3.27	2118
+12	2050.71	2.87	2109
+13	2043.60	11.75	2129
+14	2054.60	11.57	2139
+15	2033.45	5.68	2100
+16	2042.88	2.76	2101
+17	2029.66	17.47	2132
+18	2030.47	14.38	2124
+19	2054.41	3.23	2114
diff --git a/otsdaq-mu2e-calorimeter/FEInterfaces/ROCCalorimeterInterface.h b/otsdaq-mu2e-calorimeter/FEInterfaces/ROCCalorimeterInterface.h
index d237a02..f9279fa 100755
--- a/otsdaq-mu2e-calorimeter/FEInterfaces/ROCCalorimeterInterface.h
+++ b/otsdaq-mu2e-calorimeter/FEInterfaces/ROCCalorimeterInterface.h
@@ -52,35 +52,35 @@ namespace ots
 
         ROC_ADDRESS_ERRCNT                   = 17,
 
-	ROC_ADDRESS_WORKMODE                 = 122,
+        ROC_ADDRESS_WORKMODE                 = 122,
 
-	ROC_ADDRESS_EW_LENGHT                = 123,
-	ROC_ADDRESS_EW_BLIND                 = 124,
-	ROC_ADDRESS_EW_DELAY                 = 125,
+        ROC_ADDRESS_EW_LENGHT                = 123,
+        ROC_ADDRESS_EW_BLIND                 = 124,
+        ROC_ADDRESS_EW_DELAY                 = 125,
 
-	ROC_ADDRESS_MASK_A                   = 120,
-	ROC_ADDRESS_MASK_B                   = 121,
-	ROC_ADDRESS_BASE_THRESHOLD           = 100,
- 
-	ROC_ADDRESS_IS_COUNTER               = 79,
-	ROC_ADDRESS_COUNTER_IS_FALLING       = 80,
-	ROC_ADDRESS_COUNTER_SIZE             = 81,
+        ROC_ADDRESS_MASK_A                   = 120,
+        ROC_ADDRESS_MASK_B                   = 121,
+        ROC_ADDRESS_BASE_THRESHOLD           = 100,
+      
+        ROC_ADDRESS_IS_COUNTER               = 79,
+        ROC_ADDRESS_COUNTER_IS_FALLING       = 80,
+        ROC_ADDRESS_COUNTER_SIZE             = 81,
 
-	ROC_ADDRESS_IS_LASER                 = 78,
-	ROC_ADDRESS_LASER_DELAY              = 77,
+        ROC_ADDRESS_IS_LASER                 = 78,
+        ROC_ADDRESS_LASER_DELAY              = 77,
 
-	ROC_ADDRESS_MZB_BUSY                 = 140, 
+        ROC_ADDRESS_MZB_BUSY                 = 140, 
 
-	ROC_ADDRESS_SELECTLINE               = 141, 
+        ROC_ADDRESS_SELECTLINE               = 141, 
 
-	ROC_ADDRESS_BOARD_ID                 = 142, 
+        ROC_ADDRESS_BOARD_ID                 = 142, 
 
-	ROC_ADDRESS_OSCMODE_FLAG             = 148, 
-	ROC_ADDRESS_OSCMODE_LENGHT           = 149, 
+        ROC_ADDRESS_OSCMODE_FLAG             = 148, 
+        ROC_ADDRESS_OSCMODE_LENGHT           = 149, 
 
-	ROC_ADDRESS_BOARD_U_ID_LSB           = 145, 
-	ROC_ADDRESS_BOARD_U_ID_CSB           = 146,
-	ROC_ADDRESS_BOARD_U_ID_MSB           = 147
+        ROC_ADDRESS_BOARD_U_ID_LSB           = 145, 
+        ROC_ADDRESS_BOARD_U_ID_CSB           = 146,
+        ROC_ADDRESS_BOARD_U_ID_MSB           = 147
 
 
 
@@ -117,7 +117,7 @@ namespace ots
     void SetupForPatternFixedLengthDataTaking		(__ARGS__);
     void SetupForPatternFixedLengthDataTaking       (unsigned int numberOfWords);	
     void SetupForADCsDataTaking		(__ARGS__);
-    void SetupForADCsDataTaking		(unsigned int threshold);	
+    void SetupForADCsDataTaking		(bool setThr, unsigned int threshold);	
 
     void SendMzCommand(__ARGS__);
     void ROCSlowControl(__ARGS__);
@@ -131,11 +131,16 @@ namespace ots
     void RMZB_writeAllSiPMbias(float *hv);
 
     void ConfigureLink(__ARGS__);
-    void ConfigureLink(std::string conf, bool hvonoff, bool doCalibration);
+    void ConfigureLink(std::string conf, bool hvonoff, bool doCalibration, bool setThresholds);
     void CalibrateMZB(__ARGS__);
-    void CalibrateMZB(int boardID);
+    void CalibrateMZB(int boardid);
 
 
+    void ToggleMBBusy(__ARGS__);
+    void ToggleMBBusy(bool busyonoff);
+    void SetADCsThreasholds(__ARGS__);
+    void SetADCsThreasholds(int boardid);
+    
     void ReadROCErrorCounter		(__ARGS__);
     void ReadMBRegisters		(__ARGS__);
 
diff --git a/otsdaq-mu2e-calorimeter/FEInterfaces/ROCCalorimeterInterface_interface.cc b/otsdaq-mu2e-calorimeter/FEInterfaces/ROCCalorimeterInterface_interface.cc
index aeb29a3..fadf573 100755
--- a/otsdaq-mu2e-calorimeter/FEInterfaces/ROCCalorimeterInterface_interface.cc
+++ b/otsdaq-mu2e-calorimeter/FEInterfaces/ROCCalorimeterInterface_interface.cc
@@ -96,7 +96,7 @@ ROCCalorimeterInterface::ROCCalorimeterInterface(
   registerFEMacroFunction("Configure Link",
 			  static_cast<FEVInterface::frontEndMacroFunction_t>(
 									     &ROCCalorimeterInterface::ConfigureLink),
-			  std::vector<std::string>{"Configuration folder, Default:= nominal", "HV Enabled, Default := 0]", "Upload MZB calibration parameters, Default := 0]"}, //inputs parameters
+			  std::vector<std::string>{"Configuration folder, Default:= nominal", "HV Enabled, Default := 0]", "Upload MZB calibration parameters, Default := 0]", "Upload DiRAC thresholds, Default := 0]"}, //inputs parameters
 			  std::vector<std::string>{}, //output parameters
 			  1);  // requiredUserPermissions
 
@@ -107,6 +107,13 @@ ROCCalorimeterInterface::ROCCalorimeterInterface(
 			  std::vector<std::string>{}, //output parameters
 			  1);  // requiredUserPermissions
 
+  registerFEMacroFunction("SetADCsThreasholds",
+			  static_cast<FEVInterface::frontEndMacroFunction_t>(
+									     &ROCCalorimeterInterface::SetADCsThreasholds),
+			  std::vector<std::string>{"BoardID, Default := -1]"}, //inputs parameters
+			  std::vector<std::string>{}, //output parameters
+			  1);  // requiredUserPermissions
+
   registerFEMacroFunction("SetupForNoiseTaking",
 			  static_cast<FEVInterface::frontEndMacroFunction_t>(
 									     &ROCCalorimeterInterface::SetupForNoiseTaking),
@@ -125,10 +132,16 @@ ROCCalorimeterInterface::ROCCalorimeterInterface(
   registerFEMacroFunction("Setup for ADCs Data Taking",
 			  static_cast<FEVInterface::frontEndMacroFunction_t>(
 									     &ROCCalorimeterInterface::SetupForADCsDataTaking),
-			  std::vector<std::string>{"Threshold [units of adccounts, Default := 2300]"}, //inputs parameters
+			  std::vector<std::string>{"Set Threshold? [bool, Default := 0]", "Threshold [units of adccounts, Default := 2300]"}, //inputs parameters
 			  std::vector<std::string>{}, //output parameters
 			  1);  // requiredUserPermissions
 
+  registerFEMacroFunction("Toggle MB Busy for Noise",
+			  static_cast<FEVInterface::frontEndMacroFunction_t>(
+									     &ROCCalorimeterInterface::ToggleMBBusy),
+			  std::vector<std::string>{"On/Off [Busy On/Off, Default := 1]"}, //inputs parameters
+			  std::vector<std::string>{}, //output parameters
+			  1);  // requiredUserPermissions
 
   registerFEMacroFunction("ROC Status",
 			  static_cast<FEVInterface::frontEndMacroFunction_t>(
@@ -592,7 +605,7 @@ bool ROCCalorimeterInterface::running(void)
 {
 
   //SetupForPatternFixedLengthDataTaking(40);
-  SetupForADCsDataTaking(40);
+  SetupForADCsDataTaking(0, 2300);
 
   return false;
   
@@ -776,7 +789,7 @@ void ROCCalorimeterInterface::SendMzCommand(__ARGS__)
   SendMzCommand(command, paramVect);
 
  
-} //end SetupForADCsDataTaking()
+} //end SendMzCommand()
 
 //==================================================================================================
 
@@ -838,9 +851,10 @@ void ROCCalorimeterInterface::ConfigureLink(__ARGS__)
   std::string conf = __GET_ARG_IN__("Configuration folder, Default:= nominal", std::string, "nominal");
   bool hvonoff = __GET_ARG_IN__("HV Enabled, Default := 0]", bool, 0);
   bool doCalibration = __GET_ARG_IN__("Upload MZB calibration parameters, Default := 0]", bool, 0);
+  bool setThresholds = __GET_ARG_IN__("Upload DiRAC thresholds, Default := 0]", bool, 0);
 
 
-  ConfigureLink(conf, hvonoff, doCalibration);
+  ConfigureLink(conf, hvonoff, doCalibration, setThresholds);
 
 
 } //end ConfigureLink()
@@ -852,21 +866,23 @@ void ROCCalorimeterInterface::ConfigureLink(__ARGS__)
 //==================================================================================================
 
 
-void ROCCalorimeterInterface::ConfigureLink(std::string conf, bool hvonoff, bool doCalibration)
+void ROCCalorimeterInterface::ConfigureLink(std::string conf, bool hvonoff, bool doCalibration, bool setThresholds)
 {
 
   DTCLib::roc_address_t address = 147;
   DTCLib::roc_data_t    readVal;
   readVal = readRegister(address);
         
-  // std::string filename = std::string("/home/mu2ecalo/ots_spack/srcs/otsdaq-mu2e-calorimeter/boardConfig/boardMap.conf");		
-  cet::filepath_lookup_after1 lookup_policy("MU2E_CALORIMETER_CONFIG_PATH");
-  auto file_path = lookup_policy("boardMap.config");//FIXME! THIS NEEDS TO BE A VARIABLE
-  std::ifstream confMap(file_path);
+  std::string filename = std::string("/home/mu2ecalo/ots_vst/srcs/otsdaq-mu2e-calorimeter/boardConfig/boardMap.config");		
+  //cet::filepath_lookup_after1 lookup_policy("MU2E_CALORIMETER_CONFIG_PATH");
+  //auto file_path = lookup_policy("boardMap.config");//FIXME! THIS NEEDS TO BE A VARIABLE
+//  std::ifstream confMap(file_path);
+  std::ifstream confMap(filename);
+
 
   if(!confMap.is_open())
     {
-      __FE_SS__ << "Could not open file: " << file_path << __E__;
+      __FE_SS__ << "Could not open file: " << filename << __E__;
       __FE_SS_THROW__;;
     }
 
@@ -887,6 +903,7 @@ void ROCCalorimeterInterface::ConfigureLink(std::string conf, bool hvonoff, bool
 
   if(boardid != -1){
     if(doCalibration) CalibrateMZB(boardid);
+    if(setThresholds) SetADCsThreasholds(boardid);
     SetBoardVoltages(hvonoff, boardid, conf);
     writeRegister(ROC_ADDRESS_BOARD_ID,  boardid); 
   }
@@ -934,10 +951,15 @@ void ROCCalorimeterInterface::CalibrateMZB(int  boardID)
   //fix it asking to ryan or eric.. 
 
 
-  std::string filename = std::string("mzbCalib/") + buff;		
-  cet::filepath_lookup_after1 lookup_policy("MU2E_CALORIMETER_CONFIG_PATH");
-  auto file_path = lookup_policy(filename);//FIXME! THIS NEEDS TO BE A VARIABLE
-  std::ifstream confFile(file_path);
+  std::string filename = std::string("/home/mu2ecalo/ots_vst/srcs/otsdaq-mu2e-calorimeter/boardConfig/");		
+
+  filename = filename + std::string("mzbCalib/") + buff;		
+  //cet::filepath_lookup_after1 lookup_policy("MU2E_CALORIMETER_CONFIG_PATH");
+  //auto file_path = lookup_policy(filename);//FIXME! THIS NEEDS TO BE A VARIABLE
+  //std::ifstream confFile(file_path);
+
+  std::ifstream confFile(filename);
+
 
   if(!confFile.is_open())
     {
@@ -984,6 +1006,88 @@ void ROCCalorimeterInterface::CalibrateMZB(int  boardID)
 } //end CalibrateMZB()
 
 
+//==================================================================================================
+
+
+//==================================================================================================
+
+
+void ROCCalorimeterInterface::SetADCsThreasholds(__ARGS__)
+{
+
+  int boardID = __GET_ARG_IN__("BoardID, Default := -1]", int, -1);
+
+  SetADCsThreasholds(boardID);
+
+
+} //end ConfigureLink()
+
+
+
+
+
+void ROCCalorimeterInterface::SetADCsThreasholds(int  boardID)
+{
+	
+  char buff[50];
+  sprintf(buff, "dirac%03d.baseline", boardID);
+        
+  //to do:
+  //std::string filename = std::string(__ENV__("CALORIMETER_CONF_DIR")) + "/" + buff;
+  //fix it asking to ryan or eric.. 
+
+
+  std::string filename = std::string("/home/mu2ecalo/ots_vst/srcs/otsdaq-mu2e-calorimeter/boardConfig/");		
+
+  filename = filename + std::string("diracCalib/") + buff;		
+  //cet::filepath_lookup_after1 lookup_policy("MU2E_CALORIMETER_CONFIG_PATH");
+  //auto file_path = lookup_policy(filename);//FIXME! THIS NEEDS TO BE A VARIABLE
+  //std::ifstream confFile(file_path);
+
+  std::ifstream confFile(filename);
+
+
+  if(!confFile.is_open())
+  {
+      __FE_SS__ << "Could not open file: " << filename << __E__;
+  
+      for(int ichan = 0; ichan<20; ichan++){
+        writeRegister(ROC_ADDRESS_BASE_THRESHOLD + ichan, 2300); 
+      }
+  }
+  else{ 
+  
+    __MOUT_INFO__ << "Opening file: " << filename << __E__;
+
+    for(int ichan = 0; ichan<20; ichan++){
+
+      int chindex;
+      float baseline;
+      float sigma;
+      int thr2set; 
+
+      confFile >> chindex;
+      confFile >> baseline;
+      confFile >> sigma;
+      confFile >> thr2set;
+  
+      __MOUT_INFO__ << chindex <<  "  " << baseline << "  " << sigma <<  "  " << thr2set << __E__;
+      writeRegister(ROC_ADDRESS_BASE_THRESHOLD + ichan, thr2set); 
+
+    }
+
+
+    confFile.close();
+
+  }
+
+  __MOUT_INFO__ << "Thresholds set done.." << filename << __E__;
+
+
+} //end SetADCsThreasholds()
+
+
+
 //==================================================================================================
 
 
@@ -1022,7 +1126,7 @@ void ROCCalorimeterInterface::SetBoardVoltages(bool hvonoff, int  boardID, std::
 
   usleep(100000);
 
-  /*command = "SLEWRATE"; 
+  command = "SLEWRATE"; 
     paramVect[0] = 40;
     paramVect[1] = NAN;
     paramVect[2] = NAN;
@@ -1035,7 +1139,7 @@ void ROCCalorimeterInterface::SetBoardVoltages(bool hvonoff, int  boardID, std::
 
     SendMzCommand(command, paramVect);
 
-    usleep(100000);*/
+    usleep(100000);
 	
 
   if(hvonoff == 1){
@@ -1048,7 +1152,7 @@ void ROCCalorimeterInterface::SetBoardVoltages(bool hvonoff, int  boardID, std::
     //fix it asking to ryan or eric.. 
 
 
-    std::string filename = std::string("/home/mu2ecalo/ots_spack/srcs/otsdaq-mu2e-calorimeter/boardConfig/") + conf + std::string("/") + buff;		
+    std::string filename = std::string("/home/mu2ecalo/ots_vst/srcs/otsdaq-mu2e-calorimeter/boardConfig/") + conf + std::string("/") + buff;		
     //std::string filename = std::string("/home/users/moresca/ots_spack2/srcs/otsdaq-mu2e-calorimeter/boardConfig/") + conf + std::string("/") + buff;		
 
     std::ifstream confFile(filename);
@@ -1223,9 +1327,10 @@ void ROCCalorimeterInterface::ReadROCErrorCounter(__ARGS__)
 
 void ROCCalorimeterInterface::SetupForADCsDataTaking(__ARGS__)
 {
+  bool setThr = __GET_ARG_IN__("Set Threshold? [bool, Default := 0]", bool, 0);
   unsigned int threshold = __GET_ARG_IN__("Threshold [units of adccounts, Default := 2300]", uint32_t, 2300);
 
-  SetupForADCsDataTaking(threshold);
+  SetupForADCsDataTaking(setThr, threshold);
 
 
 } //end SetupForADCsDataTaking()
@@ -1242,12 +1347,13 @@ void ROCCalorimeterInterface::SetupForNoiseTaking(__ARGS__)
   SetupForNoiseTaking(numberOfsamples);
 
 
-} //end SetupForADCsDataTaking()
+} //end SetupForNoiseTaking()
 
 //==================================================================================================
 
 
 
+
 //==================================================================================================
 
 
@@ -1284,7 +1390,7 @@ void ROCCalorimeterInterface::SetupForNoiseTaking(unsigned int numberOfsamples)
 //==================================================================================================
 
 
-void ROCCalorimeterInterface::SetupForADCsDataTaking(unsigned int threshold)
+void ROCCalorimeterInterface::SetupForADCsDataTaking(bool setThr, unsigned int threshold)
 {
   __COUT_INFO__ << "SetupForADCsDataTaking()" << __E__;
 
@@ -1348,11 +1454,13 @@ void ROCCalorimeterInterface::SetupForADCsDataTaking(unsigned int threshold)
 
 
   //Write Roc thrsholds using 
-  for(int ich=0; ich<20; ich++)
+  if(setThr){
+    for(int ich=0; ich<20; ich++)
     {
       //writeRegister(ROC_ADDRESS_BASE_THRESHOLD + ich, std::stoi(csvRows[0][ich+1]));
       writeRegister(ROC_ADDRESS_BASE_THRESHOLD + ich, threshold); 
     }
+  }
 
   /*for (const std::vector<std::string>& row : csvRows)
     {
@@ -1368,6 +1476,29 @@ void ROCCalorimeterInterface::SetupForADCsDataTaking(unsigned int threshold)
 } //end SetupForADCsDataTaking()
 
 
+//==================================================================================================
+
+
+void ROCCalorimeterInterface::ToggleMBBusy(__ARGS__)
+{
+
+  unsigned int busyonoff = __GET_ARG_IN__("On/Off [Busy On/Off, Default := 1]", bool, 1);
+  ToggleMBBusy(busyonoff);
+
+} //end ToggleMBBusy()
+
+
+
+void ROCCalorimeterInterface::ToggleMBBusy(bool busyonoff)
+{
+
+    writeRegister(ROC_ADDRESS_MZB_BUSY, busyonoff); 
+
+} //end ToggleMBBusy()
+
+//==================================================================================================
+
+
 
 //==================================================================================================
 void ROCCalorimeterInterface::GetStatus(__ARGS__)