Modified files

DEF-files/COIN/SCALERS/coinscaler_cuts.def

@@ -7,10 +7,6 @@ SHMS_event         g.evtyp == 1
 HMS_event          g.evtyp == 2
 COIN_event         g.evtyp >= 4&&g.evtyp<8
 
-SHMS_Pretrig  pTRIG1_ROC2 || pTRIG2_ROC2 || pTRIG3_ROC2
-HMS_Pretrig   pTRIG4_ROC2
-COIN_Pretrig  pTRIG6_ROC2 
-
 RawDecode_master  1
 
 Block: Decode
@@ -35,6 +31,10 @@ SHMS_physics_accepted  T.coin.pEDTM_tdcTime == 0.0
 HMS_edtm_accepted      T.coin.hEDTM_tdcTime != 0.0
 HMS_physics_accepted   T.coin.hEDTM_tdcTime == 0.0
 
+SHMS_Pretrig  pTRIG1_ROC2 || pTRIG2_ROC2 || pTRIG3_ROC2
+HMS_Pretrig   pTRIG4_ROC2
+COIN_Pretrig  pTRIG6_ROC2 
+
 Decode_master     1
 
 Block: CoarseTracking

DEF-files/HMS/PRODUCTION/hstackana_production_cuts.def

@@ -11,6 +11,7 @@ SHMS_COIN_event      g.evtyp == 5
 HMS_COIN_event       g.evtyp == 6 
 COIN_ALL_event       g.evtyp == 7
 ALL_events           SHMS_event || HMS_event || BOTH_SINGLES_event || COIN_ONLY_event || COIN_ALL_event
+ALL_HMS_events       HMS_event || COIN_ONLY_event || HMS_COIN_event || COIN_ALL_event
 
 RawDecode_master  1
 
@@ -25,10 +26,10 @@ hms_trigs         HMS_event
 hcut_edtm_accepted     T.hms.hEDTM_tdcTime != 0.0
 hcut_physics_accepted  T.hms.hEDTM_tdcTime == 0.0
 
-Decode_master     ALL_events
+Decode_master     ALL_HMS_events
 
 Block: CoarseTracking
-CoarseTracking_master ALL_events
+CoarseTracking_master ALL_HMS_events
 
 add cuts to stricter times and apply them to drift distances (HMS 6 GeV Drift Chambers)
 hcut_time_cut1                            H.dc.1x1.time > 0 && H.dc.1x1.time < 250
@@ -120,13 +121,13 @@ hTest1                hmsHitsPlanes && (!hSpacePoints)
 hTest2                hSpacePoints && (!hStubLT)
 
 Block: CoarseReconstruct
-CoarseReconstruct_master ALL_events
+CoarseReconstruct_master ALL_HMS_events
 
 Block: Tracking
-Tracking_master  ALL_events
+Tracking_master  ALL_HMS_events
 
 Block: Reconstruct
-Reconstruct_master ALL_events
+Reconstruct_master ALL_HMS_events
 hcut_cer_pmt1_elec        H.cer.npe[0]>.5
 hcut_cer_pmt2_elec        H.cer.npe[0]>.5
 hcut_cer_elec       	  H.cer.npeSum>.5
@@ -207,4 +208,4 @@ HMS_hcer_track_fired_tot H.cer.totNumTracksFired>0
 
 
 Block: Physics
-Physics_master ALL_events
+Physics_master ALL_HMS_events

TEMPLATES/HMS/SCALERS/hscalers.template

@@ -25,6 +25,10 @@ BCM1 Counts: {H.BCM1.scalerCut} 	Total Charge: {H.BCM1.scalerChargeCut:%.3f} uC
 BCM2 Counts: {H.BCM2.scalerCut} 	Total Charge: {H.BCM2.scalerChargeCut:%.3f} uC
 Unser Counts: {H.Unser.scalerCut} 	Total Charge: {H.Unser.scalerChargeCut:%.3f} uC
 
+BCM1 Current: {H.BCM1.scalerChargeCut/H.1Mhz.scalerTimeCut:%.3f} uA		  
+BCM2 Current: {H.BCM2.scalerChargeCut/H.1Mhz.scalerTimeCut:%.3f} uA	
+
+
 ********************
 * DAQ Configuration
 ********************
