Spring 2018 ver19 (#425)

* Fix typo in HMS production cuts

* Corrected EDTM cuts and adjusted HMS TDC reference time cut to improve hodoscope efficiencies

* Fix bug for BCM cut currents in template files

* Add new BCM gains and offsets

* Update kinematics files

* Updated the kinematics files to be up-to-date. Note that the files had not been updated through the last two shifts (now fixed).

* updated kinematics files

* kinematics file from night shift

* Updated kinematics file, corrected mistake in HMS momentum that snuck in during OWL

* Kinematics files up to run 1799/2713 (HMS/SHMS)

* Include focal plane quantites in the tree

* Update kinematics files

* Updated kinematics files

* Update kinematics files

* Update submodules

DBASE/HMS/standard.kinematics

@@ -462,7 +462,7 @@ hpartmass = 0.00051099
 htheta_lab = -65.0
 hpcentral = 1.0	
 
-1509-9999
+1509
 gpbeam = 6.430 
 gtargmass_amu=26.98 
 hpartmass = 0.00051099
@@ -480,35 +480,35 @@ hpcentral = 2.0
 gpbeam = 6.430 
 gtargmass_amu=12.0107 
 hpartmass = 0.00051099
-htheta_lab = 30.01
+htheta_lab = -30.01
 hpcentral = 2.0	
 
 1519-1526
 gpbeam = 10.59 
 gtargmass_amu=1.00794 
 hpartmass = 0.00051099
-htheta_lab = 18.50
+htheta_lab = -18.50
 hpcentral = 5.816
 
 1527-1528
 gpbeam = 10.59 
 gtargmass_amu=12.0107 
 hpartmass = 0.00051099
-htheta_lab = 18.50
+htheta_lab = -18.50
 hpcentral = 5.816
 
 1529-1530
 gpbeam = 10.59 
 gtargmass_amu=1.00794 
 hpartmass = 0.00051099
-htheta_lab = 18.50
+htheta_lab = -18.50
 hpcentral = 5.816
 
 1531-1532
 gpbeam = 10.59 
 gtargmass_amu=12.0107
 hpartmass = 0.00051099
-htheta_lab = 18.50
+htheta_lab = -18.50
 hpcentral = 5.816
 
  
@@ -540,9 +540,676 @@ hpartmass = 0.00051099
 htheta_lab = -21.00
 hpcentral = 5.7
 
-1573-9999
+1573-1573
 gpbeam = 10.59 
 gtargmass_amu=26.98
 hpartmass = 0.00051099
 htheta_lab = -21.00
-hpcentral = 5.7
+hpcentral = 5.7
\ No newline at end of file
+
+1574-1578
+gpbeam = 10.59 
+gtargmass_amu=2.01410178
+hpartmass = 0.00051099
+htheta_lab = -21.00
+hpcentral = 5.7
+
+1579-1579
+gpbeam = 10.59 
+gtargmass_amu=10.0102
+hpartmass = 0.00051099
+htheta_lab = -21.00
+hpcentral = 5.7
+
+1580-1581
+gpbeam = 10.59 cd
+gtargmass_amu=11.01
+hpartmass = 0.00051099
+htheta_lab = -21.00
+hpcentral = 5.7
+
+1582-1586
+gpbeam = 10.59 
+gtargmass_amu=9.0122
+hpartmass = 0.00051099
+htheta_lab = -21.00
+hpcentral = 5.7
+
+1587 - 1589
+gpbeam = 10.59 
+gtargmass_amu=12.0107
+hpartmass = 0.00051099
+htheta_lab = -21.00
+hpcentral = 5.7
+
+1590 - 1591
+gpbeam = 10.59 
+gtargmass_amu=12.0107
+hpartmass = 0.00051099
+htheta_lab = -21.00
+hpcentral = 5.1
+
+1592 - 1593
+gpbeam = 10.59 
+gtargmass_amu=9.0122
+hpartmass = 0.00051099
+htheta_lab = -21.00
+hpcentral = 5.1
+
+1594 - 1594
+gpbeam = 10.59 
+gtargmass_amu=11.01
+hpartmass = 0.00051099
+htheta_lab = -21.00
+hpcentral = 5.1
+
+1595 - 1595
+gpbeam = 10.59
+gtargmass_amu=10.0102
+hpartmass = 0.00051099
+htheta_lab = -21.00
+hpcentral = 5.1
+
+1596 - 1596
+gpbeam = 10.59
+gtargmass_amu=26.98
+hpartmass = 0.00051099
+htheta_lab = -21.00
+hpcentral = 5.1
+
+1597 - 1599
+gpbeam = 10.59
+gtargmass_amu=2.0141017
+hpartmass = 0.00051099
+htheta_lab = -21.00
+hpcentral = 5.1
+
+1600 - 1602
+gpbeam = 10.59
+gtargmass_amu=1.00794
+hpartmass = 0.00051099
+htheta_lab = -21.00
+hpcentral = 5.1
+
+1603 - 1605
+gpbeam = 10.59
+gtargmass_amu=1.00794
+hpartmass = 0.00051099
+htheta_lab = -21.00
+hpcentral = 4.5
+
+1606 - 1608
+gpbeam = 10.59
+gtargmass_amu=2.014101
+hpartmass = 0.00051099
+htheta_lab = -21.00
+hpcentral = 4.5
+
+1609 - 1610
+gpbeam = 10.59
+gtargmass_amu=26.98
+hpartmass = 0.00051099
+htheta_lab = -21.00
+hpcentral = 4.5
+
+1611 - 1614
+gpbeam = 10.59
+gtargmass_amu=10.0102
+hpartmass = 0.00051099
+htheta_lab = -21.00
+hpcentral = 4.5
+
+1615 - 1616
+gpbeam = 10.59
+gtargmass_amu = 11.01
+hpartmass = 0.00051099
+htheta_lab = -21.00
+hpcentral = 4.5
+
+1617
+gpbeam = 10.59
+gtargmass_amu = 2.014101
+hpartmass = 0.00051099
+htheta_lab = -21.00
+hpcentral = 4.5
+
+1618 - 1619
+gpbeam = 10.59
+gtargmass_amu = 12.0107
+hpartmass = 0.00051099
+htheta_lab = -21.00
+hpcentral = 4.5
+
+1620 - 1621
+gpbeam = 10.59
+gtargmass_amu = 9.012
+hpartmass = 0.00051099
+htheta_lab = -21.00
+hpcentral = 4.5
+
+1622 - 1623
+gpbeam = 10.59
+gtargmass_amu = 12.0107
+hpartmass = 0.00051099
+htheta_lab = -21.00
+hpcentral = 4.0
+
+1624 - 1625
+gpbeam = 10.59
+gtargmass_amu = 2.014101
+hpartmass = 0.00051099
+htheta_lab = -21.00
+hpcentral = 4.0
+
+1626 - 1627
+gpbeam = 10.59
+gtargmass_amu = 1.00794
+hpartmass = 0.00051099
+htheta_lab = -21.00
+hpcentral = 4.0
+
+1628 - 1629
+gpbeam = 10.59
+gtargmass_amu = 26.98
+hpartmass = 0.00051099
+htheta_lab = -21.00
+hpcentral = 4.0
+
+1630 - 1632
+gpbeam = 10.59
+gtargmass_amu = 9.012
+hpartmass = 0.00051099
+htheta_lab = -21.00
+hpcentral = 4.0
+
+1633 - 1633
+gpbeam = 10.59
+gtargmass_amu = 11.01
+hpartmass = 0.00051099
+htheta_lab = -21.00
+hpcentral = 4.0
+
+1634 - 1636
+gpbeam = 10.59
+gtargmass_amu = 10.010
+hpartmass = 0.00051099
+htheta_lab = -21.00
+hpcentral = 3.3
+
+1636 - 1639
+gpbeam = 10.59
+gtargmass_amu = 1.00794
+hpartmass = 0.00051099
+htheta_lab = -21.00
+hpcentral = 3.3
+
+1640
+gpbeam = 10.59
+gtargmass_amu = 2.014101
+hpartmass = 0.00051099
+htheta_lab = -21.00
+hpcentral = 3.3
+
+1641 - 1642
+gpbeam = 10.59
+gtargmass_amu = 26.981539
+hpartmass = 0.00051099
+htheta_lab = -21.00
+hpcentral = 3.3
+
+1643
+gpbeam = 10.59
+gtargmass_amu = 26.981539
+hpartmass = 0.00051099
+htheta_lab = -59.00
+hpcentral = 1.5
+
+1644 - 1651 
+gpbeam = 10.59
+gtargmass_amu = 1.00794
+hpartmass = 0.00051099
+htheta_lab = -59.00
+hpcentral = 1.5
+
+1652 - 1655 
+gpbeam = 10.59
+gtargmass_amu = 2.014101 
+hpartmass = 0.00051099
+htheta_lab = -59.00
+hpcentral = 1.5
+
+1656 - 1657 
+gpbeam = 10.59
+gtargmass_amu = 26.98
+hpartmass = 0.00051099
+htheta_lab = -59.00
+hpcentral = 1.5
+
+1658 - 1664 
+gpbeam = 10.59
+gtargmass_amu = 1.00794
+hpartmass = 0.00051099
+htheta_lab = -59.00
+hpcentral = 1.5
+
+1665 - 1670 
+gpbeam = 10.59
+gtargmass_amu = 2.0141
+hpartmass = 0.00051099
+htheta_lab = -59.00
+hpcentral = 1.5
+
+1671 - 1673 
+gpbeam = 10.59
+gtargmass_amu = 26.9815391
+hpartmass = 0.00051099
+htheta_lab = -59.00
+hpcentral = 1.5
+
+1674 - 1677
+gpbeam = 10.59
+gtargmass_amu = 1.00794
+hpartmass = 0.00051099
+htheta_lab = -59.00
+hpcentral = 1.5
+
+1678 - 1678 
+gpbeam = 10.59
+gtargmass_amu = 26.9815391
+hpartmass = 0.00051099
+htheta_lab = -59.00
+hpcentral = 1.5
+
+1679 - 1685 
+gpbeam = 10.59
+gtargmass_amu = 2.0141
+hpartmass = 0.00051099
+htheta_lab = -59.00
+hpcentral = 1.5
+
+1686-1692
+gpbeam = 10.59
+gtargmass_amu = 1.00794
+hpartmass = 0.00051099
+htheta_lab = -59.00
+hpcentral = 1.5
+
+1693
+gpbeam = 10.59
+gtargmass_amu = 26.9815391
+hpartmass = 0.00051099
+htheta_lab = -59.00
+hpcentral = 1.5
+
+1694-1701
+gpbeam = 10.59
+gtargmass_amu = 2.014101
+hpartmass = 0.00051099
+htheta_lab = -59.00
+hpcentral = 1.5
+
+1702 - 1703
+gpbeam = 10.59
+gtargmass_amu = 26.9815391
+hpartmass = 0.00051099
+htheta_lab = -58.99.q
+hpcentral = 1.5
+
+1704-1733
+gpbeam = 10.59
+gtargmass_amu = 1.00794
+hpartmass = 0.00051099
+htheta_lab = -58.99
+hpcentral = 1.5
+
+1734-1734
+gpbeam = 10.59
+gtargmass_amu = 26.9815391
+hpartmass = 0.00051099
+htheta_lab = -58.99
+hpcentral = 1.5
+
+1735-1736
+gpbeam = 10.59
+gtargmass_amu = 2.014101
+hpartmass = 0.00051099
+htheta_lab = -58.99
+hpcentral = 1.5
+
+1737-1740
+gpbeam = 10.59
+gtargmass_amu = 1.00794
+hpartmass = 0.00051099
+htheta_lab = -58.99
+hpcentral = 1.5
+
+1741-1741
+gpbeam = 10.59
+gtargmass_amu = 26.9815391
+hpartmass = 0.00051099
+htheta_lab = -58.99
+hpcentral = 1.5
+
+1742-1745
+gpbeam = 10.59
+gtargmass_amu = 2.014101
+hpartmass = 0.00051099
+htheta_lab = -58.99
+hpcentral = 1.5
+
+1746-1761
+gpbeam = 10.59
+gtargmass_amu = 1.00794
+hpartmass = 0.00051099
+htheta_lab = -58.99
+hpcentral = 1.5
+
+1762-1763
+gpbeam = 10.59
+gtargmass_amu = 1.00794
+hpartmass = 0.00051099
+htheta_lab = -58.99
+hpcentral = 1.35
+
+1764-1764
+gpbeam = 10.59
+gtargmass_amu = 26.9815391
+hpartmass = 0.00051099
+htheta_lab = -58.99
+hpcentral = 1.35
+
+1765-1766
+gpbeam = 10.59
+gtargmass_amu = 2.014101
+hpartmass = 0.00051099
+htheta_lab = -58.99
+hpcentral = 1.35
+
+1767 - 1768
+gpbeam = 10.59
+gtargmass_amu = 1.00794
+hpartmass = 0.00051099
+htheta_lab = -58.99
+hpcentral = 1.35
+
+1769 - 1769
+gpbeam = 10.59
+gtargmass_amu = 26.9815391
+hpartmass = 0.00051099
+htheta_lab = -58.99
+hpcentral = 1.35
+
+1770 - 1771
+gpbeam = 10.59
+gtargmass_amu = 2.014101
+hpartmass = 0.00051099
+htheta_lab = -58.99
+hpcentral = 1.35
+
+1772 - 1773
+gpbeam = 10.59
+gtargmass_amu = 1.00794
+hpartmass = 0.00051099
+htheta_lab = -58.99
+hpcentral = 1.35
+
+1774 - 1774
+gpbeam = 10.59
+gtargmass_amu = 26.9815391
+hpartmass = 0.00051099
+htheta_lab = -58.99
+hpcentral = 1.35
+
+1775 - 1779
+gpbeam = 10.59
+gtargmass_amu = 2.014101
+hpartmass = 0.00051099
+htheta_lab = -58.99
+hpcentral = 1.35
+
+1780 - 1782
+gpbeam = 10.59
+gtargmass_amu = 26.9815391
+hpartmass = 0.00051099
+htheta_lab = -58.99
+hpcentral = 1.35
+
+
+1783 - 1788
+gpbeam = 10.59
+gtargmass_amu = 1.00794
+hpartmass = 0.00051099
+htheta_lab = -58.99
+hpcentral = 1.35
+
+1789 - 1797
+gpbeam = 10.59
+gtargmass_amu = 2.014101
+hpartmass = 0.00051099
+htheta_lab = -58.99
+hpcentral = 1.35
+
+1798 - 1798
+gpbeam = 10.59
+gtargmass_amu = 26.9815391
+hpartmass = 0.00051099
+htheta_lab = -58.99
+hpcentral = 1.35
+
+1799 - 1802
+gpbeam = 10.59
+gtargmass_amu = 1.00794
+hpartmass = 0.00051099
+htheta_lab = -58.99
+hpcentral = 1.35
+
+1803 - 1803
+gpbeam = 10.59
+gtargmass_amu = 12.0107
+hpartmass = 0.00051099
+htheta_lab = -58.99
+hpcentral = 1.18
+
+1804 - 1808
+gpbeam = 10.59
+gtargmass_amu = 2.014101 
+hpartmass = 0.00051099
+htheta_lab = -58.99
+hpcentral = 1.18
+
+1809-1809
+gpbeam = 10.59
+gtargmass_amu = 26.9815391
+hpartmass = 0.00051099
+htheta_lab = -58.99
+hpcentral = 1.18
+
+1810 - 1815
+gpbeam = 10.59
+gtargmass_amu = 1.00794
+hpartmass = 0.00051099
+htheta_lab = -58.99
+hpcentral = 1.18
+
+1814 - 1814
+gpbeam = 10.59
+gtargmass_amu = 26.9815391
+hpartmass = 0.00051099
+htheta_lab = -58.99
+hpcentral = 1.18
+
+1814 - 1822
+gpbeam = 10.59
+gtargmass_amu = 2.014101
+hpartmass = 0.00051099
+htheta_lab = -58.99
+hpcentral = 1.18
+
+1823 - 1827
+gpbeam = 10.59
+gtargmass_amu = 1.00794
+hpartmass = 0.00051099
+htheta_lab = -58.99
+hpcentral = 1.18
+
+1828 - 1828
+gpbeam = 10.59
+gtargmass_amu = 26.9815391
+hpartmass = 0.00051099
+htheta_lab = -58.99
+hpcentral = 1.18
+
+1829 - 1830
+gpbeam = 10.59
+gtargmass_amu = 2.014101
+hpartmass = 0.00051099
+htheta_lab = -58.99
+hpcentral = 1.18
+
+1831 - 1831
+gpbeam = 10.59
+gtargmass_amu = 2.014101
+hpartmass = 0.00051099
+htheta_lab = -58.99
+hpcentral = 1.18
+
+1832 - 1832
+gpbeam = 10.59
+gtargmass_amu = 26.9815391
+hpartmass = 0.00051099
+htheta_lab = -58.99
+hpcentral = 1.18
+
+1833 - 1834
+gpbeam = 10.59
+gtargmass_amu = 1.00794
+hpartmass = 0.00051099
+htheta_lab = -58.99
+hpcentral = 1.18
+
+1835 - 1836
+gpbeam = 10.59
+gtargmass_amu = 2.014101
+hpartmass = 0.00051099
+htheta_lab = -58.99
+hpcentral = 1.18
+
+1837 - 1840
+gpbeam = 10.59
+gtargmass_amu = 1.00794
+hpartmass = 0.00051099
+htheta_lab = -58.99
+hpcentral = 1.18
+
+1841 - 1842
+gpbeam = 10.59
+gtargmass_amu = 26.9815391
+hpartmass = 0.00051099
+htheta_lab = -58.99
+hpcentral = 1.18
+
+1843 - 1843
+gpbeam = 10.59
+gtargmass_amu = 1.00794
+hpartmass = 0.00051099
+htheta_lab = -58.99
+hpcentral = 1.18
+
+1844 - 1847
+gpbeam = 10.59
+gtargmass_amu = 1.00794
+hpartmass = 0.00051099
+htheta_lab = -58.99
+hpcentral = 1.18
+
+1848 - 1848
+gpbeam = 10.59
+gtargmass_amu = 26.981539
+hpartmass = 0.00051099
+htheta_lab = -58.99
+hpcentral = 1.05
+
+1849 - 1850
+gpbeam = 10.59
+gtargmass_amu = 2.014101
+hpartmass = 0.00051099
+htheta_lab = -58.99
+hpcentral = 1.05
+
+1851 - 1852
+gpbeam = 10.59
+gtargmass_amu = 1.00794
+hpartmass = 0.00051099
+htheta_lab = -58.99
+hpcentral = 1.18
+
+1853-1853
+gpbeam = 10.59
+gtargmass_amu = 26.981539
+hpartmass = 0.00051099
+htheta_lab = -58.99
+hpcentral = 1.05
+
+1854-1856
+gpbeam = 10.59
+gtargmass_amu = 2.014101
+hpartmass = 0.00051099
+htheta_lab = -58.99
+hpcentral = 1.05
+
+1857-1857
+gpbeam = 10.59
+gtargmass_amu = 26.981539
+hpartmass = 0.00051099
+htheta_lab = -58.99
+hpcentral = 1.05
+
+1858-1860
+gpbeam = 10.59
+gtargmass_amu = 1.00794
+hpartmass = 0.00051099
+htheta_lab = -58.99
+hpcentral = 1.05
+
+1861-1861
+gpbeam = 10.59
+gtargmass_amu = 12.0107
+hpartmass = 0.00051099
+htheta_lab = -58.99
+hpcentral = 1.05
+
+1862-1865
+gpbeam = 10.59
+gtargmass_amu = 2.014101
+hpartmass = 0.00051099
+htheta_lab = -58.99
+hpcentral = 1.2
+
+1866-1866
+gpbeam = 10.59
+gtargmass_amu = 26.981539
+hpartmass = 0.00051099
+htheta_lab = -58.99
+hpcentral = 1.2
+
+1867-1872
+gpbeam = 10.59
+gtargmass_amu = 1.00794
+hpartmass = 0.00051099
+htheta_lab = -58.99
+hpcentral = 1.2
+
+
+1873-1873
+gpbeam = 10.59
+gtargmass_amu = 26.981539
+hpartmass = 0.00051099
+htheta_lab = -58.99
+hpcentral = 1.2
+
+1874-1878
+gpbeam = 10.59
+gtargmass_amu =  2.014101
+hpartmass = 0.00051099
+htheta_lab = -58.99
+hpcentral = 1.2

DBASE/SHMS/standard.kinematics

@@ -449,9 +449,692 @@ ppartmass =  0.00051099
 ptheta_lab =21.035
 ppcentral = 5.1
 
-2489-9999
+2489-2489
 gpbeam = 10.59
 gtargmass_amu= 26.98
 ppartmass =  0.00051099
 ptheta_lab =21.035
 ppcentral = 5.1
+
+2490-2494
+gpbeam = 10.59
+gtargmass_amu= 2.01410178
+ppartmass =  0.00051099
+ptheta_lab =21.035
+ppcentral = 5.1
+
+2495-2496
+gpbeam = 10.59
+gtargmass_amu= 10.0102
+ppartmass =  0.00051099
+ptheta_lab =21.035
+ppcentral = 5.1
+
+2497-2498
+gpbeam = 10.59
+gtargmass_amu= 11.01
+ppartmass =  0.00051099
+ptheta_lab =21.035
+ppcentral = 5.1
+
+2499-2505
+gpbeam = 10.59
+gtargmass_amu= 9.0122
+ppartmass =  0.00051099
+ptheta_lab =21.035
+ppcentral = 5.1
+
+2506 - 2508
+gpbeam = 10.59
+gtargmass_amu = 12.0107
+ppartmass = 0.00051099
+ptheta_lab = 21.035
+ppcentral = 5.1
+
+2509 - 2510
+gpbeam = 10.59
+gtargmass_amu = 12.0107
+ppartmass = 0.00051099
+ptheta_lab = 21.035
+ppcentral = 4.0
+
+2511 - 2512
+gpbeam = 10.59
+gtargmass_amu = 9.0122
+ppartmass = 0.00051099
+ptheta_lab = 21.035
+ppcentral = 4.0
+
+2513 - 2514
+gpbeam = 10.59
+gtargmass_amu = 11.01
+ppartmass = 0.00051099
+ptheta_lab = 21.035
+ppcentral = 4.0
+
+2515 - 2516
+gpbeam = 10.59
+gtargmass_amu = 10.0102
+ppartmass = 0.00051099
+ptheta_lab = 21.035
+ppcentral = 4.0
+
+2517 - 2517
+gpbeam = 10.59
+gtargmass_amu = 26.98
+ppartmass = 0.00051099
+ptheta_lab = 21.035
+ppcentral = 4.0
+
+2518 - 2520
+gpbeam = 10.59
+gtargmass_amu = 2.0141017
+ppartmass = 0.00051099
+ptheta_lab = 21.035
+ppcentral = 4.0
+
+2521 - 2523
+gpbeam = 10.59
+gtargmass_amu = 1.00794
+ppartmass = 0.00051099
+ptheta_lab = 21.035
+ppcentral = 4.0
+
+2524 - 2526
+gpbeam = 10.59
+gtargmass_amu = 1.00794
+ppartmass = 0.00051099
+ptheta_lab = 21.035
+ppcentral = 3.3
+
+2527 - 2529
+gpbeam = 10.59
+gtargmass_amu = 2.014101
+ppartmass = 0.00051099
+ptheta_lab = 21.035
+ppcentral = 3.3
+
+2530 - 2531
+gpbeam = 10.59
+gtargmass_amu =  26.98
+ppartmass = 0.00051099
+ptheta_lab = 21.035
+ppcentral = 3.3
+
+2532 - 2535
+gpbeam = 10.59
+gtargmass_amu = 10.0102
+ppartmass = 0.00051099
+ptheta_lab = 21.035
+ppcentral = 3.3
+
+2536 - 2538
+gpbeam = 10.59
+gtargmass_amu = 11.01
+ppartmass = 0.00051099
+ptheta_lab = 21.035
+ppcentral = 3.3
+
+2539
+gpbeam = 10.59
+gtargmass_amu = 2.014101
+ppartmass = 0.00051099
+ptheta_lab = 21.035
+ppcentral = 3.3
+
+2540-2541
+gpbeam = 10.59
+gtargmass_amu = 12.0107
+ppartmass = 0.00051099
+ptheta_lab = 21.035
+ppcentral = 3.3
+
+2542-2545
+gpbeam = 10.59
+gtargmass_amu = 9.012
+ppartmass = 0.00051099
+ptheta_lab = 21.035
+ppcentral = 3.3
+
+2546-2548
+gpbeam = 10.59
+gtargmass_amu = 12.0107
+ppartmass = 0.00051099
+ptheta_lab = 21.035
+ppcentral = 2.7
+
+2549-2550
+gpbeam = 10.59
+gtargmass_amu = 2.014101
+ppartmass = 0.00051099
+ptheta_lab = 21.035
+ppcentral = 2.7
+
+2551-2552
+gpbeam = 10.59
+gtargmass_amu = 1.00794
+ppartmass = 0.00051099
+ptheta_lab = 21.035
+ppcentral = 2.7
+
+2553-2554
+gpbeam = 10.59
+gtargmass_amu = 26.98 
+ppartmass = 0.00051099
+ptheta_lab = 21.035
+ppcentral = 2.7
+
+2555-2557
+gpbeam = 10.59
+gtargmass_amu = 9.012
+ppartmass = 0.00051099
+ptheta_lab = 21.035
+ppcentral = 2.7
+
+2558-2560
+gpbeam = 10.59
+gtargmass_amu = 11.01
+ppartmass = 0.00051099
+ptheta_lab = 21.035
+ppcentral = 2.7
+
+2561-2563
+gpbeam = 10.59
+gtargmass_amu = 10.0102
+ppartmass = 0.00051099
+ptheta_lab = 21.035
+ppcentral = 2.7
+
+2564- 2565
+gpbeam = 10.59
+gtargmass_amu = 1.00794
+ppartmass = 0.00051099
+ptheta_lab = 21.035
+ppcentral = 2.7
+
+2566
+gpbeam = 10.59
+gtargmass_amu = 2.014101
+ppartmass = 0.00051099
+ptheta_lab = 39.00
+ppcentral = 2.5
+
+2567-2568
+gpbeam = 10.59
+gtargmass_amu = 26.981539
+ppartmass = 0.00051099
+ptheta_lab = 39.00
+ppcentral = 2.5
+
+2569 - 2576
+gpbeam = 10.59
+gtargmass_amu = 1.00794
+ppartmass = 0.00051099
+ptheta_lab = 39.00
+ppcentral = 2.5
+
+2577 - 2580
+gpbeam = 10.59
+gtargmass_amu = 2.014101
+ppartmass = 0.00051099
+ptheta_lab = 39.00
+ppcentral = 2.5
+
+2581 - 2582
+gpbeam = 10.59
+gtargmass_amu = 26.98
+ppartmass = 0.00051099
+ptheta_lab = 39.00
+ppcentral = 2.5
+
+2583 - 2589
+gpbeam = 10.59
+gtargmass_amu = 1.00794
+ppartmass = 0.00051099
+ptheta_lab = 39.00
+ppcentral = 2.5
+
+2590 - 2595
+gpbeam = 10.59
+gtargmass_amu = 2.014101
+ppartmass = 0.00051099
+ptheta_lab = 39.00
+ppcentral = 2.5
+
+2596 - 2598
+gpbeam = 10.59
+gtargmass_amu = 26.9815391
+ppartmass = 0.00051099
+ptheta_lab = 39.00
+ppcentral = 2.5
+
+2599 - 2602
+gpbeam = 10.59
+gtargmass_amu = 1.00794
+ppartmass = 0.00051099
+ptheta_lab = 39.00
+ppcentral = 2.5
+
+2603 - 2603
+gpbeam = 10.59
+gtargmass_amu = 26.9815391
+ppartmass = 0.00051099
+ptheta_lab = 39.00
+ppcentral = 2.5
+
+2604 - 2607
+gpbeam = 10.59
+gtargmass_amu = 2.014101
+ppartmass = 0.00051099
+ptheta_lab = 39.00
+ppcentral = 2.5
+
+2608-2614
+gpbeam = 10.59
+gtargmass_amu = 1.00794
+ppartmass = 0.00051099
+ptheta_lab = 39.00
+ppcentral = 2.5
+
+2615
+gpbeam = 10.59
+gtargmass_amu = 26.9815391
+ppartmass = 0.00051099
+ptheta_lab = 39.00
+ppcentral = 2.5
+
+2616 - 2623
+gpbeam = 10.59
+gtargmass_amu = 2.014101
+ppartmass = 0.00051099
+ptheta_lab = 39.00
+ppcentral = 2.5
+
+2624 - 2625
+gpbeam = 10.59
+gtargmass_amu = 26.9815391
+ppartmass = 0.00051099
+ptheta_lab = 38.98
+ppcentral = 2.5
+
+2626 - 2633
+gpbeam = 10.59
+gtargmass_amu = 1.00794
+ppartmass = 0.00051099
+ptheta_lab = 38.98
+ppcentral = 2.5
+
+2634 - 2649
+gpbeam = 10.59
+gtargmass_amu = 1.00794
+ppartmass = 0.00051099
+ptheta_lab = 38.98
+ppcentral = 2.0
+
+2650 - 2650
+gpbeam = 10.59
+gtargmass_amu = 26.9815391
+ppartmass = 0.00051099
+ptheta_lab = 38.98
+ppcentral = 2.0
+
+2651 - 2652
+gpbeam = 10.59
+gtargmass_amu = 2.014101
+ppartmass = 0.00051099
+ptheta_lab = 38.98
+ppcentral = 2.0
+
+2653 - 2656
+gpbeam = 10.59
+gtargmass_amu = 1.00794
+ppartmass = 0.00051099
+ptheta_lab = 38.98
+ppcentral = 2.0
+
+2657 - 2657
+gpbeam = 10.59
+gtargmass_amu = 26.9815391
+ppartmass = 0.00051099
+ptheta_lab = 38.98
+ppcentral = 2.0
+
+2658 - 2660
+gpbeam = 10.59
+gtargmass_amu = 2.014101
+ppartmass = 0.00051099
+ptheta_lab = 38.98
+ppcentral = 2.0
+
+2661 - 2670
+gpbeam = 10.59
+gtargmass_amu = 1.00794
+ppartmass = 0.00051099
+ptheta_lab = 38.98
+ppcentral = 2.0
+
+2671 - 2671
+gpbeam = 10.59
+gtargmass_amu = 26.981539
+ppartmass = 0.00051099
+ptheta_lab = 38.98
+ppcentral = 2.0
+
+2672 - 2673
+gpbeam = 10.597
+gtargmass_amu = 2.014101
+ppartmass = 0.00051099
+ptheta_lab = 38.98
+ppcentral = 2.0
+
+2674 - 2675
+gpbeam = 10.59
+gtargmass_amu = 1.00794
+ppartmass = 0.00051099
+ptheta_lab = 38.98
+ppcentral = 2.0
+
+2676 - 2676
+gpbeam = 10.59
+gtargmass_amu = 26.9815391
+ppartmass = 0.00051099
+ptheta_lab = 38.98
+ppcentral = 2.0
+
+2677 - 2678
+gpbeam = 10.597
+gtargmass_amu = 2.014101
+ppartmass = 0.00051099
+ptheta_lab = 38.98
+ppcentral = 2.0
+
+2679 - 2680
+gpbeam = 10.59
+gtargmass_amu = 1.00794
+ppartmass = 0.00051099
+ptheta_lab = 38.98
+ppcentral = 2.0
+
+2681 - 2681
+gpbeam = 10.59
+gtargmass_amu = 26.9815391
+ppartmass = 0.00051099
+ptheta_lab = 38.98
+ppcentral = 2.0
+
+2682 - 2686
+gpbeam = 10.597
+gtargmass_amu = 2.014101
+ppartmass = 0.00051099
+ptheta_lab = 38.98
+ppcentral = 2.0
+
+2687 - 2688           
+gpbeam = 10.59
+gtargmass_amu = 26.9815391
+ppartmass = 0.00051099
+ptheta_lab = 38.98
+ppcentral = 2.0
+
+2689           
+gpbeam = 10.59
+gtargmass_amu = 26.9815391
+ppartmass = 0.00051099
+ptheta_lab = 38.98
+ppcentral = 1.6
+
+2690 - 2695          
+gpbeam = 10.59
+gtargmass_amu = 1.00794
+ppartmass = 0.00051099
+ptheta_lab = 38.98
+ppcentral = 1.6
+
+2696 - 2708
+gpbeam = 10.597
+gtargmass_amu = 2.014101
+ppartmass = 0.00051099
+ptheta_lab = 38.98
+ppcentral = 1.6
+
+2709 - 2710           
+gpbeam = 10.59
+gtargmass_amu = 26.9815391
+ppartmass = 0.00051099
+ptheta_lab = 38.98
+ppcentral = 1.6
+
+
+2711 - 2716          
+gpbeam = 10.59
+gtargmass_amu = 1.00794
+ppartmass = 0.00051099
+ptheta_lab = 38.98
+ppcentral = 1.3
+
+2717 - 2718
+gpbeam = 10.59
+gtargmass_amu = 12.0107
+ppartmass = 0.00051099
+ptheta_lab = 38.98
+ppcentral = 1.3
+
+2719 - 2724
+gpbeam = 10.59
+gtargmass_amu =  2.014101
+ppartmass = 0.00051099
+ptheta_lab = 38.98
+ppcentral = 1.3
+
+2725 - 2725
+gpbeam = 10.59
+gtargmass_amu = 26.9815391
+ppartmass = 0.00051099
+ptheta_lab = 38.98
+ppcentral = 1.6
+
+
+2726 - 2730          
+gpbeam = 10.59
+gtargmass_amu = 1.00794
+ppartmass = 0.00051099
+ptheta_lab = 32.985
+ppcentral = 3.2
+
+2731 - 2731
+gpbeam = 10.59
+gtargmass_amu =  26.9815391
+ppartmass = 0.00051099
+ptheta_lab = 32.985
+ppcentral = 3.2
+
+2732 - 2736
+gpbeam = 10.59
+gtargmass_amu = 2.014101
+ppartmass = 0.00051099
+ptheta_lab = 32.985
+ppcentral = 3.2
+
+2737 - 2741
+gpbeam = 10.59
+gtargmass_amu = 1.00794
+ppartmass = 0.00051099
+ptheta_lab = 32.985
+ppcentral = 3.2
+
+2742 - 2742
+gpbeam = 10.59
+gtargmass_amu =  26.9815391
+ppartmass = 0.00051099
+ptheta_lab = 32.985
+ppcentral = 3.2
+
+2743 - 2744
+gpbeam = 10.59
+gtargmass_amu = 2.014101
+ppartmass = 0.00051099
+ptheta_lab = 32.985
+ppcentral = 3.2
+
+2745 - 2745
+gpbeam = 10.59
+gtargmass_amu = 2.014101
+ppartmass = 0.00051099
+ptheta_lab = 32.985
+ppcentral = 3.2
+
+2746 - 2746
+gpbeam = 10.59
+gtargmass_amu = 26.9815391
+ppartmass = 0.00051099
+ptheta_lab = 32.985
+ppcentral = 3.2
+
+2747 - 2748
+gpbeam = 10.59
+gtargmass_amu = 1.00794
+ppartmass = 0.00051099
+ptheta_lab = 32.985
+ppcentral = 3.2
+
+2749 - 2750
+gpbeam = 10.59
+gtargmass_amu = 2.014101
+ppartmass = 0.00051099
+ptheta_lab = 32.985
+ppcentral = 3.2
+
+2751 - 2754
+gpbeam = 10.59
+gtargmass_amu = 1.00794
+ppartmass = 0.00051099
+ptheta_lab = 32.985
+ppcentral = 3.2
+
+2755 - 2756
+gpbeam = 10.59
+gtargmass_amu =  26.9815391
+ppartmass = 0.00051099
+ptheta_lab = 32.985
+ppcentral = 3.2
+
+2757 - 2757
+gpbeam = 10.59
+gtargmass_amu =  1.00794
+ppartmass = 0.00051099
+ptheta_lab = 32.985
+ppcentral = 2.6
+
+2758 - 2761
+gpbeam = 10.59
+gtargmass_amu =  1.00794
+ppartmass = 0.00051099
+ptheta_lab = 32.985
+ppcentral = 2.6
+
+2762 - 2762
+gpbeam = 10.59
+gtargmass_amu =  26.9815391
+ppartmass = 0.00051099
+ptheta_lab = 32.985
+ppcentral = 2.6
+
+2763 - 2764
+gpbeam = 10.59
+gtargmass_amu =  2.014101
+ppartmass = 0.00051099
+ptheta_lab = 32.985
+ppcentral = 2.6
+
+2765-2766
+gpbeam = 10.59
+gtargmass_amu =  1.00794
+ppartmass = 0.00051099
+ptheta_lab = 32.985
+ppcentral = 2.6
+
+2767-2767
+gpbeam = 10.59
+gtargmass_amu =  26.9815391
+ppartmass = 0.00051099
+ptheta_lab = 32.985
+ppcentral = 2.6
+
+2768-2770
+gpbeam = 10.59
+gtargmass_amu =  2.014101
+ppartmass = 0.00051099
+ptheta_lab = 32.985
+ppcentral = 2.6
+
+2771-2771
+gpbeam = 10.59
+gtargmass_amu =  26.9815391
+ppartmass = 0.00051099
+ptheta_lab = 32.985
+ppcentral = 2.6
+
+2772-2774
+gpbeam = 10.59
+gtargmass_amu =  1.00794
+ppartmass = 0.00051099
+ptheta_lab = 32.985
+ppcentral = 2.6
+
+2775-2775
+gpbeam = 10.59
+gtargmass_amu = 12.010 
+ppartmass = 0.00051099
+ptheta_lab = 32.985
+ppcentral = 2.6
+
+2776-2779
+gpbeam = 10.59
+gtargmass_amu = 2.014101
+ppartmass = 0.00051099
+ptheta_lab = 32.985
+ppcentral = 2.6
+
+2780-2780
+gpbeam = 10.59
+gtargmass_amu = 26.981539
+ppartmass = 0.00051099
+ptheta_lab = 32.985
+ppcentral = 2.6
+
+2781-2783
+gpbeam = 10.59
+gtargmass_amu = 1.00794
+ppartmass = 0.00051099
+ptheta_lab = 32.985
+ppcentral = 2.6
+
+2784-2789
+gpbeam = 10.59
+gtargmass_amu = 1.00794
+ppartmass = 0.00051099
+ptheta_lab = 32.985
+ppcentral = 2.1
+
+2791-2791
+gpbeam = 10.59
+gtargmass_amu =  26.981539
+ppartmass = 0.00051099
+ptheta_lab = 32.985
+ppcentral = 2.1
+
+2792-2799
+gpbeam = 10.59
+gtargmass_amu =   2.014101
+ppartmass = 0.00051099
+ptheta_lab = 32.985
+ppcentral = 2.1
+
+2800-2807
+gpbeam = 10.59
+gtargmass_amu =   2.014101
+ppartmass = 0.00051099
+ptheta_lab = 32.985
+ppcentral = 1.7
+
+

DEF-files/HMS/PRODUCTION/CUTS/hstackana_decode_cuts.def

@@ -6,6 +6,6 @@ hcut_TRIG3        T.hms.hTRIG3_tdcTimeRaw > 0
 HMS_Pretrig       hcut_TRIG1 || hcut_TRIG2 || hcut_TRIG3
 
 hms_trigs              HMS_event
-hcut_edtm_accepted     T.hms.hEDTM_tdcTime != 0.0
-hcut_physics_accepted  T.hms.hEDTM_tdcTime == 0.0
+hcut_edtm_accepted     T.hms.hEDTM_tdcTimeRaw != 0.0
+hcut_physics_accepted  T.hms.hEDTM_tdcTimeRaw == 0.0
 ALL_HMS_NO_EDTM        ALL_HMS_events && hcut_physics_accepted
\ No newline at end of file

DEF-files/HMS/PRODUCTION/CUTS/hstackana_production_cuts.def

-# Report file for HMS stack
-
 Block: RawDecode
 #include "DEF-files/HMS/PRODUCTION/CUTS/hstackana_rawdecode_cuts.def"
 RawDecode_master  1
@@ -10,7 +8,7 @@ Decode_master          ALL_HMS_NO_EDTM
 
 Block: CoarseTracking
 #include "DEF-files/HMS/PRODUCTION/CUTS/hstackana_coarsetracking_cuts.def"
-CoarseTracking_master ALL_HMS_NO_events
+CoarseTracking_master ALL_HMS_NO_EDTM
 
 Block: CoarseReconstruct
 CoarseReconstruct_master ALL_HMS_NO_EDTM

DEF-files/SHMS/PRODUCTION/CUTS/pstackana_decode_cuts.def

@@ -6,8 +6,8 @@ pcut_TRIG3         T.shms.pTRIG3_tdcTimeRaw > 0
 SHMS_Pretrig  pcut_TRIG1 || pcut_TRIG2 || pcut_TRIG3
 
 shms_trigs        SHMS_event
-pcut_edtm_accepted     T.shms.pEDTM_tdcTime != 0.0
-pcut_physics_accepted  T.shms.pEDTM_tdcTime == 0.0
+pcut_edtm_accepted     T.shms.pEDTM_tdcTimeRaw != 0.0
+pcut_physics_accepted  T.shms.pEDTM_tdcTimeRaw == 0.0
 
 pcut_good_S1_time         T.shms.p1T_tdcTime > 241 && T.shms.p1T_tdcTime < 243
 pcut_good_S2X_time        T.shms.p2X_tdcTime > 180 && T.shms.p2X_tdcTime < 220

DEF-files/SHMS/PRODUCTION/DC/pdc_vars.def

+**************************
+* Drift Chamber Variables
+**************************
+
+
+
+block P.dc.x_fp
+block P.dc.xp_fp
+block P.dc.y_fp
+block P.dc.yp_fp
\ No newline at end of file

DEF-files/SHMS/PRODUCTION/pstackana_production.def

@@ -11,6 +11,7 @@
 #include "DEF-files/SHMS/PRODUCTION/REACT/preact_histos.def"
 #include "DEF-files/SHMS/PRODUCTION/PID/ppid_histos.def"
 
+#include "DEF-files/SHMS/PRODUCTION/DC/pdc_vars.def"
 #include "DEF-files/SHMS/PRODUCTION/GTR/pgtr_vars.def"
 #include "DEF-files/SHMS/PRODUCTION/PID/ppid_vars.def"
 #include "DEF-files/SHMS/PRODUCTION/EPICS/pepics_vars.def"
\ No newline at end of file

PARAM/GEN/gscalers.param

 gNumBCMs=6
-gBCM_Gain = 4574,3847,4166,13560,6456.,2154.
+;gBCM_Gain = 4574,3847,4166,13560,6456.,2154.
+;gBCM_Offset = 250200,250100,393000,-2994.0,-1148.0,-154.3
+gBCM_Gain = 5048,4321,4166,13650,6496.,2154.
 gBCM_Offset = 250200,250100,393000,-2994.0,-1148.0,-154.3
 gBCM_Names="BCM1 BCM2 Unser BCM4A BCM4B BCM17"
 gBCM_Current_threshold=5.0

PARAM/HMS/GEN/h_reftime_cut.param

@@ -8,7 +8,7 @@
 ;     reference time is used and warning message is produced.
 ; Cut is on reference time per detector.
 hdc_tdcrefcut=-14000.
-hhodo_tdcrefcut=-2000.
+hhodo_tdcrefcut=-1000.
 hhodo_adcrefcut=-150./.0625
 hcer_adcrefcut=-150./.0625
 hcal_adcrefcut=-150./.0625

TEMPLATES/HMS/PRODUCTION/hstackana_production.template

@@ -27,12 +27,12 @@ BCM17 Charge: {H.BCM17.scalerCharge:%.3f} uC
 Unser Charge: {H.Unser.scalerCharge:%.3f} uC
 
 Cut on BCM{gBCM_Current_threshold_index+1} current of {gBCM_Current_threshold} uA. Beam over threshold for {H.1Mhz.scalerTimeCut:%.3f}s, or {((H.1Mhz.scalerTimeCut/H.1Mhz.scalerTime)*100.):%.3f}% of total run time.
-BCM1 Beam Cut Current: {H.BCM1.scalerCharge/H.1Mhz.scalerTime:%.3f} uA		  
-BCM2 Beam Cut Current: {H.BCM2.scalerCharge/H.1Mhz.scalerTime:%.3f} uA		 
-BCM4a Beam Cut Current: {H.BCM4A.scalerCharge/H.1Mhz.scalerTime:%.3f} uA		  
-BCM4b Beam Cut Current: {H.BCM4B.scalerCharge/H.1Mhz.scalerTime:%.3f} uA		 
-BCM17 Beam Cut Current: {H.BCM17.scalerCharge/H.1Mhz.scalerTime:%.3f} uA		 
-Unser Beam Cut Current: {H.Unser.scalerCharge/H.1Mhz.scalerTime:%.3f} uA		  
+BCM1 Beam Cut Current: {H.BCM1.scalerChargeCut/H.1Mhz.scalerTimeCut:%.3f} uA		  
+BCM2 Beam Cut Current: {H.BCM2.scalerChargeCut/H.1Mhz.scalerTimeCut:%.3f} uA		 
+BCM4a Beam Cut Current: {H.BCM4A.scalerChargeCut/H.1Mhz.scalerTimeCut:%.3f} uA		  
+BCM4b Beam Cut Current: {H.BCM4B.scalerChargeCut/H.1Mhz.scalerTimeCut:%.3f} uA		 
+BCM17 Beam Cut Current: {H.BCM17.scalerChargeCut/H.1Mhz.scalerTimeCut:%.3f} uA		 
+Unser Beam Cut Current: {H.Unser.scalerChargeCut/H.1Mhz.scalerTimeCut:%.3f} uA		  
 
 BCM1  Beam Cut Charge: {H.BCM1.scalerChargeCut:%.3f} uC
 BCM2  Beam Cut Charge: {H.BCM2.scalerChargeCut:%.3f} uC

TEMPLATES/SHMS/PRODUCTION/pstackana_production.template

@@ -27,12 +27,12 @@ BCM17 Charge: {P.BCM17.scalerCharge:%.3f} uC
 Unser Charge: {P.Unser.scalerCharge:%.3f} uC
 
 Cut on BCM{gBCM_Current_threshold_index+1} current of {gBCM_Current_threshold} uA. Beam over threshold for {P.1Mhz.scalerTimeCut:%.3f}s, or {((P.1Mhz.scalerTimeCut/P.1Mhz.scalerTime)*100.):%.3f}% of total run time.
-BCM1 Beam Cut Current: {P.BCM1.scalerCharge/P.1Mhz.scalerTime:%.3f} uA		  
-BCM2 Beam Cut Current: {P.BCM2.scalerCharge/P.1Mhz.scalerTime:%.3f} uA		 
-BCM4a Beam Cut Current: {P.BCM4A.scalerCharge/P.1Mhz.scalerTime:%.3f} uA		  
-BCM4b Beam Cut Current: {P.BCM4B.scalerCharge/P.1Mhz.scalerTime:%.3f} uA		 
-BCM17 Beam Cut Current: {P.BCM17.scalerCharge/P.1Mhz.scalerTime:%.3f} uA		 
-Unser Beam Cut Current: {P.Unser.scalerCharge/P.1Mhz.scalerTime:%.3f} uA		  
+BCM1 Beam Cut Current: {P.BCM1.scalerChargeCut/P.1Mhz.scalerTimeCut:%.3f} uA		  
+BCM2 Beam Cut Current: {P.BCM2.scalerChargeCut/P.1Mhz.scalerTimeCut:%.3f} uA		 
+BCM4a Beam Cut Current: {P.BCM4A.scalerChargeCut/P.1Mhz.scalerTimeCut:%.3f} uA		  
+BCM4b Beam Cut Current: {P.BCM4B.scalerChargeCut/P.1Mhz.scalerTimeCut:%.3f} uA		 
+BCM17 Beam Cut Current: {P.BCM17.scalerChargeCut/P.1Mhz.scalerTimeCut:%.3f} uA		 
+Unser Beam Cut Current: {P.Unser.scalerChargeCut/P.1Mhz.scalerTimeCut:%.3f} uA		  
 
 BCM1  Beam Cut Charge: {P.BCM1.scalerChargeCut:%.3f} uC
 BCM2  Beam Cut Charge: {P.BCM2.scalerChargeCut:%.3f} uC

UTIL_F2_XEM @ 7cc21dd4

-Subproject commit 2d0da17fe7ded5495c4f7d90788ae099da517e74
+Subproject commit 7cc21dd45f76c18e92dc92ba45b30e5ad87f1bec

UTIL_OL @ 92942d02

-Subproject commit 71bab262e7764fca745c4e33005f9d1e9d0aab2c
+Subproject commit 92942d025b555112d2c0c49bbc9664210febcd98

run_coin_hms.sh

+UTIL_OL/SCRIPTS/SHELL/run_coin_shms.sh
\ No newline at end of file

run_coin_shms.sh

+UTIL_OL/SCRIPTS/SHELL/run_coin_shms.sh
\ No newline at end of file