Sorry tim, but I don't understand your comment re marigolds being 'in flower in time' . The efficiency of the companion planting has nothing to do with their being in flower at the same time. Purely by planting the marigolds in the same container as the tomato plant, the marigolds are supposed to give off a substance that whitefly do not like, which is taken up into the tomato plants. No additional watering is necessary. You water the tomato pots, and at the same time water the marigolds.
I would never ever use the yellow 'trappits', as they may trap the whitefly, but they would also trap the good insects, such as hoverflies, lacewings etc.
valmarg