Re #22811 set detector sizes as instrument params

instrument/CORELLI_Parameters.xml

@@ -30,6 +30,16 @@
      <value val="2." />
     </parameter>
 
+    <!-- Number of rows between detector gaps for profile fitting -->
+    <parameter name="numDetRows" type="int">
+     <value val="255" />
+    </parameter>
+
+    <!-- Number of cols between detector gaps for profile fitting -->
+    <parameter name="numDetCols" type="int">
+     <value val="16" />
+    </parameter>
+
   </component-link>
 
 </parameter-file>

instrument/MANDI_Parameters.xml

@@ -23,6 +23,17 @@
  <value val="2." />
 </parameter>
 
+<!-- Number of rows between detector gaps for profile fitting -->
+<parameter name="numDetRows" type="int">
+ <value val="255" />
+</parameter>
+
+<!-- Number of cols between detector gaps for profile fitting -->
+<parameter name="numDetCols" type="int">
+ <value val="255" />
+</parameter>
+
+
 
 </component-link>
 

instrument/MANDI_Parameters_2015_08_01.xml

@@ -23,6 +23,16 @@
  <value val="2." />
 </parameter>
 
+<!-- Number of rows between detector gaps for profile fitting -->
+<parameter name="numDetRows" type="int">
+ <value val="255" />
+</parameter>
+
+<!-- Number of cols between detector gaps for profile fitting -->
+<parameter name="numDetCols" type="int">
+ <value val="255" />
+</parameter>
+
 
 
 </parameter-file>

instrument/MANDI_Parameters_2016_02_01.xml

@@ -23,4 +23,14 @@
  <value val="2." />
 </parameter>
 
+<!-- Number of rows between detector gaps for profile fitting -->
+<parameter name="numDetRows" type="int">
+ <value val="255" />
+</parameter>
+
+<!-- Number of cols between detector gaps for profile fitting -->
+<parameter name="numDetCols" type="int">
+ <value val="255" />
+</parameter>
+
 </parameter-file>

instrument/TOPAZ_Parameters.xml

@@ -99,6 +99,17 @@ detScale={13:1.046504,14:1.259293,16:1.02449,17:1.18898,18:0.88014,19:0.98665,\
  <value val="3." />
 </parameter>
 
+<!-- Number of rows between detector gaps for profile fitting -->
+<parameter name="numDetRows" type="int">
+ <value val="255" />
+</parameter>
+
+<!-- Number of cols between detector gaps for profile fitting -->
+<parameter name="numDetCols" type="int">
+ <value val="255" />
+</parameter>
+
+
 </component-link>
 
 </parameter-file>

scripts/SCD_Reduction/BVGFitTools.py

@@ -77,13 +77,11 @@ def get3DPeak(peak, peaks_ws, box, padeCoefficients, qMask, nTheta=150, nPhi=150
 
     # This section defines detector size to determine if a peak is too
     # close to the edge.  Order is [NROWS, NCOLS].
-    if   instrumentName == 'MANDI':
-        nPixels = [255, 255]
-    elif instrumentName == 'TOPAZ':
-        nPixels = [255, 255]
-    elif instrumentName == 'CORELLI':
-        nPixels = [255,16]
-    else:
+    try:
+        numDetRows = peaks_ws.getInstrument().getIntParameter("numDetRows")[0]
+        numDetCols = peaks_ws.getInstrument().getIntParameter("numDetCols")[0]
+        nPixels = [numDetRows, numDetCols]
+    except:
         raise UserWarning('Instrument name {} not found. Assuming a 255*255 detector!'.format(instrumentName))
         nPixels = [255,255]