Refs #4819. Changed to using all neutron diffraction technique at SNS.

mantidproject · Feb 17, 2012 · 6c78eb7 · 6c78eb7
1 parent 5b6cebc
commit 6c78eb7
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 3 deletions.
diff --git a/Code/Mantid/Framework/PythonAPI/PythonAlgorithms/CalibrateRectangularDetectors.py b/Code/Mantid/Framework/PythonAPI/PythonAlgorithms/CalibrateRectangularDetectors.py
@@ -28,7 +28,13 @@ def name(self):
         return "CalibrateRectangularDetectors"
 
     def PyInit(self):
-        instruments = ["PG3", "VULCAN", "SNAP", "NOM", "TOPAZ"]
+        sns = mtd.getSettings().facility("SNS")
+        instruments = []
+        for instr in sns.instruments():
+          for tech in instr.techniques():
+            if "Neutron Diffraction" == str(tech):
+              instruments.append(instr.shortName())
+              break
         self.declareProperty("Instrument", "PG3",
                              Validator=ListValidator(instruments))
         #types = ["Event preNeXus", "Event NeXus"]

diff --git a/Code/Mantid/Framework/PythonAPI/PythonAlgorithms/SNSPowderReduction.py b/Code/Mantid/Framework/PythonAPI/PythonAlgorithms/SNSPowderReduction.py
@@ -155,7 +155,13 @@ def name(self):
         return "SNSPowderReduction"
 
     def PyInit(self):
-        instruments = ["PG3", "VULCAN", "SNAP", "NOM"]
+        sns = mtd.getSettings().facility("SNS")
+        instruments = []
+        for instr in sns.instruments():
+          for tech in instr.techniques():
+            if "Neutron Diffraction" == str(tech):
+              instruments.append(instr.shortName())
+              break
         self.declareProperty("Instrument", "PG3",
                              Validator=ListValidator(instruments))
         #types = ["Event preNeXus", "Event NeXus"]

diff --git a/Code/Mantid/Framework/PythonAPI/PythonAlgorithms/SNSPowderReduction2.py b/Code/Mantid/Framework/PythonAPI/PythonAlgorithms/SNSPowderReduction2.py
@@ -155,7 +155,13 @@ def name(self):
         return "SNSPowderReduction2"
 
     def PyInit(self):
-        instruments = ["PG3", "VULCAN", "SNAP", "NOM"]
+        sns = mtd.getSettings().facility("SNS")
+        instruments = []
+        for instr in sns.instruments():
+          for tech in instr.techniques():
+            if "Neutron Diffraction" == str(tech):
+              instruments.append(instr.shortName())
+              break
         self.declareProperty("Instrument", "PG3",
                              Validator=ListValidator(instruments))
         #types = ["Event preNeXus", "Event NeXus"]