diff --git a/Framework/PythonInterface/plugins/algorithms/IntegratePeaksProfileFitting.py b/Framework/PythonInterface/plugins/algorithms/IntegratePeaksProfileFitting.py index d28d1ad818e9860ff8eeacc54587c994ed1c780a..0e673d14fa7dc9ca7d93808c005f5dfbf86696b5 100644 --- a/Framework/PythonInterface/plugins/algorithms/IntegratePeaksProfileFitting.py +++ b/Framework/PythonInterface/plugins/algorithms/IntegratePeaksProfileFitting.py @@ -130,7 +130,7 @@ class IntegratePeaksProfileFitting(PythonAlgorithm): nTheta=50 nPhi = 50 fracHKL = 0.4 - dQPixel = 0.006 + dQPixel = 0.01 elif instrumentName == 'CORELLI': mindtBinWidth = 2 maxdtBinWidth = 60 @@ -232,9 +232,9 @@ class IntegratePeaksProfileFitting(PythonAlgorithm): peak.setSigmaIntensity(1.0) # Cleanup - for wsName in mtd.getObjectNames(): - if 'fit_' in wsName or 'bvgWS' in wsName or 'tofWS' in wsName or 'scaleWS' in wsName: - mtd.remove(wsName) + #for wsName in mtd.getObjectNames(): + # if 'fit_' in wsName or 'bvgWS' in wsName or 'tofWS' in wsName or 'scaleWS' in wsName: + # mtd.remove(wsName) np.warnings.filterwarnings('default') # Re-enable on exit # Set the output self.setProperty('OutputPeaksWorkspace', peaks_ws_out) diff --git a/docs/source/algorithms/IntegratePeaksProfileFitting-v1.rst b/docs/source/algorithms/IntegratePeaksProfileFitting-v1.rst index 85f1c9c78ea7733b7902bf991f88d591047b65e5..2f1365646904cc759f75c951633170a6a3e33edc 100644 --- a/docs/source/algorithms/IntegratePeaksProfileFitting-v1.rst +++ b/docs/source/algorithms/IntegratePeaksProfileFitting-v1.rst @@ -46,7 +46,7 @@ values are below: | Parameter | Description | MaNDi | TOPAZ | CORELLI | +==============+============================+==========+==========+=========+ | DQPixel | The side length for each | | | | -| | voxel used for fitting. | 0.003 | 0.006 | 0.007 | +| | voxel used for fitting. | 0.003 | 0.01 | 0.007 | | | Units: 1/Angstrom | | | | +--------------+----------------------------+----------+----------+---------+ | FracHKL | The distance between peaks | | | | diff --git a/scripts/SCD_Reduction/BVGFitTools.py b/scripts/SCD_Reduction/BVGFitTools.py index 722c20b9c416b09d7b4160c83713d294c97e6bb4..b2d479288ebff023ab820adcab771a26666cf262 100644 --- a/scripts/SCD_Reduction/BVGFitTools.py +++ b/scripts/SCD_Reduction/BVGFitTools.py @@ -190,7 +190,7 @@ def fitScaling(n_events, box, YTOF, YBVG, goodIDX=None, neigh_length_m=3, instru QX, QY, QZ = ICCFT.getQXQYQZ(box) dP = 8 if instrumentName == 'TOPAZ': - dP = 3 + dP = 8 fitMaxIDX = tuple( np.array(np.unravel_index(YJOINT.argmax(), YJOINT.shape))) if goodIDX is None: @@ -517,7 +517,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') - elif forceParams is not None: p0 = np.zeros(7) p0[0] = np.max(h)