From 323ce1ef6371c1919e77e155254a5dd9a324c2b8 Mon Sep 17 00:00:00 2001
From: Eric Pooser <pooser@jlab.org>
Date: Thu, 31 Aug 2017 08:30:17 -0400
Subject: [PATCH] Raster tweaks (#205)
* Incorporate fast raster DEFfiles into appropriate infrastructure
* Tweak DEFfiles to match previous pull request
---
.../SHMS/PRODUCTION/BLOCK/pblock_vars.def | 1 +
.../SHMS/PRODUCTION/HODO/phodo_histos.def | 3 +-
.../SHMS/PRODUCTION/RASTER/praster_histos.def | 22 +++++++++++++
.../SHMS/PRODUCTION/TRIG/ptrig_histos.def | 25 +--------------
DEF-files/SHMS/PRODUCTION/merge_list.txt | 1 +
.../SHMS/PRODUCTION/pstackana_production.def | 31 ++++++++++---------
6 files changed, 42 insertions(+), 41 deletions(-)
create mode 100644 DEF-files/SHMS/PRODUCTION/RASTER/praster_histos.def
diff --git a/DEF-files/SHMS/PRODUCTION/BLOCK/pblock_vars.def b/DEF-files/SHMS/PRODUCTION/BLOCK/pblock_vars.def
index c8a1c03e..809e674c 100644
--- a/DEF-files/SHMS/PRODUCTION/BLOCK/pblock_vars.def
+++ b/DEF-files/SHMS/PRODUCTION/BLOCK/pblock_vars.def
@@ -12,3 +12,4 @@ block P.aero.*
block P.cal.*
block P.gtr.*
block P.kin.*
+block P.rb.*
diff --git a/DEF-files/SHMS/PRODUCTION/HODO/phodo_histos.def b/DEF-files/SHMS/PRODUCTION/HODO/phodo_histos.def
index 8e99e5aa..f74d4284 100644
--- a/DEF-files/SHMS/PRODUCTION/HODO/phodo_histos.def
+++ b/DEF-files/SHMS/PRODUCTION/HODO/phodo_histos.def
@@ -174,5 +174,4 @@ TH1F phodo_beta_notrack 'SHMS Hodo Calculated Beta Without Track Info; Beta; Num
TH1F phodo_beta 'SHMS Hodo Beta; Beta; Number of Entries / 0.02' P.hod.beta 100 0 2.0 P.hod.beta>0.0
TH1F phodo_fpHitsTime 'SHMS Hodo Focal Plane Time; Focal Plane Time (ns); Number of Entries / 1 ns' P.hod.fpHitsTime 90 0 90
TH1F phodo_starttime 'SHMS Hodo Start Time; Start Time (ns); Number of Entries / 1ns' P.hod.starttime 90 0 90
-TH1F phodo_good_startime 'SHMS Hodo Good Start Time (ns); Good Start Time (ns); Number of Entries / 1ns' P.hod.goodstarttime 90 0 90
-TH2F phodo_xhod_vs_yhod 'SHMS Hodo Projected X vs. Y; Y_hodo(cm) / 1mm; X_hodo(cm) / 1mm' P.hod.y_hodo P.hod.x_hodo 1000 -50 50 1000 -50 50
\ No newline at end of file
+TH1F phodo_good_startime 'SHMS Hodo Good Start Time (ns); Good Start Time (ns); Number of Entries / 1ns' P.hod.goodstarttime 90 0 90
\ No newline at end of file
diff --git a/DEF-files/SHMS/PRODUCTION/RASTER/praster_histos.def b/DEF-files/SHMS/PRODUCTION/RASTER/praster_histos.def
new file mode 100644
index 00000000..6edae7a1
--- /dev/null
+++ b/DEF-files/SHMS/PRODUCTION/RASTER/praster_histos.def
@@ -0,0 +1,22 @@
+#*************
+# Fast Raster
+#*************
+
+# Assume FADC range is set to 1V and the integration is 25 channels
+# Offset in the FADC is about 0.122V or 500 channels.
+
+formula FRXA_V P.rb.raster.frxaRawAdc*(1./4096.)/25.
+formula FRXB_V P.rb.raster.frxbRawAdc*(1./4096.)/25.
+formula FRYA_V P.rb.raster.fryaRawAdc*(1./4096.)/25.
+formula FRYB_V P.rb.raster.frybRawAdc*(1./4096.)/25.
+
+TH1F pFRXA 'SHMS FRXA; FRXA RAW ADC (chan); Counts' P.rb.raster.frxaRawAdc 1000 0 100000
+TH1F pFRXA_V 'SHMS FRXA; FRXA RAW ADC (Volts); Counts' FRXA_V 1000 0 1.0
+TH1F pFRXB 'SHMS FRXB; FRXB RAW ADC (chan); Counts' P.rb.raster.frxbRawAdc 1000 0 100000
+TH1F pFRXB_V 'SHMS FRXB; FRXB RAW ADC (Volts); Counts' FRXB_V 1000 0 1.0
+TH1F pFRYA 'SHMS FRYA; FRYA RAW ADC (chan); Counts' P.rb.raster.fryaRawAdc 1000 0 100000
+TH1F pFRYA_V 'SHMS FRYA; FRYA RAW ADC (Volts); Counts' FRYA_V 1000 0 1.0
+TH1F pFRYB 'SHMS FRYB; FRYB RAW ADC (chan); Counts' P.rb.raster.frybRawAdc 1000 0 100000
+TH1F pFRYB_V 'SHMS FRYB; FRYB RAW ADC (Volts); Counts' FRYB_V 1000 0 1.0
+TH2F pFRA_XvsY 'HMSFRA_XvsY; FRXA RAW ADC (Volts); FRYA RAW ADC (Volts)' FRXA_V FRYA_V 1000 0 1.0 1000 0 1.0
+TH2F pFRB_XvsY 'HMSFRB_XvsY; FRXB RAW ADC (Volts); FRYB RAW ADC (Volts)' FRXB_V FRYB_V 1000 0 1.0 1000 0 1.0
diff --git a/DEF-files/SHMS/PRODUCTION/TRIG/ptrig_histos.def b/DEF-files/SHMS/PRODUCTION/TRIG/ptrig_histos.def
index a045cba2..44a67ad0 100644
--- a/DEF-files/SHMS/PRODUCTION/TRIG/ptrig_histos.def
+++ b/DEF-files/SHMS/PRODUCTION/TRIG/ptrig_histos.def
@@ -64,27 +64,4 @@ TH1F ptrig_pdc_ref6 'SHMS DC Reference Time Slot 11 Channel 47; Raw TDC Time (T
TH1F ptrig_pdc_ref7 'SHMS DC Reference Time Slot 12 Channel 47; Raw TDC Time (TDC Clicks); Counts / 10 TDC Clicks' T.shms.pDCREF7_tdcTime 200 12000 14000
TH1F ptrig_pdc_ref8 'SHMS DC Reference Time Slot 13 Channel 47; Raw TDC Time (TDC Clicks); Counts / 10 TDC Clicks' T.shms.pDCREF8_tdcTime 200 12000 14000
TH1F ptrig_pdc_ref9 'SHMS DC Reference Time Slot 14 Channel 15; Raw TDC Time (TDC Clicks); Counts / 10 TDC Clicks' T.shms.pDCREF9_tdcTime 200 12000 14000
-TH1F ptrig_pdc_ref10 'SHMS DC Reference Time Slot 15 Channel 47; Raw TDC Time (TDC Clicks); Counts / 10 TDC Clicks' T.shms.pDCREF10_tdcTime 200 12000 14000
-
-#-------------
-# Fast Raster
-#-------------
-
-# Assume FADC range is set to 1V and the integration is 25 channels
-# Offset in the FADC is about 0.122V or 500 channels.
-
-formula FRXA_V T.shms.pFRXA_adcPulseIntRaw*(1./4096.)/25.
-formula FRXB_V T.shms.pFRXB_adcPulseIntRaw*(1./4096.)/25.
-formula FRYA_V T.shms.pFRYA_adcPulseIntRaw*(1./4096.)/25.
-formula FRYB_V T.shms.pFRYB_adcPulseIntRaw*(1./4096.)/25.
-
-TH1F pFRXA 'SHMS FRXA; FRXA RAW ADC (chan); Counts' T.shms.pFRXA_adcPulseIntRaw 1000 0 100000
-TH1F pFRXA_V 'SHMS FRXA; FRXA RAW ADC (Volts); Counts' FRXA_V 1000 0 1.0
-TH1F pFRXB 'SHMS FRXB; FRXB RAW ADC (chan); Counts' T.shms.pFRXB_adcPulseIntRaw 1000 0 100000
-TH1F pFRXB_V 'SHMS FRXB; FRXB RAW ADC (Volts); Counts' FRXB_V 1000 0 1.0
-TH1F pFRYA 'SHMS FRYA; FRYA RAW ADC (chan); Counts' T.shms.pFRYA_adcPulseIntRaw 1000 0 100000
-TH1F pFRYA_V 'SHMS FRYA; FRYA RAW ADC (Volts); Counts' FRYA_V 1000 0 1.0
-TH1F pFRYB 'SHMS FRYB; FRYB RAW ADC (chan); Counts' T.shms.pFRYB_adcPulseIntRaw 1000 0 100000
-TH1F pFRYB_V 'SHMS FRYB; FRYB RAW ADC (Volts); Counts' FRYB_V 1000 0 1.0
-TH2F pFRA_XvsY 'HMSFRA_XvsY; FRXA RAW ADC (Volts); FRYA RAW ADC (Volts)' FRXA_V FRYA_V 1000 0 1.0 1000 0 1.0
-TH2F pFRB_XvsY 'HMSFRB_XvsY; FRXB RAW ADC (Volts); FRYB RAW ADC (Volts)' FRXB_V FRYB_V 1000 0 1.0 1000 0 1.0
\ No newline at end of file
+TH1F ptrig_pdc_ref10 'SHMS DC Reference Time Slot 15 Channel 47; Raw TDC Time (TDC Clicks); Counts / 10 TDC Clicks' T.shms.pDCREF10_tdcTime 200 12000 14000
\ No newline at end of file
diff --git a/DEF-files/SHMS/PRODUCTION/merge_list.txt b/DEF-files/SHMS/PRODUCTION/merge_list.txt
index b0cf1308..823d9ad1 100644
--- a/DEF-files/SHMS/PRODUCTION/merge_list.txt
+++ b/DEF-files/SHMS/PRODUCTION/merge_list.txt
@@ -7,4 +7,5 @@ AERO/paero_histos.def
CAL/pcal_histos.def
TRIG/ptrig_histos.def
KIN/pkin_histos.def
+RASTER/praster_histos.def
EPICS/pepics_vars.def
diff --git a/DEF-files/SHMS/PRODUCTION/pstackana_production.def b/DEF-files/SHMS/PRODUCTION/pstackana_production.def
index 99be4f2a..af1205ff 100644
--- a/DEF-files/SHMS/PRODUCTION/pstackana_production.def
+++ b/DEF-files/SHMS/PRODUCTION/pstackana_production.def
@@ -661,9 +661,22 @@ TH1F ptrig_pdc_ref8 'SHMS DC Reference Time Slot 13 Channel 47; Raw TDC Time (T
TH1F ptrig_pdc_ref9 'SHMS DC Reference Time Slot 14 Channel 15; Raw TDC Time (TDC Clicks); Counts / 10 TDC Clicks' T.shms.pDCREF9_tdcTime 200 12000 14000
TH1F ptrig_pdc_ref10 'SHMS DC Reference Time Slot 15 Channel 47; Raw TDC Time (TDC Clicks); Counts / 10 TDC Clicks' T.shms.pDCREF10_tdcTime 200 12000 14000
-#-------------
+
+#*****************************************
+# SHMS Single Arm Primary (Scattered Beam)
+# Kinematic Quantities
+#*****************************************
+
+TH1F pkin_q2 'SHMS Q2; Q2 (GeV^{2}); Number of Entries / 0.050 GeV^{2}' P.kin.Q2 100 0 5
+TH1F pkin_omega 'SHMS Omega; E_{beam} - E_{scat} (GeV); Number of Entries / 0.050 GeV' P.kin.omega 100 0 5
+TH1F pkin_w2 'SHMS W2; W2 (GeV^{2}); Number of Entries / 0.100 GeV^{2}' P.kin.W2 100 0 10
+TH1F pkin_w 'SHMS W; W (GeV); Number of Entries / 0.050 GeV' P.kin.W 100 0 5
+TH1F pkin_theta 'SHMS Scattering Angle Theta; SHMS Scattering Angle (deg); Number of Entries / 0.06 deg' P.kin.scat_ang_deg 100 12 18
+
+
+#*************
# Fast Raster
-#-------------
+#*************
# Assume FADC range is set to 1V and the integration is 25 channels
# Offset in the FADC is about 0.122V or 500 channels.
@@ -685,18 +698,6 @@ TH2F pFRA_XvsY 'HMSFRA_XvsY; FRXA RAW ADC (Volts); FRYA RAW ADC (Volts)' FRXA_V
TH2F pFRB_XvsY 'HMSFRB_XvsY; FRXB RAW ADC (Volts); FRYB RAW ADC (Volts)' FRXB_V FRYB_V 1000 0 1.0 1000 0 1.0
-#*****************************************
-# SHMS Single Arm Primary (Scattered Beam)
-# Kinematic Quantities
-#*****************************************
-
-TH1F pkin_q2 'SHMS Q2; Q2 (GeV^{2}); Number of Entries / 0.050 GeV^{2}' P.kin.Q2 100 0 5
-TH1F pkin_omega 'SHMS Omega; E_{beam} - E_{scat} (GeV); Number of Entries / 0.050 GeV' P.kin.omega 100 0 5
-TH1F pkin_w2 'SHMS W2; W2 (GeV^{2}); Number of Entries / 0.100 GeV^{2}' P.kin.W2 100 0 10
-TH1F pkin_w 'SHMS W; W (GeV); Number of Entries / 0.050 GeV' P.kin.W 100 0 5
-TH1F pkin_theta 'SHMS Scattering Angle Theta; SHMS Scattering Angle (deg); Number of Entries / 0.06 deg' P.kin.scat_ang_deg 100 12 18
-
-
#******************
# EPICS VARIABLES *
#******************
@@ -711,4 +712,4 @@ iunser
itov3out
itov4out
-end epics
+end epics
\ No newline at end of file
--
GitLab