cleaned up the diffraction section

re #8840

Framework/Algorithms/inc/MantidAlgorithms/CorelliCrossCorrelate.h

@@ -38,7 +38,7 @@ public:
 
   virtual const std::string name() const { return "CorelliCrossCorrelate"; };
   virtual int version() const { return 1; };
-  virtual const std::string category() const { return "Diffraction;Events"; };
+  virtual const std::string category() const { return "Diffraction\\Calibration;Events"; };
   virtual const std::string summary() const {
     return "Cross-correlation calculation for the elastic signal from Corelli.";
   };

Framework/Algorithms/inc/MantidAlgorithms/CreateCalFileByNames.h

@@ -78,7 +78,7 @@ public:
   /// Algorithm's version
   virtual int version() const { return (1); }
   /// Algorithm's category for identification
-  virtual const std::string category() const { return "Diffraction"; }
+  virtual const std::string category() const { return "Diffraction\\DataHandling\\CalFiles"; }
 
 private:
   /// Calibration entries map

Framework/Algorithms/inc/MantidAlgorithms/CreateDummyCalFile.h

@@ -77,7 +77,7 @@ public:
   /// Algorithm's version
   virtual int version() const { return (1); }
   /// Algorithm's category for identification
-  virtual const std::string category() const { return "Diffraction"; }
+  virtual const std::string category() const { return "Diffraction\\DataHandling\\CalFiles"; }
 
 private:
   /// Calibration entries map

Framework/Algorithms/inc/MantidAlgorithms/DiffractionEventCalibrateDetectors.h

