fix device model order

[antoinefalisse]

The iPhoneModel order should take the camera mapping into account since video order might change across trials. Luckily this should not affect processing.

[carmichaelong]

Thanks @antoinefalisse, this looks like it should fix the issue that you mentioned.

One change that could be helpful is to make a small helper function for grabbing the clean device id, and then use it in the 3 places in this function (L233, L240, L259). I think the helper function would look something like this (haven't actually tested this):

def getCleanDeviceID(video):
  return video["device_id"].replace('-', '').upper()

Also if you had a quick test that could check this that would be great, but given that this is a small patch to a complicated function, I'd be OK with skipping a test for now for this patch.