numpy indexing with tuples with contacts

tools/label/contacts.py

@@ -284,16 +284,16 @@ def contactPoints(lab, contactPairs, returnContactZones=False, boundingBoxes=Non
 
             dilOnly = numpy.logical_xor(p2['subvol'], p1['subvol'])
 
-            labSlice  = [slice(p1['slice'][0].start,p1['slice'][0].stop),
+            labSlice  = (slice(p1['slice'][0].start,p1['slice'][0].stop),
                          slice(p1['slice'][1].start,p1['slice'][1].stop),
-                         slice(p1['slice'][2].start,p1['slice'][2].stop)]
+                         slice(p1['slice'][2].start,p1['slice'][2].stop))
 
-            labSubvol = lab[ labSlice ]
+            labSubvol = lab[labSlice]
 
             if (dilOnly.shape == labSubvol.shape):
                 intersection = dilOnly * labSubvol
 
-                analysisVolume[ labSlice ][ intersection==label2 ] = n+1
+                analysisVolume[labSlice][intersection==label2] = n+1
 
             else:
                 raise Exception(
@@ -302,11 +302,11 @@ def contactPoints(lab, contactPairs, returnContactZones=False, boundingBoxes=Non
     if returnContactZones:
         return analysisVolume
     else:
-        return spam.label.centresOfMass( analysisVolume )
+        return spam.label.centresOfMass(analysisVolume)
 
 
 
-def labelledContacts( lab, maximumCoordinationNumber=20 ):
+def labelledContacts(lab, maximumCoordinationNumber=20):
     """
     Uniquely names contacts based on grains.