@@ -96,6 +100,13 @@ hTRIG4 :  	{H.hTRIG4.scaler} 	[ {(H.hTRIG4.scaler/H.1Mhz.scalerTime)/1000.:%.3f}
 hTRIG5 :  	{H.hTRIG5.scaler} 	[ {(H.hTRIG5.scaler/H.1Mhz.scalerTime)/1000.:%.3f} kHz ]
 hTRIG6 :  	{H.hTRIG6.scaler} 	[ {(H.hTRIG6.scaler/H.1Mhz.scalerTime)/1000.:%.3f} kHz ]
 
+hTRIG1_cut :  	{H.hTRIG1.scalerCut} 	[ {(H.hTRIG1.scaler/H.1Mhz.scalerTime)/1000.:%.3f} kHz ]
+hTRIG2_cut :  	{H.hTRIG2.scalerCut} 	[ {(H.hTRIG2.scaler/H.1Mhz.scalerTime)/1000.:%.3f} kHz ]
+hTRIG3_cut :  	{H.hTRIG3.scalerCut} 	[ {(H.hTRIG3.scaler/H.1Mhz.scalerTime)/1000.:%.3f} kHz ]
+hTRIG4_cut :  	{H.hTRIG4.scalerCut} 	[ {(H.hTRIG4.scaler/H.1Mhz.scalerTime)/1000.:%.3f} kHz ]
+hTRIG5_cut :  	{H.hTRIG5.scalerCut} 	[ {(H.hTRIG5.scaler/H.1Mhz.scalerTime)/1000.:%.3f} kHz ]
+hTRIG6_cut :  	{H.hTRIG6.scalerCut} 	[ {(H.hTRIG6.scaler/H.1Mhz.scalerTime)/1000.:%.3f} kHz ]
+
 =:=:=:=:
 = EDTM
 =:=:=:=:

TEMPLATES/SHMS/SCALERS/pscalers.template

@@ -25,6 +25,9 @@ BCM1 Counts: {P.BCM1.scalerCut} 	Total Charge: {P.BCM1.scalerChargeCut:%.3f} uC
 BCM2 Counts: {P.BCM2.scalerCut} 	Total Charge: {P.BCM2.scalerChargeCut:%.3f} uC
 Unser Counts: {P.Unser.scalerCut} 	Total Charge: {P.Unser.scalerChargeCut:%.3f} uC
 
+BCM1 Current: {P.BCM1.scalerChargeCut/P.1Mhz.scalerTimeCut:%.3f} uA		  
+BCM2 Current: {P.BCM2.scalerChargeCut/P.1Mhz.scalerTimeCut:%.3f} uA	
+
 ********************
 * DAQ Configuration
 ********************
@@ -96,6 +99,13 @@ pTRIG4 :  	{P.pTRIG4.scaler} 	[ {(P.pTRIG4.scaler/P.1Mhz.scalerTime)/1000.:%.3f}
 pTRIG5 :  	{P.pTRIG5.scaler} 	[ {(P.pTRIG5.scaler/P.1Mhz.scalerTime)/1000.:%.3f} kHz ]
 pTRIG6 :  	{P.pTRIG6.scaler} 	[ {(P.pTRIG6.scaler/P.1Mhz.scalerTime)/1000.:%.3f} kHz ]
 
+pTRIG1_cut :  	{P.pTRIG1.scalerCut} 	[ {(P.pTRIG1.scaler/P.1Mhz.scalerTime)/1000.:%.3f} kHz ]
+pTRIG2_cut :  	{P.pTRIG2.scalerCut} 	[ {(P.pTRIG2.scaler/P.1Mhz.scalerTime)/1000.:%.3f} kHz ]
+pTRIG3_cut :  	{P.pTRIG3.scalerCut} 	[ {(P.pTRIG3.scaler/P.1Mhz.scalerTime)/1000.:%.3f} kHz ]
+pTRIG4_cut :  	{P.pTRIG4.scalerCut} 	[ {(P.pTRIG4.scaler/P.1Mhz.scalerTime)/1000.:%.3f} kHz ]
+pTRIG5_cut :  	{P.pTRIG5.scalerCut} 	[ {(P.pTRIG5.scaler/P.1Mhz.scalerTime)/1000.:%.3f} kHz ]
+pTRIG6_cut :  	{P.pTRIG6.scalerCut} 	[ {(P.pTRIG6.scaler/P.1Mhz.scalerTime)/1000.:%.3f} kHz ]
+
 =:=:=:=:
 = EDTM
 =:=:=:=: