merging with code by Steffi Benthin,
experiment data definition for new style
Authored by: berndspeiser 2012-04-10
Parent: [r1078]
Child: [r1080]