added 'NO EDTM' cuts to single and coincidence def cuts files: Users will not...

added 'NO EDTM' cuts to single and coincidence def cuts files: Users will not have to cut EDTM events via software, as it is already being done starting from the Decode Method

DEF-files/COIN/PRODUCTION/coin_production_ep_cuts.def

@@ -21,19 +21,22 @@ goodctime         ALL_events        #LOOSE CUT AROUND COINTIME PEAK (3 beam buck
 tightctime        ALL_events        #TIGHT CUT AROUND COINTIME PEAK (1 beam buckets)
 ranctime          ALL_events        #CUT AWAY FROM COINTIME PEAK (4 beam buckets)
 
-Decode_master     ALL_events
+ALL_COIN_NO_EDTM  T.coin.hEDTM_tdcTime==0.0&&T.coin.pEDTM_tdcTime==0.0&&ALL_events
+
+
+Decode_master     ALL_COIN_NO_EDTM
 
 Block: CoarseTracking
-CoarseTracking_master ALL_events
+CoarseTracking_master ALL_COIN_NO_EDTM
 
 Block: CoarseReconstruct
-CoarseReconstruct_master ALL_events
+CoarseReconstruct_master ALL_COIN_NO_EDTM
 
 Block: Tracking
-Tracking_master  ALL_events
+Tracking_master  ALL_COIN_NO_EDTM
 
 Block: Reconstruct
-Reconstruct_master ALL_events
+Reconstruct_master ALL_COIN_NO_EDTM
 
 hcleantrack        H.gtr.index > -1
 pcleantrack        P.gtr.index > -1

DEF-files/COIN/PRODUCTION/coin_production_hElec_pProt_cuts.def

@@ -57,19 +57,21 @@ pcut_good_S1_time         T.coin.p1T_tdcTime > 241 && T.coin.p1T_tdcTime < 243
 pcut_good_S2X_time        T.coin.p2X_tdcTime > 180 && T.coin.p2X_tdcTime < 220
 pcut_good_S1_S2X_time     pcut_good_S1_time && pcut_good_S2X_time
 
-Decode_master     ALL_events
+ALL_COIN_NO_EDTM  T.coin.hEDTM_tdcTime==0.0&&T.coin.pEDTM_tdcTime==0.0&&ALL_events
+
+Decode_master     ALL_COIN_NO_EDTM
 
 Block: CoarseTracking
-CoarseTracking_master ALL_events
+CoarseTracking_master ALL_COIN_NO_EDTM
 
 Block: CoarseReconstruct
-CoarseReconstruct_master ALL_events
+CoarseReconstruct_master ALL_COIN_NO_EDTM
 
 Block: Tracking
-Tracking_master  ALL_events
+Tracking_master  ALL_COIN_NO_EDTM
 
 Block: Reconstruct
-Reconstruct_master ALL_events
+Reconstruct_master ALL_COIN_NO_EDTM
 
 hcleantrack        H.gtr.index > -1
 pcleantrack        P.gtr.index > -1

DEF-files/COIN/PRODUCTION/coin_production_pElec_hProt_cuts.def

@@ -57,19 +57,22 @@ pcut_good_S1_time         T.coin.p1T_tdcTime > 241 && T.coin.p1T_tdcTime < 243
 pcut_good_S2X_time        T.coin.p2X_tdcTime > 180 && T.coin.p2X_tdcTime < 220
 pcut_good_S1_S2X_time     pcut_good_S1_time && pcut_good_S2X_time
 
-Decode_master     ALL_events
+ALL_COIN_NO_EDTM  T.coin.hEDTM_tdcTime==0.0&&T.coin.pEDTM_tdcTime==0.0&&ALL_events
+
+
+Decode_master     ALL_COIN_NO_EDTM
 
 Block: CoarseTracking
-CoarseTracking_master ALL_events
+CoarseTracking_master ALL_COIN_NO_EDTM
 
 Block: CoarseReconstruct
-CoarseReconstruct_master ALL_events
+CoarseReconstruct_master ALL_COIN_NO_EDTM
 
 Block: Tracking
