diff --git a/DEF-files/HMS/SCALERS/hscaler_cuts.def b/DEF-files/HMS/SCALERS/hscaler_cuts.def
index 8044e55049a70f409b2235c42eeba49f0da973de..2bc4a88a8eb4ce5a828b4db7da5084a8fa7ff313 100644
--- a/DEF-files/HMS/SCALERS/hscaler_cuts.def
+++ b/DEF-files/HMS/SCALERS/hscaler_cuts.def
@@ -3,13 +3,7 @@
Block: RawDecode
Pedestal_event g.evtyp == 99
-HMS_trig_1_event g.evtyp == 1
-HMS_trig_2_event g.evtyp == 2
-HMS_trig_3_event g.evtyp == 3
-HMS_trig_4_event g.evtyp == 4
-HMS_trig_5_event g.evtyp == 5
-HMS_trig_6_event g.evtyp == 6
-HMS_event HMS_trig_1_event || HMS_trig_2_event || HMS_trig_3_event || HMS_trig_4_event || HMS_trig_5_event || HMS_trig_6_event
+HMS_event g.evtyp == 2
RawDecode_master 1
@@ -18,7 +12,7 @@ Block: Decode
hms_trigs HMS_event
edtm_accepted T.hms.hEDTM_tdcTime != 0.0
physics_accepted T.hms.hEDTM_tdcTime == 0.0
-triggers_accepted T.hms.hT1_tdcTime == 300.0
+triggers_accepted T.hms.hT1_tdcTime == 200.0
Decode_master HMS_event
@@ -35,4 +29,4 @@ Block: Reconstruct
Reconstruct_master HMS_event
Block: Physics
-Physics_master HMS_event
+Physics_master HMS_event
\ No newline at end of file
diff --git a/DEF-files/SHMS/PRODUCTION/pstackana_production_cuts.def b/DEF-files/SHMS/PRODUCTION/pstackana_production_cuts.def
index 6dfd005867a1f4b296936208d73ef3c0f81479ab..fb9287e05a42fcd94c3f8d145eb10257c53d8dcf 100644
--- a/DEF-files/SHMS/PRODUCTION/pstackana_production_cuts.def
+++ b/DEF-files/SHMS/PRODUCTION/pstackana_production_cuts.def
@@ -3,14 +3,7 @@
Block: RawDecode
Pedestal_event g.evtyp == 99
-
-SHMS_trig_1_event g.evtyp == 1
-SHMS_trig_2_event g.evtyp == 2
-SHMS_trig_3_event g.evtyp == 3
-SHMS_trig_4_event g.evtyp == 4
-SHMS_trig_5_event g.evtyp == 5
-SHMS_trig_6_event g.evtyp == 6
-SHMS_event SHMS_trig_1_event || SHMS_trig_2_event || SHMS_trig_3_event || SHMS_trig_4_event || SHMS_trig_5_event || SHMS_trig_6_event
+SHMS_event g.evtyp == 1
RawDecode_master 1
diff --git a/DEF-files/SHMS/SCALERS/pscaler_cuts.def b/DEF-files/SHMS/SCALERS/pscaler_cuts.def
index 57435c07ab37970834884694246353f2d2dda6c0..bfe576ecc48a743e75204890f3cd8f4983d9ed10 100644
--- a/DEF-files/SHMS/SCALERS/pscaler_cuts.def
+++ b/DEF-files/SHMS/SCALERS/pscaler_cuts.def
@@ -3,7 +3,7 @@
Block: RawDecode
Pedestal_event g.evtyp == 99
-SHMS_event g.evtyp == 7
+SHMS_event g.evtyp == 1
RawDecode_master 1
@@ -29,4 +29,4 @@ Block: Reconstruct
Reconstruct_master SHMS_event
Block: Physics
-Physics_master SHMS_event
+Physics_master SHMS_event
\ No newline at end of file
diff --git a/SCRIPTS/HMS/SCALERS/replay_hms_scalers.C b/SCRIPTS/HMS/SCALERS/replay_hms_scalers.C
index cde7cf9a25acc1795836f7d6cd1b69cba9833705..004368953c9ee532823cf12d692d89cfed1b9331 100644
--- a/SCRIPTS/HMS/SCALERS/replay_hms_scalers.C
+++ b/SCRIPTS/HMS/SCALERS/replay_hms_scalers.C
@@ -54,7 +54,7 @@ void replay_hms_scalers(Int_t RunNumber=0, Int_t MaxEvent=0) {
gHaEvtHandlers->Add(hcepics);
// Add event handler for scaler events
THcScalerEvtHandler *hscaler = new THcScalerEvtHandler("H","Hall C scaler event type 129");
- hscaler->AddEvtType(1);
+ hscaler->AddEvtType(129);
hscaler->SetUseFirstEvent(kTRUE);
gHaEvtHandlers->Add(hscaler);
// Add event handler for DAQ configuration event
diff --git a/SCRIPTS/SHMS/SCALERS/replay_shms_scalers.C b/SCRIPTS/SHMS/SCALERS/replay_shms_scalers.C
index db39970b88b627a226bc5ae88dfbc93a5c0f0cf0..d9d1435bda686e22cab6a49c87741ef814073bb0 100644
--- a/SCRIPTS/SHMS/SCALERS/replay_shms_scalers.C
+++ b/SCRIPTS/SHMS/SCALERS/replay_shms_scalers.C
@@ -54,7 +54,7 @@ void replay_shms_scalers (Int_t RunNumber = 0, Int_t MaxEvent = 0) {
gHaEvtHandlers->Add(hcepics);
// Add handler for scaler events
THcScalerEvtHandler *pscaler = new THcScalerEvtHandler("P","Hall C scaler event type 1");
- pscaler->AddEvtType(1);
+ pscaler->AddEvtType(129);
pscaler->SetUseFirstEvent(kTRUE);
gHaEvtHandlers->Add(pscaler);
// Add event handler for DAQ configuration event
diff --git a/TEMPLATES/SHMS/PRODUCTION/pstackana_production.template b/TEMPLATES/SHMS/PRODUCTION/pstackana_production.template
index b28ac12e4fea318d039a0171013c541903825cac..8031d34d7b935c507a26907f9aeba05bc0d973ae 100644
--- a/TEMPLATES/SHMS/PRODUCTION/pstackana_production.template
+++ b/TEMPLATES/SHMS/PRODUCTION/pstackana_production.template
@@ -23,15 +23,15 @@ Unser Counts: {P.Unser.scalerCut} Total Charge: {P.Unser.scalerChargeCut:%.3f}
SHMS triggers : {shms_trigs.npassed}
-Rate : {P.Trig.scalerRate/1000.:%7.3f} kHz
-Live Time : {(shms_trigs.npassed / P.Trig.scaler)*100.0:%3.2f} %
-Dead Time : {100.0 - (shms_trigs.npassed / P.Trig.scaler)*100.0:%3.2f} %
+Rate : {P.pTREF3.scalerRate/1000.:%7.3f} kHz
+Live Time : {(shms_trigs.npassed / P.pTREF3.scaler)*100.0:%3.2f} %
+Dead Time : {100.0 - (shms_trigs.npassed / P.pTREF3.scaler)*100.0:%3.2f} %
**DRIFT CHAMBER**
-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}
-good_S1_S2X_time Counts: {good_S1_S2X_time.npassed} / all_trigs : {good_S1_S2X_time.npassed / all_trigs.npassed}
+good_S1_time Counts: {good_S1_time.npassed} / shms_trigs : {good_S1_time.npassed / shms_trigs.npassed}
+good_S2X_time Counts: {good_S2X_time.npassed} / shms_trigs : {good_S2X_time.npassed / shms_trigs.npassed}
+good_S1_S2X_time Counts: {good_S1_S2X_time.npassed} / shms_trigs : {good_S1_S2X_time.npassed / shms_trigs.npassed}
Chamber 1 hits > 0 Counts: {shms_ch1_gt0.npassed} / shms_trigs : {shms_ch1_gt0.npassed / shms_trigs.npassed}
Chamber 2 hits > 0 Counts: {shms_ch2_gt0.npassed} / shms_trigs : { shms_ch2_gt0.npassed / shms_trigs.npassed}
@@ -91,23 +91,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/(P.Trig.scaler+.0001):%5.3f}
-goodHDC1u2: {goodHDC1u2.npassed} eff : {goodHDC1u2.npassed/(P.Trig.scaler+.0001):%5.3f}
-goodHDC1u1: {goodHDC1u1.npassed} eff : {goodHDC1u1.npassed/(P.Trig.scaler+.0001):%5.3f}
-goodHDC1v1: {goodHDC1v1.npassed} eff : {goodHDC1v1.npassed/(P.Trig.scaler+.0001):%5.3f}
-goodHDC1v2: {goodHDC1v2.npassed} eff : {goodHDC1v2.npassed/(P.Trig.scaler+.0001):%5.3f}
-goodHDC1x2: {goodHDC1x2.npassed} eff : {goodHDC1x2.npassed/(P.Trig.scaler+.0001):%5.3f}
-
-goodHDC2x1: {goodHDC2x1.npassed} eff : {goodHDC2x1.npassed/(P.Trig.scaler+.0001):%5.3f}
-goodHDC2u2: {goodHDC2u2.npassed} eff : {goodHDC2u2.npassed/(P.Trig.scaler+.0001):%5.3f}
-goodHDC2u1: {goodHDC2u1.npassed} eff : {goodHDC2u1.npassed/(P.Trig.scaler+.0001):%5.3f}
-goodHDC2v1: {goodHDC2v1.npassed} eff : {goodHDC2v1.npassed/(P.Trig.scaler+.0001):%5.3f}
-goodHDC2v2: {goodHDC2v2.npassed} eff : {goodHDC2v2.npassed/(P.Trig.scaler+.0001):%5.3f}
-goodHDC2x2: {goodHDC2x2.npassed} eff : {goodHDC2x2.npassed/(P.Trig.scaler+.0001):%5.3f}
-
-goodHDC1: {goodHDC1.npassed} eff : {goodHDC1.npassed/(P.Trig.scaler+.0001):%5.3f}
-goodHDC2: {goodHDC2.npassed} eff : {goodHDC2.npassed/(P.Trig.scaler+.0001):%5.3f}
-bothgood: {bothGood.npassed} eff : {bothGood.npassed/(P.Trig.scaler+.0001):%5.3f}
+goodHDC1x1: {goodHDC1x1.npassed} eff : {goodHDC1x1.npassed/(P.pTREF3.scaler+.0001):%5.3f}
+goodHDC1u2: {goodHDC1u2.npassed} eff : {goodHDC1u2.npassed/(P.pTREF3.scaler+.0001):%5.3f}
+goodHDC1u1: {goodHDC1u1.npassed} eff : {goodHDC1u1.npassed/(P.pTREF3.scaler+.0001):%5.3f}
+goodHDC1v1: {goodHDC1v1.npassed} eff : {goodHDC1v1.npassed/(P.pTREF3.scaler+.0001):%5.3f}
+goodHDC1v2: {goodHDC1v2.npassed} eff : {goodHDC1v2.npassed/(P.pTREF3.scaler+.0001):%5.3f}
+goodHDC1x2: {goodHDC1x2.npassed} eff : {goodHDC1x2.npassed/(P.pTREF3.scaler+.0001):%5.3f}
+
+goodHDC2x1: {goodHDC2x1.npassed} eff : {goodHDC2x1.npassed/(P.pTREF3.scaler+.0001):%5.3f}
+goodHDC2u2: {goodHDC2u2.npassed} eff : {goodHDC2u2.npassed/(P.pTREF3.scaler+.0001):%5.3f}
+goodHDC2u1: {goodHDC2u1.npassed} eff : {goodHDC2u1.npassed/(P.pTREF3.scaler+.0001):%5.3f}
+goodHDC2v1: {goodHDC2v1.npassed} eff : {goodHDC2v1.npassed/(P.pTREF3.scaler+.0001):%5.3f}
+goodHDC2v2: {goodHDC2v2.npassed} eff : {goodHDC2v2.npassed/(P.pTREF3.scaler+.0001):%5.3f}
+goodHDC2x2: {goodHDC2x2.npassed} eff : {goodHDC2x2.npassed/(P.pTREF3.scaler+.0001):%5.3f}
+
+goodHDC1: {goodHDC1.npassed} eff : {goodHDC1.npassed/(P.pTREF3.scaler+.0001):%5.3f}
+goodHDC2: {goodHDC2.npassed} eff : {goodHDC2.npassed/(P.pTREF3.scaler+.0001):%5.3f}
+bothgood: {bothGood.npassed} eff : {bothGood.npassed/(P.pTREF3.scaler+.0001):%5.3f}
realhdc1x1: {realhdc1x1.npassed}
realhdc1u2: {realhdc1u2.npassed}
@@ -126,19 +126,19 @@ realhdc2x2: {realhdc2x2.npassed}
**HODOSCOPE**
"Any" means one or more hits per scint plane.
-anyhs1x : {anyhs1x.npassed} eff: {anyhs1x.npassed/(P.Trig.scaler+.0001):%5.3f} BAD = ??
-anyhs1y : {anyhs1y.npassed} eff: {anyhs1y.npassed/(P.Trig.scaler+.0001):%5.3f}
-anyhs2x : {anyhs2x.npassed} eff: {anyhs2x.npassed/(P.Trig.scaler+.0001):%5.3f}
-anyhs2y : {anyhs2y.npassed} eff: {anyhs2y.npassed/(P.Trig.scaler+.0001):%5.3f}
+anyhs1x : {anyhs1x.npassed} eff: {anyhs1x.npassed/(P.pTREF3.scaler+.0001):%5.3f} BAD = ??
+anyhs1y : {anyhs1y.npassed} eff: {anyhs1y.npassed/(P.pTREF3.scaler+.0001):%5.3f}
+anyhs2x : {anyhs2x.npassed} eff: {anyhs2x.npassed/(P.pTREF3.scaler+.0001):%5.3f}
+anyhs2y : {anyhs2y.npassed} eff: {anyhs2y.npassed/(P.pTREF3.scaler+.0001):%5.3f}
"Good" means one or two hits per scint plane.
-goodps1x : {goodps1x.npassed} eff: {goodps1x.npassed/(P.Trig.scaler+.0001):%5.3f} BAD = ??
-goodps1y : {goodps1y.npassed} eff: {goodps1y.npassed/(P.Trig.scaler+.0001):%5.3f}
-goodps1 : {goodps1.npassed} eff: {goodps1.npassed/(P.Trig.scaler+.0001):%5.3f}
-goodps2x : {goodps2x.npassed} eff: {goodps2x.npassed/(P.Trig.scaler+.0001):%5.3f}
-goodps2y : {goodps2y.npassed} eff: {goodps2y.npassed/(P.Trig.scaler+.0001):%5.3f}
-goodps2 : {goodps2.npassed} eff: {goodps2.npassed/(P.Trig.scaler+.0001):%5.3f}
-goodps1s2: {goodps1s2.npassed} eff: {goodps1s2.npassed/(P.Trig.scaler+.0001):%5.3f}
+goodps1x : {goodps1x.npassed} eff: {goodps1x.npassed/(P.pTREF3.scaler+.0001):%5.3f} BAD = ??
+goodps1y : {goodps1y.npassed} eff: {goodps1y.npassed/(P.pTREF3.scaler+.0001):%5.3f}
+goodps1 : {goodps1.npassed} eff: {goodps1.npassed/(P.pTREF3.scaler+.0001):%5.3f}
+goodps2x : {goodps2x.npassed} eff: {goodps2x.npassed/(P.pTREF3.scaler+.0001):%5.3f}
+goodps2y : {goodps2y.npassed} eff: {goodps2y.npassed/(P.pTREF3.scaler+.0001):%5.3f}
+goodps2 : {goodps2.npassed} eff: {goodps2.npassed/(P.pTREF3.scaler+.0001):%5.3f}
+goodps1s2: {goodps1s2.npassed} eff: {goodps1s2.npassed/(P.pTREF3.scaler+.0001):%5.3f}
**CHERENKOVS AND CAL**
cer_ng_elec : {cer_ng_elec.npassed}
@@ -308,22 +308,22 @@ P2Y20-
P2Y21-
**TRACKING**
-pFoundTrack :{pFoundTrack.npassed} eff: {pFoundTrack.npassed/(P.Trig.scaler+.0001):%5.3f} BAD = ??
-pFound1Track :{pFound1Track.npassed} eff: {pFound1Track.npassed/(P.Trig.scaler+.0001):%5.3f}
-pFound2Track :{pFound2Track.npassed} eff: {pFound2Track.npassed/(P.Trig.scaler+.0001):%5.3f}
-pFound3Track :{pFound3Track.npassed} eff: {pFound3Track.npassed/(P.Trig.scaler+.0001):%5.3f}
-pFound4Track :{pFound4Track.npassed} eff: {pFound4Track.npassed/(P.Trig.scaler+.0001):%5.3f}
-
-pCleanTrack :{pCleanTrack.npassed} eff: {pCleanTrack.npassed/(P.Trig.scaler+.0001):%5.3f} BAD = ??
-1pCleanTrack:{1pCleanTrack.npassed} eff: {1pCleanTrack.npassed/(P.Trig.scaler+.0001):%5.3f}
-2pCleanTrack:{2pCleanTrack.npassed} eff: {2pCleanTrack.npassed/(P.Trig.scaler+.0001):%5.3f}
-3pCleanTrack:{3pCleanTrack.npassed} eff: {3pCleanTrack.npassed/(P.Trig.scaler+.0001):%5.3f}
-4pCleanTrack:{4pCleanTrack.npassed} eff: {4pCleanTrack.npassed/(P.Trig.scaler+.0001):%5.3f}
+pFoundTrack :{pFoundTrack.npassed} eff: {pFoundTrack.npassed/(P.pTREF3.scaler+.0001):%5.3f} BAD = ??
+pFound1Track :{pFound1Track.npassed} eff: {pFound1Track.npassed/(P.pTREF3.scaler+.0001):%5.3f}
+pFound2Track :{pFound2Track.npassed} eff: {pFound2Track.npassed/(P.pTREF3.scaler+.0001):%5.3f}
+pFound3Track :{pFound3Track.npassed} eff: {pFound3Track.npassed/(P.pTREF3.scaler+.0001):%5.3f}
+pFound4Track :{pFound4Track.npassed} eff: {pFound4Track.npassed/(P.pTREF3.scaler+.0001):%5.3f}
+
+pCleanTrack :{pCleanTrack.npassed} eff: {pCleanTrack.npassed/(P.pTREF3.scaler+.0001):%5.3f} BAD = ??
+1pCleanTrack:{1pCleanTrack.npassed} eff: {1pCleanTrack.npassed/(P.pTREF3.scaler+.0001):%5.3f}
+2pCleanTrack:{2pCleanTrack.npassed} eff: {2pCleanTrack.npassed/(P.pTREF3.scaler+.0001):%5.3f}
+3pCleanTrack:{3pCleanTrack.npassed} eff: {3pCleanTrack.npassed/(P.pTREF3.scaler+.0001):%5.3f}
+4pCleanTrack:{4pCleanTrack.npassed} eff: {4pCleanTrack.npassed/(P.pTREF3.scaler+.0001):%5.3f}
******************************
* SHMS TRACKING EFFICIENCIES *
******************************
-ptrig : {shmscoin_event.npassed}
+ptrig : {SHMS_event.npassed}
phitslt = passed hits/cham : {shmsHitsLt.npassed}
phitsplanes = +planes >= 5/6 : {shmsHitsPlanes.npassed}
phitsplanessps = + sps : {pSpacePoints.npassed}