@@ -59,7 +59,7 @@ public:
   virtual int version() const { return 1; }
   /// Algorithm's category for identification overriding a virtual method
   virtual const std::string category() const {
-    return "Diffraction;CorrectionFunctions\\InstrumentCorrections";
+    return "Diffraction\\Calibration;CorrectionFunctions\\InstrumentCorrections";
   }
   /// Function to optimize
   double intensity(double x, double y, double z, double rotx, double roty,

Framework/Algorithms/inc/MantidAlgorithms/DiffractionFocussing.h

@@ -80,7 +80,7 @@ public:
   /// Algorithm's version for identification overriding a virtual method
   virtual int version() const { return 1; }
   /// Algorithm's category for identification overriding a virtual method
-  virtual const std::string category() const { return "Diffraction"; }
+  virtual const std::string category() const { return "Diffraction\\Focussing"; }
 
 private:
   // Overridden Algorithm methods

Framework/Algorithms/inc/MantidAlgorithms/DiffractionFocussing2.h

@@ -97,7 +97,7 @@ public:
   /// Algorithm's version for identification overriding a virtual method
   virtual int version() const { return 2; }
   /// Algorithm's category for identification overriding a virtual method
-  virtual const std::string category() const { return "Diffraction"; }
+  virtual const std::string category() const { return "Diffraction\\Focussing"; }
 
 private:
   // Overridden Algorithm methods

Framework/Algorithms/inc/MantidAlgorithms/ExportTimeSeriesLog.h

@@ -44,7 +44,7 @@ public:
   virtual const std::string name() const { return "ExportTimeSeriesLog"; };
   virtual int version() const { return 1; };
   virtual const std::string category() const {
-    return "Diffraction;Events\\EventFiltering";
+    return "Diffraction\\DataHandling;Events\\EventFiltering";
   };
 
   /// Summary of algorithms purpose

Framework/Algorithms/inc/MantidAlgorithms/FixGSASInstrumentFile.h

@@ -46,7 +46,7 @@ public:
   virtual int version() const { return 1; }
 
   /// Algorithm's category for identification overriding a virtual method
-  virtual const std::string category() const { return "Diffraction"; }
+  virtual const std::string category() const { return "Diffraction\\DataHandling"; }
 
 private:
   /// Implement abstract Algorithm methods

Framework/Algorithms/inc/MantidAlgorithms/GetDetOffsetsMultiPeaks.h

@@ -77,7 +77,7 @@ public:
   /// Algorithm's version for identification overriding a virtual method
   virtual int version() const { return 1; }
   /// Algorithm's category for identification overriding a virtual method
-  virtual const std::string category() const { return "Diffraction"; }
+  virtual const std::string category() const { return "Diffraction\\Calibration"; }
   /// Summary of algorithms purpose
   virtual const std::string summary() const {
     return "Creates an OffsetsWorkspace containing offsets for each detector. "

Framework/Algorithms/inc/MantidAlgorithms/GetDetectorOffsets.h

@@ -52,7 +52,7 @@ public:
   /// Algorithm's version for identification overriding a virtual method
   virtual int version() const { return 1; }
   /// Algorithm's category for identification overriding a virtual method
-  virtual const std::string category() const { return "Diffraction"; }
+  virtual const std::string category() const { return "Diffraction\\Calibration"; }
 
 private:
   // Overridden Algorithm methods

Framework/Algorithms/inc/MantidAlgorithms/GetTimeSeriesLogInformation.h

@@ -52,7 +52,7 @@ public:
 
   virtual int version() const { return 1; }
   virtual const std::string category() const {
-    return "Diffraction;Events\\EventFiltering";
+    return "Diffraction\\Utility;Events\\EventFiltering";
   }
 
 private:

Framework/Algorithms/inc/MantidAlgorithms/HRPDSlabCanAbsorption.h

@@ -84,7 +84,7 @@ public:
   /// Algorithm's version
   virtual int version() const { return (1); }
   /// Algorithm's category for identification
-  virtual const std::string category() const { return "Diffraction"; }
+  virtual const std::string category() const { return "CorrectionFunctions\\AbsorptionCorrections"; }
 
 private:
   /// Initialisation code

Framework/Algorithms/inc/MantidAlgorithms/MaskDetectorsIf.h

@@ -62,7 +62,7 @@ public:
   virtual int version() const { return 1; }
   /// Algorithm's category for identification overriding a virtual method
   virtual const std::string category() const {
-    return "Diffraction;Transforms\\Masking";
+    return "Diffraction\\Masking;Transforms\\Masking";
   }
 
 private:

Framework/Algorithms/inc/MantidAlgorithms/PDFFourierTransform.h

@@ -25,8 +25,7 @@ public:
   /// Algorithm's version for identification
   virtual int version() const;
   /// Algorithm's category for identification
-  virtual const std::string
-  category() const; // category better be in diffraction than general
+  virtual const std::string category() const; 
   /// @copydoc Algorithm::validateInputs()
   virtual std::map<std::string, std::string> validateInputs();
 

Framework/Algorithms/inc/MantidAlgorithms/PointByPointVCorrection.h

@@ -51,7 +51,7 @@ public:
   virtual int version() const { return 1; }
   /// Algorithm's category for identification overriding a virtual method
   virtual const std::string category() const {
-    return "Diffraction;CorrectionFunctions\\SpecialCorrections";
+    return "Diffraction\\Corrections;CorrectionFunctions\\SpecialCorrections";
   }
 
 private:

Framework/Algorithms/inc/MantidAlgorithms/ReadGroupsFromFile.h

@@ -93,7 +93,7 @@ public:
   /// Algorithm's version
   virtual int version() const { return (1); }
   /// Algorithm's category for identification
-  virtual const std::string category() const { return "Diffraction"; }
+  virtual const std::string category() const { return "Diffraction\\DataHandling\\CalFiles"; }
 
 private:
   /// Map containing the detector entries found in the *.cal file. The key is

Framework/Algorithms/inc/MantidAlgorithms/SaveGSASInstrumentFile.h

@@ -52,7 +52,7 @@ public:
   /// Algorithm's version
   virtual int version() const { return (1); }
   /// Algorithm's category for identification
-  virtual const std::string category() const { return "Diffraction"; }
+  virtual const std::string category() const { return "Diffraction\\DataHandling"; }
 
 private:
   /// Initialisation code

Framework/Algorithms/inc/MantidAlgorithms/StripVanadiumPeaks.h

@@ -75,7 +75,7 @@ public:
   virtual int version() const { return (1); }
   /// Algorithm's category for identification
   virtual const std::string category() const {
-    return "CorrectionFunctions\\PeakCorrections;Optimization\\PeakFinding;Diffraction";
+    return "CorrectionFunctions\\PeakCorrections;Optimization\\PeakFinding;Diffraction\\Corrections";
   }
 
 private:

Framework/Algorithms/inc/MantidAlgorithms/StripVanadiumPeaks2.h

@@ -44,7 +44,7 @@ public:
   virtual int version() const { return 2; }
   /// Algorithm's category for identification
   virtual const std::string category() const {
-    return "CorrectionFunctions\\PeakCorrections;Optimization\\PeakFinding;Diffraction";
+    return "CorrectionFunctions\\PeakCorrections;Optimization\\PeakFinding;Diffraction\\Corrections";
   }
   /// Summary of algorithms purpose
   virtual const std::string summary() const {

Framework/Algorithms/src/AlignDetectors.cpp

@@ -145,7 +145,7 @@ const std::string AlignDetectors::name() const { return "AlignDetectors"; }
 
 int AlignDetectors::version() const { return 1; }
 
-const std::string AlignDetectors::category() const { return "Diffraction"; }
+const std::string AlignDetectors::category() const { return "Diffraction\\Calibration"; }
 
 const std::string AlignDetectors::summary() const {
   return "Performs a unit change from TOF to dSpacing, correcting the X "