Merged in SLHC calo changes from Emmanuelle and fixed variables that were not initialized in the TTTracks