Re #9264. Generalized log message for chunking.

mantidproject · Apr 3, 2014 · 435f20c · 435f20c
1 parent 0b1be84
commit 435f20c
Showing 1 changed file with 8 additions and 4 deletions.
diff --git a/Code/Mantid/Framework/PythonInterface/plugins/algorithms/SNSPowderReduction.py b/Code/Mantid/Framework/PythonInterface/plugins/algorithms/SNSPowderReduction.py
@@ -492,6 +492,13 @@ def _getStrategy(self, runnumber, extension):
 
         return strategy
 
+    def __logChunkInfo(self, chunk):
+        keys = chunk.keys()
+        keys.sort()
+
+        keys = [ str(key) + "=" + str(chunk[key]) for key in keys ]
+        self.log().information("Working on chunk [" + ", ".join(keys) + "]")
+
     def _focusChunks(self, runnumber, extension, filterWall, calib, splitwksp=None, preserveEvents=True):
         """ Load, (optional) split and focus data in chunks
 
@@ -545,10 +552,7 @@ def _focusChunks(self, runnumber, extension, filterWall, calib, splitwksp=None,
             ichunk += 1
 
             # Log information
-            if "ChunkNumber" in chunk:
-                self.log().information("Working on chunk %d of %d" % (chunk["ChunkNumber"], chunk["TotalChunks"]))
-            elif "SpectrumMin" in chunk:
-                self.log().information("Working on spectrums %d through %d" % (chunk["SpectrumMin"], chunk["SpectrumMax"]))
+            self.__logChunkInfo(chunk)
 
             # Load chunk
             temp = self._loadData(runnumber, extension, filterWall, **chunk)