From 9180c4be59fc8aca1c125f52982ff7717e2fffee Mon Sep 17 00:00:00 2001
From: Eric Pooser <pooser@jlab.org>
Date: Fri, 21 Jul 2017 11:04:23 -0400
Subject: [PATCH] Pooser scaler work (#179)

* Modify naming scheme and aesthetic chaqnges to map

* Move scaler map file and modify naming scheme

* Remove deprecated data base files and relocate them

* Remove depreacted scaler map files in MAPS directory

* Add symbolic links to scaler database files

* Modify scaler prefixes

* Modify templates to utilize new naming convention
---
 DBASE/db_HSScalevt.dat                        | 309 --------------
 DBASE/db_HScalevt.dat                         |   1 +
 DBASE/db_PSScalevt.dat                        | 278 -------------
 DBASE/db_PScalevt.dat                         |   1 +
 MAPS/SCALERS/db_HScalevt.dat                  | 309 ++++++++++++++
 MAPS/SCALERS/db_PScalevt.dat                  | 278 +++++++++++++
 {DBASE => MAPS/SCALERS}/make_scaler_db.py     |  27 +-
 MAPS/SCALERS/scaler.map                       | 379 ++++++++++++++++++
 .../SHMS/PRODUCTION/replay_production_shms.C  |   2 +-
 SCRIPTS/SHMS/SCALERS/replay_shms_scalers.C    |   4 +-
 .../PRODUCTION/pstackana_production.template  |  14 +-
 TEMPLATES/SHMS/SCALERS/pscalers.template      |  14 +-
 12 files changed, 1004 insertions(+), 612 deletions(-)
 delete mode 100755 DBASE/db_HSScalevt.dat
 create mode 120000 DBASE/db_HScalevt.dat
 delete mode 100755 DBASE/db_PSScalevt.dat
 create mode 120000 DBASE/db_PScalevt.dat
 create mode 100644 MAPS/SCALERS/db_HScalevt.dat
 create mode 100644 MAPS/SCALERS/db_PScalevt.dat
 rename {DBASE => MAPS/SCALERS}/make_scaler_db.py (67%)
 create mode 100755 MAPS/SCALERS/scaler.map

diff --git a/DBASE/db_HSScalevt.dat b/DBASE/db_HSScalevt.dat
deleted file mode 100755
index 7d088867..00000000
--- a/DBASE/db_HSScalevt.dat
+++ /dev/null
@@ -1,309 +0,0 @@
-map 3801 5 6 00000620 ffffffff 12
-map 3801 5 7 00200720 ffffffff 12
-map 3801 5 8 00400820 ffffffff 12
-map 3801 5 9 00600920 ffffffff 12
-map 3801 5 10 00800a20 ffffffff 12
-map 3801 5 11 00a00b20 ffffffff 12
-map 3801 5 12 00c00c20 ffffffff 12 31 1000000
-variable 3 3 1 hhod2y7P HMS 2Y+ paddle 7
-variable 3 3 2 hhod2y7Pr HMS 2Y+ paddle 7
-variable 0 8 1 hhod1x9P HMS 1X+ paddle 9
-variable 0 8 2 hhod1x9Pr HMS 1X+ paddle 9
-variable 0 24 1 hhod1x9M HMS 1X- paddle 9
-variable 0 24 2 hhod1x9Mr HMS 1X- paddle 9
-variable 3 19 1 hhod2y7M HMS 2Y- paddle 7
-variable 3 19 2 hhod2y7Mr HMS 2Y- paddle 7
-variable 6 4 1 h1Xh1y h1T
-variable 6 4 2 h1Xh1yr h1T
-variable 2 22 1 hhod2x6M HMS 2X- paddle 6
-variable 2 22 2 hhod2x6Mr HMS 2X- paddle 6
-variable 6 5 1 h2Xh2Y h2T
-variable 6 5 2 h2Xh2Yr h2T
-variable 2 6 1 hhod2x6P HMS 2X+ paddle 6
-variable 2 6 2 hhod2x6Pr HMS 2X+ paddle 6
-variable 2 27 1 hhod2x15M HMS 2X- paddle 15
-variable 2 27 2 hhod2x15Mr HMS 2X- paddle 15
-variable 3 26 1 Empty_20 Empty
-variable 3 26 2 Empty_20r Empty
-variable 1 2 1 hhod1y5P HMS 1Y+ paddle 5
-variable 1 2 2 hhod1y5Pr HMS 1Y+ paddle 5
-variable 3 29 1 Empty_22 Empty
-variable 3 29 2 Empty_22r Empty
-variable 1 18 1 hhod1y5M HMS 1Y- paddle 5
-variable 1 18 2 hhod1y5Mr HMS 1Y- paddle 5
-variable 3 31 1 Empty_24 Empty
-variable 3 31 2 Empty_24r Empty
-variable 2 11 1 hhod2x15P HMS 2X+ paddle 15
-variable 2 11 2 hhod2x15Pr HMS 2X+ paddle 15
-variable 6 13 1 hSHWR hSHWR
-variable 6 13 2 hSHWRr hSHWR
-variable 1 20 1 hhod1y2M HMS 1Y- paddle 2
-variable 1 20 2 hhod1y2Mr HMS 1Y- paddle 2
-variable 1 4 1 hhod1y2P HMS 1Y+ paddle 2
-variable 1 4 2 hhod1y2Pr HMS 1Y+ paddle 2
-variable 0 13 1 hhod1x12P HMS 1X+ paddle 12
-variable 0 13 2 hhod1x12Pr HMS 1X+ paddle 12
-variable 0 29 1 hhod1x12M HMS 1X- paddle 12
-variable 0 29 2 hhod1x12Mr HMS 1X- paddle 12
-variable 2 0 1 hhod2x1P HMS 2X+ paddle 1
-variable 2 0 2 hhod2x1Pr HMS 2X+ paddle 1
-variable 2 16 1 hhod2x1M HMS 2X- paddle 1
-variable 2 16 2 hhod2x1Mr HMS 2X- paddle 1
-variable 3 21 1 hhod2y4M HMS 2Y- paddle 4
-variable 3 21 2 hhod2y4Mr HMS 2Y- paddle 4
-variable 3 5 1 hhod2y4P HMS 2Y+ paddle 4
-variable 3 5 2 hhod2y4Pr HMS 2Y+ paddle 4
-variable 6 30 1 Unser Unser
-variable 6 30 2 Unserr Unser
-variable 1 5 1 hhod1y4P HMS 1Y+ paddle 4
-variable 1 5 2 hhod1y4Pr HMS 1Y+ paddle 4
-variable 2 8 1 hhod2x9P HMS 2X+ paddle 9
-variable 2 8 2 hhod2x9Pr HMS 2X+ paddle 9
-variable 2 24 1 hhod2x9M HMS 2X- paddle 9
-variable 2 24 2 hhod2x9Mr HMS 2X- paddle 9
-variable 1 21 1 hhod1y4M HMS 1Y- paddle 4
-variable 1 21 2 hhod1y4Mr HMS 1Y- paddle 4
-variable 0 0 1 hhod1x1P HMS 1X+ paddle 1
-variable 0 0 2 hhod1x1Pr HMS 1X+ paddle 1
-variable 0 16 1 hhod1x1M HMS 1X- paddle 1
-variable 0 16 2 hhod1x1Mr HMS 1X- paddle 1
-variable 0 18 1 hhod1x5M HMS 1X- paddle 5
-variable 0 18 2 hhod1x5Mr HMS 1X- paddle 5
-variable 0 27 1 hhod1x15M HMS 1X- paddle 15
-variable 0 27 2 hhod1x15Mr HMS 1X- paddle 15
-variable 0 11 1 hhod1x15P HMS 1X+ paddle 15
-variable 0 11 2 hhod1x15Pr HMS 1X+ paddle 15
-variable 3 27 1 Empty_21 Empty
-variable 3 27 2 Empty_21r Empty
-variable 3 2 1 hhod2y5P HMS 2Y+ paddle 5
-variable 3 2 2 hhod2y5Pr HMS 2Y+ paddle 5
-variable 3 18 1 hhod2y5M HMS 2Y- paddle 5
-variable 3 18 2 hhod2y5Mr HMS 2Y- paddle 5
-variable 2 7 1 hhod2x8P HMS 2X+ paddle 8
-variable 2 7 2 hhod2x8Pr HMS 2X+ paddle 8
-variable 1 19 1 hhod1y7M HMS 1Y- paddle 7
-variable 1 19 2 hhod1y7Mr HMS 1Y- paddle 7
-variable 0 2 1 hhod1x5P HMS 1X+ paddle 5
-variable 0 2 2 hhod1x5Pr HMS 1X+ paddle 5
-variable 1 3 1 hhod1y7P HMS 1Y+ paddle 7
-variable 1 3 2 hhod1y7Pr HMS 1Y+ paddle 7
-variable 3 30 1 Empty_23 Empty
-variable 3 30 2 Empty_23r Empty
-variable 2 23 1 hhod2x8M HMS 2X- paddle 8
-variable 2 23 2 hhod2x8Mr HMS 2X- paddle 8
-variable 0 22 1 hhod1x6M HMS 1X- paddle 6
-variable 0 22 2 hhod1x6Mr HMS 1X- paddle 6
-variable 2 15 1 hhod2x16P HMS 2X+ paddle 16
-variable 2 15 2 hhod2x16Pr HMS 2X+ paddle 16
-variable 6 11 1 hPSHWRLO hPSHWRLO
-variable 6 11 2 hPSHWRLOr hPSHWRLO
-variable 2 31 1 hhod2x16M HMS 2X- paddle 16
-variable 2 31 2 hhod2x16Mr HMS 2X- paddle 16
-variable 0 6 1 hhod1x6P HMS 1X+ paddle 6
-variable 0 6 2 hhod1x6Pr HMS 1X+ paddle 6
-variable 0 30 1 hhod1x14M HMS 1X- paddle 14
-variable 0 30 2 hhod1x14Mr HMS 1X- paddle 14
-variable 6 2 1 h2X h2X
-variable 6 2 2 h2Xr h2X
-variable 6 3 1 h2Y h2Y
-variable 6 3 2 h2Yr h2Y
-variable 6 27 1 BCM1 bcm1
-variable 6 27 2 BCM1r bcm1
-variable 0 14 1 hhod1x14P HMS 1X+ paddle 14
-variable 0 14 2 hhod1x14Pr HMS 1X+ paddle 14
-variable 2 17 1 hhod2x3M HMS 2X- paddle 3
-variable 2 17 2 hhod2x3Mr HMS 2X- paddle 3
-variable 2 1 1 hhod2x3P HMS 2X+ paddle 3
-variable 2 1 2 hhod2x3Pr HMS 2X+ paddle 3
-variable 1 29 1 Empty_10 Empty
-variable 1 29 2 Empty_10r Empty
-variable 1 30 1 Empty_11 Empty
-variable 1 30 2 Empty_11r Empty
-variable 1 31 1 Empty_12 Empty
-variable 1 31 2 Empty_12r Empty
-variable 3 9 1 Empty_13 Empty
-variable 3 9 2 Empty_13r Empty
-variable 3 10 1 Empty_14 Empty
-variable 3 10 2 Empty_14r Empty
-variable 3 11 1 Empty_15 Empty
-variable 3 11 2 Empty_15r Empty
-variable 3 4 1 hhod2y2P HMS 2Y+ paddle 2
-variable 3 4 2 hhod2y2Pr HMS 2Y+ paddle 2
-variable 2 28 1 hhod2x10M HMS 2X- paddle 10
-variable 2 28 2 hhod2x10Mr HMS 2X- paddle 10
-variable 3 15 1 Empty_18 Empty
-variable 3 15 2 Empty_18r Empty
-variable 3 25 1 Empty_19 Empty
-variable 3 25 2 Empty_19r Empty
-variable 6 8 1 hBSUM hBSUM
-variable 6 8 2 hBSUMr hBSUM
-variable 3 20 1 hhod2y2M HMS 2Y- paddle 2
-variable 3 20 2 hhod2y2Mr HMS 2Y- paddle 2
-variable 0 19 1 hhod1x7M HMS 1X- paddle 7
-variable 0 19 2 hhod1x7Mr HMS 1X- paddle 7
-variable 0 3 1 hhod1x7P HMS 1X+ paddle 7
-variable 0 3 2 hhod1x7Pr HMS 1X+ paddle 7
-variable 2 12 1 hhod2x10P HMS 2X+ paddle 10
-variable 2 12 2 hhod2x10Pr HMS 2X+ paddle 10
-variable 6 7 1 hASUM hASUM
-variable 6 7 2 hASUMr hASUM
-variable 6 1 1 h1Y h1Y
-variable 6 1 2 h1Yr h1Y
-variable 6 0 1 h1X h1X
-variable 6 0 2 h1Xr h1X
-variable 6 25 1 BCM4A bcm4a
-variable 6 25 2 BCM4Ar bcm4a
-variable 0 31 1 hhod1x16M HMS 1X- paddle 16
-variable 0 31 2 hhod1x16Mr HMS 1X- paddle 16
-variable 0 15 1 hhod1x16P HMS 1X+ paddle 16
-variable 0 15 2 hhod1x16Pr HMS 1X+ paddle 16
-variable 3 13 1 Empty_16 Empty
-variable 3 13 2 Empty_16r Empty
-variable 1 24 1 hhod1y9M HMS 1Y- paddle 9
-variable 1 24 2 hhod1y9Mr HMS 1Y- paddle 9
-variable 2 4 1 hhod2x2P HMS 2X+ paddle 2
-variable 2 4 2 hhod2x2Pr HMS 2X+ paddle 2
-variable 2 20 1 hhod2x2M HMS 2X- paddle 2
-variable 2 20 2 hhod2x2Mr HMS 2X- paddle 2
-variable 1 8 1 hhod1y9P HMS 1Y+ paddle 9
-variable 1 8 2 hhod1y9Pr HMS 1Y+ paddle 9
-variable 2 9 1 hhod2x11P HMS 2X+ paddle 11
-variable 2 9 2 hhod2x11Pr HMS 2X+ paddle 11
-variable 3 17 1 hhod2y3M HMS 2Y- paddle 3
-variable 3 17 2 hhod2y3Mr HMS 2Y- paddle 3
-variable 2 25 1 hhod2x11M HMS 2X- paddle 11
-variable 2 25 2 hhod2x11Mr HMS 2X- paddle 11
-variable 3 1 1 hhod2y3P HMS 2Y+ paddle 3
-variable 3 1 2 hhod2y3Pr HMS 2Y+ paddle 3
-variable 6 29 1 BCM17 bcm17
-variable 6 29 2 BCM17r bcm17
-variable 3 14 1 Empty_17 Empty
-variable 3 14 2 Empty_17r Empty
-variable 1 6 1 hhod1y6P HMS 1Y+ paddle 6
-variable 1 6 2 hhod1y6Pr HMS 1Y+ paddle 6
-variable 1 22 1 hhod1y6M HMS 1Y- paddle 6
-variable 1 22 2 hhod1y6Mr HMS 1Y- paddle 6
-variable 6 15 1 hCERSUM hCERSUM
-variable 6 15 2 hCERSUMr hCERSUM
-variable 0 5 1 hhod1x4P HMS 1X+ paddle 4
-variable 0 5 2 hhod1x4Pr HMS 1X+ paddle 4
-variable 0 21 1 hhod1x4M HMS 1X- paddle 4
-variable 0 21 2 hhod1x4Mr HMS 1X- paddle 4
-variable 6 12 1 hPSHWRHI hPSHWRHI
-variable 6 12 2 hPSHWRHIr hPSHWRHI
-variable 3 7 1 hhod2y8P HMS 2Y+ paddle 8
-variable 3 7 2 hhod2y8Pr HMS 2Y+ paddle 8
-variable 3 23 1 hhod2y8M HMS 2Y- paddle 8
-variable 3 23 2 hhod2y8Mr HMS 2Y- paddle 8
-variable 2 18 1 hhod2x5M HMS 2X- paddle 5
-variable 2 18 2 hhod2x5Mr HMS 2X- paddle 5
-variable 1 23 1 hhod1y8M HMS 1Y- paddle 8
-variable 1 23 2 hhod1y8Mr HMS 1Y- paddle 8
-variable 1 7 1 hhod1y8P HMS 1Y+ paddle 8
-variable 1 7 2 hhod1y8Pr HMS 1Y+ paddle 8
-variable 2 2 1 hhod2x5P HMS 2X+ paddle 5
-variable 2 2 2 hhod2x5Pr HMS 2X+ paddle 5
-variable 2 29 1 hhod2x12M HMS 2X- paddle 12
-variable 2 29 2 hhod2x12Mr HMS 2X- paddle 12
-variable 2 13 1 hhod2x12P HMS 2X+ paddle 12
-variable 2 13 2 hhod2x12Pr HMS 2X+ paddle 12
-variable 6 6 1 hTrig hT1
-variable 6 6 2 hTrigr hT1
-variable 0 4 1 hhod1x2P HMS 1X+ paddle 2
-variable 0 4 2 hhod1x2Pr HMS 1X+ paddle 2
-variable 0 20 1 hhod1x2M HMS 1X- paddle 2
-variable 0 20 2 hhod1x2Mr HMS 1X- paddle 2
-variable 1 16 1 hhod1y1M HMS 1Y- paddle 1
-variable 1 16 2 hhod1y1Mr HMS 1Y- paddle 1
-variable 1 26 1 Empty_8 Empty
-variable 1 26 2 Empty_8r Empty
-variable 1 27 1 Empty_9 Empty
-variable 1 27 2 Empty_9r Empty
-variable 1 0 1 hhod1y1P HMS 1Y+ paddle 1
-variable 1 0 2 hhod1y1Pr HMS 1Y+ paddle 1
-variable 1 10 1 Empty_2 Empty
-variable 1 10 2 Empty_2r Empty
-variable 1 11 1 Empty_3 Empty
-variable 1 11 2 Empty_3r Empty
-variable 1 15 1 Empty_6 Empty
-variable 1 15 2 Empty_6r Empty
-variable 1 25 1 Empty_7 Empty
-variable 1 25 2 Empty_7r Empty
-variable 1 13 1 Empty_4 Empty
-variable 1 13 2 Empty_4r Empty
-variable 1 14 1 Empty_5 Empty
-variable 1 14 2 Empty_5r Empty
-variable 0 9 1 hhod1x11P HMS 1X+ paddle 11
-variable 0 9 2 hhod1x11Pr HMS 1X+ paddle 11
-variable 1 9 1 Empty Empty
-variable 1 9 2 Emptyr Empty
-variable 0 25 1 hhod1x11M HMS 1X- paddle 11
-variable 0 25 2 hhod1x11Mr HMS 1X- paddle 11
-variable 1 28 1 hhod1y10M HMS 1Y- paddle 10
-variable 1 28 2 hhod1y10Mr HMS 1Y- paddle 10
-variable 1 12 1 hhod1y10P HMS 1Y+ paddle 10
-variable 1 12 2 hhod1y10Pr HMS 1Y+ paddle 10
-variable 3 24 1 hhod2y9M HMS 2Y- paddle 9
-variable 3 24 2 hhod2y9Mr HMS 2Y- paddle 9
-variable 6 10 1 hDSUM hDSUM
-variable 6 10 2 hDSUMr hDSUM
-variable 3 8 1 hhod2y9P HMS 2Y+ paddle 9
-variable 3 8 2 hhod2y9Pr HMS 2Y+ paddle 9
-variable 2 21 1 hhod2x4M HMS 2X- paddle 4
-variable 2 21 2 hhod2x4Mr HMS 2X- paddle 4
-variable 2 5 1 hhod2x4P HMS 2X+ paddle 4
-variable 2 5 2 hhod2x4Pr HMS 2X+ paddle 4
-variable 3 16 1 hhod2y1M HMS 2Y- paddle 1
-variable 3 16 2 hhod2y1Mr HMS 2Y- paddle 1
-variable 2 10 1 hhod2x13P HMS 2X+ paddle 13
-variable 2 10 2 hhod2x13Pr HMS 2X+ paddle 13
-variable 0 1 1 hhod1x3P HMS 1X+ paddle 3
-variable 0 1 2 hhod1x3Pr HMS 1X+ paddle 3
-variable 6 26 1 BCM4B bcm4b
-variable 6 26 2 BCM4Br bcm4b
-variable 2 26 1 hhod2x13M HMS 2X- paddle 13
-variable 2 26 2 hhod2x13Mr HMS 2X- paddle 13
-variable 0 17 1 hhod1x3M HMS 1X- paddle 3
-variable 0 17 2 hhod1x3Mr HMS 1X- paddle 3
-variable 6 31 1 1Mhz 1MHz
-variable 6 31 2 1Mhzr 1MHz
-variable 0 12 1 hhod1x10P HMS 1X+ paddle 10
-variable 0 12 2 hhod1x10Pr HMS 1X+ paddle 10
-variable 0 28 1 hhod1x10M HMS 1X- paddle 10
-variable 0 28 2 hhod1x10Mr HMS 1X- paddle 10
-variable 3 0 1 hhod2y1P HMS 2Y+ paddle 1
-variable 3 0 2 hhod2y1Pr HMS 2Y+ paddle 1
-variable 6 9 1 hCSUM hCSUM
-variable 6 9 2 hCSUMr hCSUM
-variable 3 28 1 hhod2y10M HMS 2Y- paddle 10
-variable 3 28 2 hhod2y10Mr HMS 2Y- paddle 10
-variable 0 23 1 hhod1x8M HMS 1X- paddle 8
-variable 0 23 2 hhod1x8Mr HMS 1X- paddle 8
-variable 0 7 1 hhod1x8P HMS 1X+ paddle 8
-variable 0 7 2 hhod1x8Pr HMS 1X+ paddle 8
-variable 3 12 1 hhod2y10P HMS 2Y+ paddle 10
-variable 3 12 2 hhod2y10Pr HMS 2Y+ paddle 10
-variable 6 28 1 BCM2 bcm2
-variable 6 28 2 BCM2r bcm2
-variable 3 6 1 hhod2y6P HMS 2Y+ paddle 6
-variable 3 6 2 hhod2y6Pr HMS 2Y+ paddle 6
-variable 3 22 1 hhod2y6M HMS 2Y- paddle 6
-variable 3 22 2 hhod2y6Mr HMS 2Y- paddle 6
-variable 2 3 1 hhod2x7P HMS 2X+ paddle 7
-variable 2 3 2 hhod2x7Pr HMS 2X+ paddle 7
-variable 6 14 1 hAERSUM hAERSUM
-variable 6 14 2 hAERSUMr hAERSUM
-variable 2 19 1 hhod2x7M HMS 2X- paddle 7
-variable 2 19 2 hhod2x7Mr HMS 2X- paddle 7
-variable 2 30 1 hhod2x14M HMS 2X- paddle 14
-variable 2 30 2 hhod2x14Mr HMS 2X- paddle 14
-variable 2 14 1 hhod2x14P HMS 2X+ paddle 14
-variable 2 14 2 hhod2x14Pr HMS 2X+ paddle 14
-variable 1 1 1 hhod1y3P HMS 1Y+ paddle 3
-variable 1 1 2 hhod1y3Pr HMS 1Y+ paddle 3
-variable 1 17 1 hhod1y3M HMS 1Y- paddle 3
-variable 1 17 2 hhod1y3Mr HMS 1Y- paddle 3
-variable 0 26 1 hhod1x13M HMS 1X- paddle 13
-variable 0 26 2 hhod1x13Mr HMS 1X- paddle 13
-variable 0 10 1 hhod1x13P HMS 1X+ paddle 13
-variable 0 10 2 hhod1x13Pr HMS 1X+ paddle 13
diff --git a/DBASE/db_HScalevt.dat b/DBASE/db_HScalevt.dat
new file mode 120000
index 00000000..a8001535
--- /dev/null
+++ b/DBASE/db_HScalevt.dat
@@ -0,0 +1 @@
+../MAPS/SCALERS/db_HScalevt.dat
\ No newline at end of file
diff --git a/DBASE/db_PSScalevt.dat b/DBASE/db_PSScalevt.dat
deleted file mode 100755
index cb66f3cf..00000000
--- a/DBASE/db_PSScalevt.dat
+++ /dev/null
@@ -1,278 +0,0 @@
-map 3801 8 6 02800620 ffffffff 13
-map 3801 8 7 02a00720 ffffffff 13
-map 3801 8 8 02c00820 ffffffff 13
-map 3801 8 9 02e00920 ffffffff 13
-map 3801 8 10 03000a20 ffffffff 13
-map 3801 8 11 03200b20 ffffffff 13
-map 3801 8 12 03400c20 ffffffff 13
-map 3801 8 13 03600d20 ffffffff 13 31 1000000
-variable 7 31 1 1Mhz 1MHz
-variable 7 31 2 1Mhzr 1MHz
-variable 7 28 1 BCM2 bcm2
-variable 7 28 2 BCM2r bcm2
-variable 7 27 1 BCM1 bcm1
-variable 7 27 2 BCM1r bcm1
-variable 0 16 1 shod1x1M SHMS 1X- paddle 1
-variable 0 16 2 shod1x1Mr SHMS 1X- paddle 1
-variable 0 20 1 shod1x2M SHMS 1X- paddle 2
-variable 0 20 2 shod1x2Mr SHMS 1X- paddle 2
-variable 0 17 1 shod1x3M SHMS 1X- paddle 3
-variable 0 17 2 shod1x3Mr SHMS 1X- paddle 3
-variable 0 21 1 shod1x4M SHMS 1X- paddle 4
-variable 0 21 2 shod1x4Mr SHMS 1X- paddle 4
-variable 0 18 1 shod1x5M SHMS 1X- paddle 5
-variable 0 18 2 shod1x5Mr SHMS 1X- paddle 5
-variable 0 22 1 shod1x6M SHMS 1X- paddle 6
-variable 0 22 2 shod1x6Mr SHMS 1X- paddle 6
-variable 0 19 1 shod1x7M SHMS 1X- paddle 7
-variable 0 19 2 shod1x7Mr SHMS 1X- paddle 7
-variable 0 23 1 shod1x8M SHMS 1X- paddle 8
-variable 0 23 2 shod1x8Mr SHMS 1X- paddle 8
-variable 0 24 1 shod1x9M SHMS 1X- paddle 9
-variable 0 24 2 shod1x9Mr SHMS 1X- paddle 9
-variable 0 28 1 shod1x10M SHMS 1X- paddle 10
-variable 0 28 2 shod1x10Mr SHMS 1X- paddle 10
-variable 0 25 1 shod1x11M SHMS 1X- paddle 11
-variable 0 25 2 shod1x11Mr SHMS 1X- paddle 11
-variable 0 30 1 shod1x12M SHMS 1X- paddle 12
-variable 0 30 2 shod1x12Mr SHMS 1X- paddle 12
-variable 0 26 1 shod1x13M SHMS 1X- paddle 13
-variable 0 26 2 shod1x13Mr SHMS 1X- paddle 13
-variable 0 0 1 shod1x1P SHMS 1X+ paddle 1
-variable 0 0 2 shod1x1Pr SHMS 1X+ paddle 1
-variable 0 4 1 shod1x2P SHMS 1X+ paddle 2
-variable 0 4 2 shod1x2Pr SHMS 1X+ paddle 2
-variable 0 1 1 shod1x3P SHMS 1X+ paddle 3
-variable 0 1 2 shod1x3Pr SHMS 1X+ paddle 3
-variable 0 5 1 shod1x4P SHMS 1X+ paddle 4
-variable 0 5 2 shod1x4Pr SHMS 1X+ paddle 4
-variable 0 2 1 shod1x5P SHMS 1X+ paddle 5
-variable 0 2 2 shod1x5Pr SHMS 1X+ paddle 5
-variable 0 6 1 shod1x6P SHMS 1X+ paddle 6
-variable 0 6 2 shod1x6Pr SHMS 1X+ paddle 6
-variable 0 3 1 shod1x7P SHMS 1X+ paddle 7
-variable 0 3 2 shod1x7Pr SHMS 1X+ paddle 7
-variable 0 7 1 shod1x8P SHMS 1X+ paddle 8
-variable 0 7 2 shod1x8Pr SHMS 1X+ paddle 8
-variable 0 8 1 shod1x9P SHMS 1X+ paddle 9
-variable 0 8 2 shod1x9Pr SHMS 1X+ paddle 9
-variable 0 12 1 shod1x10P SHMS 1X+ paddle 10
-variable 0 12 2 shod1x10Pr SHMS 1X+ paddle 10
-variable 0 9 1 shod1x11P SHMS 1X+ paddle 11
-variable 0 9 2 shod1x11Pr SHMS 1X+ paddle 11
-variable 0 13 1 shod1x12P SHMS 1X+ paddle 12
-variable 0 13 2 shod1x12Pr SHMS 1X+ paddle 12
-variable 0 10 1 shod1x13P SHMS 1X+ paddle 13
-variable 0 10 2 shod1x13Pr SHMS 1X+ paddle 13
-variable 1 0 1 shod1y1M SHMS 1Y- paddle 1
-variable 1 0 2 shod1y1Mr SHMS 1Y- paddle 1
-variable 1 4 1 shod1y2M SHMS 1Y- paddle 2
-variable 1 4 2 shod1y2Mr SHMS 1Y- paddle 2
-variable 1 1 1 shod1y3M SHMS 1Y- paddle 3
-variable 1 1 2 shod1y3Mr SHMS 1Y- paddle 3
-variable 1 5 1 shod1y4M SHMS 1Y- paddle 4
-variable 1 5 2 shod1y4Mr SHMS 1Y- paddle 4
-variable 1 2 1 shod1y5M SHMS 1Y- paddle 5
-variable 1 2 2 shod1y5Mr SHMS 1Y- paddle 5
-variable 1 3 1 shod1y7M SHMS 1Y- paddle 7
-variable 1 3 2 shod1y7Mr SHMS 1Y- paddle 7
-variable 1 7 1 shod1y8M SHMS 1Y- paddle 8
-variable 1 7 2 shod1y8Mr SHMS 1Y- paddle 8
-variable 1 8 1 shod1y9M SHMS 1Y- paddle 9
-variable 1 8 2 shod1y9Mr SHMS 1Y- paddle 9
-variable 1 12 1 shod1y10M SHMS 1Y- paddle 10
-variable 1 12 2 shod1y10Mr SHMS 1Y- paddle 10
-variable 1 9 1 shod1y11M SHMS 1Y- paddle 11
-variable 1 9 2 shod1y11Mr SHMS 1Y- paddle 11
-variable 1 13 1 shod1y12M SHMS 1Y- paddle 12
-variable 1 13 2 shod1y12Mr SHMS 1Y- paddle 12
-variable 1 10 1 shod1y13M SHMS 1Y- paddle 13
-variable 1 10 2 shod1y13Mr SHMS 1Y- paddle 13
-variable 1 16 1 shod1y1P SHMS 1Y+ paddle 1
-variable 1 16 2 shod1y1Pr SHMS 1Y+ paddle 1
-variable 1 20 1 shod1y2P SHMS 1Y+ paddle 2
-variable 1 20 2 shod1y2Pr SHMS 1Y+ paddle 2
-variable 1 17 1 shod1y3P SHMS 1Y+ paddle 3
-variable 1 17 2 shod1y3Pr SHMS 1Y+ paddle 3
-variable 1 21 1 shod1y4P SHMS 1Y+ paddle 4
-variable 1 21 2 shod1y4Pr SHMS 1Y+ paddle 4
-variable 1 18 1 shod1y5P SHMS 1Y+ paddle 5
-variable 1 18 2 shod1y5Pr SHMS 1Y+ paddle 5
-variable 1 22 1 shod1y6P SHMS 1Y+ paddle 6
-variable 1 22 2 shod1y6Pr SHMS 1Y+ paddle 6
-variable 1 19 1 shod1y7P SHMS 1Y+ paddle 7
-variable 1 19 2 shod1y7Pr SHMS 1Y+ paddle 7
-variable 1 23 1 shod1y8P SHMS 1Y+ paddle 8
-variable 1 23 2 shod1y8Pr SHMS 1Y+ paddle 8
-variable 1 24 1 shod1y9P SHMS 1Y+ paddle 9
-variable 1 24 2 shod1y9Pr SHMS 1Y+ paddle 9
-variable 1 28 1 shod1y10P SHMS 1Y+ paddle 10
-variable 1 28 2 shod1y10Pr SHMS 1Y+ paddle 10
-variable 1 25 1 shod1y11P SHMS 1Y+ paddle 11
-variable 1 25 2 shod1y11Pr SHMS 1Y+ paddle 11
-variable 1 29 1 shod1y12P SHMS 1Y+ paddle 12
-variable 1 29 2 shod1y12Pr SHMS 1Y+ paddle 12
-variable 1 26 1 shod1y13P SHMS 1Y+ paddle 13
-variable 1 26 2 shod1y13Pr SHMS 1Y+ paddle 13
-variable 2 9 1 shod2x11P SHMS 2X+ paddle 11
-variable 2 9 2 shod2x11Pr SHMS 2X+ paddle 11
-variable 7 1 1 s1Y s1Y
-variable 7 1 2 s1Yr s1Y
-variable 7 30 1 Unser Unser
-variable 7 30 2 Unserr Unser
-variable 2 30 1 shod2x14M SHMS 2X- paddle 14
-variable 2 30 2 shod2x14Mr SHMS 2X- paddle 14
-variable 7 14 1 sAERSUM sAERSUM
-variable 7 14 2 sAERSUMr sAERSUM
-variable 3 19 1 shod2y7M SHMS 2y- paddle 7
-variable 3 19 2 shod2y7Mr SHMS 2y- paddle 7
-variable 3 3 1 shod2y7P SHMS 2y+ paddle 7
-variable 3 3 2 shod2y7Pr SHMS 2y+ paddle 7
-variable 2 19 1 shod2x7M SHMS 2X- paddle 7
-variable 2 19 2 shod2x7Mr SHMS 2X- paddle 7
-variable 2 3 1 shod2x7P SHMS 2X+ paddle 7
-variable 2 3 2 shod2x7Pr SHMS 2X+ paddle 7
-variable 3 31 1 shod2y16M SHMS 2y- paddle 16
-variable 3 31 2 shod2y16Mr SHMS 2y- paddle 16
-variable 3 15 1 shod2y16P SHMS 2y+ paddle 16
-variable 3 15 2 shod2y16Pr SHMS 2y+ paddle 16
-variable 3 24 1 shod2y9M SHMS 2y- paddle 9
-variable 3 24 2 shod2y9Mr SHMS 2y- paddle 9
-variable 7 15 1 sCERSUM sCERSUM
-variable 7 15 2 sCERSUMr sCERSUM
-variable 3 14 1 shod2y14P SHMS 2y+ paddle 14
-variable 3 14 2 shod2y14Pr SHMS 2y+ paddle 14
-variable 2 5 1 shod2x4P SHMS 2X+ paddle 4
-variable 2 5 2 shod2x4Pr SHMS 2X+ paddle 4
-variable 2 21 1 shod2x4M SHMS 2X- paddle 4
-variable 2 21 2 shod2x4Mr SHMS 2X- paddle 4
-variable 7 3 1 s2Y s2Y
-variable 7 3 2 s2Yr s2Y
-variable 7 2 1 s2X s2X
-variable 7 2 2 s2Xr s2X
-variable 2 13 1 shod2x12P SHMS 2X+ paddle 12
-variable 2 13 2 shod2x12Pr SHMS 2X+ paddle 12
-variable 2 2 1 shod2x5P SHMS 2X+ paddle 5
-variable 2 2 2 shod2x5Pr SHMS 2X+ paddle 5
-variable 3 8 1 shod2y9P SHMS 2y+ paddle 9
-variable 3 8 2 shod2y9Pr SHMS 2y+ paddle 9
-variable 3 16 1 shod2y1M SHMS 2y- paddle 1
-variable 3 16 2 shod2y1Mr SHMS 2y- paddle 1
-variable 3 0 1 shod2y1P SHMS 2y+ paddle 1
-variable 3 0 2 shod2y1Pr SHMS 2y+ paddle 1
-variable 7 7 1 sASUM sASUM
-variable 7 7 2 sASUMr sASUM
-variable 2 25 1 shod2x11M SHMS 2X- paddle 11
-variable 2 25 2 shod2x11Mr SHMS 2X- paddle 11
-variable 3 28 1 shod2y10M SHMS 2y- paddle 10
-variable 3 28 2 shod2y10Mr SHMS 2y- paddle 10
-variable 3 12 1 shod2y10P SHMS 2y+ paddle 10
-variable 3 12 2 shod2y10Pr SHMS 2y+ paddle 10
-variable 7 9 1 sCSUM sCSUM
-variable 7 9 2 sCSUMr sCSUM
-variable 3 5 1 shod2y4P SHMS 2y+ paddle 4
-variable 3 5 2 shod2y4Pr SHMS 2y+ paddle 4
-variable 3 10 1 shod2y13P SHMS 2y+ paddle 13
-variable 3 10 2 shod2y13Pr SHMS 2y+ paddle 13
-variable 7 4 1 s1Xs1y s1T
-variable 7 4 2 s1Xs1yr s1T
-variable 2 4 1 shod2x2P SHMS 2X+ paddle 2
-variable 2 4 2 shod2x2Pr SHMS 2X+ paddle 2
-variable 2 20 1 shod2x2M SHMS 2X- paddle 2
-variable 2 20 2 shod2x2Mr SHMS 2X- paddle 2
-variable 3 22 1 shod2y6M SHMS 2y- paddle 6
-variable 3 22 2 shod2y6Mr SHMS 2y- paddle 6
-variable 2 12 1 shod2x10P SHMS 2X+ paddle 10
-variable 2 12 2 shod2x10Pr SHMS 2X+ paddle 10
-variable 2 28 1 shod2x10M SHMS 2X- paddle 10
-variable 2 28 2 shod2x10Mr SHMS 2X- paddle 10
-variable 3 25 1 shod2y11M SHMS 2y- paddle 11
-variable 3 25 2 shod2y11Mr SHMS 2y- paddle 11
-variable 2 10 1 shod2x13P SHMS 2X+ paddle 13
-variable 2 10 2 shod2x13Pr SHMS 2X+ paddle 13
-variable 3 6 1 shod2y6P SHMS 2y+ paddle 6
-variable 3 6 2 shod2y6Pr SHMS 2y+ paddle 6
-variable 2 22 1 shod2x6M SHMS 2X- paddle 6
-variable 2 22 2 shod2x6Mr SHMS 2X- paddle 6
-variable 3 23 1 shod2y8M SHMS 2y- paddle 8
-variable 3 23 2 shod2y8Mr SHMS 2y- paddle 8
-variable 3 7 1 shod2y8P SHMS 2y+ paddle 8
-variable 3 7 2 shod2y8Pr SHMS 2y+ paddle 8
-variable 2 1 1 shod2x3P SHMS 2X+ paddle 3
-variable 2 1 2 shod2x3Pr SHMS 2X+ paddle 3
-variable 2 17 1 shod2x3M SHMS 2X- paddle 3
-variable 2 17 2 shod2x3Mr SHMS 2X- paddle 3
-variable 3 9 1 shod2y11P SHMS 2y+ paddle 11
-variable 3 9 2 shod2y11Pr SHMS 2y+ paddle 11
-variable 3 1 1 shod2y3P SHMS 2y+ paddle 3
-variable 3 1 2 shod2y3Pr SHMS 2y+ paddle 3
-variable 2 24 1 shod2x9M SHMS 2X- paddle 9
-variable 2 24 2 shod2x9Mr SHMS 2X- paddle 9
-variable 3 17 1 shod2y3M SHMS 2y- paddle 3
-variable 3 17 2 shod2y3Mr SHMS 2y- paddle 3
-variable 2 26 1 shod2x13M SHMS 2X- paddle 13
-variable 2 26 2 shod2x13Mr SHMS 2X- paddle 13
-variable 2 8 1 shod2x9P SHMS 2X+ paddle 9
-variable 2 8 2 shod2x9Pr SHMS 2X+ paddle 9
-variable 3 13 1 shod2y12P SHMS 2y+ paddle 12
-variable 3 13 2 shod2y12Pr SHMS 2y+ paddle 12
-variable 7 0 1 s1X s1X
-variable 7 0 2 s1Xr s1X
-variable 3 29 1 shod2y12M SHMS 2y- paddle 12
-variable 3 29 2 shod2y12Mr SHMS 2y- paddle 12
-variable 7 8 1 sBSUM sBSUM
-variable 7 8 2 sBSUMr sBSUM
-variable 7 29 1 BCM17 bcm17
-variable 7 29 2 BCM17r bcm17
-variable 3 20 1 shod2y2M SHMS 2y- paddle 2
-variable 3 20 2 shod2y2Mr SHMS 2y- paddle 2
-variable 7 13 1 sSHWR sSHWR
-variable 7 13 2 sSHWRr sSHWR
-variable 3 4 1 shod2y2P SHMS 2y+ paddle 2
-variable 3 4 2 shod2y2Pr SHMS 2y+ paddle 2
-variable 2 23 1 shod2x8M SHMS 2X- paddle 8
-variable 2 23 2 shod2x8Mr SHMS 2X- paddle 8
-variable 7 6 1 sTrig sT1
-variable 7 6 2 sTrigr sT1
-variable 2 7 1 shod2x8P SHMS 2X+ paddle 8
-variable 2 7 2 shod2x8Pr SHMS 2X+ paddle 8
-variable 7 10 1 sDSUM sDSUM
-variable 7 10 2 sDSUMr sDSUM
-variable 2 16 1 shod2x1M SHMS 2X- paddle 1
-variable 2 16 2 shod2x1Mr SHMS 2X- paddle 1
-variable 3 2 1 shod2y5P SHMS 2y+ paddle 5
-variable 3 2 2 shod2y5Pr SHMS 2y+ paddle 5
-variable 3 18 1 shod2y5M SHMS 2y- paddle 5
-variable 3 18 2 shod2y5Mr SHMS 2y- paddle 5
-variable 2 0 1 shod2x1P SHMS 2X+ paddle 1
-variable 2 0 2 shod2x1Pr SHMS 2X+ paddle 1
-variable 2 14 1 shod2x14P SHMS 2X+ paddle 14
-variable 2 14 2 shod2x14Pr SHMS 2X+ paddle 14
-variable 7 11 1 sPSHWRLO sPSHWRLO
-variable 7 11 2 sPSHWRLOr sPSHWRLO
-variable 7 5 1 s2Xs2Y s2T
-variable 7 5 2 s2Xs2Yr s2T
-variable 3 30 1 shod2y14M SHMS 2y- paddle 14
-variable 3 30 2 shod2y14Mr SHMS 2y- paddle 14
-variable 2 6 1 shod2x6P SHMS 2X+ paddle 6
-variable 2 6 2 shod2x6Pr SHMS 2X+ paddle 6
-variable 7 26 1 BCM4B bcm4b
-variable 7 26 2 BCM4Br bcm4b
-variable 3 21 1 shod2y4M SHMS 2y- paddle 4
-variable 3 21 2 shod2y4Mr SHMS 2y- paddle 4
-variable 3 26 1 shod2y13M SHMS 2y- paddle 13
-variable 3 26 2 shod2y13Mr SHMS 2y- paddle 13
-variable 7 25 1 BCM4A bcm4a
-variable 7 25 2 BCM4Ar bcm4a
-variable 3 11 1 shod2y15P SHMS 2y+ paddle 15
-variable 3 11 2 shod2y15Pr SHMS 2y+ paddle 15
-variable 3 27 1 shod2y15M SHMS 2y- paddle 15
-variable 3 27 2 shod2y15Mr SHMS 2y- paddle 15
-variable 7 12 1 sPSHWRHI sPSHWRHI
-variable 7 12 2 sPSHWRHIr sPSHWRHI
-variable 2 29 1 shod2x12M SHMS 2X- paddle 12
-variable 2 29 2 shod2x12Mr SHMS 2X- paddle 12
-variable 1 6 1 shod1y6M SHMS 1Y- paddle 6
-variable 1 6 2 shod1y6Mr SHMS 1Y- paddle 6
-variable 2 18 1 shod2x5M SHMS 2X- paddle 5
-variable 2 18 2 shod2x5Mr SHMS 2X- paddle 5
diff --git a/DBASE/db_PScalevt.dat b/DBASE/db_PScalevt.dat
new file mode 120000
index 00000000..d72d0494
--- /dev/null
+++ b/DBASE/db_PScalevt.dat
@@ -0,0 +1 @@
+../MAPS/SCALERS/db_PScalevt.dat
\ No newline at end of file
diff --git a/MAPS/SCALERS/db_HScalevt.dat b/MAPS/SCALERS/db_HScalevt.dat
new file mode 100644
index 00000000..06d24d5a
--- /dev/null
+++ b/MAPS/SCALERS/db_HScalevt.dat
@@ -0,0 +1,309 @@
+map 3801 5 6 00000620 ffffffff 12
+map 3801 5 7 00200720 ffffffff 12
+map 3801 5 8 00400820 ffffffff 12
+map 3801 5 9 00600920 ffffffff 12
+map 3801 5 10 00800a20 ffffffff 12
+map 3801 5 11 00a00b20 ffffffff 12
+map 3801 5 12 00c00c20 ffffffff 12 31 1000000
+variable 3 3 1 .hod.2y7.posScaler HMS 2Y+ paddle 7
+variable 3 3 2 .hod.2y7.posScalerRate HMS 2Y+ paddle 7
+variable 0 8 1 .hod.1x9.posScaler HMS 1X+ paddle 9
+variable 0 8 2 .hod.1x9.posScalerRate HMS 1X+ paddle 9
+variable 0 24 1 .hod.1x9.negScaler HMS 1X- paddle 9
+variable 0 24 2 .hod.1x9.negScalerRate HMS 1X- paddle 9
+variable 3 19 1 .hod.2y7.negScaler HMS 2Y- paddle 7
+variable 3 19 2 .hod.2y7.negScalerRate HMS 2Y- paddle 7
+variable 2 22 1 .hod.2x6.negScaler HMS 2X- paddle 6
+variable 2 22 2 .hod.2x6.negScalerRate HMS 2X- paddle 6
+variable 2 6 1 .hod.2x6.posScaler HMS 2X+ paddle 6
+variable 2 6 2 .hod.2x6.posScalerRate HMS 2X+ paddle 6
+variable 2 27 1 .hod.2x15.negScaler HMS 2X- paddle 15
+variable 2 27 2 .hod.2x15.negScalerRate HMS 2X- paddle 15
+variable 3 26 1 .Empty_20.scaler Empty
+variable 3 26 2 .Empty_20.scalerRate Empty
+variable 1 2 1 .hod.1y5.posScaler HMS 1Y+ paddle 5
+variable 1 2 2 .hod.1y5.posScalerRate HMS 1Y+ paddle 5
+variable 3 29 1 .Empty_22.scaler Empty
+variable 3 29 2 .Empty_22.scalerRate Empty
+variable 1 18 1 .hod.1y5.negScaler HMS 1Y- paddle 5
+variable 1 18 2 .hod.1y5.negScalerRate HMS 1Y- paddle 5
+variable 3 31 1 .Empty_24.scaler Empty
+variable 3 31 2 .Empty_24.scalerRate Empty
+variable 2 11 1 .hod.2x15.posScaler HMS 2X+ paddle 15
+variable 2 11 2 .hod.2x15.posScalerRate HMS 2X+ paddle 15
+variable 1 20 1 .hod.1y2.negScaler HMS 1Y- paddle 2
+variable 1 20 2 .hod.1y2.negScalerRate HMS 1Y- paddle 2
+variable 6 11 1 .PSHWRLO.scaler HMS PSHWRLO
+variable 6 11 2 .PSHWRLO.scalerRate HMS PSHWRLO
+variable 1 4 1 .hod.1y2.posScaler HMS 1Y+ paddle 2
+variable 1 4 2 .hod.1y2.posScalerRate HMS 1Y+ paddle 2
+variable 6 9 1 .CSUM.scaler HMS CSUM
+variable 6 9 2 .CSUM.scalerRate HMS CSUM
+variable 0 13 1 .hod.1x12.posScaler HMS 1X+ paddle 12
+variable 0 13 2 .hod.1x12.posScalerRate HMS 1X+ paddle 12
+variable 0 29 1 .hod.1x12.negScaler HMS 1X- paddle 12
+variable 0 29 2 .hod.1x12.negScalerRate HMS 1X- paddle 12
+variable 2 0 1 .hod.2x1.posScaler HMS 2X+ paddle 1
+variable 2 0 2 .hod.2x1.posScalerRate HMS 2X+ paddle 1
+variable 2 16 1 .hod.2x1.negScaler HMS 2X- paddle 1
+variable 2 16 2 .hod.2x1.negScalerRate HMS 2X- paddle 1
+variable 3 21 1 .hod.2y4.negScaler HMS 2Y- paddle 4
+variable 3 21 2 .hod.2y4.negScalerRate HMS 2Y- paddle 4
+variable 3 5 1 .hod.2y4.posScaler HMS 2Y+ paddle 4
+variable 3 5 2 .hod.2y4.posScalerRate HMS 2Y+ paddle 4
+variable 6 6 1 .Trig.scaler HMS T1
+variable 6 6 2 .Trig.scalerRate HMS T1
+variable 1 5 1 .hod.1y4.posScaler HMS 1Y+ paddle 4
+variable 1 5 2 .hod.1y4.posScalerRate HMS 1Y+ paddle 4
+variable 2 8 1 .hod.2x9.posScaler HMS 2X+ paddle 9
+variable 2 8 2 .hod.2x9.posScalerRate HMS 2X+ paddle 9
+variable 2 24 1 .hod.2x9.negScaler HMS 2X- paddle 9
+variable 2 24 2 .hod.2x9.negScalerRate HMS 2X- paddle 9
+variable 1 21 1 .hod.1y4.negScaler HMS 1Y- paddle 4
+variable 1 21 2 .hod.1y4.negScalerRate HMS 1Y- paddle 4
+variable 0 0 1 .hod.1x1.posScaler HMS 1X+ paddle 1
+variable 0 0 2 .hod.1x1.posScalerRate HMS 1X+ paddle 1
+variable 0 16 1 .hod.1x1.negScaler HMS 1X- paddle 1
+variable 0 16 2 .hod.1x1.negScalerRate HMS 1X- paddle 1
+variable 0 18 1 .hod.1x5.negScaler HMS 1X- paddle 5
+variable 0 18 2 .hod.1x5.negScalerRate HMS 1X- paddle 5
+variable 0 27 1 .hod.1x15.negScaler HMS 1X- paddle 15
+variable 0 27 2 .hod.1x15.negScalerRate HMS 1X- paddle 15
+variable 0 11 1 .hod.1x15.posScaler HMS 1X+ paddle 15
+variable 0 11 2 .hod.1x15.posScalerRate HMS 1X+ paddle 15
+variable 3 27 1 .Empty_21.scaler Empty
+variable 3 27 2 .Empty_21.scalerRate Empty
+variable 3 2 1 .hod.2y5.posScaler HMS 2Y+ paddle 5
+variable 3 2 2 .hod.2y5.posScalerRate HMS 2Y+ paddle 5
+variable 3 18 1 .hod.2y5.negScaler HMS 2Y- paddle 5
+variable 3 18 2 .hod.2y5.negScalerRate HMS 2Y- paddle 5
+variable 2 7 1 .hod.2x8.posScaler HMS 2X+ paddle 8
+variable 2 7 2 .hod.2x8.posScalerRate HMS 2X+ paddle 8
+variable 1 19 1 .hod.1y7.negScaler HMS 1Y- paddle 7
+variable 1 19 2 .hod.1y7.negScalerRate HMS 1Y- paddle 7
+variable 0 2 1 .hod.1x5.posScaler HMS 1X+ paddle 5
+variable 0 2 2 .hod.1x5.posScalerRate HMS 1X+ paddle 5
+variable 1 3 1 .hod.1y7.posScaler HMS 1Y+ paddle 7
+variable 1 3 2 .hod.1y7.posScalerRate HMS 1Y+ paddle 7
+variable 3 30 1 .Empty_23.scaler Empty
+variable 3 30 2 .Empty_23.scalerRate Empty
+variable 2 23 1 .hod.2x8.negScaler HMS 2X- paddle 8
+variable 2 23 2 .hod.2x8.negScalerRate HMS 2X- paddle 8
+variable 0 22 1 .hod.1x6.negScaler HMS 1X- paddle 6
+variable 0 22 2 .hod.1x6.negScalerRate HMS 1X- paddle 6
+variable 2 15 1 .hod.2x16.posScaler HMS 2X+ paddle 16
+variable 2 15 2 .hod.2x16.posScalerRate HMS 2X+ paddle 16
+variable 2 31 1 .hod.2x16.negScaler HMS 2X- paddle 16
+variable 2 31 2 .hod.2x16.negScalerRate HMS 2X- paddle 16
+variable 0 6 1 .hod.1x6.posScaler HMS 1X+ paddle 6
+variable 0 6 2 .hod.1x6.posScalerRate HMS 1X+ paddle 6
+variable 6 0 1 .S1X.scaler HMS S1X
+variable 6 0 2 .S1X.scalerRate HMS S1X
+variable 6 1 1 .S1Y.scaler HMS S1Y
+variable 6 1 2 .S1Y.scalerRate HMS S1Y
+variable 0 30 1 .hod.1x14.negScaler HMS 1X- paddle 14
+variable 0 30 2 .hod.1x14.negScalerRate HMS 1X- paddle 14
+variable 6 7 1 .ASUM.scaler HMS ASUM
+variable 6 7 2 .ASUM.scalerRate HMS ASUM
+variable 6 27 1 .BCM1.scaler bcm1
+variable 6 27 2 .BCM1.scalerRate bcm1
+variable 0 14 1 .hod.1x14.posScaler HMS 1X+ paddle 14
+variable 0 14 2 .hod.1x14.posScalerRate HMS 1X+ paddle 14
+variable 2 17 1 .hod.2x3.negScaler HMS 2X- paddle 3
+variable 2 17 2 .hod.2x3.negScalerRate HMS 2X- paddle 3
+variable 2 1 1 .hod.2x3.posScaler HMS 2X+ paddle 3
+variable 2 1 2 .hod.2x3.posScalerRate HMS 2X+ paddle 3
+variable 1 29 1 .Empty_10.scaler Empty
+variable 1 29 2 .Empty_10.scalerRate Empty
+variable 1 30 1 .Empty_11.scaler Empty
+variable 1 30 2 .Empty_11.scalerRate Empty
+variable 1 31 1 .Empty_12.scaler Empty
+variable 1 31 2 .Empty_12.scalerRate Empty
+variable 3 9 1 .Empty_13.scaler Empty
+variable 3 9 2 .Empty_13.scalerRate Empty
+variable 3 10 1 .Empty_14.scaler Empty
+variable 3 10 2 .Empty_14.scalerRate Empty
+variable 3 11 1 .Empty_15.scaler Empty
+variable 3 11 2 .Empty_15.scalerRate Empty
+variable 3 4 1 .hod.2y2.posScaler HMS 2Y+ paddle 2
+variable 3 4 2 .hod.2y2.posScalerRate HMS 2Y+ paddle 2
+variable 2 28 1 .hod.2x10.negScaler HMS 2X- paddle 10
+variable 2 28 2 .hod.2x10.negScalerRate HMS 2X- paddle 10
+variable 3 15 1 .Empty_18.scaler Empty
+variable 3 15 2 .Empty_18.scalerRate Empty
+variable 3 25 1 .Empty_19.scaler Empty
+variable 3 25 2 .Empty_19.scalerRate Empty
+variable 6 12 1 .PSHWRHI.scaler HMS PSHWRHI
+variable 6 12 2 .PSHWRHI.scalerRate HMS PSHWRHI
+variable 3 20 1 .hod.2y2.negScaler HMS 2Y- paddle 2
+variable 3 20 2 .hod.2y2.negScalerRate HMS 2Y- paddle 2
+variable 0 19 1 .hod.1x7.negScaler HMS 1X- paddle 7
+variable 0 19 2 .hod.1x7.negScalerRate HMS 1X- paddle 7
+variable 0 3 1 .hod.1x7.posScaler HMS 1X+ paddle 7
+variable 0 3 2 .hod.1x7.posScalerRate HMS 1X+ paddle 7
+variable 6 14 1 .AERSUM.scaler HMS AERSUM
+variable 6 14 2 .AERSUM.scalerRate HMS AERSUM
+variable 2 12 1 .hod.2x10.posScaler HMS 2X+ paddle 10
+variable 2 12 2 .hod.2x10.posScalerRate HMS 2X+ paddle 10
+variable 6 25 1 .BCM4A.scaler bcm4a
+variable 6 25 2 .BCM4A.scalerRate bcm4a
+variable 0 31 1 .hod.1x16.negScaler HMS 1X- paddle 16
+variable 0 31 2 .hod.1x16.negScalerRate HMS 1X- paddle 16
+variable 0 15 1 .hod.1x16.posScaler HMS 1X+ paddle 16
+variable 0 15 2 .hod.1x16.posScalerRate HMS 1X+ paddle 16
+variable 3 13 1 .Empty_16.scaler Empty
+variable 3 13 2 .Empty_16.scalerRate Empty
+variable 1 24 1 .hod.1y9.negScaler HMS 1Y- paddle 9
+variable 1 24 2 .hod.1y9.negScalerRate HMS 1Y- paddle 9
+variable 2 4 1 .hod.2x2.posScaler HMS 2X+ paddle 2
+variable 2 4 2 .hod.2x2.posScalerRate HMS 2X+ paddle 2
+variable 2 20 1 .hod.2x2.negScaler HMS 2X- paddle 2
+variable 2 20 2 .hod.2x2.negScalerRate HMS 2X- paddle 2
+variable 1 8 1 .hod.1y9.posScaler HMS 1Y+ paddle 9
+variable 1 8 2 .hod.1y9.posScalerRate HMS 1Y+ paddle 9
+variable 2 9 1 .hod.2x11.posScaler HMS 2X+ paddle 11
+variable 2 9 2 .hod.2x11.posScalerRate HMS 2X+ paddle 11
+variable 3 17 1 .hod.2y3.negScaler HMS 2Y- paddle 3
+variable 3 17 2 .hod.2y3.negScalerRate HMS 2Y- paddle 3
+variable 2 25 1 .hod.2x11.negScaler HMS 2X- paddle 11
+variable 2 25 2 .hod.2x11.negScalerRate HMS 2X- paddle 11
+variable 3 1 1 .hod.2y3.posScaler HMS 2Y+ paddle 3
+variable 3 1 2 .hod.2y3.posScalerRate HMS 2Y+ paddle 3
+variable 6 29 1 .BCM17.scaler bcm17
+variable 6 29 2 .BCM17.scalerRate bcm17
+variable 3 14 1 .Empty_17.scaler Empty
+variable 3 14 2 .Empty_17.scalerRate Empty
+variable 1 6 1 .hod.1y6.posScaler HMS 1Y+ paddle 6
+variable 1 6 2 .hod.1y6.posScalerRate HMS 1Y+ paddle 6
+variable 1 22 1 .hod.1y6.negScaler HMS 1Y- paddle 6
+variable 1 22 2 .hod.1y6.negScalerRate HMS 1Y- paddle 6
+variable 0 5 1 .hod.1x4.posScaler HMS 1X+ paddle 4
+variable 0 5 2 .hod.1x4.posScalerRate HMS 1X+ paddle 4
+variable 0 21 1 .hod.1x4.negScaler HMS 1X- paddle 4
+variable 0 21 2 .hod.1x4.negScalerRate HMS 1X- paddle 4
+variable 3 7 1 .hod.2y8.posScaler HMS 2Y+ paddle 8
+variable 3 7 2 .hod.2y8.posScalerRate HMS 2Y+ paddle 8
+variable 3 23 1 .hod.2y8.negScaler HMS 2Y- paddle 8
+variable 3 23 2 .hod.2y8.negScalerRate HMS 2Y- paddle 8
+variable 2 18 1 .hod.2x5.negScaler HMS 2X- paddle 5
+variable 2 18 2 .hod.2x5.negScalerRate HMS 2X- paddle 5
+variable 1 23 1 .hod.1y8.negScaler HMS 1Y- paddle 8
+variable 1 23 2 .hod.1y8.negScalerRate HMS 1Y- paddle 8
+variable 1 7 1 .hod.1y8.posScaler HMS 1Y+ paddle 8
+variable 1 7 2 .hod.1y8.posScalerRate HMS 1Y+ paddle 8
+variable 2 2 1 .hod.2x5.posScaler HMS 2X+ paddle 5
+variable 2 2 2 .hod.2x5.posScalerRate HMS 2X+ paddle 5
+variable 2 29 1 .hod.2x12.negScaler HMS 2X- paddle 12
+variable 2 29 2 .hod.2x12.negScalerRate HMS 2X- paddle 12
+variable 6 8 1 .BSUM.scaler HMS BSUM
+variable 6 8 2 .BSUM.scalerRate HMS BSUM
+variable 2 13 1 .hod.2x12.posScaler HMS 2X+ paddle 12
+variable 2 13 2 .hod.2x12.posScalerRate HMS 2X+ paddle 12
+variable 0 4 1 .hod.1x2.posScaler HMS 1X+ paddle 2
+variable 0 4 2 .hod.1x2.posScalerRate HMS 1X+ paddle 2
+variable 0 20 1 .hod.1x2.negScaler HMS 1X- paddle 2
+variable 0 20 2 .hod.1x2.negScalerRate HMS 1X- paddle 2
+variable 1 16 1 .hod.1y1.negScaler HMS 1Y- paddle 1
+variable 1 16 2 .hod.1y1.negScalerRate HMS 1Y- paddle 1
+variable 1 26 1 .Empty_8.scaler Empty
+variable 1 26 2 .Empty_8.scalerRate Empty
+variable 1 27 1 .Empty_9.scaler Empty
+variable 1 27 2 .Empty_9.scalerRate Empty
+variable 1 0 1 .hod.1y1.posScaler HMS 1Y+ paddle 1
+variable 1 0 2 .hod.1y1.posScalerRate HMS 1Y+ paddle 1
+variable 1 10 1 .Empty_2.scaler Empty
+variable 1 10 2 .Empty_2.scalerRate Empty
+variable 1 11 1 .Empty_3.scaler Empty
+variable 1 11 2 .Empty_3.scalerRate Empty
+variable 1 15 1 .Empty_6.scaler Empty
+variable 1 15 2 .Empty_6.scalerRate Empty
+variable 1 25 1 .Empty_7.scaler Empty
+variable 1 25 2 .Empty_7.scalerRate Empty
+variable 1 13 1 .Empty_4.scaler Empty
+variable 1 13 2 .Empty_4.scalerRate Empty
+variable 1 14 1 .Empty_5.scaler Empty
+variable 1 14 2 .Empty_5.scalerRate Empty
+variable 0 9 1 .hod.1x11.posScaler HMS 1X+ paddle 11
+variable 0 9 2 .hod.1x11.posScalerRate HMS 1X+ paddle 11
+variable 1 9 1 .Empty.scaler Empty
+variable 1 9 2 .Empty.scalerRate Empty
+variable 0 25 1 .hod.1x11.negScaler HMS 1X- paddle 11
+variable 0 25 2 .hod.1x11.negScalerRate HMS 1X- paddle 11
+variable 1 28 1 .hod.1y10.negScaler HMS 1Y- paddle 10
+variable 1 28 2 .hod.1y10.negScalerRate HMS 1Y- paddle 10
+variable 1 12 1 .hod.1y10.posScaler HMS 1Y+ paddle 10
+variable 1 12 2 .hod.1y10.posScalerRate HMS 1Y+ paddle 10
+variable 3 24 1 .hod.2y9.negScaler HMS 2Y- paddle 9
+variable 3 24 2 .hod.2y9.negScalerRate HMS 2Y- paddle 9
+variable 3 8 1 .hod.2y9.posScaler HMS 2Y+ paddle 9
+variable 3 8 2 .hod.2y9.posScalerRate HMS 2Y+ paddle 9
+variable 2 21 1 .hod.2x4.negScaler HMS 2X- paddle 4
+variable 2 21 2 .hod.2x4.negScalerRate HMS 2X- paddle 4
+variable 2 5 1 .hod.2x4.posScaler HMS 2X+ paddle 4
+variable 2 5 2 .hod.2x4.posScalerRate HMS 2X+ paddle 4
+variable 6 4 1 .S1XS1Y.scaler HMS S1T
+variable 6 4 2 .S1XS1Y.scalerRate HMS S1T
+variable 6 15 1 .CERSUM.scaler HMS CERSUM
+variable 6 15 2 .CERSUM.scalerRate HMS CERSUM
+variable 6 13 1 .SHWR.scaler HMS SHWR
+variable 6 13 2 .SHWR.scalerRate HMS SHWR
+variable 3 16 1 .hod.2y1.negScaler HMS 2Y- paddle 1
+variable 3 16 2 .hod.2y1.negScalerRate HMS 2Y- paddle 1
+variable 2 10 1 .hod.2x13.posScaler HMS 2X+ paddle 13
+variable 2 10 2 .hod.2x13.posScalerRate HMS 2X+ paddle 13
+variable 0 1 1 .hod.1x3.posScaler HMS 1X+ paddle 3
+variable 0 1 2 .hod.1x3.posScalerRate HMS 1X+ paddle 3
+variable 6 26 1 .BCM4B.scaler bcm4b
+variable 6 26 2 .BCM4B.scalerRate bcm4b
+variable 2 26 1 .hod.2x13.negScaler HMS 2X- paddle 13
+variable 2 26 2 .hod.2x13.negScalerRate HMS 2X- paddle 13
+variable 0 17 1 .hod.1x3.negScaler HMS 1X- paddle 3
+variable 0 17 2 .hod.1x3.negScalerRate HMS 1X- paddle 3
+variable 6 31 1 .1Mhz.scaler 1MHz
+variable 6 31 2 .1Mhz.scalerRate 1MHz
+variable 6 30 1 .Unser.scaler Unser
+variable 6 30 2 .Unser.scalerRate Unser
+variable 6 10 1 .DSUM.scaler HMS DSUM
+variable 6 10 2 .DSUM.scalerRate HMS DSUM
+variable 0 12 1 .hod.1x10.posScaler HMS 1X+ paddle 10
+variable 0 12 2 .hod.1x10.posScalerRate HMS 1X+ paddle 10
+variable 0 28 1 .hod.1x10.negScaler HMS 1X- paddle 10
+variable 0 28 2 .hod.1x10.negScalerRate HMS 1X- paddle 10
+variable 6 5 1 .S2XS2Y.scaler HMS S2T
+variable 6 5 2 .S2XS2Y.scalerRate HMS S2T
+variable 3 0 1 .hod.2y1.posScaler HMS 2Y+ paddle 1
+variable 3 0 2 .hod.2y1.posScalerRate HMS 2Y+ paddle 1
+variable 3 28 1 .hod.2y10.negScaler HMS 2Y- paddle 10
+variable 3 28 2 .hod.2y10.negScalerRate HMS 2Y- paddle 10
+variable 0 23 1 .hod.1x8.negScaler HMS 1X- paddle 8
+variable 0 23 2 .hod.1x8.negScalerRate HMS 1X- paddle 8
+variable 0 7 1 .hod.1x8.posScaler HMS 1X+ paddle 8
+variable 0 7 2 .hod.1x8.posScalerRate HMS 1X+ paddle 8
+variable 3 12 1 .hod.2y10.posScaler HMS 2Y+ paddle 10
+variable 3 12 2 .hod.2y10.posScalerRate HMS 2Y+ paddle 10
+variable 6 28 1 .BCM2.scaler bcm2
+variable 6 28 2 .BCM2.scalerRate bcm2
+variable 3 6 1 .hod.2y6.posScaler HMS 2Y+ paddle 6
+variable 3 6 2 .hod.2y6.posScalerRate HMS 2Y+ paddle 6
+variable 3 22 1 .hod.2y6.negScaler HMS 2Y- paddle 6
+variable 3 22 2 .hod.2y6.negScalerRate HMS 2Y- paddle 6
+variable 2 3 1 .hod.2x7.posScaler HMS 2X+ paddle 7
+variable 2 3 2 .hod.2x7.posScalerRate HMS 2X+ paddle 7
+variable 2 19 1 .hod.2x7.negScaler HMS 2X- paddle 7
+variable 2 19 2 .hod.2x7.negScalerRate HMS 2X- paddle 7
+variable 2 30 1 .hod.2x14.negScaler HMS 2X- paddle 14
+variable 2 30 2 .hod.2x14.negScalerRate HMS 2X- paddle 14
+variable 2 14 1 .hod.2x14.posScaler HMS 2X+ paddle 14
+variable 2 14 2 .hod.2x14.posScalerRate HMS 2X+ paddle 14
+variable 6 3 1 .S2Y.scaler HMS S2Y
+variable 6 3 2 .S2Y.scalerRate HMS S2Y
+variable 6 2 1 .S2X.scaler HMS S2X
+variable 6 2 2 .S2X.scalerRate HMS S2X
+variable 1 1 1 .hod.1y3.posScaler HMS 1Y+ paddle 3
+variable 1 1 2 .hod.1y3.posScalerRate HMS 1Y+ paddle 3
+variable 1 17 1 .hod.1y3.negScaler HMS 1Y- paddle 3
+variable 1 17 2 .hod.1y3.negScalerRate HMS 1Y- paddle 3
+variable 0 26 1 .hod.1x13.negScaler HMS 1X- paddle 13
+variable 0 26 2 .hod.1x13.negScalerRate HMS 1X- paddle 13
+variable 0 10 1 .hod.1x13.posScaler HMS 1X+ paddle 13
+variable 0 10 2 .hod.1x13.posScalerRate HMS 1X+ paddle 13
diff --git a/MAPS/SCALERS/db_PScalevt.dat b/MAPS/SCALERS/db_PScalevt.dat
new file mode 100644
index 00000000..31ec1a5c
--- /dev/null
+++ b/MAPS/SCALERS/db_PScalevt.dat
@@ -0,0 +1,278 @@
+map 3801 8 6 02800620 ffffffff 13
+map 3801 8 7 02a00720 ffffffff 13
+map 3801 8 8 02c00820 ffffffff 13
+map 3801 8 9 02e00920 ffffffff 13
+map 3801 8 10 03000a20 ffffffff 13
+map 3801 8 11 03200b20 ffffffff 13
+map 3801 8 12 03400c20 ffffffff 13
+map 3801 8 13 03600d20 ffffffff 13 31 1000000
+variable 3 22 1 .hod.2y6.negScaler SHMS 2y- paddle 6
+variable 3 22 2 .hod.2y6.negScalerRate SHMS 2y- paddle 6
+variable 2 7 1 .hod.2x8.posScaler SHMS 2X+ paddle 8
+variable 2 7 2 .hod.2x8.posScalerRate SHMS 2X+ paddle 8
+variable 7 30 1 .Unser.scaler Unser
+variable 7 30 2 .Unser.scalerRate Unser
+variable 3 16 1 .hod.2y1.negScaler SHMS 2y- paddle 1
+variable 3 16 2 .hod.2y1.negScalerRate SHMS 2y- paddle 1
+variable 3 15 1 .hod.2y16.posScaler SHMS 2y+ paddle 16
+variable 3 15 2 .hod.2y16.posScalerRate SHMS 2y+ paddle 16
+variable 3 31 1 .hod.2y16.negScaler SHMS 2y- paddle 16
+variable 3 31 2 .hod.2y16.negScalerRate SHMS 2y- paddle 16
+variable 2 19 1 .hod.2x7.negScaler SHMS 2X- paddle 7
+variable 2 19 2 .hod.2x7.negScalerRate SHMS 2X- paddle 7
+variable 3 27 1 .hod.2y15.negScaler SHMS 2y- paddle 15
+variable 3 27 2 .hod.2y15.negScalerRate SHMS 2y- paddle 15
+variable 3 23 1 .hod.2y8.negScaler SHMS 2y- paddle 8
+variable 3 23 2 .hod.2y8.negScalerRate SHMS 2y- paddle 8
+variable 0 4 1 .hod.1x2.posScaler SHMS 1X+ paddle 2
+variable 0 4 2 .hod.1x2.posScalerRate SHMS 1X+ paddle 2
+variable 0 20 1 .hod.1x2.negScaler SHMS 1X- paddle 2
+variable 0 20 2 .hod.1x2.negScalerRate SHMS 1X- paddle 2
+variable 7 6 1 .Trig.scaler SHMS T1
+variable 7 6 2 .Trig.scalerRate SHMS T1
+variable 3 29 1 .hod.2y12.negScaler SHMS 2y- paddle 12
+variable 3 29 2 .hod.2y12.negScalerRate SHMS 2y- paddle 12
+variable 7 8 1 .BSUM.scaler SHMS BSUM
+variable 7 8 2 .BSUM.scalerRate SHMS BSUM
+variable 7 28 1 .BCM2.scaler bcm2
+variable 7 28 2 .BCM2.scalerRate bcm2
+variable 1 20 1 .hod.1y2.posScaler SHMS 1Y+ paddle 2
+variable 1 20 2 .hod.1y2.posScalerRate SHMS 1Y+ paddle 2
+variable 0 5 1 .hod.1x4.posScaler SHMS 1X+ paddle 4
+variable 0 5 2 .hod.1x4.posScalerRate SHMS 1X+ paddle 4
+variable 0 23 1 .hod.1x8.negScaler SHMS 1X- paddle 8
+variable 0 23 2 .hod.1x8.negScalerRate SHMS 1X- paddle 8
+variable 0 7 1 .hod.1x8.posScaler SHMS 1X+ paddle 8
+variable 0 7 2 .hod.1x8.posScalerRate SHMS 1X+ paddle 8
+variable 3 9 1 .hod.2y11.posScaler SHMS 2y+ paddle 11
+variable 3 9 2 .hod.2y11.posScalerRate SHMS 2y+ paddle 11
+variable 2 12 1 .hod.2x10.posScaler SHMS 2X+ paddle 10
+variable 2 12 2 .hod.2x10.posScalerRate SHMS 2X+ paddle 10
+variable 7 27 1 .BCM1.scaler bcm1
+variable 7 27 2 .BCM1.scalerRate bcm1
+variable 2 28 1 .hod.2x10.negScaler SHMS 2X- paddle 10
+variable 2 28 2 .hod.2x10.negScalerRate SHMS 2X- paddle 10
+variable 0 1 1 .hod.1x3.posScaler SHMS 1X+ paddle 3
+variable 0 1 2 .hod.1x3.posScalerRate SHMS 1X+ paddle 3
+variable 3 1 1 .hod.2y3.posScaler SHMS 2y+ paddle 3
+variable 3 1 2 .hod.2y3.posScalerRate SHMS 2y+ paddle 3
+variable 7 13 1 .SHWR.scaler SHMS SHWR
+variable 7 13 2 .SHWR.scalerRate SHMS SHWR
+variable 0 17 1 .hod.1x3.negScaler SHMS 1X- paddle 3
+variable 0 17 2 .hod.1x3.negScalerRate SHMS 1X- paddle 3
+variable 1 29 1 .hod.1y12.posScaler SHMS 1Y+ paddle 12
+variable 1 29 2 .hod.1y12.posScalerRate SHMS 1Y+ paddle 12
+variable 7 4 1 .S1XS1y.scaler SHMS S1T
+variable 7 4 2 .S1XS1y.scalerRate SHMS S1T
+variable 1 17 1 .hod.1y3.posScaler SHMS 1Y+ paddle 3
+variable 1 17 2 .hod.1y3.posScalerRate SHMS 1Y+ paddle 3
+variable 1 1 1 .hod.1y3.negScaler SHMS 1Y- paddle 3
+variable 1 1 2 .hod.1y3.negScalerRate SHMS 1Y- paddle 3
+variable 1 13 1 .hod.1y12.negScaler SHMS 1Y- paddle 12
+variable 1 13 2 .hod.1y12.negScalerRate SHMS 1Y- paddle 12
+variable 0 9 1 .hod.1x11.posScaler SHMS 1X+ paddle 11
+variable 0 9 2 .hod.1x11.posScalerRate SHMS 1X+ paddle 11
+variable 7 12 1 .PSHWRHI.scaler SHMS PSHWRHI
+variable 7 12 2 .PSHWRHI.scalerRate SHMS PSHWRHI
+variable 2 30 1 .hod.2x14.negScaler SHMS 2X- paddle 14
+variable 2 30 2 .hod.2x14.negScalerRate SHMS 2X- paddle 14
+variable 0 25 1 .hod.1x11.negScaler SHMS 1X- paddle 11
+variable 0 25 2 .hod.1x11.negScalerRate SHMS 1X- paddle 11
+variable 1 19 1 .hod.1y7.posScaler SHMS 1Y+ paddle 7
+variable 1 19 2 .hod.1y7.posScalerRate SHMS 1Y+ paddle 7
+variable 1 12 1 .hod.1y10.negScaler SHMS 1Y- paddle 10
+variable 1 12 2 .hod.1y10.negScalerRate SHMS 1Y- paddle 10
+variable 0 12 1 .hod.1x10.posScaler SHMS 1X+ paddle 10
+variable 0 12 2 .hod.1x10.posScalerRate SHMS 1X+ paddle 10
+variable 2 14 1 .hod.2x14.posScaler SHMS 2X+ paddle 14
+variable 2 14 2 .hod.2x14.posScalerRate SHMS 2X+ paddle 14
+variable 3 28 1 .hod.2y10.negScaler SHMS 2y- paddle 10
+variable 3 28 2 .hod.2y10.negScalerRate SHMS 2y- paddle 10
+variable 7 10 1 .DSUM.scaler SHMS DSUM
+variable 7 10 2 .DSUM.scalerRate SHMS DSUM
+variable 3 12 1 .hod.2y10.posScaler SHMS 2y+ paddle 10
+variable 3 12 2 .hod.2y10.posScalerRate SHMS 2y+ paddle 10
+variable 3 17 1 .hod.2y3.negScaler SHMS 2y- paddle 3
+variable 3 17 2 .hod.2y3.negScalerRate SHMS 2y- paddle 3
+variable 2 9 1 .hod.2x11.posScaler SHMS 2X+ paddle 11
+variable 2 9 2 .hod.2x11.posScalerRate SHMS 2X+ paddle 11
+variable 2 25 1 .hod.2x11.negScaler SHMS 2X- paddle 11
+variable 2 25 2 .hod.2x11.negScalerRate SHMS 2X- paddle 11
+variable 3 13 1 .hod.2y12.posScaler SHMS 2y+ paddle 12
+variable 3 13 2 .hod.2y12.posScalerRate SHMS 2y+ paddle 12
+variable 2 29 1 .hod.2x12.negScaler SHMS 2X- paddle 12
+variable 2 29 2 .hod.2x12.negScalerRate SHMS 2X- paddle 12
+variable 2 5 1 .hod.2x4.posScaler SHMS 2X+ paddle 4
+variable 2 5 2 .hod.2x4.posScalerRate SHMS 2X+ paddle 4
+variable 7 15 1 .CERSUM.scaler SHMS CERSUM
+variable 7 15 2 .CERSUM.scalerRate SHMS CERSUM
+variable 1 4 1 .hod.1y2.negScaler SHMS 1Y- paddle 2
+variable 1 4 2 .hod.1y2.negScalerRate SHMS 1Y- paddle 2
+variable 0 3 1 .hod.1x7.posScaler SHMS 1X+ paddle 7
+variable 0 3 2 .hod.1x7.posScalerRate SHMS 1X+ paddle 7
+variable 1 9 1 .hod.1y11.negScaler SHMS 1Y- paddle 11
+variable 1 9 2 .hod.1y11.negScalerRate SHMS 1Y- paddle 11
+variable 7 7 1 .ASUM.scaler SHMS ASUM
+variable 7 7 2 .ASUM.scalerRate SHMS ASUM
+variable 7 3 1 .S2Y.scaler SHMS S2Y
+variable 7 3 2 .S2Y.scalerRate SHMS S2Y
+variable 7 2 1 .S2X.scaler SHMS S2X
+variable 7 2 2 .S2X.scalerRate SHMS S2X
+variable 1 25 1 .hod.1y11.posScaler SHMS 1Y+ paddle 11
+variable 1 25 2 .hod.1y11.posScalerRate SHMS 1Y+ paddle 11
+variable 3 21 1 .hod.2y4.negScaler SHMS 2y- paddle 4
+variable 3 21 2 .hod.2y4.negScalerRate SHMS 2y- paddle 4
+variable 3 10 1 .hod.2y13.posScaler SHMS 2y+ paddle 13
+variable 3 10 2 .hod.2y13.posScalerRate SHMS 2y+ paddle 13
+variable 3 5 1 .hod.2y4.posScaler SHMS 2y+ paddle 4
+variable 3 5 2 .hod.2y4.posScalerRate SHMS 2y+ paddle 4
+variable 3 26 1 .hod.2y13.negScaler SHMS 2y- paddle 13
+variable 3 26 2 .hod.2y13.negScalerRate SHMS 2y- paddle 13
+variable 1 7 1 .hod.1y8.negScaler SHMS 1Y- paddle 8
+variable 1 7 2 .hod.1y8.negScalerRate SHMS 1Y- paddle 8
+variable 7 11 1 .PSHWRLO.scaler SHMS PSHWRLO
+variable 7 11 2 .PSHWRLO.scalerRate SHMS PSHWRLO
+variable 7 29 1 .BCM17.scaler bcm17
+variable 7 29 2 .BCM17.scalerRate bcm17
+variable 1 18 1 .hod.1y5.posScaler SHMS 1Y+ paddle 5
+variable 1 18 2 .hod.1y5.posScalerRate SHMS 1Y+ paddle 5
+variable 1 2 1 .hod.1y5.negScaler SHMS 1Y- paddle 5
+variable 1 2 2 .hod.1y5.negScalerRate SHMS 1Y- paddle 5
+variable 2 0 1 .hod.2x1.posScaler SHMS 2X+ paddle 1
+variable 2 0 2 .hod.2x1.posScalerRate SHMS 2X+ paddle 1
+variable 2 10 1 .hod.2x13.posScaler SHMS 2X+ paddle 13
+variable 2 10 2 .hod.2x13.posScalerRate SHMS 2X+ paddle 13
+variable 0 0 1 .hod.1x1.posScaler SHMS 1X+ paddle 1
+variable 0 0 2 .hod.1x1.posScalerRate SHMS 1X+ paddle 1
+variable 0 16 1 .hod.1x1.negScaler SHMS 1X- paddle 1
+variable 0 16 2 .hod.1x1.negScalerRate SHMS 1X- paddle 1
+variable 3 4 1 .hod.2y2.posScaler SHMS 2y+ paddle 2
+variable 3 4 2 .hod.2y2.posScalerRate SHMS 2y+ paddle 2
+variable 2 16 1 .hod.2x1.negScaler SHMS 2X- paddle 1
+variable 2 16 2 .hod.2x1.negScalerRate SHMS 2X- paddle 1
+variable 7 14 1 .AERSUM.scaler SHMS AERSUM
+variable 7 14 2 .AERSUM.scalerRate SHMS AERSUM
+variable 0 26 1 .hod.1x13.negScaler SHMS 1X- paddle 13
+variable 0 26 2 .hod.1x13.negScalerRate SHMS 1X- paddle 13
+variable 0 10 1 .hod.1x13.posScaler SHMS 1X+ paddle 13
+variable 0 10 2 .hod.1x13.posScalerRate SHMS 1X+ paddle 13
+variable 1 23 1 .hod.1y8.posScaler SHMS 1Y+ paddle 8
+variable 1 23 2 .hod.1y8.posScalerRate SHMS 1Y+ paddle 8
+variable 0 13 1 .hod.1x12.posScaler SHMS 1X+ paddle 12
+variable 0 13 2 .hod.1x12.posScalerRate SHMS 1X+ paddle 12
+variable 3 24 1 .hod.2y9.negScaler SHMS 2y- paddle 9
+variable 3 24 2 .hod.2y9.negScalerRate SHMS 2y- paddle 9
+variable 1 21 1 .hod.1y4.posScaler SHMS 1Y+ paddle 4
+variable 1 21 2 .hod.1y4.posScalerRate SHMS 1Y+ paddle 4
+variable 2 8 1 .hod.2x9.posScaler SHMS 2X+ paddle 9
+variable 2 8 2 .hod.2x9.posScalerRate SHMS 2X+ paddle 9
+variable 2 24 1 .hod.2x9.negScaler SHMS 2X- paddle 9
+variable 2 24 2 .hod.2x9.negScalerRate SHMS 2X- paddle 9
+variable 1 5 1 .hod.1y4.negScaler SHMS 1Y- paddle 4
+variable 1 5 2 .hod.1y4.negScalerRate SHMS 1Y- paddle 4
+variable 0 22 1 .hod.1x6.negScaler SHMS 1X- paddle 6
+variable 0 22 2 .hod.1x6.negScalerRate SHMS 1X- paddle 6
+variable 0 6 1 .hod.1x6.posScaler SHMS 1X+ paddle 6
+variable 0 6 2 .hod.1x6.posScalerRate SHMS 1X+ paddle 6
+variable 3 3 1 .hod.2y7.posScaler SHMS 2y+ paddle 7
+variable 3 3 2 .hod.2y7.posScalerRate SHMS 2y+ paddle 7
+variable 3 2 1 .hod.2y5.posScaler SHMS 2y+ paddle 5
+variable 3 2 2 .hod.2y5.posScalerRate SHMS 2y+ paddle 5
+variable 2 22 1 .hod.2x6.negScaler SHMS 2X- paddle 6
+variable 2 22 2 .hod.2x6.negScalerRate SHMS 2X- paddle 6
+variable 3 11 1 .hod.2y15.posScaler SHMS 2y+ paddle 15
+variable 3 11 2 .hod.2y15.posScalerRate SHMS 2y+ paddle 15
+variable 1 28 1 .hod.1y10.posScaler SHMS 1Y+ paddle 10
+variable 1 28 2 .hod.1y10.posScalerRate SHMS 1Y+ paddle 10
+variable 1 10 1 .hod.1y13.negScaler SHMS 1Y- paddle 13
+variable 1 10 2 .hod.1y13.negScalerRate SHMS 1Y- paddle 13
+variable 3 6 1 .hod.2y6.posScaler SHMS 2y+ paddle 6
+variable 3 6 2 .hod.2y6.posScalerRate SHMS 2y+ paddle 6
+variable 1 26 1 .hod.1y13.posScaler SHMS 1Y+ paddle 13
+variable 1 26 2 .hod.1y13.posScalerRate SHMS 1Y+ paddle 13
+variable 3 8 1 .hod.2y9.posScaler SHMS 2y+ paddle 9
+variable 3 8 2 .hod.2y9.posScalerRate SHMS 2y+ paddle 9
+variable 2 13 1 .hod.2x12.posScaler SHMS 2X+ paddle 12
+variable 2 13 2 .hod.2x12.posScalerRate SHMS 2X+ paddle 12
+variable 3 18 1 .hod.2y5.negScaler SHMS 2y- paddle 5
+variable 3 18 2 .hod.2y5.negScalerRate SHMS 2y- paddle 5
+variable 1 3 1 .hod.1y7.negScaler SHMS 1Y- paddle 7
+variable 1 3 2 .hod.1y7.negScalerRate SHMS 1Y- paddle 7
+variable 2 6 1 .hod.2x6.posScaler SHMS 2X+ paddle 6
+variable 2 6 2 .hod.2x6.posScalerRate SHMS 2X+ paddle 6
+variable 0 19 1 .hod.1x7.negScaler SHMS 1X- paddle 7
+variable 0 19 2 .hod.1x7.negScalerRate SHMS 1X- paddle 7
+variable 3 7 1 .hod.2y8.posScaler SHMS 2y+ paddle 8
+variable 3 7 2 .hod.2y8.posScalerRate SHMS 2y+ paddle 8
+variable 7 31 1 .1Mhz.scaler 1MHz
+variable 7 31 2 .1Mhz.scalerRate 1MHz
+variable 7 1 1 .S1Y.scaler SHMS S1Y
+variable 7 1 2 .S1Y.scalerRate SHMS S1Y
+variable 0 28 1 .hod.1x10.negScaler SHMS 1X- paddle 10
+variable 0 28 2 .hod.1x10.negScalerRate SHMS 1X- paddle 10
+variable 3 14 1 .hod.2y14.posScaler SHMS 2y+ paddle 14
+variable 3 14 2 .hod.2y14.posScalerRate SHMS 2y+ paddle 14
+variable 3 30 1 .hod.2y14.negScaler SHMS 2y- paddle 14
+variable 3 30 2 .hod.2y14.negScalerRate SHMS 2y- paddle 14
+variable 1 8 1 .hod.1y9.negScaler SHMS 1Y- paddle 9
+variable 1 8 2 .hod.1y9.negScalerRate SHMS 1Y- paddle 9
+variable 3 25 1 .hod.2y11.negScaler SHMS 2y- paddle 11
+variable 3 25 2 .hod.2y11.negScalerRate SHMS 2y- paddle 11
+variable 7 0 1 .S1X.scaler SHMS S1X
+variable 7 0 2 .S1X.scalerRate SHMS S1X
+variable 2 21 1 .hod.2x4.negScaler SHMS 2X- paddle 4
+variable 2 21 2 .hod.2x4.negScalerRate SHMS 2X- paddle 4
+variable 2 4 1 .hod.2x2.posScaler SHMS 2X+ paddle 2
+variable 2 4 2 .hod.2x2.posScalerRate SHMS 2X+ paddle 2
+variable 2 20 1 .hod.2x2.negScaler SHMS 2X- paddle 2
+variable 2 20 2 .hod.2x2.negScalerRate SHMS 2X- paddle 2
+variable 3 20 1 .hod.2y2.negScaler SHMS 2y- paddle 2
+variable 3 20 2 .hod.2y2.negScalerRate SHMS 2y- paddle 2
+variable 0 8 1 .hod.1x9.posScaler SHMS 1X+ paddle 9
+variable 0 8 2 .hod.1x9.posScalerRate SHMS 1X+ paddle 9
+variable 1 24 1 .hod.1y9.posScaler SHMS 1Y+ paddle 9
+variable 1 24 2 .hod.1y9.posScalerRate SHMS 1Y+ paddle 9
+variable 0 24 1 .hod.1x9.negScaler SHMS 1X- paddle 9
+variable 0 24 2 .hod.1x9.negScalerRate SHMS 1X- paddle 9
+variable 1 22 1 .hod.1y6.posScaler SHMS 1Y+ paddle 6
+variable 1 22 2 .hod.1y6.posScalerRate SHMS 1Y+ paddle 6
+variable 1 6 1 .hod.1y6.negScaler SHMS 1Y- paddle 6
+variable 1 6 2 .hod.1y6.negScalerRate SHMS 1Y- paddle 6
+variable 3 0 1 .hod.2y1.posScaler SHMS 2y+ paddle 1
+variable 3 0 2 .hod.2y1.posScalerRate SHMS 2y+ paddle 1
+variable 0 21 1 .hod.1x4.negScaler SHMS 1X- paddle 4
+variable 0 21 2 .hod.1x4.negScalerRate SHMS 1X- paddle 4
+variable 2 3 1 .hod.2x7.posScaler SHMS 2X+ paddle 7
+variable 2 3 2 .hod.2x7.posScalerRate SHMS 2X+ paddle 7
+variable 2 26 1 .hod.2x13.negScaler SHMS 2X- paddle 13
+variable 2 26 2 .hod.2x13.negScalerRate SHMS 2X- paddle 13
+variable 0 30 1 .hod.1x12.negScaler SHMS 1X- paddle 12
+variable 0 30 2 .hod.1x12.negScalerRate SHMS 1X- paddle 12
+variable 2 18 1 .hod.2x5.negScaler SHMS 2X- paddle 5
+variable 2 18 2 .hod.2x5.negScalerRate SHMS 2X- paddle 5
+variable 2 2 1 .hod.2x5.posScaler SHMS 2X+ paddle 5
+variable 2 2 2 .hod.2x5.posScalerRate SHMS 2X+ paddle 5
+variable 7 5 1 .S2XS2Y.scaler SHMS S2T
+variable 7 5 2 .S2XS2Y.scalerRate SHMS S2T
+variable 7 25 1 .BCM4A.scaler bcm4a
+variable 7 25 2 .BCM4A.scalerRate bcm4a
+variable 7 26 1 .BCM4B.scaler bcm4b
+variable 7 26 2 .BCM4B.scalerRate bcm4b
+variable 2 23 1 .hod.2x8.negScaler SHMS 2X- paddle 8
+variable 2 23 2 .hod.2x8.negScalerRate SHMS 2X- paddle 8
+variable 7 9 1 .CSUM.scaler SHMS CSUM
+variable 7 9 2 .CSUM.scalerRate SHMS CSUM
+variable 3 19 1 .hod.2y7.negScaler SHMS 2y- paddle 7
+variable 3 19 2 .hod.2y7.negScalerRate SHMS 2y- paddle 7
+variable 2 17 1 .hod.2x3.negScaler SHMS 2X- paddle 3
+variable 2 17 2 .hod.2x3.negScalerRate SHMS 2X- paddle 3
+variable 1 0 1 .hod.1y1.negScaler SHMS 1Y- paddle 1
+variable 1 0 2 .hod.1y1.negScalerRate SHMS 1Y- paddle 1
+variable 2 1 1 .hod.2x3.posScaler SHMS 2X+ paddle 3
+variable 2 1 2 .hod.2x3.posScalerRate SHMS 2X+ paddle 3
+variable 1 16 1 .hod.1y1.posScaler SHMS 1Y+ paddle 1
+variable 1 16 2 .hod.1y1.posScalerRate SHMS 1Y+ paddle 1
+variable 0 18 1 .hod.1x5.negScaler SHMS 1X- paddle 5
+variable 0 18 2 .hod.1x5.negScalerRate SHMS 1X- paddle 5
+variable 0 2 1 .hod.1x5.posScaler SHMS 1X+ paddle 5
+variable 0 2 2 .hod.1x5.posScalerRate SHMS 1X+ paddle 5
diff --git a/DBASE/make_scaler_db.py b/MAPS/SCALERS/make_scaler_db.py
similarity index 67%
rename from DBASE/make_scaler_db.py
rename to MAPS/SCALERS/make_scaler_db.py
index 93b29c32..259a643c 100755
--- a/DBASE/make_scaler_db.py
+++ b/MAPS/SCALERS/make_scaler_db.py
@@ -8,8 +8,8 @@ cratemap = {
     "4":{"spec":"H", "firstslot":6, "nslots":7, "roc":5, "offset":0},
     "5":{"spec":"P", "firstslot":6, "nslots":8, "roc":8, "offset":640}
     }
-chandict = {}
-nperslot = 32
+chandict  = {}
+nperslot  = 32
 clockrate = 1000000
 
 class Channel:
@@ -58,7 +58,7 @@ with open(xscalerMapName, 'r') as fi:
         lastslot = firstslot + nslots - 1
         offset = cratemap[spec]["offset"]
         specprefix = cratemap[spec]["spec"]
-        hcanaMapName = 'db_'+specprefix+'SScalevt.dat'
+        hcanaMapName = 'db_'+specprefix+'Scalevt.dat'
         with open(hcanaMapName, 'w') as fo:
             for slot in range(firstslot,firstslot+nslots):
                 if slot == lastslot:
@@ -72,12 +72,23 @@ with open(xscalerMapName, 'r') as fi:
             for name in chandict:
                 channel = chandict[name]
                 slot = channel.slot-firstslot
-                printname = name[1:] # Drop prefix
-                printname = printname.replace("+","P")
-                printname = printname.replace("-","M")
+                printname = "." + name[1:] + ".scaler" # Drop prefix
+                detPrefix = name[2:5]
+                printHodoName = "." + detPrefix + "." + name[5:10] + "."
                 if specprefix == channel.spec and slot<nslots:
                     chan = channel.chan
                     slot = channel.slot-firstslot
                     comment = channel.comment
-                    print >>fo, 'variable', slot, chan, 1, printname, comment
-                    print >>fo, 'variable', slot, chan, 2, printname+'r', comment
+                    if detPrefix == "hod":
+                        if printHodoName.find("+") != -1:
+                            printHodoName = printHodoName.replace("+", "")
+                            printHodoName = printHodoName + "posScaler"
+                        if printHodoName.find("-") != -1:
+                            printHodoName = printHodoName.replace("-", "")
+                            printHodoName = printHodoName + "negScaler"
+                        print >>fo, 'variable', slot, chan, 1, printHodoName, comment
+                        print >>fo, 'variable', slot, chan, 2, printHodoName+'Rate', comment
+                    else:    
+                        print(printname)
+                        print >>fo, 'variable', slot, chan, 1, printname, comment
+                        print >>fo, 'variable', slot, chan, 2, printname+'Rate', comment
diff --git a/MAPS/SCALERS/scaler.map b/MAPS/SCALERS/scaler.map
new file mode 100755
index 00000000..772b95e8
--- /dev/null
+++ b/MAPS/SCALERS/scaler.map
@@ -0,0 +1,379 @@
+# This file: scaler.map
+# Author: Robert Michaels, Jlab
+# Contains time-dependent text-based mapping of scaler channels
+# which permits getting data from THaScaler by names like "bcm_u3".
+# Also contains "directives" that control xscaler
+# For documentation about this file, see
+# http://hallaweb.jlab.org/equipment/daq/THaScaler.html (scroll to "scaler.map"
+# near the end of that web page).
+#
+
+# ------ Jan 4, 2017
+
+DATE 4 1 2017
+
+# Setup for Hall C testing HMS hodoscopes, etc.
+
+xscaler-tabs     HMS 0:X1      1:Y1      2:X2      3:Y2      4:Trig 
+xscaler-layout   HMS 0:8x4     1:8x4     2:8x4     3:8x4     4:8x4  
+xscaler-pageslot HMS 0:slot0   1:slot1   2:slot2   3:slot3   4:slot6 
+
+xscaler-pagename HMS 0:'HMS Hodoscope X1'
+xscaler-pagename HMS 1:'HMS Hodoscope Y1'
+xscaler-pagename HMS 2:'HMS Hodoscope X2'
+xscaler-pagename HMS 3:'HMS Hodoscope Y2'
+xscaler-pagename HMS 4:'HMS Trigger,BCM and clock'
+
+xscaler-clock HMS slot:7 chan:1 rate:60 
+#####################################################################
+
+# Setup for Hall C testing SHMS hodoscopes, etc.
+
+xscaler-tabs     SHMS 0:X1      1:Y1      2:X2      3:Y2      4:Trig 
+xscaler-layout   SHMS 0:8x4     1:8x4     2:8x4     3:8x4     4:8x4  
+xscaler-pageslot SHMS 0:slot0   1:slot1   2:slot2   3:slot3   4:slot7 
+
+xscaler-pagename SHMS 0:'SHMS Hodoscope X1'
+xscaler-pagename SHMS 1:'SHMS Hodoscope Y1'
+xscaler-pagename SHMS 2:'SHMS Hodoscope X2'
+xscaler-pagename SHMS 3:'SHMS Hodoscope Y2'
+xscaler-pagename SHMS 4:'SHMS Trigger,BCM and clock'
+
+xscaler-clock SHMS slot:9 chan:1 rate:60
+#####################################################################
+
+# HMS tabs
+# for HMS the crate is 4 
+# let hel=0 always
+
+# desc      hel crate slot start nchan  long-description
+hhod1x1+     0    4     0    0     1     HMS 1X+ paddle 1
+hhod1x3+     0    4     0    1     1     HMS 1X+ paddle 3 
+hhod1x5+     0    4     0    2     1     HMS 1X+ paddle 5
+hhod1x7+     0    4     0    3     1     HMS 1X+ paddle 7
+hhod1x2+     0    4     0    4     1     HMS 1X+ paddle 2
+hhod1x4+     0    4     0    5     1     HMS 1X+ paddle 4
+hhod1x6+     0    4     0    6     1     HMS 1X+ paddle 6
+hhod1x8+     0    4     0    7     1     HMS 1X+ paddle 8
+hhod1x9+     0    4     0    8     1     HMS 1X+ paddle 9
+hhod1x11+    0    4     0    9     1     HMS 1X+ paddle 11
+hhod1x13+    0    4     0    10    1     HMS 1X+ paddle 13
+hhod1x15+    0    4     0    11    1     HMS 1X+ paddle 15
+hhod1x10+    0    4     0    12    1     HMS 1X+ paddle 10
+hhod1x12+    0    4     0    13    1     HMS 1X+ paddle 12
+hhod1x14+    0    4     0    14    1     HMS 1X+ paddle 14
+hhod1x16+    0    4     0    15    1     HMS 1X+ paddle 16
+
+# desc      hel crate slot start nchan  long-description
+hhod1x1-     0    4     0    16    1     HMS 1X- paddle 1
+hhod1x3-     0    4     0    17    1     HMS 1X- paddle 3
+hhod1x5-     0    4     0    18    1     HMS 1X- paddle 5
+hhod1x7-     0    4     0    19    1     HMS 1X- paddle 7
+hhod1x2-     0    4     0    20    1     HMS 1X- paddle 2
+hhod1x4-     0    4     0    21    1     HMS 1X- paddle 4
+hhod1x6-     0    4     0    22    1     HMS 1X- paddle 6
+hhod1x8-     0    4     0    23    1     HMS 1X- paddle 8
+hhod1x9-     0    4     0    24    1     HMS 1X- paddle 9
+hhod1x11-    0    4     0    25    1     HMS 1X- paddle 11
+hhod1x13-    0    4     0    26    1     HMS 1X- paddle 13
+hhod1x15-    0    4     0    27    1     HMS 1X- paddle 15
+hhod1x10-    0    4     0    28    1     HMS 1X- paddle 10
+hhod1x12-    0    4     0    29    1     HMS 1X- paddle 12
+hhod1x14-    0    4     0    30    1     HMS 1X- paddle 14
+hhod1x16-    0    4     0    31    1     HMS 1X- paddle 16
+
+# desc      hel crate slot start nchan  long-description
+hhod1y1+     0    4     1    0     1     HMS 1Y+ paddle 1
+hhod1y3+     0    4     1    1     1     HMS 1Y+ paddle 3
+hhod1y5+     0    4     1    2     1     HMS 1Y+ paddle 5
+hhod1y7+     0    4     1    3     1     HMS 1Y+ paddle 7
+hhod1y2+     0    4     1    4     1     HMS 1Y+ paddle 2
+hhod1y4+     0    4     1    5     1     HMS 1Y+ paddle 4
+hhod1y6+     0    4     1    6     1     HMS 1Y+ paddle 6
+hhod1y8+     0    4     1    7     1     HMS 1Y+ paddle 8
+hhod1y9+     0    4     1    8     1     HMS 1Y+ paddle 9
+Empty	     0    4     1    9     1     Empty
+Empty        0    4     1    10    1     Empty
+Empty        0    4     1    11    1     Empty
+hhod1y10+    0    4     1    12    1     HMS 1Y+ paddle 10
+Empty	     0    4     1    13    1     Empty
+Empty        0    4     1    14    1     Empty
+Empty        0    4     1    15    1     Empty
+
+# desc      hel crate slot start nchan  long-description
+hhod1y1-     0    4     1    16    1     HMS 1Y- paddle 1
+hhod1y3-     0    4     1    17    1     HMS 1Y- paddle 3
+hhod1y5-     0    4     1    18    1     HMS 1Y- paddle 5
+hhod1y7-     0    4     1    19    1     HMS 1Y- paddle 7
+hhod1y2-     0    4     1    20    1     HMS 1Y- paddle 2
+hhod1y4-     0    4     1    21    1     HMS 1Y- paddle 4
+hhod1y6-     0    4     1    22    1     HMS 1Y- paddle 6
+hhod1y8-     0    4     1    23    1     HMS 1Y- paddle 8
+hhod1y9-     0    4     1    24    1     HMS 1Y- paddle 9
+Empty	     0    4     1    25    1     Empty
+Empty        0    4     1    26    1     Empty
+Empty        0    4     1    27    1     Empty
+hhod1y10-    0    4     1    28    1     HMS 1Y- paddle 10
+Empty	     0    4     1    29    1     Empty
+Empty        0    4     1    30    1     Empty
+Empty        0    4     1    31    1     Empty
+
+# desc      hel crate slot start nchan  long-description
+hhod2x1+     0    4     2    0     1     HMS 2X+ paddle 1
+hhod2x3+     0    4     2    1     1     HMS 2X+ paddle 3
+hhod2x5+     0    4     2    2     1     HMS 2X+ paddle 5
+hhod2x7+     0    4     2    3     1     HMS 2X+ paddle 7
+hhod2x2+     0    4     2    4     1     HMS 2X+ paddle 2
+hhod2x4+     0    4     2    5     1     HMS 2X+ paddle 4
+hhod2x6+     0    4     2    6     1     HMS 2X+ paddle 6
+hhod2x8+     0    4     2    7     1     HMS 2X+ paddle 8
+hhod2x9+     0    4     2    8     1     HMS 2X+ paddle 9
+hhod2x11+    0    4     2    9     1     HMS 2X+ paddle 11
+hhod2x13+    0    4     2    10    1     HMS 2X+ paddle 13
+hhod2x15+    0    4     2    11    1     HMS 2X+ paddle 15
+hhod2x10+    0    4     2    12    1     HMS 2X+ paddle 10
+hhod2x12+    0    4     2    13    1     HMS 2X+ paddle 12
+hhod2x14+    0    4     2    14    1     HMS 2X+ paddle 14
+hhod2x16+    0    4     2    15    1     HMS 2X+ paddle 16
+
+# desc      hel crate slot start nchan  long-description
+hhod2x1-     0    4     2    16    1     HMS 2X- paddle 1
+hhod2x3-     0    4     2    17    1     HMS 2X- paddle 3
+hhod2x5-     0    4     2    18    1     HMS 2X- paddle 5
+hhod2x7-     0    4     2    19    1     HMS 2X- paddle 7
+hhod2x2-     0    4     2    20    1     HMS 2X- paddle 2
+hhod2x4-     0    4     2    21    1     HMS 2X- paddle 4
+hhod2x6-     0    4     2    22    1     HMS 2X- paddle 6
+hhod2x8-     0    4     2    23    1     HMS 2X- paddle 8
+hhod2x9-     0    4     2    24    1     HMS 2X- paddle 9
+hhod2x11-    0    4     2    25    1     HMS 2X- paddle 11
+hhod2x13-    0    4     2    26    1     HMS 2X- paddle 13
+hhod2x15-    0    4     2    27    1     HMS 2X- paddle 15
+hhod2x10-    0    4     2    28    1     HMS 2X- paddle 10
+hhod2x12-    0    4     2    29    1     HMS 2X- paddle 12
+hhod2x14-    0    4     2    30    1     HMS 2X- paddle 14
+hhod2x16-    0    4     2    31    1     HMS 2X- paddle 16 
+
+# desc      hel crate slot start nchan  long-description
+hhod2y1+     0    4     3    0     1     HMS 2Y+ paddle 1
+hhod2y3+     0    4     3    1     1     HMS 2Y+ paddle 3
+hhod2y5+     0    4     3    2     1     HMS 2Y+ paddle 5
+hhod2y7+     0    4     3    3     1     HMS 2Y+ paddle 7
+hhod2y2+     0    4     3    4     1     HMS 2Y+ paddle 2
+hhod2y4+     0    4     3    5     1     HMS 2Y+ paddle 4
+hhod2y6+     0    4     3    6     1     HMS 2Y+ paddle 6
+hhod2y8+     0    4     3    7     1     HMS 2Y+ paddle 8
+hhod2y9+     0    4     3    8     1     HMS 2Y+ paddle 9
+Empty	     0    4     3    9     1     Empty
+Empty        0    4     3    10    1     Empty
+Empty        0    4     3    11    1     Empty
+hhod2y10+    0    4     3    12    1     HMS 2Y+ paddle 10
+Empty	     0    4     3    13    1     Empty
+Empty        0    4     3    14    1     Empty
+Empty        0    4     3    15    1     Empty
+
+# desc      hel crate slot start nchan  long-description
+hhod2y1-     0    4     3    16    1     HMS 2Y- paddle 1
+hhod2y3-     0    4     3    17    1     HMS 2Y- paddle 3
+hhod2y5-     0    4     3    18    1     HMS 2Y- paddle 5
+hhod2y7-     0    4     3    19    1     HMS 2Y- paddle 7
+hhod2y2-     0    4     3    20    1     HMS 2Y- paddle 2
+hhod2y4-     0    4     3    21    1     HMS 2Y- paddle 4
+hhod2y6-     0    4     3    22    1     HMS 2Y- paddle 6
+hhod2y8-     0    4     3    23    1     HMS 2Y- paddle 8
+hhod2y9-     0    4     3    24    1     HMS 2Y- paddle 9
+Empty	     0    4     3    25    1     Empty
+Empty        0    4     3    26    1     Empty
+Empty        0    4     3    27    1     Empty
+hhod2y10-    0    4     3    28    1     HMS 2Y- paddle 10
+Empty	     0    4     3    29    1     Empty
+Empty        0    4     3    30    1     Empty
+Empty        0    4     3    31    1     Empty
+
+# desc      hel crate slot start nchan  long-description                            
+S1X          0    4     6    0     1     HMS S1X                                           
+S1Y          0    4     6    1     1     HMS S1Y                                           
+S2X          0    4     6    2     1     HMS S2X                                           
+S2Y          0    4     6    3     1     HMS S2Y                                           
+S1XS1Y       0    4     6    4     1     HMS S1T                                           
+S2XS2Y       0    4     6    5     1     HMS S2T                                           
+Trig         0    4     6    6     1     HMS T1                                           
+ASUM         0    4     6    7     1     HMS ASUM                                         
+BSUM         0    4     6    8     1     HMS BSUM                                         
+CSUM         0    4     6    9     1     HMS CSUM                                         
+DSUM         0    4     6    10    1     HMS DSUM                                         
+PSHWRLO      0    4     6    11    1     HMS PSHWRLO                                      
+PSHWRHI      0    4     6    12    1     HMS PSHWRHI                                      
+SHWR         0    4     6    13    1     HMS SHWR                                         
+AERSUM       0    4     6    14    1     HMS AERSUM                                       
+CERSUM       0    4     6    15    1     HMS CERSUM                                       
+BCM4A        0    4     6    25    1     bcm4a                                           
+BCM4B        0    4     6    26    1     bcm4b                                           
+BCM1         0    4     6    27    1     bcm1                                           
+BCM2         0    4     6    28    1     bcm2                                           
+BCM17        0    4     6    29    1     bcm17                                           
+Unser        0    4     6    30    1     Unser                                          
+1Mhz         0    4     6    31    1     1MHz  
+                                        
+# desc      hel crate slot start nchan  long-description                            
+clock        0    4     7    1     1     clock   
+
+# SHMS tabs
+# for SHMS the crate is 5 
+# let hel=0 always
+
+# desc      hel crate slot start nchan  long-description
+phod1x1+     0    5     0    0     1     SHMS 1X+ paddle 1
+phod1x3+     0    5     0    1     1     SHMS 1X+ paddle 3
+phod1x5+     0    5     0    2     1     SHMS 1X+ paddle 5
+phod1x7+     0    5     0    3     1     SHMS 1X+ paddle 7
+phod1x2+     0    5     0    4     1     SHMS 1X+ paddle 2
+phod1x4+     0    5     0    5     1     SHMS 1X+ paddle 4
+phod1x6+     0    5     0    6     1     SHMS 1X+ paddle 6
+phod1x8+     0    5     0    7     1     SHMS 1X+ paddle 8
+phod1x9+     0    5     0    8     1     SHMS 1X+ paddle 9
+phod1x11+    0    5     0    9     1     SHMS 1X+ paddle 11
+phod1x13+    0    5     0    10    1     SHMS 1X+ paddle 13
+phod1x10+    0    5     0    12    1     SHMS 1X+ paddle 10
+phod1x12+    0    5     0    13    1     SHMS 1X+ paddle 12
+
+# desc      hel crate slot start nchan  long-description 
+phod1x1-     0    5     0    16    1     SHMS 1X- paddle 1
+phod1x3-     0    5     0    17    1     SHMS 1X- paddle 3
+phod1x5-     0    5     0    18    1     SHMS 1X- paddle 5
+phod1x7-     0    5     0    19    1     SHMS 1X- paddle 7
+phod1x2-     0    5     0    20    1     SHMS 1X- paddle 2
+phod1x4-     0    5     0    21    1     SHMS 1X- paddle 4
+phod1x6-     0    5     0    22    1     SHMS 1X- paddle 6
+phod1x8-     0    5     0    23    1     SHMS 1X- paddle 8
+phod1x9-     0    5     0    24    1     SHMS 1X- paddle 9
+phod1x11-    0    5     0    25    1     SHMS 1X- paddle 11
+phod1x13-    0    5     0    26    1     SHMS 1X- paddle 13
+phod1x10-    0    5     0    28    1     SHMS 1X- paddle 10
+phod1x12-    0    5     0    30    1     SHMS 1X- paddle 12
+
+# desc      hel crate slot start nchan  long-description 
+phod1y1-     0    5     1    0     1     SHMS 1Y- paddle 1
+phod1y3-     0    5     1    1     1     SHMS 1Y- paddle 3
+phod1y5-     0    5     1    2     1     SHMS 1Y- paddle 5
+phod1y7-     0    5     1    3     1     SHMS 1Y- paddle 7
+phod1y2-     0    5     1    4     1     SHMS 1Y- paddle 2
+phod1y4-     0    5     1    5     1     SHMS 1Y- paddle 4
+phod1y6-     0    5     1    6     1     SHMS 1Y- paddle 6
+phod1y8-     0    5     1    7     1     SHMS 1Y- paddle 8
+phod1y9-     0    5     1    8     1     SHMS 1Y- paddle 9
+phod1y11-    0    5     1    9     1     SHMS 1Y- paddle 11
+phod1y13-    0    5     1    10    1     SHMS 1Y- paddle 13
+phod1y10-    0    5     1    12    1     SHMS 1Y- paddle 10
+phod1y12-    0    5     1    13    1     SHMS 1Y- paddle 12
+
+# desc      hel crate slot start nchan  long-description 
+phod1y1+     0    5     1    16    1     SHMS 1Y+ paddle 1
+phod1y3+     0    5     1    17    1     SHMS 1Y+ paddle 3
+phod1y5+     0    5     1    18    1     SHMS 1Y+ paddle 5
+phod1y7+     0    5     1    19    1     SHMS 1Y+ paddle 7
+phod1y2+     0    5     1    20    1     SHMS 1Y+ paddle 2
+phod1y4+     0    5     1    21    1     SHMS 1Y+ paddle 4
+phod1y6+     0    5     1    22    1     SHMS 1Y+ paddle 6
+phod1y8+     0    5     1    23    1     SHMS 1Y+ paddle 8
+phod1y9+     0    5     1    24    1     SHMS 1Y+ paddle 9
+phod1y11+    0    5     1    25    1     SHMS 1Y+ paddle 11
+phod1y13+    0    5     1    26    1     SHMS 1Y+ paddle 13
+phod1y10+    0    5     1    28    1     SHMS 1Y+ paddle 10
+phod1y12+    0    5     1    29    1     SHMS 1Y+ paddle 12
+
+# desc      hel crate slot start nchan  long-description 
+phod2x1+     0    5     2    0     1     SHMS 2X+ paddle 1
+phod2x3+     0    5     2    1     1     SHMS 2X+ paddle 3
+phod2x5+     0    5     2    2     1     SHMS 2X+ paddle 5
+phod2x7+     0    5     2    3     1     SHMS 2X+ paddle 7
+phod2x2+     0    5     2    4     1     SHMS 2X+ paddle 2
+phod2x4+     0    5     2    5     1     SHMS 2X+ paddle 4
+phod2x6+     0    5     2    6     1     SHMS 2X+ paddle 6
+phod2x8+     0    5     2    7     1     SHMS 2X+ paddle 8
+phod2x9+     0    5     2    8     1     SHMS 2X+ paddle 9
+phod2x11+    0    5     2    9     1     SHMS 2X+ paddle 11
+phod2x13+    0    5     2    10    1     SHMS 2X+ paddle 13
+phod2x10+    0    5     2    12    1     SHMS 2X+ paddle 10
+phod2x12+    0    5     2    13    1     SHMS 2X+ paddle 12
+phod2x14+    0    5     2    14    1     SHMS 2X+ paddle 14
+
+# desc      hel crate slot start nchan  long-description 
+phod2x1-     0    5     2    16    1     SHMS 2X- paddle 1
+phod2x3-     0    5     2    17    1     SHMS 2X- paddle 3
+phod2x5-     0    5     2    18    1     SHMS 2X- paddle 5
+phod2x7-     0    5     2    19    1     SHMS 2X- paddle 7
+phod2x2-     0    5     2    20    1     SHMS 2X- paddle 2
+phod2x4-     0    5     2    21    1     SHMS 2X- paddle 4
+phod2x6-     0    5     2    22    1     SHMS 2X- paddle 6
+phod2x8-     0    5     2    23    1     SHMS 2X- paddle 8
+phod2x9-     0    5     2    24    1     SHMS 2X- paddle 9
+phod2x11-    0    5     2    25    1     SHMS 2X- paddle 11
+phod2x13-    0    5     2    26    1     SHMS 2X- paddle 13
+phod2x10-    0    5     2    28    1     SHMS 2X- paddle 10
+phod2x12-    0    5     2    29    1     SHMS 2X- paddle 12
+phod2x14-    0    5     2    30    1     SHMS 2X- paddle 14
+
+# desc      hel crate slot start nchan  long-description 
+phod2y1+     0    5     3    0     1     SHMS 2y+ paddle 1
+phod2y3+     0    5     3    1     1     SHMS 2y+ paddle 3
+phod2y5+     0    5     3    2     1     SHMS 2y+ paddle 5
+phod2y7+     0    5     3    3     1     SHMS 2y+ paddle 7
+phod2y2+     0    5     3    4     1     SHMS 2y+ paddle 2
+phod2y4+     0    5     3    5     1     SHMS 2y+ paddle 4
+phod2y6+     0    5     3    6     1     SHMS 2y+ paddle 6
+phod2y8+     0    5     3    7     1     SHMS 2y+ paddle 8
+phod2y9+     0    5     3    8     1     SHMS 2y+ paddle 9
+phod2y11+    0    5     3    9     1     SHMS 2y+ paddle 11
+phod2y13+    0    5     3    10    1     SHMS 2y+ paddle 13
+phod2y15+    0    5     3    11    1     SHMS 2y+ paddle 15
+phod2y10+    0    5     3    12    1     SHMS 2y+ paddle 10
+phod2y12+    0    5     3    13    1     SHMS 2y+ paddle 12
+phod2y14+    0    5     3    14    1     SHMS 2y+ paddle 14
+phod2y16+    0    5     3    15    1     SHMS 2y+ paddle 16
+
+# desc      hel crate slot start nchan  long-description 
+phod2y1-     0    5     3    16    1     SHMS 2y- paddle 1
+phod2y3-     0    5     3    17    1     SHMS 2y- paddle 3
+phod2y5-     0    5     3    18    1     SHMS 2y- paddle 5
+phod2y7-     0    5     3    19    1     SHMS 2y- paddle 7
+phod2y2-     0    5     3    20    1     SHMS 2y- paddle 2
+phod2y4-     0    5     3    21    1     SHMS 2y- paddle 4
+phod2y6-     0    5     3    22    1     SHMS 2y- paddle 6
+phod2y8-     0    5     3    23    1     SHMS 2y- paddle 8
+phod2y9-     0    5     3    24    1     SHMS 2y- paddle 9
+phod2y11-    0    5     3    25    1     SHMS 2y- paddle 11
+phod2y13-    0    5     3    26    1     SHMS 2y- paddle 13
+phod2y15-    0    5     3    27    1     SHMS 2y- paddle 15
+phod2y10-    0    5     3    28    1     SHMS 2y- paddle 10
+phod2y12-    0    5     3    29    1     SHMS 2y- paddle 12
+phod2y14-    0    5     3    30    1     SHMS 2y- paddle 14
+phod2y16-    0    5     3    31    1     SHMS 2y- paddle 16
+
+# desc      hel crate slot start nchan  long-description                            
+S1X          0    5     7    0     1     SHMS S1X                                           
+S1Y          0    5     7    1     1     SHMS S1Y                                           
+S2X          0    5     7    2     1     SHMS S2X                                           
+S2Y          0    5     7    3     1     SHMS S2Y                                           
+S1XS1y       0    5     7    4     1     SHMS S1T                                           
+S2XS2Y       0    5     7    5     1     SHMS S2T                                           
+Trig         0    5     7    6     1     SHMS T1                                           
+ASUM         0    5     7    7     1     SHMS ASUM                                         
+BSUM         0    5     7    8     1     SHMS BSUM                                         
+CSUM         0    5     7    9     1     SHMS CSUM                                         
+DSUM         0    5     7    10    1     SHMS DSUM                                         
+PSHWRLO      0    5     7    11    1     SHMS PSHWRLO                                      
+PSHWRHI      0    5     7    12    1     SHMS PSHWRHI                                      
+SHWR         0    5     7    13    1     SHMS SHWR                                         
+AERSUM       0    5     7    14    1     SHMS AERSUM                                       
+CERSUM       0    5     7    15    1     SHMS CERSUM                                       
+BCM4A        0    5     7    25    1     bcm4a                                           
+BCM4B        0    5     7    26    1     bcm4b                                           
+BCM1         0    5     7    27    1     bcm1                                           
+BCM2         0    5     7    28    1     bcm2                                           
+BCM17        0    5     7    29    1     bcm17                                           
+Unser        0    5     7    30    1     Unser                                          
+1Mhz         0    5     7    31    1     1MHz  
+
+# desc      hel crate slot start nchan  long-description                            
+clock        0    5     9    1     1     clock   
diff --git a/SCRIPTS/SHMS/PRODUCTION/replay_production_shms.C b/SCRIPTS/SHMS/PRODUCTION/replay_production_shms.C
index 0285c213..81f244c1 100644
--- a/SCRIPTS/SHMS/PRODUCTION/replay_production_shms.C
+++ b/SCRIPTS/SHMS/PRODUCTION/replay_production_shms.C
@@ -76,7 +76,7 @@ void replay_production_shms (Int_t RunNumber = 0, Int_t MaxEvent = 0) {
   THaEpicsEvtHandler *hcepics = new THaEpicsEvtHandler("epics", "HC EPICS event type 180");
   gHaEvtHandlers->Add(hcepics);
   // Add handler for scaler events
-  THcScalerEvtHandler *pscaler = new THcScalerEvtHandler("PS","Hall C scaler event type 1");
+  THcScalerEvtHandler *pscaler = new THcScalerEvtHandler("P","Hall C scaler event type 1");
   pscaler->AddEventType(1);
   pscaler->SetUseFirstEvent(kTRUE);
   gHaEvtHandlers->Add (pscaler);
diff --git a/SCRIPTS/SHMS/SCALERS/replay_shms_scalers.C b/SCRIPTS/SHMS/SCALERS/replay_shms_scalers.C
index ac3d1785..f879bd70 100644
--- a/SCRIPTS/SHMS/SCALERS/replay_shms_scalers.C
+++ b/SCRIPTS/SHMS/SCALERS/replay_shms_scalers.C
@@ -47,10 +47,10 @@ void replay_shms_scalers (Int_t RunNumber = 0, Int_t MaxEvent = 0) {
   THaEpicsEvtHandler *hcepics = new THaEpicsEvtHandler("epics", "HC EPICS event type 180");
   gHaEvtHandlers->Add(hcepics);
   // Add handler for scaler events
-  THcScalerEvtHandler *pscaler = new THcScalerEvtHandler("PS","Hall C scaler event type 1");
+  THcScalerEvtHandler *pscaler = new THcScalerEvtHandler("P","Hall C scaler event type 1");
   pscaler->AddEventType(1);
   pscaler->SetUseFirstEvent(kTRUE);
-  gHaEvtHandlers->Add (pscaler);
+  gHaEvtHandlers->Add(pscaler);
 
   // Set up the analyzer - we use the standard one,
   // but this could be an experiment-specific one as well.
diff --git a/TEMPLATES/SHMS/PRODUCTION/pstackana_production.template b/TEMPLATES/SHMS/PRODUCTION/pstackana_production.template
index 8a84c311..7ed00c6b 100644
--- a/TEMPLATES/SHMS/PRODUCTION/pstackana_production.template
+++ b/TEMPLATES/SHMS/PRODUCTION/pstackana_production.template
@@ -1,17 +1,17 @@
 Run #: {gen_run_number}
 
-Run Time  : {PS1Mhz}  {PS1Mhz/1000000.} sec
+Run Time  : {P.1Mhz.scaler}  {P.1Mhz.scaler/1000000.} sec
 
-BCM1  : {(PSBCM1r-250000)/(4673):%3.3f} uA      Total charge = {(PSBCM1r-250000) / (4673)*PS1Mhz/1000000.:%7.3f} uC
-BCM2  : {(PSBCM2r-250000)/(3954):%3.3f} uA      Total charge = {(PSBCM2r-250000) / (3954)*PS1Mhz/1000000.:%7.3f} uC 
-Unser : {(PSUnserr-393000)/(4000):%3.3f} uA     Total charge = {(PSUnserr-393000) / (4000)*PS1Mhz/1000000.:%7.3f} uC
+BCM1  : {(P.BCM1.scalerRate-250000)/(4673):%3.3f} uA      Total charge = {(P.BCM1.scalerRate-250000) / (4673)*P.1Mhz.scaler/1000000.:%7.3f} uC
+BCM2  : {(P.BCM2.scalerRate-250000)/(3954):%3.3f} uA      Total charge = {(P.BCM2.scalerRate-250000) / (3954)*P.1Mhz.scaler/1000000.:%7.3f} uC 
+Unser : {(P.Unser.scalerRate-393000)/(4000):%3.3f} uA     Total charge = {(P.Unser.scalerRate-393000) / (4000)*P.1Mhz.scaler/1000000.:%7.3f} uC
 
 All triggers  :  {all_trigs.npassed}
 
-Rate  :  {PSsTrigr/1000.:%7.3f} kHz
+Rate  :  {P.Trig.scalerRate/1000.:%7.3f} kHz
 
-Live Time : {(all_trigs.npassed / PSsTrig)*100.0:%3.2f} %
-Dead Time : {100.0 - (all_trigs.npassed / PSsTrig)*100.0:%3.2f} %
+Live Time : {(all_trigs.npassed / P.Trig.scaler)*100.0:%3.2f} %
+Dead Time : {100.0 - (all_trigs.npassed / P.Trig.scaler)*100.0:%3.2f} %
 
 good_S1_time         Counts: {good_S1_time.npassed}     / all_trigs : {good_S1_time.npassed / all_trigs.npassed}       
 good_S2X_time        Counts: {good_S2X_time.npassed}    / all_trigs : {good_S2X_time.npassed / all_trigs.npassed}    
diff --git a/TEMPLATES/SHMS/SCALERS/pscalers.template b/TEMPLATES/SHMS/SCALERS/pscalers.template
index 44fe4f23..352ce23a 100644
--- a/TEMPLATES/SHMS/SCALERS/pscalers.template
+++ b/TEMPLATES/SHMS/SCALERS/pscalers.template
@@ -1,14 +1,14 @@
 Run #: {gen_run_number}
 
-Run Time  : {PS1Mhz}  {PS1Mhz/1000000.} sec
+Run Time  : {P.1Mhz.scaler}  {P.1Mhz.scaler/1000000.} sec
 
-BCM1  : {(PSBCM1r-250000)/(4673):%3.3f} uA      Total charge = {(PSBCM1r-250000) / (4673)*PS1Mhz/1000000.:%7.3f} uC
-BCM2  : {(PSBCM2r-250000)/(3954):%3.3f} uA      Total charge = {(PSBCM2r-250000) / (3954)*PS1Mhz/1000000.:%7.3f} uC 
-Unser : {(PSUnserr-393000)/(4000):%3.3f} uA     Total charge = {(PSUnserr-393000) / (4000)*PS1Mhz/1000000.:%7.3f} uC
+BCM1  : {(P.BCM1.scalerRate-250000)/(4673):%3.3f} uA      Total charge = {(P.BCM1.scalerRate-250000) / (4673)*P.1Mhz.scaler/1000000.:%7.3f} uC
+BCM2  : {(P.BCM2.scalerRate-250000)/(3954):%3.3f} uA      Total charge = {(P.BCM2.scalerRate-250000) / (3954)*P.1Mhz.scaler/1000000.:%7.3f} uC 
+Unser : {(P.Unser.scalerRate-393000)/(4000):%3.3f} uA     Total charge = {(P.Unser.scalerRate-393000) / (4000)*P.1Mhz.scaler/1000000.:%7.3f} uC
 
 All triggers  :  {all_trigs.npassed}
 
-Rate  :  {PSsTrigr/1000.:%7.3f} kHz
+Rate  :  {P.Trig.scalerRate/1000.:%7.3f} kHz
 
-Live Time : {(all_trigs.npassed / PSsTrig)*100.0:%3.2f} %
-Dead Time : {100.0 - (all_trigs.npassed / PSsTrig)*100.0:%3.2f} %
+Live Time : {(all_trigs.npassed / P.Trig.scaler)*100.0:%3.2f} %
+Dead Time : {100.0 - (all_trigs.npassed / P.Trig.scaler)*100.0:%3.2f} %
-- 
GitLab