Renamed VanadiumSetup to AdvancedSetup. Refs #6555.

Code/Mantid/scripts/Interface/reduction_gui/instruments/diffraction_interface_dev.py

@@ -1,14 +1,9 @@
 from interface import InstrumentInterface
 
 from reduction_gui.widgets.diffraction.diffraction_run_setup import RunSetupWidget
-from reduction_gui.widgets.diffraction.diffraction_van_setup import VanadiumSetupWidget
+from reduction_gui.widgets.diffraction.diffraction_adv_setup import AdvancedSetupWidget
 from reduction_gui.widgets.diffraction.diffraction_filter_setup import FilterSetupWidget
 
-# from reduction_gui.widgets.inelastic.dgs_data_corrections import DataCorrectionsWidget
-# from reduction_gui.widgets.inelastic.dgs_diagnose_detectors import DiagnoseDetectorsWidget
-# from reduction_gui.widgets.inelastic.dgs_absolute_units import AbsoluteUnitsWidget
-# from reduction_gui.widgets.inelastic.dgs_pd_sc_conversion import PdAndScConversionWidget
-
 from reduction_gui.reduction.diffraction.diffraction_reduction_script import DiffractionReductionScripter
 
 class DiffractionInterface(InstrumentInterface):
@@ -27,32 +22,13 @@ def __init__(self, name, settings):
         # Scripter object to interface with Mantid 
         self.scripter = DiffractionReductionScripter(name=name, facility=settings.facility_name)        
 
-        # Tab Test: Sample run setup (Test case.  Will be removed later)
-        # self.attach(SampleSetupWidget(settings = self._settings, data_type = self.data_type))
-
         # Tab 1: Run number setup (Will be the first one)
         self.attach(RunSetupWidget(settings = self._settings, data_type = self.data_type))
 
         # Tab 2: Advanced and Vanadium number setup 
-        self.attach(VanadiumSetupWidget(settings = self._settings, data_type = self.data_type))
+        self.attach(AdvancedSetupWidget(settings = self._settings, data_type = self.data_type))
 
         # Tab 3: Event filters setup
         self.attach(FilterSetupWidget(settings = self._settings, data_type = self.data_type))
 
-        # Data corrections
-        # self.attach(DataCorrectionsWidget(settings = self._settings,
-        #                                   data_type = self.data_type))
-
-        # Diagnose detectors
-        # self.attach(DiagnoseDetectorsWidget(settings = self._settings, 
-        #                                     data_type = self.data_type))
-
-        # Absolute units normalisation
-        # self.attach(AbsoluteUnitsWidget(settings = self._settings,
-        #                                 data_type = self.data_type))
-
-        # Powder and Single Crystal conversion
-        #self.attach(PdAndScConversionWidget(settings = self._settings,
-        #                                    data_type = self.data_type))
-
         return

Code/Mantid/scripts/Interface/reduction_gui/reduction/diffraction/diffraction_adv_setup_script.py

@@ -27,7 +27,7 @@ def getBooleanElement(instrument_dom, keyname, default):
 
     return returnbool
 
-class VanadiumSetupScript(BaseScriptElement):
+class AdvancedSetupScript(BaseScriptElement):
     """ Run setup script for tab 'Run Setup'
     """
 
@@ -47,7 +47,7 @@ class VanadiumSetupScript(BaseScriptElement):
     def __init__(self, inst_name):
         """ Initialization
         """
-        super(VanadiumSetupScript, self).__init__()
+        super(AdvancedSetupScript, self).__init__()
         self.createParametersList()
 
         self.set_default_pars(inst_name)
@@ -122,7 +122,7 @@ def to_xml(self):
         """
         pardict = self.buildParameterDict()
 
-        xml = "<VanadiumSetup>\n"
+        xml = "<AdvancedSetup>\n"
         for parname in self.parnamelist:
             value = pardict[parname]
             keyname = parname.lower()
@@ -132,7 +132,7 @@ def to_xml(self):
                 value = '0'
             xml += " <%s>%s</%s>\n" % (keyname, str(value), keyname)
         # ENDFOR
-        xml += "</VanadiumSetup>\n"
+        xml += "</AdvancedSetup>\n"
 
         return xml
 
@@ -141,73 +141,73 @@ def from_xml(self, xml_str):
             @param xml_str: text to read the data from
         """       
         dom = xml.dom.minidom.parseString(xml_str)