-Tracking_master  ALL_events
+Tracking_master  ALL_COIN_NO_EDTM
 
 Block: Reconstruct
-Reconstruct_master ALL_events
+Reconstruct_master ALL_COIN_NO_EDTM
 
 hcleantrack        H.gtr.index > -1
 pcleantrack        P.gtr.index > -1

DEF-files/HMS/PRODUCTION/hstackana_production_cuts.def

@@ -20,13 +20,14 @@ Block: Decode
 hcut_TRIG1        T.hms.hTRIG1_tdcTimeRaw > 0
 hcut_TRIG2        T.hms.hTRIG2_tdcTimeRaw > 0
 hcut_TRIG3        T.hms.hTRIG3_tdcTimeRaw > 0
-HMS_Pretrig  hcut_TRIG1 || hcut_TRIG2 || hcut_TRIG3
+HMS_Pretrig       hcut_TRIG1 || hcut_TRIG2 || hcut_TRIG3
 
-hms_trigs         HMS_event
+hms_trigs              HMS_event
 hcut_edtm_accepted     T.hms.hEDTM_tdcTime != 0.0
 hcut_physics_accepted  T.hms.hEDTM_tdcTime == 0.0
+ALL_HMS_NO_EDTM        ALL_HMS_events && hcut_physics_accepted
 
-Decode_master     ALL_HMS_events
+Decode_master          ALL_HMS_NO_EDTM
 
 Block: CoarseTracking
 CoarseTracking_master ALL_HMS_events
@@ -121,13 +122,13 @@ hTest1                hmsHitsPlanes && (!hSpacePoints)
 hTest2                hSpacePoints && (!hStubLT)
 
 Block: CoarseReconstruct
-CoarseReconstruct_master ALL_HMS_events
+CoarseReconstruct_master ALL_HMS_NO_EDTM
 
 Block: Tracking
-Tracking_master  ALL_HMS_events
+Tracking_master  ALL_HMS_NO_EDTM
 
 Block: Reconstruct
-Reconstruct_master ALL_HMS_events
+Reconstruct_master ALL_HMS_NO_EDTM
 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
@@ -208,4 +209,4 @@ HMS_hcer_track_fired_tot H.cer.totNumTracksFired>0
 
 
 Block: Physics
-Physics_master ALL_HMS_events
+Physics_master ALL_HMS_NO_EDTM

DEF-files/SHMS/PRODUCTION/pstackana_production_cuts.def

@@ -29,10 +29,13 @@ 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
 pcut_good_S1_S2X_time     pcut_good_S1_time && pcut_good_S2X_time
 
-Decode_master     ALL_events
+ALL_SHMS_NO_EDTM          ALL_events && pcut_physics_accepted
+
+
+Decode_master     ALL_SHMS_NO_EDTM
 
 Block: CoarseTracking
-CoarseTracking_master ALL_events
+CoarseTracking_master ALL_SHMS_NO_EDTM
 
 # Add cuts to stricter times and apply them to drift distances 
 pcut_time_cut1      P.dc.1u1.time > 0 && P.dc.1u1.time < 250
@@ -148,13 +151,13 @@ pTest1     shmsHitsPlanes && (!pSpacePoints)
 pTest2	   pSpacePoints && (!pStubLT)
 
 Block: CoarseReconstruct
-CoarseReconstruct_master ALL_events
+CoarseReconstruct_master ALL_SHMS_NO_EDTM
 
 Block: Tracking
-Tracking_master  ALL_events
+Tracking_master  ALL_SHMS_NO_EDTM
 
 Block: Reconstruct
-Reconstruct_master ALL_events
+Reconstruct_master ALL_SHMS_NO_EDTM
 
 pcut_cer_ng_elec    	  P.ngcer.npeSum > 0.5
 pcut_cer_ng_pi      	  P.ngcer.npeSum <= 0.5
@@ -276,4 +279,4 @@ SHMS_aero_track_matched_tot P.aero.totNumTracksMatched>0
 SHMS_aero_track_fired_tot P.aero.totNumTracksFired>0
 
 Block: Physics
-Physics_master ALL_events
+Physics_master ALL_SHMS_NO_EDTM