Re #23470 update instrument parameter files

instrument/CORELLI_Parameters.xml

@@ -75,6 +75,21 @@
      <value val="10" />
     </parameter>
 
+    <!-- Initial guess parameters for coshPeakWidthModel -->
+    <parameter name="sigSC0Params" type="string">
+     <value val="0.00413132 1.54103839 1.0 -0.00266634" />
+    </parameter>
+
+    <!-- Initial guess for sigma along the azimuthal direction (rad) -->
+    <parameter name="sigAZ0">
+     <value val="0.0025" />
+    </parameter>
+
+    <!-- Initial guess parameters for fsigP (BVG covariance) -->
+    <parameter name="sigP0Params" type="string">
+     <value val="0.1460775 1.85816592 0.26850086 -0.00725352" />
+    </parameter>
+
     <!-- Constraints for ICC fitting.  Valid names are iccA, iccB, iccR, iccT0, iccScale0
          iccHatWidth and iccKConv.  Inputs are strings with values separated by
          spaces which are prased by the IntegratePeaksProfileFitting algorithm.  

instrument/MANDI_Parameters.xml

@@ -68,6 +68,21 @@
  <value val="5" />
 </parameter>
 
+<!-- Initial guess parameters for coshPeakWidthModel -->
+<parameter name="sigSC0Params" type="string">
+ <value val="0.00413132 1.54103839 1.0 -0.00266634" />
+</parameter>
+
+<!-- Initial guess for sigma along the azimuthal direction (rad) -->
+<parameter name="sigAZ0">
+ <value val="0.0025" />
+</parameter>
+
+<!-- Initial guess parameters for fsigP (BVG covariance) -->
+<parameter name="sigP0Params" type="string">
+ <value val="0.1460775 1.85816592 0.26850086 -0.00725352" />
+</parameter>
+
 </component-link>
 
 </parameter-file>

instrument/MANDI_Parameters_2015_08_01.xml

@@ -67,5 +67,20 @@
  <value val="5" />
 </parameter>
 
+<!-- Initial guess parameters for coshPeakWidthModel -->
+<parameter name="sigSC0Params" type="string">
+ <value val="0.00413132 1.54103839 1.0 -0.00266634" />
+</parameter>
+
+<!-- Initial guess for sigma along the azimuthal direction (rad) -->
+<parameter name="sigAZ0">
+ <value val="0.0025" />
+</parameter>
+
+<!-- Initial guess parameters for fsigP (BVG covariance) -->
+<parameter name="sigP0Params" type="string">
+ <value val="0.1460775 1.85816592 0.26850086 -0.00725352" />
+</parameter>
+
 </component-link>
 </parameter-file>

instrument/MANDI_Parameters_2016_02_01.xml

@@ -67,5 +67,20 @@
  <value val="5" />
 </parameter>
 
+<!-- Initial guess parameters for coshPeakWidthModel -->
+<parameter name="sigSC0Params" type="string">
+ <value val="0.00413132 1.54103839 1.0 -0.00266634" />
+</parameter>
+
+<!-- Initial guess for sigma along the azimuthal direction (rad) -->
+<parameter name="sigAZ0">
+ <value val="0.0025" />
+</parameter>
+
+<!-- Initial guess parameters for fsigP (BVG covariance) -->
+<parameter name="sigP0Params" type="string">
+ <value val="0.1460775 1.85816592 0.26850086 -0.00725352" />
+</parameter>
+
 </component-link>
 </parameter-file>

instrument/TOPAZ_Parameters.xml

@@ -144,6 +144,21 @@ detScale={13:1.046504,14:1.259293,16:1.02449,17:1.18898,18:0.88014,19:0.98665,\
  <value val="15" />
 </parameter>
 
+<!-- Initial guess parameters for coshPeakWidthModel -->
+<parameter name="sigSC0Params" type="string">
+ <value val="0.00413132 1.54103839 1.0 -0.00266634" />
+</parameter>
+
+<!-- Initial guess for sigma along the azimuthal direction (rad) -->
+<parameter name="sigAZ0">
+ <value val="0.0025" />
+</parameter>
+
+<!-- Initial guess parameters for fsigP (BVG covariance) -->
+<parameter name="sigP0Params" type="string">
+ <value val="0.1460775 1.85816592 0.26850086 -0.00725352" />
+</parameter>
+
 <!-- Constraints for ICC fitting.  Valid names are iccA, iccB, iccR, iccT0, iccScale0
      iccHatWidth and iccKConv.  Inputs are strings with values separated by
      spaces which are prased by the IntegratePeaksProfileFitting algorithm.  
@@ -158,5 +173,7 @@ detScale={13:1.046504,14:1.259293,16:1.02449,17:1.18898,18:0.88014,19:0.98665,\
 </parameter>
 </component-link>
 
+
+
 </parameter-file>
  

scripts/SCD_Reduction/BVGFitTools.py

@@ -184,16 +184,16 @@ def getBVGGuesses(peaks_ws, sigX0Params, sigY0, sigP0Params):
     # If we're not given initial guesses for the BVG, then we try to find instrument defaults.  If those are not
     # available we use default values.
     if sigX0Params is None:
-        if peaks_ws.getInstrument().hasParameter("sigX0Params"):
-            sigX0Params = np.array(peaks_ws.getInstrument().getStringParameter("sigX0Params")[0].split(),dtype=float)
+        if peaks_ws.getInstrument().hasParameter("sigSC0Params"):
+            sigX0Params = np.array(peaks_ws.getInstrument().getStringParameter("sigSC0Params")[0].split(),dtype=float)
         else:
             sigX0Params=[0.00413132, 1.54103839, 1.0, -0.00266634]
     
     if sigY0 is None:
-        if peaks_ws.getInstrument().hasParameter("sigY0"):
-            sigY0 = peaks_ws.getInstrument().getNumberParameter("sigY0")[0]
+        if peaks_ws.getInstrument().hasParameter("sigAZ0"):
+            sigY0 = peaks_ws.getInstrument().getNumberParameter("sigAZ0")[0]
         else:
-            sigY0=0.025
+            sigY0=0.0025
     if sigP0Params is None:
         if peaks_ws.getInstrument().hasParameter("sigP0Params"):
             sigP0Params = np.array(peaks_ws.getInstrument().getStringParameter("sigP0Params")[0].split(),dtype=float)