From 34be3263cfa42d0cf10faefe42105caf7932b777 Mon Sep 17 00:00:00 2001 From: Cdaq Account <cdaq@cdaql1.jlab.org> Date: Wed, 8 Feb 2017 13:15:28 -0500 Subject: [PATCH] Update Parameter files Modified standard.kinmatics to set ptheta_lab and ppcentral Modified pcal.param to eliminate stuff left over from when used in standalone Modified shmsflags.param to eliminate ppcentral and ptheta_lab which should be set in standard.kinematics Modified phodo.param to have better time offsets and set cosmicflag. --- DBASE/standard.kinematics | 14 +++++++------- PARAM/SHMS/CAL/pcal.param | 16 ---------------- PARAM/SHMS/GEN/shmsflags.param | 10 ++++------ PARAM/SHMS/HODO/phodo.param | 3 ++- 4 files changed, 13 insertions(+), 30 deletions(-) diff --git a/DBASE/standard.kinematics b/DBASE/standard.kinematics index 332dde9d..defaf2c4 100644 --- a/DBASE/standard.kinematics +++ b/DBASE/standard.kinematics @@ -1,9 +1,9 @@ 1-99999 -gpbeam=999 -gtarg_num = 999 -htheta_lab = 999 -stheta_lab = 999 -hpcentral = 999 -spcentral = 999 +gpbeam=6. +gtarg_num = 1 +htheta_lab = 15. +ptheta_lab = 15. +hpcentral = 2. +ppcentral = 2. hpartmass = 0.00051099 -spartmass = 0.00051099 +ppartmass = 0.00051099 diff --git a/PARAM/SHMS/CAL/pcal.param b/PARAM/SHMS/CAL/pcal.param index e9a664e0..de0a7f57 100644 --- a/PARAM/SHMS/CAL/pcal.param +++ b/PARAM/SHMS/CAL/pcal.param @@ -62,19 +62,3 @@ pcal_neg_gain_cor=1.0,1.0,1.0,1.0,1.0,1.0,1.0,1.0,1.0,1.0,1.0,1.0,1.0,1.0 pcal_min_peds = 500 -; Parameters we need to keep THcHallCSpectrometer Happy -p_recon_coeff_filename = "" -ptheta_offset = 0.0 -pphi_offset = 0.0 -pdelta_offset = 0.0 -pthetacentral_offset = 0.0 -p_oopcentral_offset = 0.0 -ppcentral_offset = 0.0 -ppcentral = 0.0 -ptheta_lab = 0.0 -ppartmass = 0.139 - -; "Hodoscope" parameters -; Not used, but to keep THcTestPaddles happy -pref_offset = 0 -pref_nsperchan = 0.1 \ No newline at end of file diff --git a/PARAM/SHMS/GEN/shmsflags.param b/PARAM/SHMS/GEN/shmsflags.param index 56ef41f5..78493f50 100644 --- a/PARAM/SHMS/GEN/shmsflags.param +++ b/PARAM/SHMS/GEN/shmsflags.param @@ -1,6 +1,6 @@ -; The hdelta_offset,htheta_offset,hphi_offset effect the -; reconstructed target quantities. Used in h_targ_trans.f +; The pdelta_offset,ptheta_offset,pphi_offset effect the +; reconstructed target quantities. ; For transport x is in the dispersive direction with + down ; y is in the horizontal + towards small angles. ; z is along the central optics axis. @@ -8,7 +8,7 @@ ; but for unknown reasons the yp offset is named htheta_offset ; and the xp offset is named hphi_offset ; Do not to change these values, since these are the zero order -; CMOP matrix elements. If you do change then your hms sieve +; CMOP matrix elements. If you do change then your shms sieve ; plots will be screwed up. pdelta_offset = 0.0 @@ -16,13 +16,11 @@ ptheta_offset = 0.0 pphi_offset = 0.0 ; The following offsets are applied to the central kinematic variables -; in h_apply_offsets.f . These might be modified by an experiment +; These might be modified by an experiment ; after doing calibration with elastic ep. pthetacentral_offset = 0.0 p_oopcentral_offset = 0.0 ppcentral_offset = 0.0 -ppcentral = 0.0 -ptheta_lab = 0.0 diff --git a/PARAM/SHMS/HODO/phodo.param b/PARAM/SHMS/HODO/phodo.param index 000a8899..0d0e6ea7 100644 --- a/PARAM/SHMS/HODO/phodo.param +++ b/PARAM/SHMS/HODO/phodo.param @@ -1,3 +1,4 @@ +pcosmicflag=1 ; for now manually set hte FADC mode ; 1 == Use the pulse int - pulse ped ; 2 == Use the sample integral - known ped @@ -7,7 +8,7 @@ phodo_adc_mode=1 ; ; hhodo_tdc_offset is array of time offsets for all paddles in a plane ; to move the tdc to between 0 and 4000 channels. - phodo_tdc_offset = 1300, 1300, 1300, 1300 + phodo_tdc_offset = 1450, 1550, 1550, 1550 ; pstart_time_center center of allowed time window pstart_time_center = 32. ; hstart_time_slop 1/2 width of time window -- GitLab