diff --git a/TEMPLATES/SHMS/SCALERS/pscalers.template b/TEMPLATES/SHMS/SCALERS/pscalers.template
index 723a199304703e911c564fd07c6bdb04ef6f0cad..c328cd756e4fe3eb0591b5090b4ca8dc2f34ef8f 100644
--- a/TEMPLATES/SHMS/SCALERS/pscalers.template
+++ b/TEMPLATES/SHMS/SCALERS/pscalers.template
@@ -49,20 +49,12 @@ Estimated Physics Triggers : {(P.Trig.scalerRate - P.HOD_EDTM.scalerRate)*(P.1Mh
Physics Trigger Rate : {(P.Trig.scalerRate - P.HOD_EDTM.scalerRate)/1000.:%.3f} kHz
Accepted Physics Triggers : {physics_accepted.npassed}
-
-All triggers : {all_trigs.npassed}
-Trig : {P.Trig.scaler:%8d} [{P.Trig.scalerRate:%7.1f}]
-Rate : {P.Trig.scalerRate/1000.:%7.3f} kHz
-
-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} %
-
*******************
* Hardware Scalers
*******************
*HODOSCOPES*
-Scint Counts Rate
+Scint Counts Rate
P1X1+: {P.hod.1x1.posScaler:%8d} [ {P.hod.1x1.posScalerRate:%7.1f} ]
P1X2+: {P.hod.1x2.posScaler:%8d} [ {P.hod.1x2.posScalerRate:%7.1f} ]
P1X3+: {P.hod.1x3.posScaler:%8d} [ {P.hod.1x3.posScalerRate:%7.1f} ]
@@ -199,10 +191,9 @@ P2X: {P.S2X.scaler:%8d} [ {P.S2X.scalerRate:%7.1f} ] AND between + and - sides o
P2Y: {P.S2Y.scaler:%8d} [ {P.S2Y.scalerRate:%7.1f} ] AND between + and - sides of P2Y
P1XP1Y: {P.S1XS1Y.scaler:%8d} [{P.S1XS1Y.scalerRate:%7.1f}] AND between P1X and P1Y planes
-P2XP2Y: {P.S2XS2Y.scaler:%8d} [{P.S2XS2Y.scalerRate:%7.1f}] OR between P2X and P2Y planes (just for kpp, will be AND)
-
-*AEROGEL AND PRESHOWER*
-AERSUM: {P.AERSUM.scaler:%8d} [{P.AERSUM.scalerRate:%7.1f}] Sum of aerogel signals that pass a discriminator threshold
-PSHWRLO:{P.PSHWRLO.scaler:%8d} [{P.PSHWRLO.scalerRate:%7.1f}] Sum of preshower signals that pass a discriminator threshold
-PSHWRHI:{P.PSHWRHI.scaler:%8d} [{P.PSHWRHI.scalerRate:%7.1f}] Sum of preshower signals that pass a slightly higher discriminator threshold
+P2XP2Y: {P.S2XS2Y.scaler:%8d} [{P.S2XS2Y.scalerRate:%7.1f}] OR between P2X and P2Y planes (just for kpp, will be AND)
+*Aerogel, NGC, HGC*
+AERO: {P.AERO.scaler:%8d} [{P.AERO.scalerRate:%7.1f}]
+HGC:{P.HGC.scaler:%8d} [{P.HGC.scalerRate:%7.1f}]
+NGC:{P.NGC.scaler:%8d} [{P.NGC.scalerRate:%7.1f}]
diff --git a/TEMPLATES/SHMS/STACK/pstackana.template b/TEMPLATES/SHMS/STACK/pstackana.template
index 1d928575f1afe55567448f84da2402d56ff511ec..4a597df5fbb01d2b23277cd6741fee7d7fd216ff 100644
--- a/TEMPLATES/SHMS/STACK/pstackana.template
+++ b/TEMPLATES/SHMS/STACK/pstackana.template
@@ -56,7 +56,7 @@ shmsShowerArray Counts: {P.cal.stat_trksum_array} eff : {P.cal.stat_hitsum_
******************************
* SHMS TRACKING EFFICIENCIES *
******************************
-ptrig : {shmscoin_event.npassed}
+ptrig : {shms_trigs.npassed}
phitslt = passed hits/cham : {shmsHitsLt.npassed}
phitsplanes = +planes >= 5/6 : {shmsHitsPlanes.npassed}
phitsplanessps = + sps : {pSpacePoints.npassed}
@@ -99,23 +99,23 @@ shmsDC2_1hit_v2: {shmsDC2_1hit_v2.npassed} ;eff:
shmsDC2_1hit_x2: {shmsDC2_1hit_x2.npassed} ;eff:
"Good" means one or two hits per dc plane.
-goodHDC1x1: {goodHDC1x1.npassed} eff : {goodHDC1x1.npassed/(shmscoin_event.npassed+.0001):%5.3f}
-goodHDC1u2: {goodHDC1u2.npassed} eff : {goodHDC1u2.npassed/(shmscoin_event.npassed+.0001):%5.3f}
-goodHDC1u1: {goodHDC1u1.npassed} eff : {goodHDC1u1.npassed/(shmscoin_event.npassed+.0001):%5.3f}
-goodHDC1v1: {goodHDC1v1.npassed} eff : {goodHDC1v1.npassed/(shmscoin_event.npassed+.0001):%5.3f}
-goodHDC1v2: {goodHDC1v2.npassed} eff : {goodHDC1v2.npassed/(shmscoin_event.npassed+.0001):%5.3f}
-goodHDC1x2: {goodHDC1x2.npassed} eff : {goodHDC1x2.npassed/(shmscoin_event.npassed+.0001):%5.3f}
-
-goodHDC2x1: {goodHDC2x1.npassed} eff : {goodHDC2x1.npassed/(shmscoin_event.npassed+.0001):%5.3f}
-goodHDC2u2: {goodHDC2u2.npassed} eff : {goodHDC2u2.npassed/(shmscoin_event.npassed+.0001):%5.3f}
-goodHDC2u1: {goodHDC2u1.npassed} eff : {goodHDC2u1.npassed/(shmscoin_event.npassed+.0001):%5.3f}
-goodHDC2v1: {goodHDC2v1.npassed} eff : {goodHDC2v1.npassed/(shmscoin_event.npassed+.0001):%5.3f}
-goodHDC2v2: {goodHDC2v2.npassed} eff : {goodHDC2v2.npassed/(shmscoin_event.npassed+.0001):%5.3f}
-goodHDC2x2: {goodHDC2x2.npassed} eff : {goodHDC2x2.npassed/(shmscoin_event.npassed+.0001):%5.3f}
-
-goodHDC1: {goodHDC1.npassed} eff : {goodHDC1.npassed/(shmscoin_event.npassed+.0001):%5.3f}
-goodHDC2: {goodHDC2.npassed} eff : {goodHDC2.npassed/(shmscoin_event.npassed+.0001):%5.3f}
-bothgood: {bothGood.npassed} eff : {bothGood.npassed/(shmscoin_event.npassed+.0001):%5.3f}
+goodHDC1x1: {goodHDC1x1.npassed} eff : {goodHDC1x1.npassed/(shms_trigs.npassed+.0001):%5.3f}
+goodHDC1u2: {goodHDC1u2.npassed} eff : {goodHDC1u2.npassed/(shms_trigs.npassed+.0001):%5.3f}
+goodHDC1u1: {goodHDC1u1.npassed} eff : {goodHDC1u1.npassed/(shms_trigs.npassed+.0001):%5.3f}
+goodHDC1v1: {goodHDC1v1.npassed} eff : {goodHDC1v1.npassed/(shms_trigs.npassed+.0001):%5.3f}
+goodHDC1v2: {goodHDC1v2.npassed} eff : {goodHDC1v2.npassed/(shms_trigs.npassed+.0001):%5.3f}
+goodHDC1x2: {goodHDC1x2.npassed} eff : {goodHDC1x2.npassed/(shms_trigs.npassed+.0001):%5.3f}
+
+goodHDC2x1: {goodHDC2x1.npassed} eff : {goodHDC2x1.npassed/(shms_trigs.npassed+.0001):%5.3f}
+goodHDC2u2: {goodHDC2u2.npassed} eff : {goodHDC2u2.npassed/(shms_trigs.npassed+.0001):%5.3f}
+goodHDC2u1: {goodHDC2u1.npassed} eff : {goodHDC2u1.npassed/(shms_trigs.npassed+.0001):%5.3f}
+goodHDC2v1: {goodHDC2v1.npassed} eff : {goodHDC2v1.npassed/(shms_trigs.npassed+.0001):%5.3f}
+goodHDC2v2: {goodHDC2v2.npassed} eff : {goodHDC2v2.npassed/(shms_trigs.npassed+.0001):%5.3f}
+goodHDC2x2: {goodHDC2x2.npassed} eff : {goodHDC2x2.npassed/(shms_trigs.npassed+.0001):%5.3f}
+
+goodHDC1: {goodHDC1.npassed} eff : {goodHDC1.npassed/(shms_trigs.npassed+.0001):%5.3f}
+goodHDC2: {goodHDC2.npassed} eff : {goodHDC2.npassed/(shms_trigs.npassed+.0001):%5.3f}
+bothgood: {bothGood.npassed} eff : {bothGood.npassed/(shms_trigs.npassed+.0001):%5.3f}
realhdc1x1: {realhdc1x1.npassed}
realhdc1u2: {realhdc1u2.npassed}
@@ -134,33 +134,33 @@ realhdc2x2: {realhdc2x2.npassed}
**HODOSCOPE**
"Any" means one or more hits per scint plane.
-anyhs1x : {anyhs1x.npassed} eff: {anyhs1x.npassed/(shmscoin_event.npassed+.0001):%5.3f} BAD = ??
-anyhs1y : {anyhs1y.npassed} eff: {anyhs1y.npassed/(shmscoin_event.npassed+.0001):%5.3f}
-anyhs2x : {anyhs2x.npassed} eff: {anyhs2x.npassed/(shmscoin_event.npassed+.0001):%5.3f}
-anyhs2y : {anyhs2y.npassed} eff: {anyhs2y.npassed/(shmscoin_event.npassed+.0001):%5.3f}
+anyhs1x : {anyhs1x.npassed} eff: {anyhs1x.npassed/(shms_trigs.npassed+.0001):%5.3f} BAD = ??
+anyhs1y : {anyhs1y.npassed} eff: {anyhs1y.npassed/(shms_trigs.npassed+.0001):%5.3f}
+anyhs2x : {anyhs2x.npassed} eff: {anyhs2x.npassed/(shms_trigs.npassed+.0001):%5.3f}
+anyhs2y : {anyhs2y.npassed} eff: {anyhs2y.npassed/(shms_trigs.npassed+.0001):%5.3f}
"Good" means one or two hits per scint plane.
-goodps1x : {goodps1x.npassed} eff: {goodps1x.npassed/(shmscoin_event.npassed+.0001):%5.3f} BAD = ??
-goodps1y : {goodps1y.npassed} eff: {goodps1y.npassed/(shmscoin_event.npassed+.0001):%5.3f}
-goodps1 : {goodps1.npassed} eff: {goodps1.npassed/(shmscoin_event.npassed+.0001):%5.3f}
-goodps2x : {goodps2x.npassed} eff: {goodps2x.npassed/(shmscoin_event.npassed+.0001):%5.3f}
-goodps2y : {goodps2y.npassed} eff: {goodps2y.npassed/(shmscoin_event.npassed+.0001):%5.3f}
-goodps2 : {goodps2.npassed} eff: {goodps2.npassed/(shmscoin_event.npassed+.0001):%5.3f}
-goodps1s2: {goodps1s2.npassed} eff: {goodps1s2.npassed/(shmscoin_event.npassed+.0001):%5.3f}
+goodps1x : {goodps1x.npassed} eff: {goodps1x.npassed/(shms_trigs.npassed+.0001):%5.3f} BAD = ??
+goodps1y : {goodps1y.npassed} eff: {goodps1y.npassed/(shms_trigs.npassed+.0001):%5.3f}
+goodps1 : {goodps1.npassed} eff: {goodps1.npassed/(shms_trigs.npassed+.0001):%5.3f}
+goodps2x : {goodps2x.npassed} eff: {goodps2x.npassed/(shms_trigs.npassed+.0001):%5.3f}
+goodps2y : {goodps2y.npassed} eff: {goodps2y.npassed/(shms_trigs.npassed+.0001):%5.3f}
+goodps2 : {goodps2.npassed} eff: {goodps2.npassed/(shms_trigs.npassed+.0001):%5.3f}
+goodps1s2: {goodps1s2.npassed} eff: {goodps1s2.npassed/(shms_trigs.npassed+.0001):%5.3f}
**TRACKING**
-pFoundTrack :{pFoundTrack.npassed} eff: {pFoundTrack.npassed/(shmscoin_event.npassed+.0001):%5.3f} BAD = ??
-pFound1Track :{pFound1Track.npassed} eff: {pFound1Track.npassed/(shmscoin_event.npassed+.0001):%5.3f}
-pFound2Track :{pFound2Track.npassed} eff: {pFound2Track.npassed/(shmscoin_event.npassed+.0001):%5.3f}
-pFound3Track :{pFound3Track.npassed} eff: {pFound3Track.npassed/(shmscoin_event.npassed+.0001):%5.3f}
-pFound4Track :{pFound4Track.npassed} eff: {pFound4Track.npassed/(shmscoin_event.npassed+.0001):%5.3f}
+pFoundTrack :{pFoundTrack.npassed} eff: {pFoundTrack.npassed/(shms_trigs.npassed+.0001):%5.3f} BAD = ??
+pFound1Track :{pFound1Track.npassed} eff: {pFound1Track.npassed/(shms_trigs.npassed+.0001):%5.3f}
+pFound2Track :{pFound2Track.npassed} eff: {pFound2Track.npassed/(shms_trigs.npassed+.0001):%5.3f}
+pFound3Track :{pFound3Track.npassed} eff: {pFound3Track.npassed/(shms_trigs.npassed+.0001):%5.3f}
+pFound4Track :{pFound4Track.npassed} eff: {pFound4Track.npassed/(shms_trigs.npassed+.0001):%5.3f}
-pCleanTrack :{pCleanTrack.npassed} eff: {pCleanTrack.npassed/(shmscoin_event.npassed+.0001):%5.3f} BAD = ??
-1pCleanTrack:{1pCleanTrack.npassed} eff: {1pCleanTrack.npassed/(shmscoin_event.npassed+.0001):%5.3f}
-2pCleanTrack:{2pCleanTrack.npassed} eff: {2pCleanTrack.npassed/(shmscoin_event.npassed+.0001):%5.3f}
-3pCleanTrack:{3pCleanTrack.npassed} eff: {3pCleanTrack.npassed/(shmscoin_event.npassed+.0001):%5.3f}
-4pCleanTrack:{4pCleanTrack.npassed} eff: {4pCleanTrack.npassed/(shmscoin_event.npassed+.0001):%5.3f}
+pCleanTrack :{pCleanTrack.npassed} eff: {pCleanTrack.npassed/(shms_trigs.npassed+.0001):%5.3f} BAD = ??
+1pCleanTrack:{1pCleanTrack.npassed} eff: {1pCleanTrack.npassed/(shms_trigs.npassed+.0001):%5.3f}
+2pCleanTrack:{2pCleanTrack.npassed} eff: {2pCleanTrack.npassed/(shms_trigs.npassed+.0001):%5.3f}
+3pCleanTrack:{3pCleanTrack.npassed} eff: {3pCleanTrack.npassed/(shms_trigs.npassed+.0001):%5.3f}
+4pCleanTrack:{4pCleanTrack.npassed} eff: {4pCleanTrack.npassed/(shms_trigs.npassed+.0001):%5.3f}
**CHERENKOVS AND CAL**
cer_ng_elec : {cer_ng_elec.npassed}
@@ -225,7 +225,7 @@ Efficiencies for calorimeter is the fraction of times block was hit when track
with chisquared/dof < {pstat_cal_maxchisq:%5.1f} came within {pstat_cal_slop:%4.1f} cm of the center.
and scal_npe_sum > 3.0 (hardwired). (is this still true?)
-Events examined = strig = {shmscoin_event.npassed}
+Events examined = strig = {shms_trigs.npassed}
Tracks found = scleantrack = {pCleanTrack.npassed}
Tracks passing chisquared cut = {pstat_cal_numevents:%7d} (fix here)
@@ -239,7 +239,7 @@ Block eff Hits
Efficiencies for hodoscopes is the fraction of times scin. was hit when track
with chisquared/dof < {pstat_maxchisq:%5.1f} came within {pstat_slop:%4.1f} cm of the center.
-Events examined = strig = {shmscoin_event.npassed}
+Events examined = strig = {shms_trigs.npassed}
Tracks found = scleantrack = {pCleanTrack.npassed}
Tracks passing chisquared cut = {pstat_numevents} (fix here)