Skip to content

Commit

Permalink
Spring 2018 ver19 (#425)
Browse files Browse the repository at this point in the history 
* 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
  • Loading branch information
@hallc-online
hallc-online authored and Eric Pooser committed Mar 12, 2018
1 parent d68f46f commit 85c00d1
Show file tree
Hide file tree
Showing 15 changed files with 1,395 additions and 32 deletions.
683 changes: 675 additions & 8 deletions DBASE/HMS/standard.kinematics
View file

Large diffs are not rendered by default.

685 changes: 684 additions & 1 deletion DBASE/SHMS/standard.kinematics
View file

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions DEF-files/HMS/PRODUCTION/CUTS/hstackana_decode_cuts.def
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
4 changes: 1 addition & 3 deletions DEF-files/HMS/PRODUCTION/CUTS/hstackana_production_cuts.def
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
# Report file for HMS stack

Block: RawDecode
#include "DEF-files/HMS/PRODUCTION/CUTS/hstackana_rawdecode_cuts.def"
RawDecode_master 1
Expand All @@ -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
Expand Down
4 changes: 2 additions & 2 deletions DEF-files/SHMS/PRODUCTION/CUTS/pstackana_decode_cuts.def
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
10 changes: 10 additions & 0 deletions DEF-files/SHMS/PRODUCTION/DC/pdc_vars.def
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
**************************
* Drift Chamber Variables
**************************



block P.dc.x_fp
block P.dc.xp_fp
block P.dc.y_fp
block P.dc.yp_fp
1 change: 1 addition & 0 deletions DEF-files/SHMS/PRODUCTION/pstackana_production.def
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"
4 changes: 3 additions & 1 deletion PARAM/GEN/gscalers.param
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
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
Expand Down
2 changes: 1 addition & 1 deletion PARAM/HMS/GEN/h_reftime_cut.param
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
12 changes: 6 additions & 6 deletions TEMPLATES/HMS/PRODUCTION/hstackana_production.template
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
12 changes: 6 additions & 6 deletions TEMPLATES/SHMS/PRODUCTION/pstackana_production.template
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion UTIL_F2_XEM
Submodule UTIL_F2_XEM updated 3 files
+2 −0 .gitignore
+36 −0 draw_yield.C
+1 −1 get_elecs_hms.C
2 changes: 1 addition & 1 deletion UTIL_OL
Submodule UTIL_OL updated 11 files
+2 −1 .gitignore
+137 −0 ANGLE/get_coda_photos
+12 −12 PED_MON/hms_coin_ped.C
+1 −1 PED_MON/hms_ped.C
+2 −2 PED_MON/shms_coin_ped.C
+1 −1 PED_MON/shms_ped.C
+41 −0 REP_MON/readout_coin_hms.py
+40 −0 REP_MON/readout_coin_shms.py
+1 −1 REP_MON/readout_hms.py
+1 −1 REP_MON/readout_shms.py
+177 −0 SCRIPTS/SHELL/run_coin_shms.sh
1 change: 1 addition & 0 deletions run_coin_hms.sh
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
UTIL_OL/SCRIPTS/SHELL/run_coin_shms.sh
1 change: 1 addition & 0 deletions run_coin_shms.sh
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
UTIL_OL/SCRIPTS/SHELL/run_coin_shms.sh

0 comments on commit 85c00d1

Please sign in to comment.