-        element_list = dom.getElementsByTagName("VanadiumSetup")
+        element_list = dom.getElementsByTagName("AdvancedSetup")
         if len(element_list)>0:
             instrument_dom = element_list[0]
 
 
 
             tempfloat = BaseScriptElement.getStringElement(instrument_dom,
-                    "unwrapref", default=VanadiumSetupScript.unwrapref)
+                    "unwrapref", default=AdvancedSetupScript.unwrapref)
             try:
                 self.unwrapref = float(tempfloat)
             except ValueError:
                 self.unwrapref = ""
 
             tempfloat = BaseScriptElement.getStringElement(instrument_dom,
-                    "lowresref", default=VanadiumSetupScript.lowresref)
+                    "lowresref", default=AdvancedSetupScript.lowresref)
             try:
                 self.lowresref = float(tempfloat)
             except ValueError:
                 self.lowresref = ""
 
             tempfloat = BaseScriptElement.getStringElement(instrument_dom,
-                    "cropwavelengthmin", default=VanadiumSetupScript.cropwavelengthmin)
+                    "cropwavelengthmin", default=AdvancedSetupScript.cropwavelengthmin)
             try:
                 self.cropwavelengthmin = float(tempfloat)
             except ValueError:
                 self.cropwavelengthmin = ""
 
             tempfloat = BaseScriptElement.getStringElement(instrument_dom,
-                    "removepromptpulsewidth", default=VanadiumSetupScript.removepropmppulsewidth)
+                    "removepromptpulsewidth", default=AdvancedSetupScript.removepropmppulsewidth)
             try:
                 self.removepropmppulsewidth = float(tempfloat)
             except ValueError:
                 self.removepropmppulsewidth = ""
 
             tempint = BaseScriptElement.getStringElement(instrument_dom,
-                    "maxchunksize", default=VanadiumSetupScript.maxchunksize)
+                    "maxchunksize", default=AdvancedSetupScript.maxchunksize)
             try:
                 self.maxchunksize = int(tempint)
             except ValueError:
                 self.maxchunksize = ""
 
 
             self.filterbadpulses = getBooleanElement(instrument_dom, 
-                    "filterbadpulses", VanadiumSetupScript.filterbadpulses)
+                    "filterbadpulses", AdvancedSetupScript.filterbadpulses)
 
             self.pushdatapositive = BaseScriptElement.getStringElement(instrument_dom,
-                    "pushdatapositive", default=VanadiumSetupScript.pushdatapositive)
+                    "pushdatapositive", default=AdvancedSetupScript.pushdatapositive)
 
             self.stripvanadiumpeaks = getBooleanElement(instrument_dom, 
-                    "stripvanadiumpeaks", VanadiumSetupScript.stripvanadiumpeaks)
+                    "stripvanadiumpeaks", AdvancedSetupScript.stripvanadiumpeaks)
 
             tempfloat = BaseScriptElement.getStringElement(instrument_dom,
-                    "vanadiumfwhm", default=VanadiumSetupScript.vanadiumfwhm)
+                    "vanadiumfwhm", default=AdvancedSetupScript.vanadiumfwhm)
             try:
                 self.vanadiumfwhm = float(tempfloat)
             except ValueError:
                 self.vanadiumfwhm = ""
 
             tempfloat = BaseScriptElement.getStringElement(instrument_dom,
-                    "vanadiumpeaktol", default=VanadiumSetupScript.vanadiumpeaktol)
+                    "vanadiumpeaktol", default=AdvancedSetupScript.vanadiumpeaktol)
             try:
                 self.vanadiumpeaktol = float(tempfloat)
             except ValueError:
                 self.vanadiumpeaktol = ""
 
             self.vanadiumsmoothparams = BaseScriptElement.getStringElement(instrument_dom,
-                "vanadiumsmoothparams", default=VanadiumSetupScript.vanadiumsmoothparams)
+                "vanadiumsmoothparams", default=AdvancedSetupScript.vanadiumsmoothparams)
 
             return
 

Code/Mantid/scripts/Interface/reduction_gui/widgets/diffraction/diffraction_adv_setup.py

@@ -1,15 +1,15 @@
 ################################################################################ 
-# Vanadium (and advanced) Setup Widget
+# Advanced Setup Widget
 ################################################################################
 from PyQt4 import QtGui, uic, QtCore
 from functools import partial
 from reduction_gui.widgets.base_widget import BaseWidget
 import reduction_gui.widgets.util as util
 
-from reduction_gui.reduction.diffraction.diffraction_van_setup_script import VanadiumSetupScript 
-import ui.diffraction.ui_diffraction_van_setup
+from reduction_gui.reduction.diffraction.diffraction_adv_setup_script import AdvancedSetupScript 
+import ui.diffraction.ui_diffraction_adv_setup
 
-class VanadiumSetupWidget(BaseWidget):
+class AdvancedSetupWidget(BaseWidget):
     """ Widget that presents run setup including sample run, optional vanadium run and etc.
     """
     # Widge name
@@ -18,16 +18,16 @@ class VanadiumSetupWidget(BaseWidget):
     def __init__(self, parent=None, state=None, settings=None, data_type=None):
         """ Initialization
         """
-        super(VanadiumSetupWidget, self).__init__(parent, state, settings, data_type=data_type)
+        super(AdvancedSetupWidget, self).__init__(parent, state, settings, data_type=data_type)
 
-        class VanadiumSetFrame(QtGui.QFrame, ui.diffraction.ui_diffraction_van_setup.Ui_Frame): 
+        class AdvancedSetFrame(QtGui.QFrame, ui.diffraction.ui_diffraction_adv_setup.Ui_Frame): 
             """ Define class linked to UI Frame
             """
             def __init__(self, parent=None):
                 QtGui.QFrame.__init__(self, parent)
                 self.setupUi(self)
 
-        self._content = VanadiumSetFrame(self)
+        self._content = AdvancedSetFrame(self)
         self._layout.addWidget(self._content)
         self._instrument_name = settings.instrument_name
         self._facility_name = settings.facility_name
@@ -36,7 +36,7 @@ def __init__(self, parent=None):
         if state is not None:
             self.set_state(state)
         else:
-            self.set_state(VanadiumSetupScript(self._instrument_name))
+            self.set_state(AdvancedSetupScript(self._instrument_name))
 
         return
 
@@ -125,7 +125,7 @@ def get_state(self):
         """ Returns a RunSetupScript with the state of Run_Setup_Interface
         Set up all the class parameters in RunSetupScrpt with values in the content
         """
-        s = VanadiumSetupScript(self._instrument_name)
+        s = AdvancedSetupScript(self._instrument_name)
 
         s.pushdatapositive = str(self._content.pushdatapos_combo.currentText())
         s.unwrapref = self._content.unwrap_edit.text()