Re #6253. Refactored AlignAndFocusPowder and added lots of logging.

The exec and execEvents were near identical. This consolodates those
into a single branch and adds logging.
Re #6253. Put the work for LoadCalFile into a centralized function.

Re #6253. Renamed several variables in preparation.

Re #6253. Merged execEvent function into exec

Re #6253. Added more logging statements.

Code/Mantid/Framework/WorkflowAlgorithms/inc/MantidWorkflowAlgorithms/AlignAndFocusPowder.h

@@ -74,20 +74,20 @@ namespace Mantid
       // Overridden Algorithm methods
       void init();
       void exec();
-      void execEvent();
+      void loadCalFile(const std::string &calFileName);
       API::MatrixWorkspace_sptr m_inputW;
       API::MatrixWorkspace_sptr m_outputW;
-      DataObjects::EventWorkspace_sptr m_eventW;
-      DataObjects::OffsetsWorkspace_sptr offsetsWS;
-      API::MatrixWorkspace_sptr maskWS;
-      DataObjects::GroupingWorkspace_sptr groupWS;
+      DataObjects::EventWorkspace_sptr m_inputEW;
+      DataObjects::EventWorkspace_sptr m_outputEW;
+      DataObjects::OffsetsWorkspace_sptr m_offsetsWS;
+      API::MatrixWorkspace_sptr m_maskWS;
+      DataObjects::GroupingWorkspace_sptr m_groupWS;
       double l1;
       std::vector<int32_t> specids;
       std::vector<double> l2s;
       std::vector<double> tths;
       std::vector<double> phis;
-      std::string instName;
-      std::string calFileName;
+      std::string m_instName;
       std::vector<double> params;
       bool dspace;
       double xmin;
@@ -97,6 +97,7 @@ namespace Mantid
       double minwl;
       double tmin;
       double tmax;
+      bool m_preserveEvents;
       void doSortEvents(Mantid::API::Workspace_sptr ws);
 
     };