adjusted calibration structure for all raw's
adjusted calibration structure for desire
Merge pull request #5 from ipa-fxm/groovy_dev

Groovy dev