From 04afd2c6dd1f75742560ac1201d7edf8b24896e5 Mon Sep 17 00:00:00 2001
From: Brendan Sullivan <sullivanbt@ornl.gov>
Date: Mon, 16 Jul 2018 16:47:50 -0400
Subject: [PATCH] Re #22811 set to ignore detector gaps when forcing BVG params
---
scripts/SCD_Reduction/BVGFitTools.py | 13 ++++++++++---
1 file changed, 10 insertions(+), 3 deletions(-)
diff --git a/scripts/SCD_Reduction/BVGFitTools.py b/scripts/SCD_Reduction/BVGFitTools.py
index 740ff8ff28c..4d8b4f7872e 100644
--- a/scripts/SCD_Reduction/BVGFitTools.py
+++ b/scripts/SCD_Reduction/BVGFitTools.py
@@ -491,8 +491,7 @@ def doBVGFit(box, nTheta=200, nPhi=200, zBG=1.96, fracBoxToHistogram=1.0, goodID
if instrumentName == 'CORELLI':
sigX0 = sigX0*2.
sigY0 = sigY0*2.
- print(sigX0, sigY0, '****')
- neigh_length_m = 3
+ neigh_length_m = 5
convBox = 1.0*np.ones([neigh_length_m, neigh_length_m]) / neigh_length_m**2
conv_h = convolve(h, convBox)
H[:,:,0] = conv_h
@@ -521,7 +520,6 @@ def doBVGFit(box, nTheta=200, nPhi=200, zBG=1.96, fracBoxToHistogram=1.0, goodID
fitResults = Fit(Function=m, InputWorkspace='bvgWS', Output='bvgfit',
Minimizer='Levenberg-MarquardtMD')
- print(m)
elif forceParams is not None:
p0 = np.zeros(7)
@@ -561,6 +559,15 @@ def doBVGFit(box, nTheta=200, nPhi=200, zBG=1.96, fracBoxToHistogram=1.0, goodID
if instrumentName == 'MANDI':
pass
+ if instrumentName == 'CORELLI':
+ sigX0 = sigX0*2.
+ sigY0 = sigY0*2.
+ neigh_length_m = 5
+ convBox = 1.0*np.ones([neigh_length_m, neigh_length_m]) / neigh_length_m**2
+ conv_h = convolve(h, convBox)
+ H[:,:,0] = conv_h
+ H[:,:,1] = conv_h
+
# Set our initial guess
m = BivariateGaussian.BivariateGaussian()
m.init()
--
GitLab