Merge pull request #888 from suddhasourav/master

BF: TrialHandlerExt - ensure proper masking of data for uncompleted blocks
psychopy · Apr 30, 2015 · 8772ef0 · 8772ef0
2 parents 4ca6468 + a4ae9d0
commit 8772ef0
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/psychopy/data.py b/psychopy/data.py
@@ -1689,7 +1689,7 @@ def _createOutputArrayData(self, dataOut):
                     thisDataChunk = self.data[dataType][idx_data==curTrialIndex,:]
                     padWidth = max(self.trialWeights)*self.nReps - numpy.prod(thisDataChunk.shape)
                     thisDataChunkRowPadded = numpy.pad(thisDataChunk.transpose().flatten().data, (0, padWidth), mode='constant', constant_values=(0,0))
-                    thisDataChunkRowPaddedMask = numpy.pad(thisDataChunk.flatten().mask, (0, padWidth), mode='constant', constant_values=(0,True))
+                    thisDataChunkRowPaddedMask = numpy.pad(thisDataChunk.transpose().flatten().mask, (0, padWidth), mode='constant', constant_values=(0,True))
 
                     thisDataChunkRow = numpy.ma.masked_array(thisDataChunkRowPadded, mask=thisDataChunkRowPaddedMask)
                     resizedData[curTrialIndex,:] = thisDataChunkRow